fix tests path

Azure-Samples · Feb 20, 2024 · 792c7f8 · 792c7f8
1 parent 32c5851
commit 792c7f8
Show file tree

Hide file tree

Showing 125 changed files with 25 additions and 970 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -29,7 +29,7 @@
 				"TeamsDevApp.ms-teams-vscode-extension"
 			],
 			"settings": {
-				"azureFunctions.projectSubpath": "code/batch",
+				"azureFunctions.projectSubpath": "code/backend/batch",
                 "python.defaultInterpreterPath": "/usr/local/bin/python",
 				"python.pythonPath": "/usr/local/bin/python"
             }

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -21,7 +21,5 @@ jobs:
         - name: Install dependencies
           run: |
             pip install -r code/requirements.txt -r code/dev-requirements.txt -r code/backend/requirements.txt
-        - name: Check directory into codes 
-          run: cd codes/
         - name: Run Python tests
-          run: python -m pytest -m "not azure"
+          run: cd code/; python -m pytest -m "not azure"
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "azureFunctions.deploySubpath": "code\\batch",
+    "azureFunctions.deploySubpath": "code\\backend\\batch",
     "azureFunctions.scmDoBuildDuringDeployment": true,
     "azureFunctions.pythonVenv": ".venv",
     "azureFunctions.projectLanguage": "Python",

diff --git a/azure.yaml b/azure.yaml
@@ -6,7 +6,7 @@ metadata:
 
 services:
   web:
-    project: ./codes
+    project: ./code
     language: py
     host: appservice
     hooks:
@@ -23,11 +23,11 @@ services:
           continueOnError: false
 
   adminweb:
-    project: ./codes/backend
+    project: ./code/backend
     language: py
     host: appservice
 
   function:
-    project: ./codes/backend/batch
+    project: ./code/backend/batch
     language: py
     host: function
