fix config issue

Author: Pavan-Microsoft

src/api/.env.sample

@@ -1,4 +1,7 @@
 APPINSIGHTS_INSTRUMENTATIONKEY=
+APPLICATIONINSIGHTS_CONNECTION_STRING=
+AZURE_AI_AGENT_ENDPOINT=
+AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME=
 AZURE_AI_PROJECT_CONN_STRING=
 AZURE_AI_SEARCH_API_KEY=
 AZURE_AI_SEARCH_ENDPOINT=
@@ -7,14 +10,13 @@ AZURE_COSMOSDB_ACCOUNT=
 AZURE_COSMOSDB_CONVERSATIONS_CONTAINER="conversations"
 AZURE_COSMOSDB_DATABASE="db_conversation_history"
 AZURE_COSMOSDB_ENABLE_FEEDBACK="True"
-AZURE_OPENAI_DEPLOYMENT_MODEL="gpt-4o-mini"
-AZURE_OPENAI_ENDPOINT=
 AZURE_OPENAI_API_VERSION=
+AZURE_OPENAI_DEPLOYMENT_MODEL=
+AZURE_OPENAI_ENDPOINT=
 AZURE_OPENAI_RESOURCE=
+DISPLAY_CHART_DEFAULT="False"
+REACT_APP_LAYOUT_CONFIG="{\n  \"appConfig\": {\n    \"THREE_COLUMN\": {\n      \"DASHBOARD\": 50,\n      \"CHAT\": 33,\n      \"CHATHISTORY\": 17\n    },\n    \"TWO_COLUMN\": {\n      \"DASHBOARD_CHAT\": {\n        \"DASHBOARD\": 65,\n        \"CHAT\": 35\n      },\n      \"CHAT_CHATHISTORY\": {\n        \"CHAT\": 80,\n        \"CHATHISTORY\": 20\n      }\n    }\n  },\n  \"charts\": [\n    {\n      \"id\": \"SATISFIED\",\n      \"name\": \"Satisfied\",\n      \"type\": \"card\",\n      \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\n    },\n    {\n      \"id\": \"TOTAL_CALLS\",\n      \"name\": \"Total Calls\",\n      \"type\": \"card\",\n      \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\n    },\n    {\n      \"id\": \"AVG_HANDLING_TIME\",\n      \"name\": \"Average Handling Time\",\n      \"type\": \"card\",\n      \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\n    },\n    {\n      \"id\": \"SENTIMENT\",\n      \"name\": \"Topics Overview\",\n      \"type\": \"donutchart\",\n      \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\n    },\n    {\n      \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\n      \"name\": \"Average Handling Time By Topic\",\n      \"type\": \"bar\",\n      \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\n    },\n    {\n      \"id\": \"TOPICS\",\n      \"name\": \"Trending Topics\",\n      \"type\": \"table\",\n      \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\n    },\n    {\n      \"id\": \"KEY_PHRASES\",\n      \"name\": \"Key Phrases\",\n      \"type\": \"wordcloud\",\n      \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\n    }\n  ]\n}"
 SQLDB_DATABASE=
 SQLDB_SERVER=
-SQLDB_USER_MID=
-SQLDB_USERNAME=
 USE_AI_PROJECT_CLIENT="False"
 USE_CHAT_HISTORY_ENABLED="True"
-WEBSITE_HTTPLOGGING_RETENTION_DAYS=

src/api/common/config/config.py

@@ -30,7 +30,7 @@ def __init__(self):
 
         # AI Project Client configuration
         self.use_ai_project_client = os.getenv("USE_AI_PROJECT_CLIENT", "False").lower() == "true"
-        self.azure_ai_project_conn_string = os.getenv("AZURE_AI_PROJECT_CONN_STRING")
+        self.ai_project_endpoint = os.getenv("AZURE_AI_AGENT_ENDPOINT")
 
         # Chat history configuration
         self.use_chat_history_enabled = os.getenv("USE_CHAT_HISTORY_ENABLED", "false").strip().lower() == "true"

src/api/helpers/chat_helper.py

@@ -5,6 +5,7 @@
 import uuid
 import logging
 from helpers.azure_openai_helper import get_azure_openai_client
+from common.config.config import Config
 
 # Configure logger
 logger = logging.getLogger(__name__)

