Merge pull request #619 from Fr4nc3/macae-rfp-af-101725

Fr4nc3 · web-flow · commit 1a7154db99c0 · 2025-11-10T18:33:42.000-05:00
Update index_name for RFP analysis team agents
diff --git a/data/agent_teams/rfp_analysis_team.json b/data/agent_teams/rfp_analysis_team.json
@@ -21,7 +21,7 @@
       "use_mcp": false,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "rfp-index",
+      "index_name": "macae-rfp-index",
       "index_foundry_name": "",
       "index_endpoint": "",
       "coding_tools": false
@@ -38,7 +38,7 @@
       "use_mcp": false,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "rfp-index",
+      "index_name": "macae-rfp-index",
       "index_foundry_name": "",
       "index_endpoint": "",
       "coding_tools": false
@@ -55,7 +55,7 @@
       "use_mcp": false,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "rfp-index",
+      "index_name": "macae-rfp-index",
       "index_foundry_name": "",
       "index_endpoint": "",
       "coding_tools": false
diff --git a/src/backend/.env.sample b/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=
diff --git a/src/backend/uv.lock b/src/backend/uv.lock
diff --git a/src/backend/v4/magentic_agents/foundry_agent.py b/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,
                             }
                         ]
                     }
diff --git a/src/backend/v4/magentic_agents/magentic_agent_factory.py b/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'})"
         )
 
diff --git a/src/backend/v4/magentic_agents/models/agent_models.py b/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
         )
diff --git a/src/backend/v4/magentic_agents/reasoning_agent.py b/src/backend/v4/magentic_agents/reasoning_agent.py
@@ -19,7 +19,6 @@
 
 from v4.magentic_agents.common.lifecycle import MCPEnabledBase
 from v4.magentic_agents.models.agent_models import MCPConfig, SearchConfig
-from v4.magentic_agents.reasoning_search import ReasoningSearch, create_reasoning_search
 from v4.config.agent_registry import agent_registry
 
 
@@ -73,8 +72,6 @@ def __init__(
         self._credential: Optional[DefaultAzureCredential] = None
         self._client: Optional[AzureAIAgentClient] = None
         
-        # Search integration
-        self.reasoning_search: Optional[ReasoningSearch] = None
         
         self.logger = logging.getLogger(__name__)
 
@@ -100,16 +97,6 @@ async def _after_open(self) -> None:
                 self.model_deployment_name
             )
 
-            # Initialize search capabilities if configured
-            if self.search_config:
-                self.reasoning_search = await create_reasoning_search(self.search_config)
-                if self.reasoning_search.is_available():
-                    self.logger.info(
-                        "Initialized Azure AI Search with index '%s'",
-                        self.search_config.index_name
-                    )
-                else:
-                    self.logger.warning("Azure AI Search initialization failed or incomplete config")
 
             # Initialize MCP tools (called after stack is ready)
             await self._prepare_mcp_tool()
@@ -153,10 +140,6 @@ async def _after_open(self) -> None:
     async def close(self) -> None:
         """Close all resources."""
         try:
-            # Close reasoning search
-            if self.reasoning_search:
-                await self.reasoning_search.close()
-                self.reasoning_search = None
 
             # Unregister from registry
             try:
@@ -169,55 +152,6 @@ async def close(self) -> None:
             self._client = None
             self._credential = None
 
-    async def _augment_with_search(self, prompt: str) -> str:
-        """
-        Augment the prompt with relevant search results.
-        
-        Args:
-            prompt: Original user prompt
-            
-        Returns:
-            Augmented instructions including search results
-        """
-        instructions = self.base_instructions
-        
-        if not self.reasoning_search or not self.reasoning_search.is_available():
-            return instructions
-
-        if not prompt.strip():
-            return instructions
-
-        try:
-            # Fetch relevant documents
-            docs = await self.reasoning_search.search_documents(
-                query=prompt,
-                limit=self.max_search_docs
-            )
-            
-            if docs:
-                # Format documents for inclusion
-                doc_context = "\n\n".join(
-                    f"[Document {i+1}]\n{doc}" 
-                    for i, doc in enumerate(docs)
-                )
-                
-                # Append to instructions
-                instructions = (
-                    f"{instructions}\n\n"
-                    f"**Relevant Reference Documents:**\n{doc_context}\n\n"
-                    f"Use the above documents only if they help answer the user's question. "
-                    f"Do not mention the documents unless directly relevant."
-                )
-                
-                self.logger.debug(
-                    "Augmented prompt with %d search documents",
-                    len(docs)
-                )
-        except Exception as ex:
-            self.logger.warning("Search augmentation failed: %s", ex)
-
-        return instructions
-
     def _prepare_tools(self) -> list:
         """
         Prepare tools for reasoning model invocation.
diff --git a/src/backend/v4/magentic_agents/reasoning_search.py b/src/backend/v4/magentic_agents/reasoning_search.py

Original file line number	Diff line number	Diff line change
`@@ -85,16 +85,17 @@ async def create_agent_from_config(self, user_id: str, agent_obj: SimpleNamespac`
`85`	`85`	`)`
`86`	`86`
`87`	`87`	`# Only create configs for explicitly requested capabilities`
	`88`	`+ index_name = getattr(agent_obj, "index_name", None)`
`88`	`89`	`search_config = (`
`89`		`- SearchConfig.from_env() if getattr(agent_obj, "use_rag", False) else None`
	`90`	`+ SearchConfig.from_env(index_name) if getattr(agent_obj, "use_rag", False) else None`
`90`	`91`	`)`
`91`	`92`	`mcp_config = (`
`92`	`93`	`MCPConfig.from_env() if getattr(agent_obj, "use_mcp", False) else None`
`93`	`94`	`)`
`94`	`95`	`# bing_config = BingConfig.from_env() if getattr(agent_obj, 'use_bing', False) else None`
`95`	`96`
`96`	`97`	`self.logger.info(`
`97`		`- f"Creating agent '{agent_obj.name}' with model '{deployment_name}' "`
	`98`	`+ f"Creating agent '{agent_obj.name}' with model '{deployment_name}' {index_name} "`
`98`	`99`	`f"(Template: {'Reasoning' if use_reasoning else 'Foundry'})"`
`99`	`100`	`)`
`100`	`101`