[AVC] Update agent endpoints (#13798)

tjprescott · web-flow · commit d887cf7372bd · 2026-01-30T11:08:18.000-08:00
* Update agent endpoint.

* Code review feedback.
diff --git a/packages/python-packages/apiview-copilot/scripts/infra/_variables.py b/packages/python-packages/apiview-copilot/scripts/infra/_variables.py
@@ -72,9 +72,8 @@ def __init__(self, *, is_staging: bool, path: str = "variables.yaml"):
         self.keyvault_endpoint = f"https://{self.keyvault_name}.vault.azure.net/"
         self.app_configuration_endpoint = f"https://{self.app_configuration_name}.azconfig.io"
         self.webapp_endpoint = f"https://{self.webapp_name}.azurewebsites.net/"
-        self.foundry_endpoint = (
-            f"https://{self.foundry_account_name}.services.ai.azure.com/api/projects/{self.foundry_project_name}"
-        )
+        self.foundry_endpoint = f"https://{self.foundry_account_name}.services.ai.azure.com"
+        self.foundry_project = self.foundry_project_name
         self.assignee_object_id = os.getenv("ASSIGNEE_OBJECT_ID")
         self.is_staging = is_staging
 
diff --git a/packages/python-packages/apiview-copilot/scripts/infra/create_resources.py b/packages/python-packages/apiview-copilot/scripts/infra/create_resources.py
@@ -1102,6 +1102,7 @@ def populate_settings(v: Variables):
             "foundry_endpoint",
             "foundry_kernel_model",
             "foundry_api_version",
+            "foundry_project",
             "openai_endpoint",
             "rg_name",
             "search_endpoint",
diff --git a/packages/python-packages/apiview-copilot/src/agent/_agent.py b/packages/python-packages/apiview-copilot/src/agent/_agent.py
@@ -6,9 +6,13 @@
 
 """
 Module for managing APIView Copilot agents.
+
+Agents are retrieved by name if they exist, or created if not. Each chat session
+creates a new thread with the persistent agent, rather than creating/deleting agents per request.
 """
 
 import asyncio
+import logging
 from contextlib import contextmanager
 from typing import Optional
 
@@ -25,6 +29,92 @@
 from src.agent.tools._search_tools import SearchTools
 from src.agent.tools._utility_tools import UtilityTools
 
+logger = logging.getLogger(__name__)
+
+
+def _get_agents_endpoint() -> str:
+    """Get the Azure AI Agents endpoint.
+
+    Constructs the full endpoint: {FOUNDRY_ENDPOINT}/api/projects/{FOUNDRY_PROJECT}
+    """
+    settings = SettingsManager()
+    endpoint = settings.get("FOUNDRY_ENDPOINT")
+    project = settings.get("FOUNDRY_PROJECT")
+
+    if not endpoint:
+        raise ValueError("FOUNDRY_ENDPOINT not configured in AppConfiguration.")
+    if not project:
+        raise ValueError("FOUNDRY_PROJECT not configured in AppConfiguration.")
+
+    # Construct the full agents endpoint
+    endpoint = endpoint.rstrip("/")
+    return f"{endpoint}/api/projects/{project}"
+
+
+def _get_client() -> AgentsClient:
+    """Create and return an AgentsClient."""
+    credential = get_credential()
+    endpoint = _get_agents_endpoint()
+    return AgentsClient(endpoint=endpoint, credential=credential)
+
+
+def _get_or_create_agent(
+    client: AgentsClient,
+    name: str,
+    description: str,
+    instructions: str,
+    toolset: ToolSet,
+) -> str:
+    """Get existing agent by name or create a new one if none exists.
+
+    Args:
+        client: The AgentsClient to use
+        name: Agent name to search for / create
+        description: Agent description
+        instructions: Agent instructions
+        toolset: Tools available to the agent
+
+    Returns:
+        The agent ID
+    """
+    settings = SettingsManager()
+    model_deployment_name = settings.get("FOUNDRY_KERNEL_MODEL")
+    if not model_deployment_name:
+        raise ValueError("FOUNDRY_KERNEL_MODEL not configured in AppConfiguration.")
+
+    # Search for existing agent by name
+    logger.info("Searching for existing agent by name '%s'...", name)
+    try:
+        existing_agents = list(client.list_agents())
+        for agent in existing_agents:
+            if agent.name == name:
+                logger.info("Found existing agent: %s", agent.id)
+                return agent.id
+    except Exception as e:
+        logger.warning("Error listing agents: %s, will create new one", e)
+
+    # Create new agent only if none exists with that name
+    logger.info("No existing agent found, creating new agent '%s'...", name)
+    try:
+        agent = client.create_agent(
+            name=name,
+            description=description,
+            model=model_deployment_name,
+            instructions=instructions,
+            toolset=toolset,
+        )
+        logger.info("Created agent: %s", agent.id)
+        return agent.id
+    except Exception as e:
+        error_msg = str(e)
+        if "timed out" in error_msg.lower():
+            raise RuntimeError(
+                "Failed to create agent: Azure Agents service timed out. "
+                "This may be a temporary service issue. Please try again in a moment."
+            ) from e
+        else:
+            raise RuntimeError(f"Failed to create agent: {error_msg}") from e
+
 
 async def invoke_agent(
     *,
@@ -52,9 +142,6 @@ async def invoke_agent(
     await asyncio.to_thread(client.messages.create, thread_id=thread_id, role="user", content=user_input)
 
     # 3) Process a run (polls until terminal state; executes tools if auto-enabled)
-    import logging
-
-    logger = logging.getLogger(__name__)
     logger.info("Processing agent run... (this may take a moment)")
     await asyncio.to_thread(client.runs.create_and_process, thread_id=thread_id, agent_id=agent_id)
     logger.info("Agent run completed")
@@ -87,10 +174,12 @@ def extract_text(obj):
 
 @contextmanager
 def get_readwrite_agent():
-    """Create and yield the read-write APIView Copilot agent."""
-    settings = SettingsManager()
-    endpoint = settings.get("FOUNDRY_ENDPOINT")
-    model_deployment_name = settings.get("FOUNDRY_KERNEL_MODEL")
+    """Get or create the read-write APIView Copilot agent.
+
+    The agent is retrieved by name if it exists, or created if not.
+    Each chat session creates a new thread with this persistent agent.
+    """
+    client = _get_client()
 
     ai_instructions = """
 Your job is to receive a request from the user, determine their intent, and pass the request to the
@@ -99,52 +188,34 @@ def get_readwrite_agent():
 process the request. You will also handle any errors that occur during the processing of the request and return
 an appropriate error message to the user.
 """
-    credential = get_credential()
-    client = AgentsClient(endpoint=endpoint, credential=credential)
-
-    # TODO: These were treated as subagents before and may not be applicable in the new format.
-    # delete_agent = await stack.enter_async_context(get_delete_agent())
-    # create_agent = await stack.enter_async_context(get_create_agent())
-    # retrieve_agent = await stack.enter_async_context(get_retrieve_agent())
-    # link_agent = await stack.enter_async_context(get_link_agent())
 
     toolset = ToolSet()
     tools = SearchTools().all_tools() + ApiReviewTools().all_tools() + UtilityTools().all_tools()
     toolset.add(FunctionTool(tools))
 
-    try:
-        agent = client.create_agent(
-            name="APIView Copilot Readwrite Agent",
-            description="A read-write agent that can perform searches and trigger allowed actions.",
-            model=model_deployment_name,
-            instructions=ai_instructions,
-            toolset=toolset,
-        )
-    except Exception as e:
-        error_msg = str(e)
-        if "timed out" in error_msg.lower():
-            raise RuntimeError(
-                "Failed to create agent: Azure Agents service timed out. "
-                "This may be a temporary service issue. Please try again in a moment."
-            ) from e
-        else:
-            raise RuntimeError(f"Failed to create agent: {error_msg}") from e
+    agent_id = _get_or_create_agent(
+        client=client,
+        name="APIView Copilot Readwrite Agent",
+        description="A read-write agent that can perform searches and trigger allowed actions.",
+        instructions=ai_instructions,
+        toolset=toolset,
+    )
 
     # enable all tools by default
     client.enable_auto_function_calls(tools=toolset)
 
-    try:
-        yield client, agent.id
-    finally:
-        client.delete_agent(agent.id)
+    yield client, agent_id
+    # Note: We don't delete the agent - it persists for reuse
 
 
 @contextmanager
 def get_readonly_agent():
-    """Create and yield a read-only APIView Copilot agent (no mutating tools)."""
-    settings = SettingsManager()
-    endpoint = settings.get("FOUNDRY_ENDPOINT")
-    model_deployment_name = settings.get("FOUNDRY_KERNEL_MODEL")
+    """Get or create a read-only APIView Copilot agent (no mutating tools).
+
+    The agent is retrieved by name if it exists, or created if not.
+    Each chat session creates a new thread with this persistent agent.
+    """
+    client = _get_client()
 
     ai_instructions = """
 You are a READ-ONLY assistant.
@@ -153,9 +224,6 @@ def get_readonly_agent():
 - If asked to update/create/delete/link data or run indexers, refuse and explain alternatives.
 """
 
-    credential = get_credential()
-    client = AgentsClient(endpoint=endpoint, credential=credential)
-
     toolset = ToolSet()
 
     # Exclude tools that can mutate state or trigger background operations.
@@ -165,28 +233,16 @@ def get_readonly_agent():
     tools = safe_search_tools + ApiReviewTools().all_tools() + UtilityTools().all_tools()
     toolset.add(FunctionTool(tools))
 
-    try:
-        agent = client.create_agent(
-            name="APIView Copilot Readonly Agent",
-            description="A read-only agent for search/retrieve/summarize without side effects.",
-            model=model_deployment_name,
-            instructions=ai_instructions,
-            toolset=toolset,
-        )
-    except Exception as e:
-        error_msg = str(e)
-        if "timed out" in error_msg.lower():
-            raise RuntimeError(
-                "Failed to create agent: Azure Agents service timed out. "
-                "This may be a temporary service issue. Please try again in a moment."
-            ) from e
-        else:
-            raise RuntimeError(f"Failed to create agent: {error_msg}") from e
+    agent_id = _get_or_create_agent(
+        client=client,
+        name="APIView Copilot Readonly Agent",
+        description="A read-only agent for search/retrieve/summarize without side effects.",
+        instructions=ai_instructions,
+        toolset=toolset,
+    )
 
     # enable all tools by default
     client.enable_auto_function_calls(tools=toolset)
 
-    try:
-        yield client, agent.id
-    finally:
-        client.delete_agent(agent.id)
+    yield client, agent_id
+    # Note: We don't delete the agent - it persists for reuse
diff --git a/packages/python-packages/apiview-copilot/tests/agent_test.py b/packages/python-packages/apiview-copilot/tests/agent_test.py
