Merge branch 'agents_resume' into agents_resume_2

Author: yanxi0830

src/llama_stack_client/_base_client.py

@@ -518,7 +518,7 @@ def _build_request(
             # so that passing a `TypedDict` doesn't cause an error.
             # https://github.com/microsoft/pyright/issues/3526#event-6715453066
             params=self.qs.stringify(cast(Mapping[str, Any], params)) if params else None,
-            json=json_data,
+            json=json_data if is_given(json_data) else None,
             files=files,
             **kwargs,
         )

src/llama_stack_client/resources/agents/turn.py

@@ -58,6 +58,7 @@ def create(
         *,
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         stream: Literal[False] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
@@ -91,6 +92,7 @@ def create(
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
         stream: Literal[True],
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
         toolgroups: List[turn_create_params.Toolgroup] | NotGiven = NOT_GIVEN,
@@ -123,6 +125,7 @@ def create(
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
         stream: bool,
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
         toolgroups: List[turn_create_params.Toolgroup] | NotGiven = NOT_GIVEN,
@@ -154,6 +157,7 @@ def create(
         *,
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         stream: Literal[False] | Literal[True] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
@@ -174,6 +178,7 @@ def create(
             body=maybe_transform(
                 {
                     "messages": messages,
+                    "allow_turn_resume": allow_turn_resume,
                     "documents": documents,
                     "stream": stream,
                     "tool_config": tool_config,
@@ -377,6 +382,7 @@ async def create(
         *,
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         stream: Literal[False] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
@@ -410,6 +416,7 @@ async def create(
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
         stream: Literal[True],
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
         toolgroups: List[turn_create_params.Toolgroup] | NotGiven = NOT_GIVEN,
@@ -442,6 +449,7 @@ async def create(
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
         stream: bool,
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
         toolgroups: List[turn_create_params.Toolgroup] | NotGiven = NOT_GIVEN,
@@ -473,6 +481,7 @@ async def create(
         *,
         agent_id: str,
         messages: Iterable[turn_create_params.Message],
+        allow_turn_resume: bool | NotGiven = NOT_GIVEN,
         documents: Iterable[turn_create_params.Document] | NotGiven = NOT_GIVEN,
         stream: Literal[False] | Literal[True] | NotGiven = NOT_GIVEN,
         tool_config: turn_create_params.ToolConfig | NotGiven = NOT_GIVEN,
@@ -493,6 +502,7 @@ async def create(
             body=await async_maybe_transform(
                 {
                     "messages": messages,
+                    "allow_turn_resume": allow_turn_resume,
                     "documents": documents,
                     "stream": stream,
                     "tool_config": tool_config,

src/llama_stack_client/types/agents/turn_create_params.py

@@ -32,6 +32,8 @@ class TurnCreateParamsBase(TypedDict, total=False):
 
     messages: Required[Iterable[Message]]
 
+    allow_turn_resume: bool
+
     documents: Iterable[Document]
 
     tool_config: ToolConfig

tests/api_resources/agents/test_turn.py

@@ -43,6 +43,7 @@ def test_method_create_with_all_params_overload_1(self, client: LlamaStackClient
                     "context": "string",
                 }
             ],
+            allow_turn_resume=True,
             documents=[
                 {
                     "content": "string",
@@ -151,6 +152,7 @@ def test_method_create_with_all_params_overload_2(self, client: LlamaStackClient
                 }
             ],
             stream=True,
+            allow_turn_resume=True,
             documents=[
                 {
                     "content": "string",
@@ -562,6 +564,7 @@ async def test_method_create_with_all_params_overload_1(self, async_client: Asyn
                     "context": "string",
                 }
             ],
+            allow_turn_resume=True,
             documents=[
                 {
                     "content": "string",
@@ -670,6 +673,7 @@ async def test_method_create_with_all_params_overload_2(self, async_client: Asyn
                 }
             ],
             stream=True,
+            allow_turn_resume=True,
             documents=[
                 {
                     "content": "string",