Merge pull request #304 from microsoft/folder-structure

refactor: folder structure

Author: Roopan-Microsoft

.github/workflows/docker-build-and-push.yml

@@ -72,8 +72,8 @@ jobs:
       - name: Build Docker Image and optionally push - Internal Registry
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: WebApp.Dockerfile
+          context: ./src
+          file: ./src/WebApp.Dockerfile
           push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
           tags: |
             ${{ steps.registry.outputs.int_registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}
@@ -83,8 +83,8 @@ jobs:
         if: ${{ github.ref_name == 'main' }}
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: WebApp.Dockerfile
+          context: ./src
+          file: ./src/WebApp.Dockerfile
           push: ${{github.ref_name == 'main' }}
           tags: |
             ${{ steps.registry.outputs.ext_registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}

.github/workflows/node.js.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: frontend
+        working-directory: src/frontend
     strategy:
       matrix:
         node-version: [18.x, 21.x]
@@ -28,7 +28,8 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
-        cache-dependency-path: '**/package-lock.json'
+        cache-dependency-path: 'src/frontend/package-lock.json'
     - run: npm ci
+    - run: npm install --save-dev jest-environment-jsdom  # Install missing package
     - run: NODE_OPTIONS=--max_old_space_size=8192 npm run build --if-present
     - run: npm run test --if-present

.github/workflows/pylint.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements-dev.txt
+          pip install -r src/requirements-dev.txt
           
       # Step 3: Run all code quality checks
       - name: Pylint

.github/workflows/python-app.yml

@@ -25,10 +25,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        pip install -r src/requirements-dev.txt
     - name: Test with pytest
       run: |
-        export PYTHONPATH=$(pwd)
+        export PYTHONPATH=$(pwd)/src
         pytest -v --show-capture=stdout -k "not integration"
 
   test_windows:
@@ -43,8 +43,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        pip install -r src/requirements-dev.txt
     - name: Test with pytest
       run: |
-        $env:PYTHONPATH=$pwd
+        $env:PYTHONPATH="$pwd\src"
         pytest -v --show-capture=stdout -k "not integration"

.github/workflows/tests.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install Backend Dependencies
         run: |
-          python -m pip install -r requirements.txt
+          python -m pip install -r src/requirements.txt
           python -m pip install coverage pytest-cov
           python -m pip install azure-keyvault-secrets
 
@@ -79,21 +79,21 @@ jobs:
             ${{ runner.os }}-node-
       
       - name: Navigate to frontend directory
-        run: cd frontend
+        run: cd src/frontend
 
       - name: Install Frontend Dependencies
         run: |
-          cd frontend  # Change to the frontend directory
+          cd src/frontend  # Change to the frontend directory
           npm install  # Install dependencies from frontend/package.json
 
       - name: Run Frontend Tests with Coverage
         run: |
-          cd frontend  # Change to the frontend directory
+          cd src/frontend  # Change to the frontend directory
           if npm run test -- --coverage; then
             echo "Tests completed, checking coverage."
             # Check coverage report and ensure it meets threshold
-            if [ -f frontend/coverage/lcov-report/index.html ]; then
-              COVERAGE=$(cat frontend/coverage/lcov-report/index.html | grep -oP 'total: \K[0-9]+(\.[0-9]+)?')
+            if [ -f src/frontend/coverage/lcov-report/index.html ]; then
+              COVERAGE=$(cat src/frontend/coverage/lcov-report/index.html | grep -oP 'total: \K[0-9]+(\.[0-9]+)?')
               if (( $(echo "$COVERAGE < 80" | bc -l) )); then
                 echo "Coverage is below 80%, failing the job."
                 exit 1
@@ -107,5 +107,5 @@ jobs:
         with:
           name: frontend-coverage
           path: |
-            frontend/coverage/  # Correct path to frontend coverage
-            frontend/coverage/lcov-report/  # Correct path to frontend lcov report
+            src/frontend/coverage/  # Correct path to frontend coverage
+            src/frontend/coverage/lcov-report/  # Correct path to frontend lcov report

.gitignore

@@ -1,12 +1,12 @@
 .venv
-frontend/node_modules
+
 .env
 .azure/
 __pycache__/
 .ipynb_checkpoints/
-static
-scripts/config.json
+
+
 venv
 myenv
-frontend/coverage
+
 scriptsenv/

README.md

@@ -32,7 +32,7 @@ The documents are intended for use as sample data only.
 
 
 ### Solution accelerator architecture
-![image](/docs/images/architecture.png)
+![image](/docs/images/Archimage.png)
 
 <h2><img src="./docs/images/oneClickDeploy.png" width="64">
 <br/>

docs/images/Archimage.png

@@ -0,0 +1,14 @@
+[
+    {
+        "data_path": "../data",
+        "location": "eastus", 
+        "subscription_id": "ff9b5430-90ea-44c0-8a00-e488c1bf56f4",
+        "resource_group": "rg-bsbycgen",
+        "search_service_name": "search-594d4a19-00cd-5358-b7e1-8bba04e9e79e",
+        "index_name": "promissory-notes-index",
+        "chunk_size": 1024,
+        "token_overlap": 128,
+        "semantic_config_name": "default",
+        "language": "en"
+    }
+]