Merge branch 'main' into responses-and-safety

llama_stack/providers/inline/agents/meta_reference/agents.py

@@ -30,6 +30,7 @@ from llama_stack.apis.agents import (
 )
 from llama_stack.apis.agents.openai_responses import OpenAIResponseText
 from llama_stack.apis.common.responses import PaginatedResponse
+from llama_stack.apis.conversations import Conversations
 from llama_stack.apis.inference import (
     Inference,
     ToolConfig,
@@ -63,6 +64,7 @@ class MetaReferenceAgentsImpl(Agents):
         safety_api: Safety,
         tool_runtime_api: ToolRuntime,
         tool_groups_api: ToolGroups,
+        conversations_api: Conversations,
         policy: list[AccessRule],
         telemetry_enabled: bool = False,
     ):
@@ -72,6 +74,7 @@ class MetaReferenceAgentsImpl(Agents):
         self.safety_api = safety_api
         self.tool_runtime_api = tool_runtime_api
         self.tool_groups_api = tool_groups_api
+        self.conversations_api = conversations_api
         self.telemetry_enabled = telemetry_enabled
 
         self.in_memory_store = InmemoryKVStoreImpl()
@@ -89,6 +92,7 @@ class MetaReferenceAgentsImpl(Agents):
             responses_store=self.responses_store,
             vector_io_api=self.vector_io_api,
             safety_api=self.safety_api,
+            conversations_api=self.conversations_api,
         )
 
     async def create_agent(
@@ -326,6 +330,7 @@ class MetaReferenceAgentsImpl(Agents):
         model: str,
         instructions: str | None = None,
         previous_response_id: str | None = None,
+        conversation: str | None = None,
         store: bool | None = True,
         stream: bool | None = False,
         temperature: float | None = None,
@@ -340,6 +345,7 @@ class MetaReferenceAgentsImpl(Agents):
             model,
             instructions,
             previous_response_id,
+            conversation,
             store,
             stream,
             temperature,