recover ci

ks6088ts · ks6088ts · commit 5eb1bf92dc34 · 2024-07-21T16:38:39.000+09:00
diff --git a/README.md b/README.md
@@ -24,30 +24,26 @@ This repository contains a collection of solutions that leverage Azure AI servic
 Use Makefile to run the project locally.
 
 ```shell
-# help
-make
+# Launch backend API server
+make backend
 
-# install dependencies for development
-make install-deps-dev
+# Launch frontend app server
+make frontend
 
-# run tests
-make test
-
-# run CI tests
-make ci-test
+# Azure Functions
+make azure-functions-start
 ```
 
 ### Docker development
 
-```shell
-# build docker image
-make docker-build
+See the actual implementation in the [compose.yaml](./compose.yaml) file.
 
-# run docker container
-make docker-run
+```shell
+# Launch backend API server
+docker compose up backend
 
-# run CI tests in docker container
-make ci-test-docker
+# Launch frontend app server
+docker compose up frontend
 ```
 
 ### Run local test
@@ -64,18 +60,19 @@ make test
 
 ## Deployment instructions
 
-### Docker compose
+```shell
+# Deploy Azure resources via Bicep
+cd infra
+make deploy
+```
 
-Docker compose is used to run the services locally.
-Refer to the following steps to run the services.
-See the actual implementation in the [compose.yaml](./compose.yaml) file.
+Azure Functions are deployed using the following commands.
 
 ```shell
-# Create environment files for each service
-cp ./settings/{NAME}.env.sample ./settings/{NAME}.env
-
-# Build and run the services
-docker compose up
+# Deploy Azure Functions
+make azure-functions-deploy
+# Publish Azure Functions
+make azure-functions-publish
 ```
 
 ### Push docker image to Docker Hub
@@ -86,18 +83,3 @@ To publish the docker image to Docker Hub via GitHub Actions, you need to set th
 gh secret set DOCKERHUB_USERNAME --body $DOCKERHUB_USERNAME
 gh secret set DOCKERHUB_TOKEN --body $DOCKERHUB_TOKEN
 ```
-
-### Deploy Azure Functions
-
-To deploy the Azure Functions, run the following script.
-
-```shell
-# Deploy the Azure Functions
-sh ./scripts/deploy-azure-functions.sh
-
-# Destroy the Azure Functions
-sh ./scripts/destroy-azure-functions.sh
-```
-
-- [scripts/deploy-azure-functions.sh](./scripts/deploy-azure-functions.sh): Deploy the Azure Functions using Azure CLI.
-- [scripts/destroy-azure-functions.sh](./scripts/destroy-azure-functions.sh): Destroy the Azure Functions using Azure CLI.
diff --git a/backend/internals/agent_search.py b/backend/internals/agent_search.py
@@ -14,7 +14,6 @@
 from internals.tools.yahoo_finance_tool import yahoo_finance_tool
 from langchain_core.messages import HumanMessage
 from langchain_openai import AzureChatOpenAI
-
 from settings.agents import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_ai_document_intelligence.py b/backend/internals/azure_ai_document_intelligence.py
@@ -3,7 +3,6 @@
 from azure.ai.documentintelligence import DocumentIntelligenceClient
 from azure.ai.documentintelligence.models import AnalyzeDocumentRequest, AnalyzeResult, ContentFormat
 from azure.core.credentials import AzureKeyCredential
-
 from settings.azure_ai_document_intelligence import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_ai_speech.py b/backend/internals/azure_ai_speech.py
@@ -2,7 +2,6 @@
 from urllib.parse import urljoin
 
 import requests
-
 from settings.azure_ai_speech import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_ai_vision.py b/backend/internals/azure_ai_vision.py
@@ -3,7 +3,6 @@
 from azure.ai.vision.imageanalysis import ImageAnalysisClient
 from azure.ai.vision.imageanalysis.models import VisualFeatures
 from azure.core.credentials import AzureKeyCredential
-
 from settings.azure_ai_vision import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_cosmos_db.py b/backend/internals/azure_cosmos_db.py
@@ -4,7 +4,6 @@
 from azure.cosmos import CosmosClient, PartitionKey
 from azure.cosmos.container import ContainerProxy
 from azure.cosmos.database import DatabaseProxy
-
 from settings.azure_cosmos_db import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_event_grid.py b/backend/internals/azure_event_grid.py
