removed commented code and final fixes

Author: Rafi-Microsoft

infra/scripts/index_scripts/04_cu_process_data_new_data.py

@@ -10,10 +10,7 @@
 from azure.search.documents import SearchClient
 from azure.search.documents.indexes import SearchIndexClient
 from azure.storage.filedatalake import DataLakeServiceClient
-# --- REPLACED ---
-# from openai import AzureOpenAI
 from azure.ai.inference import ChatCompletionsClient, EmbeddingsClient
-# ----------------
 from content_understanding_client import AzureContentUnderstandingClient
 from azure_credential_utils import get_azure_credential
 from azure.search.documents.indexes.models import (
@@ -72,6 +69,17 @@ def get_secrets_from_kv(kv_name, secret_name):
 index_client = SearchIndexClient(endpoint=search_endpoint, credential=search_credential)
 print("Azure Search setup complete.")
 
+# ---------- Azure AI Foundry (Inference) clients (Managed Identity) ----------
+# For Azure OpenAI endpoints, the Inference SDK expects the deployment path and api_version + scopes.
+# chat deployment (already coming from Key Vault as `deployment`)
+chat_endpoint = f"{openai_api_base}/openai/deployments/{deployment}"
+chat_client = ChatCompletionsClient(
+    endpoint=chat_endpoint,
+    credential=credential,
+    credential_scopes=["https://cognitiveservices.azure.com/.default"],
+    api_version=openai_api_version,
+)
+
 # Delete the search index
 search_index_client = SearchIndexClient(search_endpoint, search_credential)
 search_index_client.delete_index(INDEX_NAME)
@@ -405,8 +413,6 @@ def call_gpt4(topics_str1, client):
 
 max_tokens = 3096
 res = call_gpt4(", ".join([]), chat_client)
-# (rest of topic mining and mapping logic unchanged)
-
 for object1 in res['topics']:
     cursor.execute("INSERT INTO km_mined_topics (label, description) VALUES (?,?)", (object1['label'], object1['description']))
 conn.commit()
@@ -424,8 +430,7 @@ def get_mined_topic_mapping(input_text, list_of_topics):
     prompt = f'''You are a data analysis assistant to help find the closest topic for a given text {input_text} 
                 from a list of topics - {list_of_topics}.
                 ALWAYS only return a topic from list - {list_of_topics}. Do not add any other text.'''
-    response = openai_client.chat.completions.create(
-        model=deployment,
+    response = chat_client.complete(
         messages=[
             {"role": "system", "content": "You are a helpful assistant."},
             {"role": "user", "content": prompt},

src/api/services/history_service.py

@@ -2,7 +2,6 @@
 import uuid
 from typing import Optional
 from fastapi import HTTPException, status
-# from openai import AsyncAzureOpenAI  # Commented out - replaced with Foundry SDK
 from azure.ai.projects import AIProjectClient
 from azure.ai.agents.models import MessageRole, ListSortOrder
 from common.config.config import Config
@@ -31,11 +30,9 @@ def __init__(self):
             and self.azure_cosmosdb_conversations_container
         )
 
-        # OpenAI configuration (partially commented out - now using Foundry SDK)
-        # self.azure_openai_endpoint = config.azure_openai_endpoint  # Not needed for Foundry SDK
-        # self.azure_openai_api_version = config.azure_openai_api_version  # Not needed for Foundry SDK
-        self.azure_openai_deployment_name = config.azure_openai_deployment_model  # Still needed for Foundry SDK model parameter
-        # self.azure_openai_resource = config.azure_openai_resource  # Not needed for Foundry SDK
+    
+        self.azure_openai_deployment_name = config.azure_openai_deployment_model
+        
         self.azure_client_id = config.azure_client_id
 
         # AI Project configuration for Foundry SDK
@@ -62,47 +59,8 @@ def init_cosmosdb_client(self):
             logger.exception("Failed to initialize CosmosDB client")
             raise
 
-    # def init_openai_client(self):
-    #     """
-    #     COMMENTED OUT - Replaced with Foundry SDK in generate_title method
-    #     This method was used for direct OpenAI API calls, but we now use
-    #     Azure AI Foundry SDK with AIProjectClient for title generation
-    #     """
-    #     user_agent = "GitHubSampleWebApp/AsyncAzureOpenAI/1.0.0"
-    #
-    #     try:
-    #         if not self.azure_openai_endpoint and not self.azure_openai_resource:
-    #             raise ValueError(
-    #                 "AZURE_OPENAI_ENDPOINT or AZURE_OPENAI_RESOURCE is required")
-    #
-    #         endpoint = self.azure_openai_endpoint or f"https://{self.azure_openai_resource}.openai.azure.com/"
-    #         ad_token_provider = None
-    #
-    #         logger.debug("Using Azure AD authentication for OpenAI")
-    #         ad_token_provider = get_bearer_token_provider(
-    #             get_azure_credential(client_id=self.azure_client_id), "https://cognitiveservices.azure.com/.default")
-    #
-    #         if not self.azure_openai_deployment_name:
-    #             raise ValueError("AZURE_OPENAI_MODEL is required")
-    #
-    #         return AsyncAzureOpenAI(
-    #             api_version=self.azure_openai_api_version,
-    #             azure_ad_token_provider=ad_token_provider,
-    #             default_headers={"x-ms-useragent": user_agent},
-    #             azure_endpoint=endpoint,
-    #         )
-    #     except Exception:
-    #         logger.exception("Failed to initialize Azure OpenAI client")
-    #         raise
 
     async def generate_title(self, conversation_messages):
-        """
-        Generate a conversation title using Azure AI Foundry SDK.
-
-        This method has been migrated from direct OpenAI API calls to use
-        Azure AI Foundry SDK with AIProjectClient for better resource management
-        and integration with Azure AI services.
-        """
         title_prompt = (
             "Summarize the conversation so far into a 4-word or less title. "
             "Do not use any quotation marks or punctuation. "