src/api/plugins/chat_with_data_plugin.py

@@ -10,22 +10,22 @@
 
 from semantic_kernel.functions.kernel_function_decorator import kernel_function
 from azure.ai.projects import AIProjectClient
+from azure.identity import DefaultAzureCredential
 
 from common.database.sqldb_service import execute_sql_query
+from common.config.config import Config
 from helpers.azure_openai_helper import get_azure_openai_client
 
 
 class ChatWithDataPlugin:
     def __init__(self):
         config = Config()
         self.azure_openai_deployment_model = config.azure_openai_deployment_model
-        self.azure_openai_endpoint = config.azure_openai_endpoint
-        self.azure_openai_api_version = config.azure_openai_api_version
+        self.ai_project_endpoint = config.ai_project_endpoint
         self.azure_ai_search_endpoint = config.azure_ai_search_endpoint
         self.azure_ai_search_api_key = config.azure_ai_search_api_key
         self.azure_ai_search_index = config.azure_ai_search_index
         self.use_ai_project_client = config.use_ai_project_client
-        self.azure_ai_project_conn_string = config.azure_ai_project_conn_string
 
     @kernel_function(name="Greeting",
                      description="Respond to any greeting or general questions")
@@ -34,8 +34,8 @@ async def greeting(self, input: Annotated[str, "the question"]) -> Annotated[str
 
         try:
             if self.use_ai_project_client:
-                project = AIProjectClient.from_connection_string(
-                    conn_str=self.azure_ai_project_conn_string,
+                project = AIProjectClient(
+                    endpoint=self.ai_project_endpoint,
                     credential=DefaultAzureCredential()
                 )
                 client = project.inference.get_chat_completions_client()
@@ -84,8 +84,8 @@ async def get_SQL_Response(
 
         try:
             if self.use_ai_project_client:
-                project = AIProjectClient.from_connection_string(
-                    conn_str=self.azure_ai_project_conn_string,
+                project = AIProjectClient(
+                    endpoint=self.ai_project_endpoint,
                     credential=DefaultAzureCredential()
                 )
                 client = project.inference.get_chat_completions_client()

src/api/services/chat_service.py

@@ -27,6 +27,7 @@
 
 from helpers.utils import format_stream_response
 from helpers.azure_openai_helper import get_azure_openai_client
+from common.config.config import Config
 
 # Constants
 HOST_NAME = "CKM"
@@ -79,8 +80,6 @@ class ChatService:
 
     def __init__(self, request : Request):
         config = Config()
-        self.azure_openai_endpoint = config.azure_openai_endpoint
-        self.azure_openai_api_version = config.azure_openai_api_version
         self.azure_openai_deployment_name = config.azure_openai_deployment_model
         self.agent = request.app.state.agent
 

src/api/services/history_service.py

@@ -30,7 +30,6 @@ def __init__(self):
         )
 
         self.azure_openai_endpoint = config.azure_openai_endpoint
-        self.azure_openai_api_key = config.azure_openai_api_key
         self.azure_openai_api_version = config.azure_openai_api_version
         self.azure_openai_deployment_name = config.azure_openai_deployment_model
         self.azure_openai_resource = config.azure_openai_resource

src/tests/api/common/config/test_config.py

@@ -43,7 +43,6 @@ def test_config_initialization(mock_env_vars):
         # Azure OpenAI config
         assert config.azure_openai_endpoint == "https://openai.test"
         assert config.azure_openai_deployment_model == "gpt-4"
-        assert config.azure_openai_api_key == "test_key"
         assert config.azure_openai_api_version == "2023-03-15-preview"
         assert config.azure_openai_resource == "test_resource"
 

src/tests/api/services/test_history_service.py

@@ -15,7 +15,6 @@ def mock_config_instance():
     config.azure_cosmosdb_conversations_container = "test-container"
     config.azure_cosmosdb_enable_feedback = True
     config.azure_openai_endpoint = "https://test-openai.openai.azure.com/"
-    config.azure_openai_api_key = "test-api-key"
     config.azure_openai_api_version = "2024-02-15-preview"
     config.azure_openai_deployment_model = "gpt-4o-mini"
     config.azure_openai_resource = "test-resource"