diff --git a/codes/app.py → code/app.py b/codes/app.py → code/app.py
diff --git a/codes/backend/Admin.py → code/backend/Admin.py b/codes/backend/Admin.py → code/backend/Admin.py
diff --git a/codes/backend/batch/.funcignore → code/backend/batch/.funcignore b/codes/backend/batch/.funcignore → code/backend/batch/.funcignore
diff --git a/codes/backend/batch/.gitignore → code/backend/batch/.gitignore b/codes/backend/batch/.gitignore → code/backend/batch/.gitignore
diff --git a/codes/backend/batch/.vscode/extensions.json → code/backend/batch/.vscode/extensions.json b/codes/backend/batch/.vscode/extensions.json → code/backend/batch/.vscode/extensions.json
diff --git a/codes/backend/batch/AddURLEmbeddings.py → code/backend/batch/AddURLEmbeddings.py b/codes/backend/batch/AddURLEmbeddings.py → code/backend/batch/AddURLEmbeddings.py
diff --git a/codes/backend/batch/BatchPushResults.py → code/backend/batch/BatchPushResults.py b/codes/backend/batch/BatchPushResults.py → code/backend/batch/BatchPushResults.py
diff --git a/codes/backend/batch/BatchStartProcessing.py → code/backend/batch/BatchStartProcessing.py b/codes/backend/batch/BatchStartProcessing.py → code/backend/batch/BatchStartProcessing.py
diff --git a/codes/backend/batch/function_app.py → code/backend/batch/function_app.py b/codes/backend/batch/function_app.py → code/backend/batch/function_app.py
diff --git a/codes/backend/batch/host.json → code/backend/batch/host.json b/codes/backend/batch/host.json → code/backend/batch/host.json
diff --git a/.../backend/batch/local.settings.json.sample → .../backend/batch/local.settings.json.sample b/.../backend/batch/local.settings.json.sample → .../backend/batch/local.settings.json.sample
diff --git a/codes/backend/batch/requirements.txt → code/backend/batch/requirements.txt b/codes/backend/batch/requirements.txt → code/backend/batch/requirements.txt
diff --git a/codes/__init__.py → code/backend/batch/utilities/__init__.py b/codes/__init__.py → code/backend/batch/utilities/__init__.py
diff --git a/.../backend/batch/utilities/common/Answer.py → .../backend/batch/utilities/common/Answer.py b/.../backend/batch/utilities/common/Answer.py → .../backend/batch/utilities/common/Answer.py
diff --git a/.../batch/utilities/common/SourceDocument.py → .../batch/utilities/common/SourceDocument.py b/.../batch/utilities/common/SourceDocument.py → .../batch/utilities/common/SourceDocument.py
diff --git a/codes/backend/__init__.py → ...ackend/batch/utilities/common/__init__.py b/codes/backend/__init__.py → ...ackend/batch/utilities/common/__init__.py
diff --git a/...document_chunking/DocumentChunkingBase.py → ...document_chunking/DocumentChunkingBase.py b/...document_chunking/DocumentChunkingBase.py → ...document_chunking/DocumentChunkingBase.py
diff --git a/...ies/document_chunking/FixedSizeOverlap.py → ...ies/document_chunking/FixedSizeOverlap.py b/...ies/document_chunking/FixedSizeOverlap.py → ...ies/document_chunking/FixedSizeOverlap.py
diff --git a/...tch/utilities/document_chunking/Layout.py → ...tch/utilities/document_chunking/Layout.py b/...tch/utilities/document_chunking/Layout.py → ...tch/utilities/document_chunking/Layout.py
diff --git a/...batch/utilities/document_chunking/Page.py → ...batch/utilities/document_chunking/Page.py b/...batch/utilities/document_chunking/Page.py → ...batch/utilities/document_chunking/Page.py
diff --git a/.../utilities/document_chunking/Paragraph.py → .../utilities/document_chunking/Paragraph.py b/.../utilities/document_chunking/Paragraph.py → .../utilities/document_chunking/Paragraph.py
diff --git a/...utilities/document_chunking/Strategies.py → ...utilities/document_chunking/Strategies.py b/...utilities/document_chunking/Strategies.py → ...utilities/document_chunking/Strategies.py
diff --git a/...h/utilities/document_chunking/__init__.py → ...h/utilities/document_chunking/__init__.py b/...h/utilities/document_chunking/__init__.py → ...h/utilities/document_chunking/__init__.py
diff --git a/...s/document_loading/DocumentLoadingBase.py → ...s/document_loading/DocumentLoadingBase.py b/...s/document_loading/DocumentLoadingBase.py → ...s/document_loading/DocumentLoadingBase.py
diff --git a/...atch/utilities/document_loading/Layout.py → ...atch/utilities/document_loading/Layout.py b/...atch/utilities/document_loading/Layout.py → ...atch/utilities/document_loading/Layout.py
diff --git a/.../batch/utilities/document_loading/Read.py → .../batch/utilities/document_loading/Read.py b/.../batch/utilities/document_loading/Read.py → .../batch/utilities/document_loading/Read.py
diff --git a/.../utilities/document_loading/Strategies.py → .../utilities/document_loading/Strategies.py b/.../utilities/document_loading/Strategies.py → .../utilities/document_loading/Strategies.py
diff --git a/...d/batch/utilities/document_loading/Web.py → ...d/batch/utilities/document_loading/Web.py b/...d/batch/utilities/document_loading/Web.py → ...d/batch/utilities/document_loading/Web.py
diff --git a/...tilities/document_loading/WordDocument.py → ...tilities/document_loading/WordDocument.py b/...tilities/document_loading/WordDocument.py → ...tilities/document_loading/WordDocument.py
diff --git a/...ch/utilities/document_loading/__init__.py → ...ch/utilities/document_loading/__init__.py b/...ch/utilities/document_loading/__init__.py → ...ch/utilities/document_loading/__init__.py
diff --git a/...ilities/helpers/AzureBlobStorageHelper.py → ...ilities/helpers/AzureBlobStorageHelper.py b/...ilities/helpers/AzureBlobStorageHelper.py → ...ilities/helpers/AzureBlobStorageHelper.py
diff --git a/...ties/helpers/AzureFormRecognizerHelper.py → ...ties/helpers/AzureFormRecognizerHelper.py b/...ties/helpers/AzureFormRecognizerHelper.py → ...ties/helpers/AzureFormRecognizerHelper.py
diff --git a/...ch/utilities/helpers/AzureSearchHelper.py → ...ch/utilities/helpers/AzureSearchHelper.py b/...ch/utilities/helpers/AzureSearchHelper.py → ...ch/utilities/helpers/AzureSearchHelper.py
diff --git a/...d/batch/utilities/helpers/ConfigHelper.py → ...d/batch/utilities/helpers/ConfigHelper.py b/...d/batch/utilities/helpers/ConfigHelper.py → ...d/batch/utilities/helpers/ConfigHelper.py
diff --git a/...ilities/helpers/DocumentChunkingHelper.py → ...ilities/helpers/DocumentChunkingHelper.py b/...ilities/helpers/DocumentChunkingHelper.py → ...ilities/helpers/DocumentChunkingHelper.py
diff --git a/...tilities/helpers/DocumentLoadingHelper.py → ...tilities/helpers/DocumentLoadingHelper.py b/...tilities/helpers/DocumentLoadingHelper.py → ...tilities/helpers/DocumentLoadingHelper.py
diff --git a/...lities/helpers/DocumentProcessorHelper.py → ...lities/helpers/DocumentProcessorHelper.py b/...lities/helpers/DocumentProcessorHelper.py → ...lities/helpers/DocumentProcessorHelper.py
diff --git a/...kend/batch/utilities/helpers/EnvHelper.py → ...kend/batch/utilities/helpers/EnvHelper.py b/...kend/batch/utilities/helpers/EnvHelper.py → ...kend/batch/utilities/helpers/EnvHelper.py
diff --git a/...kend/batch/utilities/helpers/LLMHelper.py → ...kend/batch/utilities/helpers/LLMHelper.py b/...kend/batch/utilities/helpers/LLMHelper.py → ...kend/batch/utilities/helpers/LLMHelper.py
diff --git a/...h/utilities/helpers/OrchestratorHelper.py → ...h/utilities/helpers/OrchestratorHelper.py b/...h/utilities/helpers/OrchestratorHelper.py → ...h/utilities/helpers/OrchestratorHelper.py
diff --git a/codes/backend/batch/utilities/__init__.py → ...ckend/batch/utilities/helpers/__init__.py b/codes/backend/batch/utilities/__init__.py → ...ckend/batch/utilities/helpers/__init__.py
diff --git a/...h/utilities/loggers/ConversationLogger.py → ...h/utilities/loggers/ConversationLogger.py b/...h/utilities/loggers/ConversationLogger.py → ...h/utilities/loggers/ConversationLogger.py
diff --git a/...nd/batch/utilities/loggers/TokenLogger.py → ...nd/batch/utilities/loggers/TokenLogger.py b/...nd/batch/utilities/loggers/TokenLogger.py → ...nd/batch/utilities/loggers/TokenLogger.py
diff --git a/.../utilities/orchestrator/LangChainAgent.py → .../utilities/orchestrator/LangChainAgent.py b/.../utilities/orchestrator/LangChainAgent.py → .../utilities/orchestrator/LangChainAgent.py
diff --git a/...utilities/orchestrator/OpenAIFunctions.py → ...utilities/orchestrator/OpenAIFunctions.py b/...utilities/orchestrator/OpenAIFunctions.py → ...utilities/orchestrator/OpenAIFunctions.py
diff --git a/...tilities/orchestrator/OrchestratorBase.py → ...tilities/orchestrator/OrchestratorBase.py b/...tilities/orchestrator/OrchestratorBase.py → ...tilities/orchestrator/OrchestratorBase.py
diff --git a/...atch/utilities/orchestrator/Strategies.py → ...atch/utilities/orchestrator/Strategies.py b/...atch/utilities/orchestrator/Strategies.py → ...atch/utilities/orchestrator/Strategies.py
diff --git a/.../batch/utilities/orchestrator/__init__.py → .../batch/utilities/orchestrator/__init__.py b/.../batch/utilities/orchestrator/__init__.py → .../batch/utilities/orchestrator/__init__.py
diff --git a/...atch/utilities/parser/OutputParserTool.py → ...atch/utilities/parser/OutputParserTool.py b/...atch/utilities/parser/OutputParserTool.py → ...atch/utilities/parser/OutputParserTool.py
diff --git a/...kend/batch/utilities/parser/ParserBase.py → ...kend/batch/utilities/parser/ParserBase.py b/...kend/batch/utilities/parser/ParserBase.py → ...kend/batch/utilities/parser/ParserBase.py
diff --git a/...ackend/batch/utilities/parser/__init__.py → ...ackend/batch/utilities/parser/__init__.py b/...ackend/batch/utilities/parser/__init__.py → ...ackend/batch/utilities/parser/__init__.py
diff --git a/...h/utilities/tools/AnswerProcessingBase.py → ...h/utilities/tools/AnswerProcessingBase.py b/...h/utilities/tools/AnswerProcessingBase.py → ...h/utilities/tools/AnswerProcessingBase.py
diff --git a/...atch/utilities/tools/AnsweringToolBase.py → ...atch/utilities/tools/AnsweringToolBase.py b/...atch/utilities/tools/AnsweringToolBase.py → ...atch/utilities/tools/AnsweringToolBase.py
diff --git a/...h/utilities/tools/ContentSafetyChecker.py → ...h/utilities/tools/ContentSafetyChecker.py b/...h/utilities/tools/ContentSafetyChecker.py → ...h/utilities/tools/ContentSafetyChecker.py
diff --git a/...d/batch/utilities/tools/PostPromptTool.py → ...d/batch/utilities/tools/PostPromptTool.py b/...d/batch/utilities/tools/PostPromptTool.py → ...d/batch/utilities/tools/PostPromptTool.py
diff --git a/...tch/utilities/tools/QuestionAnswerTool.py → ...tch/utilities/tools/QuestionAnswerTool.py b/...tch/utilities/tools/QuestionAnswerTool.py → ...tch/utilities/tools/QuestionAnswerTool.py
diff --git a/...tch/utilities/tools/TextProcessingTool.py → ...tch/utilities/tools/TextProcessingTool.py b/...tch/utilities/tools/TextProcessingTool.py → ...tch/utilities/tools/TextProcessingTool.py
diff --git a/...ackend/batch/utilities/common/__init__.py → ...backend/batch/utilities/tools/__init__.py b/...ackend/batch/utilities/common/__init__.py → ...backend/batch/utilities/tools/__init__.py
diff --git a/codes/backend/images/favicon.ico → code/backend/images/favicon.ico b/codes/backend/images/favicon.ico → code/backend/images/favicon.ico
diff --git a/codes/backend/images/logo.png → code/backend/images/logo.png b/codes/backend/images/logo.png → code/backend/images/logo.png
diff --git a/codes/backend/pages/01_Ingest_Data.py → code/backend/pages/01_Ingest_Data.py b/codes/backend/pages/01_Ingest_Data.py → code/backend/pages/01_Ingest_Data.py
diff --git a/codes/backend/pages/02_Explore_Data.py → code/backend/pages/02_Explore_Data.py b/codes/backend/pages/02_Explore_Data.py → code/backend/pages/02_Explore_Data.py
diff --git a/codes/backend/pages/03_Delete_Data.py → code/backend/pages/03_Delete_Data.py b/codes/backend/pages/03_Delete_Data.py → code/backend/pages/03_Delete_Data.py
diff --git a/codes/backend/pages/04_Configuration.py → code/backend/pages/04_Configuration.py b/codes/backend/pages/04_Configuration.py → code/backend/pages/04_Configuration.py
diff --git a/codes/backend/requirements.txt → code/backend/requirements.txt b/codes/backend/requirements.txt → code/backend/requirements.txt
diff --git a/codes/dev-requirements.txt → code/dev-requirements.txt b/codes/dev-requirements.txt → code/dev-requirements.txt
diff --git a/codes/frontend/index.html → code/frontend/index.html b/codes/frontend/index.html → code/frontend/index.html
diff --git a/codes/frontend/package-lock.json → code/frontend/package-lock.json b/codes/frontend/package-lock.json → code/frontend/package-lock.json
diff --git a/codes/frontend/package.json → code/frontend/package.json b/codes/frontend/package.json → code/frontend/package.json
diff --git a/codes/frontend/public/favicon.ico → code/frontend/public/favicon.ico b/codes/frontend/public/favicon.ico → code/frontend/public/favicon.ico
diff --git a/codes/frontend/src/api/api.ts → code/frontend/src/api/api.ts b/codes/frontend/src/api/api.ts → code/frontend/src/api/api.ts
diff --git a/codes/frontend/src/api/index.ts → code/frontend/src/api/index.ts b/codes/frontend/src/api/index.ts → code/frontend/src/api/index.ts
diff --git a/codes/frontend/src/api/models.ts → code/frontend/src/api/models.ts b/codes/frontend/src/api/models.ts → code/frontend/src/api/models.ts
diff --git a/codes/frontend/src/assets/Azure.svg → code/frontend/src/assets/Azure.svg b/codes/frontend/src/assets/Azure.svg → code/frontend/src/assets/Azure.svg
diff --git a/codes/frontend/src/assets/Send.svg → code/frontend/src/assets/Send.svg b/codes/frontend/src/assets/Send.svg → code/frontend/src/assets/Send.svg
diff --git a/codes/frontend/src/assets/mic-outline.svg → code/frontend/src/assets/mic-outline.svg b/codes/frontend/src/assets/mic-outline.svg → code/frontend/src/assets/mic-outline.svg
diff --git a/...d/src/components/Answer/Answer.module.css → ...d/src/components/Answer/Answer.module.css b/...d/src/components/Answer/Answer.module.css → ...d/src/components/Answer/Answer.module.css
diff --git a/...frontend/src/components/Answer/Answer.tsx → ...frontend/src/components/Answer/Answer.tsx b/...frontend/src/components/Answer/Answer.tsx → ...frontend/src/components/Answer/Answer.tsx
diff --git a/...nd/src/components/Answer/AnswerParser.tsx → ...nd/src/components/Answer/AnswerParser.tsx b/...nd/src/components/Answer/AnswerParser.tsx → ...nd/src/components/Answer/AnswerParser.tsx
diff --git a/...s/frontend/src/components/Answer/index.ts → code/frontend/src/components/Answer/index.ts b/...s/frontend/src/components/Answer/index.ts → code/frontend/src/components/Answer/index.ts
diff --git a/...ts/QuestionInput/QuestionInput.module.css → ...ts/QuestionInput/QuestionInput.module.css b/...ts/QuestionInput/QuestionInput.module.css → ...ts/QuestionInput/QuestionInput.module.css
diff --git a/...omponents/QuestionInput/QuestionInput.tsx → ...omponents/QuestionInput/QuestionInput.tsx b/...omponents/QuestionInput/QuestionInput.tsx → ...omponents/QuestionInput/QuestionInput.tsx
diff --git a/...end/src/components/QuestionInput/index.ts → ...end/src/components/QuestionInput/index.ts b/...end/src/components/QuestionInput/index.ts → ...end/src/components/QuestionInput/index.ts
diff --git a/codes/frontend/src/index.css → code/frontend/src/index.css b/codes/frontend/src/index.css → code/frontend/src/index.css
diff --git a/codes/frontend/src/index.tsx → code/frontend/src/index.tsx b/codes/frontend/src/index.tsx → code/frontend/src/index.tsx
diff --git a/codes/frontend/src/pages/NoPage.tsx → code/frontend/src/pages/NoPage.tsx b/codes/frontend/src/pages/NoPage.tsx → code/frontend/src/pages/NoPage.tsx
diff --git a/...s/frontend/src/pages/chat/Chat.module.css → code/frontend/src/pages/chat/Chat.module.css b/...s/frontend/src/pages/chat/Chat.module.css → code/frontend/src/pages/chat/Chat.module.css
diff --git a/codes/frontend/src/pages/chat/Chat.tsx → code/frontend/src/pages/chat/Chat.tsx b/codes/frontend/src/pages/chat/Chat.tsx → code/frontend/src/pages/chat/Chat.tsx
diff --git a/...ontend/src/pages/layout/Layout.module.css → ...ontend/src/pages/layout/Layout.module.css b/...ontend/src/pages/layout/Layout.module.css → ...ontend/src/pages/layout/Layout.module.css
diff --git a/codes/frontend/src/pages/layout/Layout.tsx → code/frontend/src/pages/layout/Layout.tsx b/codes/frontend/src/pages/layout/Layout.tsx → code/frontend/src/pages/layout/Layout.tsx
diff --git a/codes/frontend/src/vite-env.d.ts → code/frontend/src/vite-env.d.ts b/codes/frontend/src/vite-env.d.ts → code/frontend/src/vite-env.d.ts
diff --git a/codes/frontend/tsconfig.json → code/frontend/tsconfig.json b/codes/frontend/tsconfig.json → code/frontend/tsconfig.json
diff --git a/codes/frontend/tsconfig.node.json → code/frontend/tsconfig.node.json b/codes/frontend/tsconfig.node.json → code/frontend/tsconfig.node.json
diff --git a/codes/frontend/vite.config.ts → code/frontend/vite.config.ts b/codes/frontend/vite.config.ts → code/frontend/vite.config.ts
diff --git a/codes/requirements.txt → code/requirements.txt b/codes/requirements.txt → code/requirements.txt
diff --git a/codes/tests/conftest.py → code/tests/conftest.py b/codes/tests/conftest.py → code/tests/conftest.py
diff --git a/codes/tests/test_AzureBlobStorage.py → code/tests/test_AzureBlobStorage.py b/codes/tests/test_AzureBlobStorage.py → code/tests/test_AzureBlobStorage.py
diff --git a/codes/tests/test_ContentSafetyChecker.py → code/tests/test_ContentSafetyChecker.py b/codes/tests/test_ContentSafetyChecker.py → code/tests/test_ContentSafetyChecker.py
diff --git a/codes/tests/test_DocumentChunking.py → code/tests/test_DocumentChunking.py b/codes/tests/test_DocumentChunking.py → code/tests/test_DocumentChunking.py
diff --git a/codes/tests/test_DocumentLoading.py → code/tests/test_DocumentLoading.py b/codes/tests/test_DocumentLoading.py → code/tests/test_DocumentLoading.py
diff --git a/codes/tests/test_DocumentProcessor.py → code/tests/test_DocumentProcessor.py b/codes/tests/test_DocumentProcessor.py → code/tests/test_DocumentProcessor.py
diff --git a/codes/tests/test_Orchestrator.py → code/tests/test_Orchestrator.py b/codes/tests/test_Orchestrator.py → code/tests/test_Orchestrator.py
diff --git a/codes/tests/test_OutputParserTool.py → code/tests/test_OutputParserTool.py b/codes/tests/test_OutputParserTool.py → code/tests/test_OutputParserTool.py
diff --git a/codes/tests/test_app.py → code/tests/test_app.py b/codes/tests/test_app.py → code/tests/test_app.py
diff --git a/codes/backend/batch/utilities/helpers/__init__.py b/codes/backend/batch/utilities/helpers/__init__.py
diff --git a/codes/backend/batch/utilities/tools/__init__.py b/codes/backend/batch/utilities/tools/__init__.py
diff --git a/codes/static/assets/Azure-d0a62656.svg b/codes/static/assets/Azure-d0a62656.svg
diff --git a/codes/static/assets/Send-a9ab2367.svg b/codes/static/assets/Send-a9ab2367.svg
diff --git a/codes/static/assets/index-3213546e.css b/codes/static/assets/index-3213546e.css