@@ -2,7 +2,6 @@
 
 from azure.core.credentials import AzureKeyCredential
 from azure.eventgrid import EventGridEvent, EventGridPublisherClient
-
 from settings.azure_event_grid import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_iot_hub.py b/backend/internals/azure_iot_hub.py
@@ -3,7 +3,6 @@
 from azure.iot.device.aio import IoTHubDeviceClient
 from azure.iot.hub import IoTHubRegistryManager
 from azure.iot.hub.models import CloudToDeviceMethod, CloudToDeviceMethodResult
-
 from settings.azure_iot_hub import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_openai.py b/backend/internals/azure_openai.py
@@ -3,7 +3,6 @@
 from logging import getLogger
 
 from openai import AzureOpenAI
-
 from settings.azure_openai import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_openai_langchain.py b/backend/internals/azure_openai_langchain.py
@@ -5,7 +5,6 @@
 from langchain.prompts import ChatPromptTemplate, HumanMessagePromptTemplate
 from langchain_core.messages import HumanMessage, SystemMessage
 from langchain_openai import AzureChatOpenAI
-
 from settings.azure_openai import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_storage_blob.py b/backend/internals/azure_storage_blob.py
@@ -1,7 +1,6 @@
 from logging import getLogger
 
 from azure.storage.blob import BlobServiceClient
-
 from settings.azure_storage_blob import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/internals/azure_storage_queue.py b/backend/internals/azure_storage_queue.py
@@ -2,7 +2,6 @@
 
 from azure.core.paging import ItemPaged
 from azure.storage.queue import QueueMessage, QueueServiceClient
-
 from settings.azure_storage_queue import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/agents.py b/backend/routers/agents.py
@@ -5,7 +5,6 @@
 from fastapi.responses import JSONResponse
 from internals.agent_search import Client
 from schemas import agents as agents_schemas
-
 from settings.agents import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_ai_document_intelligence.py b/backend/routers/azure_ai_document_intelligence.py
@@ -3,7 +3,6 @@
 from fastapi import APIRouter, UploadFile
 from internals.azure_ai_document_intelligence import Client
 from schemas import azure_ai_document_intelligence as azure_ai_document_intelligence_schemas
-
 from settings.azure_ai_document_intelligence import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_ai_speech.py b/backend/routers/azure_ai_speech.py
@@ -4,7 +4,6 @@
 from fastapi.responses import JSONResponse
 from internals.azure_ai_speech import Client
 from schemas import azure_ai_speech as azure_ai_speech_schemas
-
 from settings.azure_ai_speech import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_ai_vision.py b/backend/routers/azure_ai_vision.py
@@ -3,7 +3,6 @@
 from fastapi import APIRouter, UploadFile
 from internals.azure_ai_vision import Client
 from schemas import azure_ai_vision as azure_ai_vision_schemas
-
 from settings.azure_ai_vision import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_cosmos_db.py b/backend/routers/azure_cosmos_db.py
@@ -3,7 +3,6 @@
 from fastapi import APIRouter
 from internals.azure_cosmos_db import Client
 from schemas import azure_cosmos_db as azure_cosmos_db_schemas
-
 from settings.azure_cosmos_db import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_event_grid.py b/backend/routers/azure_event_grid.py
@@ -2,7 +2,6 @@
 
 from fastapi import APIRouter
 from internals.azure_event_grid import Client
-
 from settings.azure_event_grid import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_iot_hub.py b/backend/routers/azure_iot_hub.py
@@ -3,7 +3,6 @@
 from fastapi import APIRouter, status
 from fastapi.responses import JSONResponse
 from internals.azure_iot_hub import Client
-
 from settings.azure_iot_hub import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_openai.py b/backend/routers/azure_openai.py
@@ -4,7 +4,6 @@
 from fastapi.responses import StreamingResponse
 from internals.azure_openai_langchain import Client
 from schemas import azure_openai as azure_openai_schemas
-
 from settings.azure_openai import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_storage_blob.py b/backend/routers/azure_storage_blob.py
@@ -4,7 +4,6 @@
 from fastapi.responses import JSONResponse
 from internals.azure_storage_blob import Client
 from schemas import azure_storage_blob as azure_storage_schemas
-
 from settings.azure_storage_blob import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/routers/azure_storage_queue.py b/backend/routers/azure_storage_queue.py
