Merge branch 'master' into dependabot/pip/tiktoken-0.6.0

Author: codeurzebs

Diff for: .github/workflows/docker-image.yml

@@ -0,0 +1,36 @@
+name: Docker Image CI
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'The branch to build'
+        required: true
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Azure Container Registry Login
+      uses: Azure/docker-login@v1
+      with:
+        # Container registry username
+        username: ${{ secrets.ACR_USERNAME }}
+        # Container registry password
+        password: ${{ secrets.ACR_PASSWORD }}
+        # Container registry server url
+        login-server: ${{ secrets.ACR_LOGIN_SERVER }}
+        
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.inputs.branch }}
+    - name: Build the Docker image
+      run:         
+        docker build . --file WebApp.Dockerfile --tag fruoccopublic.azurecr.io/sample-app-aoai-chatgpt:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;
+        docker tag fruoccopublic.azurecr.io/sample-app-aoai-chatgpt:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER fruoccopublic.azurecr.io/sample-app-aoai-chatgpt:latest;
+        docker push fruoccopublic.azurecr.io/sample-app-aoai-chatgpt:$(date +'%Y-%m-%d')_$GITHUB_RUN_NUMBER;
+        docker push fruoccopublic.azurecr.io/sample-app-aoai-chatgpt:latest;
+      

Diff for: .github/workflows/master_ngcodex-gpt.yml renamed to .github/workflows/master_codeurzebs-chatgpt.yml

@@ -2,7 +2,7 @@
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 # More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
 
-name: Build and deploy Python app to Azure Web App - ngcodex
+name: Build and deploy Python app to Azure Web App - codeurzebs-chatgpt
 
 on:
   push:
@@ -49,8 +49,8 @@ jobs:
     environment:
       name: 'Production'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    permissions:
-      id-token: write #This is required for requesting the JWT
+    permissions:
+      id-token: write #This is required for requesting the JWT
 
     steps:
       - name: Download artifact from build job
@@ -61,18 +61,18 @@ jobs:
       - name: Unzip artifact for deployment
         run: unzip release.zip
 
-      
-      - name: Login to Azure
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_3378C322D4024C48985609FD9E9DDE2F }}
-          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_77B64334BED546FE87D388D50EEF49AA }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_DBA0530B37D1486A9B978C842056B10A }}
+      
+      - name: Login to Azure
+        uses: azure/login@v1
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_7D24E0AF7863497FB0D2CE966CF4C40B }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_FFF91247B01348C9A3D5D9B1F93F84D9 }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_487EA3E34C114A2BBD255EA78A5504F3 }}
 
       - name: 'Deploy to Azure Web App'
         uses: azure/webapps-deploy@v2
         id: deploy-to-webapp
         with:
-          app-name: 'ngcodex-gpt'
+          app-name: 'codeurzebs-chatgpt'
           slot-name: 'Production'
-          
+          

Diff for: requirements-dev.txt

@@ -7,6 +7,6 @@ tiktoken==0.6.0
 langchain==0.0.340
 bs4==0.0.1
 urllib3==2.0.6
-pytest==7.4.0
+pytest==8.1.1
 azure-storage-blob
 chardet

Diff for: requirements.txt

@@ -2,6 +2,6 @@ azure-identity==1.14.0
 Flask==2.3.2
 openai==0.27.7
 azure-search-documents==11.4.0b6
-azure-storage-blob==12.17.0
+azure-storage-blob==12.19.1
 python-dotenv==1.0.0
 azure-cosmos==4.5.0