Sync updates from stainless branch: yanxi0830/dev

Author: yanxi0830

src/llama_stack_client/_client.py

@@ -126,14 +126,14 @@ def __init__(
     ) -> None:
         """Construct a new synchronous llama-stack-client client instance.
 
-        This automatically infers the `api_key` argument from the `LLAMA_STACK_CLIENT_API_KEY` environment variable if it is not provided.
+        This automatically infers the `api_key` argument from the `LLAMA_STACK_API_KEY` environment variable if it is not provided.
         """
         if api_key is None:
-            api_key = os.environ.get("LLAMA_STACK_CLIENT_API_KEY")
+            api_key = os.environ.get("LLAMA_STACK_API_KEY")
         self.api_key = api_key
 
         if base_url is None:
-            base_url = os.environ.get("LLAMA_STACK_CLIENT_BASE_URL")
+            base_url = os.environ.get("LLAMA_STACK_BASE_URL")
         if base_url is None:
             base_url = f"http://any-hosted-llama-stack.com"
 
@@ -342,14 +342,14 @@ def __init__(
     ) -> None:
         """Construct a new async llama-stack-client client instance.
 
-        This automatically infers the `api_key` argument from the `LLAMA_STACK_CLIENT_API_KEY` environment variable if it is not provided.
+        This automatically infers the `api_key` argument from the `LLAMA_STACK_API_KEY` environment variable if it is not provided.
         """
         if api_key is None:
-            api_key = os.environ.get("LLAMA_STACK_CLIENT_API_KEY")
+            api_key = os.environ.get("LLAMA_STACK_API_KEY")
         self.api_key = api_key
 
         if base_url is None:
-            base_url = os.environ.get("LLAMA_STACK_CLIENT_BASE_URL")
+            base_url = os.environ.get("LLAMA_STACK_BASE_URL")
         if base_url is None:
             base_url = f"http://any-hosted-llama-stack.com"
 

src/llama_stack_client/_utils/_logs.py

@@ -14,7 +14,7 @@ def _basic_config() -> None:
 
 
 def setup_logging() -> None:
-    env = os.environ.get("LLAMA_STACK_CLIENT_LOG")
+    env = os.environ.get("LLAMA_STACK_LOG")
     if env == "debug":
         _basic_config()
         logger.setLevel(logging.DEBUG)

src/llama_stack_client/resources/agents/turn.py

@@ -23,8 +23,9 @@
 )
 from ..._streaming import Stream, AsyncStream
 from ..._base_client import make_request_options
-from ...types.agents import turn_create_params
+from ...types.agents import turn_create_params, turn_resume_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"]
@@ -225,6 +226,129 @@ 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
@@ -421,6 +545,129 @@ 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:
@@ -432,6 +679,9 @@ def __init__(self, turn: TurnResource) -> None:
         self.retrieve = to_raw_response_wrapper(
             turn.retrieve,
         )
+        self.resume = to_raw_response_wrapper(
+            turn.resume,
+        )
 
 
 class AsyncTurnResourceWithRawResponse:
@@ -444,6 +694,9 @@ 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:
@@ -456,6 +709,9 @@ def __init__(self, turn: TurnResource) -> None:
         self.retrieve = to_streamed_response_wrapper(
             turn.retrieve,
         )
+        self.resume = to_streamed_response_wrapper(
+            turn.resume,
+        )
 
 
 class AsyncTurnResourceWithStreamingResponse:
@@ -468,3 +724,6 @@ def __init__(self, turn: AsyncTurnResource) -> None:
         self.retrieve = async_to_streamed_response_wrapper(
             turn.retrieve,
         )
+        self.resume = async_to_streamed_response_wrapper(
+            turn.resume,
+        )

src/llama_stack_client/types/agents/__init__.py

@@ -5,6 +5,7 @@
 from .turn import Turn as Turn
 from .session import Session as Session
 from .turn_create_params import TurnCreateParams as TurnCreateParams
+from .turn_resume_params import TurnResumeParams as TurnResumeParams
 from .turn_response_event import TurnResponseEvent as TurnResponseEvent
 from .session_create_params import SessionCreateParams as SessionCreateParams
 from .step_retrieve_response import StepRetrieveResponse as StepRetrieveResponse

src/llama_stack_client/types/agents/turn_response_event_payload.py

@@ -20,6 +20,7 @@
     "AgentTurnResponseStepCompletePayloadStepDetails",
     "AgentTurnResponseTurnStartPayload",
     "AgentTurnResponseTurnCompletePayload",
+    "AgentTurnResponseTurnAwaitingInputPayload",
 ]
 
 
@@ -72,13 +73,21 @@ class AgentTurnResponseTurnCompletePayload(BaseModel):
     """A single turn in an interaction with an Agentic System."""
 
 
+class AgentTurnResponseTurnAwaitingInputPayload(BaseModel):
+    event_type: Literal["turn_awaiting_input"]
+
+    turn: Turn
+    """A single turn in an interaction with an Agentic System."""
+
+
 TurnResponseEventPayload: TypeAlias = Annotated[
     Union[
         AgentTurnResponseStepStartPayload,
         AgentTurnResponseStepProgressPayload,
         AgentTurnResponseStepCompletePayload,
         AgentTurnResponseTurnStartPayload,
         AgentTurnResponseTurnCompletePayload,
+        AgentTurnResponseTurnAwaitingInputPayload,
     ],
     PropertyInfo(discriminator="event_type"),
 ]