From 1fa5207bf7811fafa3321a183d993e286c8a3a89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 05:14:51 +0000 Subject: [PATCH 001/101] Bump rollup from 3.29.4 to 3.29.5 in /frontend Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 58416aa4..204cfc82 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -13988,9 +13988,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -26017,9 +26017,9 @@ } }, "rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "requires": { "fsevents": "~2.3.2" From 579c996decadaa26c9dcb6fd73ba26852421bf19 Mon Sep 17 00:00:00 2001 From: UtkarshMishra-Microsoft Date: Wed, 30 Oct 2024 18:25:50 +0530 Subject: [PATCH 002/101] fix bug #7834 --- scripts/data_utils.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/scripts/data_utils.py b/scripts/data_utils.py index 33071c26..9610198e 100644 --- a/scripts/data_utils.py +++ b/scripts/data_utils.py @@ -146,9 +146,11 @@ def find_imgs(string): def split_text(self, text: str) -> List[str]: content_dict, masked_text = self.mask_urls_and_imgs(text) - start_tag = self._table_tags["table_open"] - end_tag = self._table_tags["table_close"] - splits = masked_text.split(start_tag) + start_tags = [self._table_tags["table_open"] ""] + end_tags = [self._table_tags["table_close"] ""] + splits = masked_text + for start_tag in start_tags: + splits = splits.split(start_tag) final_chunks = self.chunk_rest(splits[0]) # the first split is before the first table tag so it is regular text @@ -156,10 +158,12 @@ def split_text(self, text: str) -> List[str]: if len(final_chunks)>0: table_caption_prefix += self.extract_caption(final_chunks[-1]) # extracted from the last chunk before the table for part in splits[1:]: - table, rest = part.split(end_tag) - table = start_tag + table + end_tag - minitables = self.chunk_table(table, table_caption_prefix) - final_chunks.extend(minitables) + for end_tag in part: + if end_tag in part: + table, rest = part.split(end_tag) + table = start_tags[0] + table + end_tags[0] + minitables = self.chunk_table(table, table_caption_prefix) + final_chunks.extend(minitables) if rest.strip()!="": text_minichunks = self.chunk_rest(rest) @@ -167,7 +171,7 @@ def split_text(self, text: str) -> List[str]: table_caption_prefix = self.extract_caption(text_minichunks[-1]) else: table_caption_prefix = "" - + break final_final_chunks = [chunk for chunk, chunk_size in merge_chunks_serially(final_chunks, self._chunk_size, content_dict)] From 9b313b1c4ca2b2a7f8544c17d31ccbdadeb3cc50 Mon Sep 17 00:00:00 2001 From: UtkarshMishra-Microsoft Date: Wed, 30 Oct 2024 18:48:49 +0530 Subject: [PATCH 003/101] fixissue7834 --- scripts/data_utils.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/data_utils.py b/scripts/data_utils.py index 9610198e..811cf8f6 100644 --- a/scripts/data_utils.py +++ b/scripts/data_utils.py @@ -146,8 +146,8 @@ def find_imgs(string): def split_text(self, text: str) -> List[str]: content_dict, masked_text = self.mask_urls_and_imgs(text) - start_tags = [self._table_tags["table_open"] ""] - end_tags = [self._table_tags["table_close"] ""] + start_tags = [self._table_tags["table_open"], ""] + end_tags = [self._table_tags["table_close"], ""] splits = masked_text for start_tag in start_tags: splits = splits.split(start_tag) @@ -165,13 +165,12 @@ def split_text(self, text: str) -> List[str]: minitables = self.chunk_table(table, table_caption_prefix) final_chunks.extend(minitables) - if rest.strip()!="": - text_minichunks = self.chunk_rest(rest) - final_chunks.extend(text_minichunks) - table_caption_prefix = self.extract_caption(text_minichunks[-1]) - else: - table_caption_prefix = "" - break + if rest.strip()!="": + text_minichunks = self.chunk_rest(rest) + final_chunks.extend(text_minichunks) + table_caption_prefix = self.extract_caption(text_minichunks[-1]) + else: + table_caption_prefix = "" final_final_chunks = [chunk for chunk, chunk_size in merge_chunks_serially(final_chunks, self._chunk_size, content_dict)] From 0da12b9898c7f3be6b30b2f291cea872fbea25b6 Mon Sep 17 00:00:00 2001 From: Pavan-Microsoft Date: Thu, 31 Oct 2024 15:54:23 +0530 Subject: [PATCH 004/101] Update docker-build-and-push.yml --- .github/workflows/docker-build-and-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index 38102f59..b2912ff9 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -28,5 +28,5 @@ jobs: - name: Build and push Docker image run: | - docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest -f WebApp.Dockerfile . - docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest \ No newline at end of file + docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:dev -f WebApp.Dockerfile . + docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:dev From 4aa87952b862f909b2e08e6e995f197b41486813 Mon Sep 17 00:00:00 2001 From: Pavan-Microsoft Date: Thu, 31 Oct 2024 15:56:10 +0530 Subject: [PATCH 005/101] Update deployment.json --- infrastructure/deployment.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/deployment.json b/infrastructure/deployment.json index 91885419..fb5cf461 100644 --- a/infrastructure/deployment.json +++ b/infrastructure/deployment.json @@ -263,7 +263,7 @@ } }, "variables": { - "WebAppImageName": "DOCKER|acrbyocga.azurecr.io/webapp:latest", + "WebAppImageName": "DOCKER|byocgacontainerreg.azurecr.io/webapp:dev", "cosmosdb_database_name": "db_conversation_history", "cosmosdb_container_name": "conversations", "roleDefinitionId": "00000000-0000-0000-0000-000000000002", @@ -638,4 +638,4 @@ ] } ] -} \ No newline at end of file +} From 8144e24b8fd231ba2576ff53f0c357e8b83c51a7 Mon Sep 17 00:00:00 2001 From: Mohan Venudass Date: Tue, 5 Nov 2024 18:05:41 +0530 Subject: [PATCH 006/101] Fix the bug 9825 --- frontend/src/components/Sidebar/Sidebar.tsx | 130 +++++++++++++++----- frontend/src/pages/chat/Chat.tsx | 15 +++ frontend/src/state/AppProvider.tsx | 5 +- frontend/src/state/AppReducer.tsx | 2 + 4 files changed, 121 insertions(+), 31 deletions(-) diff --git a/frontend/src/components/Sidebar/Sidebar.tsx b/frontend/src/components/Sidebar/Sidebar.tsx index 9dc59360..da774019 100644 --- a/frontend/src/components/Sidebar/Sidebar.tsx +++ b/frontend/src/components/Sidebar/Sidebar.tsx @@ -1,13 +1,20 @@ import React, { useEffect, useState, useContext } from 'react' import { Stack, Text } from '@fluentui/react' -import { Book28Regular, Book32Regular, BookRegular, News28Regular, NewsRegular, Notepad28Regular, Notepad32Regular } from '@fluentui/react-icons' +import { + Book28Regular, + Book32Regular, + BookRegular, + News28Regular, + NewsRegular, + Notepad28Regular, + Notepad32Regular +} from '@fluentui/react-icons' import { Button, Avatar } from '@fluentui/react-components' import styles from './Sidebar.module.css' import { AppStateContext } from '../../state/AppProvider' import { getUserInfo } from '../../api' import { useNavigate, useLocation } from 'react-router-dom' - enum NavigationButtonStates { Active = 'active', Inactive = 'inactive', @@ -28,9 +35,24 @@ const NavigationButton = ({ text, buttonState, onClick }: NavigationButtonProps) }[buttonState] const iconElements: { [key: string]: JSX.Element } = { - 'Browse': , - 'Generate': , - 'Draft': + Browse: ( + + ), + Generate: ( + + ), + Draft: ( + + ) } const buttonStyle = { @@ -42,13 +64,18 @@ const NavigationButton = ({ text, buttonState, onClick }: NavigationButtonProps) const icon = iconElements[text] return ( - {}} className={buttonStyle}> -