Refactor Azure AI Search config and connection handling

Removed unused API key references and improved connection resolution logic for Azure AI Search. SearchConfig now requires index_name as an argument and no longer uses api_key. Updated agent factory and foundry agent to align with these changes and simplified query type handling.

Author: Fr4nc3

src/backend/.env.sample

@@ -31,5 +31,4 @@ SUPPORTED_MODELS='["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'
 AZURE_AI_SEARCH_CONNECTION_NAME=
 AZURE_AI_SEARCH_INDEX_NAME=
 AZURE_AI_SEARCH_ENDPOINT=
-AZURE_AI_SEARCH_API_KEY=
 BING_CONNECTION_NAME=

src/backend/v4/magentic_agents/foundry_agent.py

@@ -105,7 +105,7 @@ async def _create_azure_search_enabled_client(self):
               a) API key + endpoint, OR
               b) Managed Identity (RBAC enabled on the Search service with Search Service Contributor + Search Index Data Reader).
           - search_config.index_name must exist in the Search service.
-          - search_config.connection_name OR search_config.connection_id must reference the desired connection.
+
 
         Returns:
             AzureAIAgentClient | None
@@ -114,10 +114,10 @@ async def _create_azure_search_enabled_client(self):
             self.logger.error("Search configuration missing.")
             return None
 
-        desired_connection_id = getattr(self.search, "connection_id", None)
+
         desired_connection_name = getattr(self.search, "connection_name", None)
         index_name = getattr(self.search, "index_name", "")
-        query_type = getattr(self.search, "search_query_type", "vector")
+        query_type = getattr(self.search, "search_query_type", "simple")
 
         if not index_name:
             self.logger.error("index_name not provided in search_config; aborting Azure Search path.")
@@ -128,33 +128,27 @@ async def _create_azure_search_enabled_client(self):
         try:
             async for connection in self.project_client.connections.list():
                 if connection.type == ConnectionType.AZURE_AI_SEARCH:
-                    # Allow direct id override
-                    if desired_connection_id and connection.id == desired_connection_id:
-                        resolved_connection_id = connection.id
-                        break
-                    # Else match by name
+
                     if desired_connection_name and connection.name == desired_connection_name:
                         resolved_connection_id = connection.id
                         break
                     # Fallback: if no specific connection requested and none resolved yet, take the first
-                    if not desired_connection_id and not desired_connection_name and not resolved_connection_id:
+                    if not desired_connection_name and not resolved_connection_id:
                         resolved_connection_id = connection.id
                         # Do not break yet; we log but allow chance to find a name match later. If not, this stays.
 
             if not resolved_connection_id:
                 self.logger.error(
                     "No Azure AI Search connection resolved. "
-                    "Provided connection_id=%s, connection_name=%s",
-                    desired_connection_id,
+                    "connection_name=%s",
                     desired_connection_name,
                 )
               #  return None
 
             self.logger.info(
-                "Using Azure AI Search connection (id=%s, requested_name=%s, requested_id=%s).",
+                "Using Azure AI Search connection (id=%s, requested_name=%s).",
                 resolved_connection_id,
                 desired_connection_name,
-                desired_connection_id,
             )
         except Exception as ex:
             self.logger.error("Failed to enumerate connections: %s", ex)
@@ -176,7 +170,7 @@ async def _create_azure_search_enabled_client(self):
                             {
                                 "index_connection_id": resolved_connection_id,
                                 "index_name": index_name,
-                                "query_type": "simple",
+                                "query_type": query_type,
                             }
                         ]
                     }

src/backend/v4/magentic_agents/magentic_agent_factory.py

@@ -85,16 +85,17 @@ async def create_agent_from_config(self, user_id: str, agent_obj: SimpleNamespac
                 )
 
         # Only create configs for explicitly requested capabilities
+        index_name = getattr(agent_obj, "index_name", None)
         search_config = (
-            SearchConfig.from_env() if getattr(agent_obj, "use_rag", False) else None
+            SearchConfig.from_env(index_name) if getattr(agent_obj, "use_rag", False) else None
         )
         mcp_config = (
             MCPConfig.from_env() if getattr(agent_obj, "use_mcp", False) else None
         )
         # bing_config = BingConfig.from_env() if getattr(agent_obj, 'use_bing', False) else None
 
         self.logger.info(
-            f"Creating agent '{agent_obj.name}' with model '{deployment_name}' "
+            f"Creating agent '{agent_obj.name}' with model '{deployment_name}' {index_name} "
             f"(Template: {'Reasoning' if use_reasoning else 'Foundry'})"
         )
 

src/backend/v4/magentic_agents/models/agent_models.py

@@ -61,14 +61,14 @@ class SearchConfig:
     connection_name: str | None = None
     endpoint: str | None = None
     index_name: str | None = None
-    api_key: str | None = None  # API key for Azure AI Search
+
 
     @classmethod
-    def from_env(cls) -> "SearchConfig":
+    def from_env(cls, index_name: str) -> "SearchConfig":
         connection_name = config.AZURE_AI_SEARCH_CONNECTION_NAME
-        index_name = config.AZURE_AI_SEARCH_INDEX_NAME
+        index_name = index_name or config.AZURE_AI_SEARCH_INDEX_NAME
         endpoint = config.AZURE_AI_SEARCH_ENDPOINT
-        api_key = config.AZURE_AI_SEARCH_API_KEY
+
 
         # Raise exception if any required environment variable is missing
         if not all([connection_name, index_name, endpoint]):
@@ -79,6 +79,5 @@ def from_env(cls) -> "SearchConfig":
         return cls(
             connection_name=connection_name,
             index_name=index_name,
-            endpoint=endpoint,
-            api_key=api_key,
+            endpoint=endpoint
         )