@@ -4,7 +4,6 @@
 from fastapi.responses import JSONResponse
 from internals.azure_storage_queue import Client
 from schemas import azure_storage_queue as azure_storage_queue_schemas
-
 from settings.azure_storage_queue import Settings
 
 logger = getLogger(__name__)
diff --git a/backend/tests/test_smoke.py b/backend/tests/test_smoke.py
@@ -1,4 +1,4 @@
-from tests.utilities import client
+from .utilities import client
 
 
 def test_main():
diff --git a/backend/tests/test_smoke_azure_ai_document_intelligence.py b/backend/tests/test_smoke_azure_ai_document_intelligence.py
@@ -1,7 +1,8 @@
 from logging import getLogger
 
 import pytest
-from tests.utilities import RUN_TEST, client, image
+
+from .utilities import RUN_TEST, client, image
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_ai_speech.py b/backend/tests/test_smoke_azure_ai_speech.py
@@ -1,7 +1,8 @@
 from logging import getLogger
 
 import pytest
-from tests.utilities import RUN_TEST, client
+
+from .utilities import RUN_TEST, client
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_ai_vision.py b/backend/tests/test_smoke_azure_ai_vision.py
@@ -1,7 +1,8 @@
 from logging import getLogger
 
 import pytest
-from tests.utilities import RUN_TEST, client, image
+
+from .utilities import RUN_TEST, client, image
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_cosmos_db.py b/backend/tests/test_smoke_azure_cosmos_db.py
@@ -2,7 +2,8 @@
 from uuid import uuid4
 
 import pytest
-from tests.utilities import RUN_TEST, client
+
+from .utilities import RUN_TEST, client
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_event_grid.py b/backend/tests/test_smoke_azure_event_grid.py
@@ -1,7 +1,8 @@
 from logging import getLogger
 
 import pytest
-from tests.utilities import RUN_TEST, client
+
+from .utilities import RUN_TEST, client
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_openai.py b/backend/tests/test_smoke_azure_openai.py
@@ -1,7 +1,8 @@
 from logging import getLogger
 
 import pytest
-from tests.utilities import RUN_TEST, client, image
+
+from .utilities import RUN_TEST, client, image
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_storage_blob.py b/backend/tests/test_smoke_azure_storage_blob.py
@@ -2,7 +2,8 @@
 from uuid import uuid4
 
 import pytest
-from tests.utilities import RUN_TEST, client, image
+
+from .utilities import RUN_TEST, client, image
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/test_smoke_azure_storage_queue.py b/backend/tests/test_smoke_azure_storage_queue.py
@@ -2,7 +2,8 @@
 from uuid import uuid4
 
 import pytest
-from tests.utilities import RUN_TEST, client
+
+from .utilities import RUN_TEST, client
 
 logger = getLogger(__name__)
 
diff --git a/backend/tests/utilities.py b/backend/tests/utilities.py
@@ -1,6 +1,11 @@
+import os
+import sys
 from os import getenv
 
 import requests
+
+# FIXME: This is a workaround to import the FastAPI app
+sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 from core import app
 from fastapi.testclient import TestClient
 from main import setup_logging
diff --git a/frontend/pages/sandbox.py b/frontend/pages/sandbox.py
@@ -15,11 +15,10 @@ async def chat_completions_post(
     backend_url: str,
     prompt: str,
 ):
-    from kiota_abstractions.authentication.anonymous_authentication_provider import AnonymousAuthenticationProvider
-    from kiota_http.httpx_request_adapter import HttpxRequestAdapter
-
     from client.api_client import ApiClient
     from client.models.chat_completion_request import ChatCompletionRequest
+    from kiota_abstractions.authentication.anonymous_authentication_provider import AnonymousAuthenticationProvider
+    from kiota_http.httpx_request_adapter import HttpxRequestAdapter
 
     auth_provider = AnonymousAuthenticationProvider()
     request_adapter = HttpxRequestAdapter(
diff --git a/scripts/publish-azure-functions.sh b/scripts/publish-azure-functions.sh
@@ -10,4 +10,4 @@ poetry export \
 # Publish the Azure Functions
 cd backend || exit
 FUNCTION_APP_NAME=$(jq -r '.FUNCTION_APP_NAME' < ../azure-functions.json)
-func azure functionapp publish $FUNCTION_APP_NAME
+func azure functionapp publish "$FUNCTION_APP_NAME"
