Sync updates from stainless branch: yanxi0830/dev

Author: yanxi0830

src/llama_stack_client/_client.py

@@ -135,7 +135,7 @@ def __init__(
         if base_url is None:
             base_url = os.environ.get("LLAMA_STACK_BASE_URL")
         if base_url is None:
-            base_url = "http://any-hosted-llama-stack.com"
+            base_url = f"http://any-hosted-llama-stack.com"
 
         custom_headers = default_headers or {}
         custom_headers["X-LlamaStack-Client-Version"] = __version__
@@ -351,7 +351,7 @@ def __init__(
         if base_url is None:
             base_url = os.environ.get("LLAMA_STACK_BASE_URL")
         if base_url is None:
-            base_url = "http://any-hosted-llama-stack.com"
+            base_url = f"http://any-hosted-llama-stack.com"
 
         custom_headers = default_headers or {}
         custom_headers["X-LlamaStack-Client-Version"] = __version__

src/llama_stack_client/_files.py

@@ -71,7 +71,7 @@ def _transform_file(file: FileTypes) -> HttpxFileTypes:
     if is_tuple_t(file):
         return (file[0], _read_file_content(file[1]), *file[2:])
 
-    raise TypeError("Expected file types input to be a FileContent type or to be a tuple")
+    raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
 def _read_file_content(file: FileContent) -> HttpxFileContent:
@@ -113,7 +113,7 @@ async def _async_transform_file(file: FileTypes) -> HttpxFileTypes:
     if is_tuple_t(file):
         return (file[0], await _async_read_file_content(file[1]), *file[2:])
 
-    raise TypeError("Expected file types input to be a FileContent type or to be a tuple")
+    raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
 async def _async_read_file_content(file: FileContent) -> HttpxFileContent:

src/llama_stack_client/_response.py

@@ -229,7 +229,7 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
             # the response class ourselves but that is something that should be supported directly in httpx
             # as it would be easy to incorrectly construct the Response object due to the multitude of arguments.
             if cast_to != httpx.Response:
-                raise ValueError("Subclasses of httpx.Response cannot be passed to `cast_to`")
+                raise ValueError(f"Subclasses of httpx.Response cannot be passed to `cast_to`")
             return cast(R, response)
 
         if (
@@ -245,9 +245,9 @@ def _parse(self, *, to: type[_T] | None = None) -> R | _T:
 
         if (
             cast_to is not object
-            and origin is not list
-            and origin is not dict
-            and origin is not Union
+            and not origin is list
+            and not origin is dict
+            and not origin is Union
             and not issubclass(origin, BaseModel)
         ):
             raise RuntimeError(

src/llama_stack_client/resources/agents/turn.py

@@ -23,9 +23,8 @@
 )
 from ..._streaming import Stream, AsyncStream
 from ..._base_client import make_request_options
-from ...types.agents import turn_create_params, turn_resume_params
+from ...types.agents import turn_create_params
 from ...types.agents.turn import Turn
-from ...types.shared_params.tool_response_message import ToolResponseMessage
 from ...types.agents.agent_turn_response_stream_chunk import AgentTurnResponseStreamChunk
 
 __all__ = ["TurnResource", "AsyncTurnResource"]
@@ -231,129 +230,6 @@ def retrieve(
             cast_to=Turn,
         )
 
-    @overload
-    def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        tool_responses: Iterable[ToolResponseMessage],
-        stream: Literal[False] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Turn:
-        """
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        stream: Literal[True],
-        tool_responses: Iterable[ToolResponseMessage],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Stream[AgentTurnResponseStreamChunk]:
-        """
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        stream: bool,
-        tool_responses: Iterable[ToolResponseMessage],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Turn | Stream[AgentTurnResponseStreamChunk]:
-        """
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["agent_id", "session_id", "tool_responses"], ["agent_id", "session_id", "stream", "tool_responses"])
-    def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        tool_responses: Iterable[ToolResponseMessage],
-        stream: Literal[False] | Literal[True] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Turn | Stream[AgentTurnResponseStreamChunk]:
-        if not agent_id:
-            raise ValueError(f"Expected a non-empty value for `agent_id` but received {agent_id!r}")
-        if not session_id:
-            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
-        if not turn_id:
-            raise ValueError(f"Expected a non-empty value for `turn_id` but received {turn_id!r}")
-        return self._post(
-            f"/v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}/resume",
-            body=maybe_transform(
-                {
-                    "tool_responses": tool_responses,
-                    "stream": stream,
-                },
-                turn_resume_params.TurnResumeParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=Turn,
-            stream=stream or False,
-            stream_cls=Stream[AgentTurnResponseStreamChunk],
-        )
-
 
 class AsyncTurnResource(AsyncAPIResource):
     @cached_property
@@ -555,129 +431,6 @@ async def retrieve(
             cast_to=Turn,
         )
 
-    @overload
-    async def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        tool_responses: Iterable[ToolResponseMessage],
-        stream: Literal[False] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Turn:
-        """
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        stream: Literal[True],
-        tool_responses: Iterable[ToolResponseMessage],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncStream[AgentTurnResponseStreamChunk]:
-        """
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        stream: bool,
-        tool_responses: Iterable[ToolResponseMessage],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Turn | AsyncStream[AgentTurnResponseStreamChunk]:
-        """
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @required_args(["agent_id", "session_id", "tool_responses"], ["agent_id", "session_id", "stream", "tool_responses"])
-    async def resume(
-        self,
-        turn_id: str,
-        *,
-        agent_id: str,
-        session_id: str,
-        tool_responses: Iterable[ToolResponseMessage],
-        stream: Literal[False] | Literal[True] | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Turn | AsyncStream[AgentTurnResponseStreamChunk]:
-        if not agent_id:
-            raise ValueError(f"Expected a non-empty value for `agent_id` but received {agent_id!r}")
-        if not session_id:
-            raise ValueError(f"Expected a non-empty value for `session_id` but received {session_id!r}")
-        if not turn_id:
-            raise ValueError(f"Expected a non-empty value for `turn_id` but received {turn_id!r}")
-        return await self._post(
-            f"/v1/agents/{agent_id}/session/{session_id}/turn/{turn_id}/resume",
-            body=await async_maybe_transform(
-                {
-                    "tool_responses": tool_responses,
-                    "stream": stream,
-                },
-                turn_resume_params.TurnResumeParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=Turn,
-            stream=stream or False,
-            stream_cls=AsyncStream[AgentTurnResponseStreamChunk],
-        )
-
 
 class TurnResourceWithRawResponse:
     def __init__(self, turn: TurnResource) -> None:
@@ -689,9 +442,6 @@ def __init__(self, turn: TurnResource) -> None:
         self.retrieve = to_raw_response_wrapper(
             turn.retrieve,
         )
-        self.resume = to_raw_response_wrapper(
-            turn.resume,
-        )
 
 
 class AsyncTurnResourceWithRawResponse:
@@ -704,9 +454,6 @@ def __init__(self, turn: AsyncTurnResource) -> None:
         self.retrieve = async_to_raw_response_wrapper(
             turn.retrieve,
         )
-        self.resume = async_to_raw_response_wrapper(
-            turn.resume,
-        )
 
 
 class TurnResourceWithStreamingResponse:
@@ -719,9 +466,6 @@ def __init__(self, turn: TurnResource) -> None:
         self.retrieve = to_streamed_response_wrapper(
             turn.retrieve,
         )
-        self.resume = to_streamed_response_wrapper(
-            turn.resume,
-        )
 
 
 class AsyncTurnResourceWithStreamingResponse:
@@ -734,6 +478,3 @@ def __init__(self, turn: AsyncTurnResource) -> None:
         self.retrieve = async_to_streamed_response_wrapper(
             turn.retrieve,
         )
-        self.resume = async_to_streamed_response_wrapper(
-            turn.resume,
-        )