Sync updates from stainless branch: ehhuang/dev

Eric Huang (AI Platform) · Eric Huang (AI Platform) · commit 4fcdb0d25992 · 2025-03-18T17:15:12.000-07:00
diff --git a/src/llama_stack_client/__init__.py b/src/llama_stack_client/__init__.py
@@ -37,6 +37,12 @@
 from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
+from .lib.agents.agent import Agent
+from .lib.agents.event_logger import EventLogger as AgentEventLogger
+from .lib.inference.event_logger import EventLogger as InferenceEventLogger
+from .types.agents.turn_create_params import Document
+from .types.shared_params.document import Document as RAGDocument
+
 __all__ = [
     "types",
     "__version__",
diff --git a/src/llama_stack_client/resources/benchmarks.py b/src/llama_stack_client/resources/benchmarks.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Type, Union, Iterable, Optional, cast
+from typing import Dict, List, Type, Union, Iterable, cast
 
 import httpx
 
@@ -58,7 +58,7 @@ def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Benchmark]:
+    ) -> Benchmark:
         """
         Args:
           extra_headers: Send extra headers
@@ -178,7 +178,7 @@ async def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Benchmark]:
+    ) -> Benchmark:
         """
         Args:
           extra_headers: Send extra headers
diff --git a/src/llama_stack_client/resources/datasets.py b/src/llama_stack_client/resources/datasets.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Type, Union, Iterable, Optional, cast
+from typing import Dict, Type, Union, Iterable, cast
 from typing_extensions import Literal
 
 import httpx
@@ -61,7 +61,7 @@ def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DatasetRetrieveResponse]:
+    ) -> DatasetRetrieveResponse:
         """
         Args:
           extra_headers: Send extra headers
@@ -122,7 +122,7 @@ def iterrows(
         Uses cursor-based pagination.
 
         Args:
-          limit: The number of rows to get per page.
+          limit: The number of rows to get.
 
           start_index: Index into dataset for the first row to get. Get all rows if None.
 
@@ -185,8 +185,8 @@ def register(
               "Hello, John Doe. How can I help you today?"}, {"role": "user", "content":
               "What's my name?"}, ], "answer": "John Doe" }
 
-          source:
-              The data source of the dataset. Examples: - { "type": "uri", "uri":
+          source: The data source of the dataset. Ensure that the data source schema is compatible
+              with the purpose of the dataset. Examples: - { "type": "uri", "uri":
               "https://mywebsite.com/mydata.jsonl" } - { "type": "uri", "uri":
               "lsfs://mydata.jsonl" } - { "type": "uri", "uri":
               "data:csv;base64,{base64_content}" } - { "type": "uri", "uri":
@@ -286,7 +286,7 @@ async def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DatasetRetrieveResponse]:
+    ) -> DatasetRetrieveResponse:
         """
         Args:
           extra_headers: Send extra headers
@@ -347,7 +347,7 @@ async def iterrows(
         Uses cursor-based pagination.
 
         Args:
-          limit: The number of rows to get per page.
+          limit: The number of rows to get.
 
           start_index: Index into dataset for the first row to get. Get all rows if None.
 
@@ -410,8 +410,8 @@ async def register(
               "Hello, John Doe. How can I help you today?"}, {"role": "user", "content":
               "What's my name?"}, ], "answer": "John Doe" }
 
-          source:
-              The data source of the dataset. Examples: - { "type": "uri", "uri":
+          source: The data source of the dataset. Ensure that the data source schema is compatible
+              with the purpose of the dataset. Examples: - { "type": "uri", "uri":
               "https://mywebsite.com/mydata.jsonl" } - { "type": "uri", "uri":
               "lsfs://mydata.jsonl" } - { "type": "uri", "uri":
               "data:csv;base64,{base64_content}" } - { "type": "uri", "uri":
diff --git a/src/llama_stack_client/resources/eval/jobs.py b/src/llama_stack_client/resources/eval/jobs.py
@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
 import httpx
 
 from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
@@ -126,7 +124,7 @@ def status(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobStatusResponse]:
+    ) -> JobStatusResponse:
         """
         Get the status of a job.
 
@@ -256,7 +254,7 @@ async def status(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobStatusResponse]:
+    ) -> JobStatusResponse:
         """
         Get the status of a job.
 
diff --git a/src/llama_stack_client/resources/models.py b/src/llama_stack_client/resources/models.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Type, Union, Iterable, Optional, cast
+from typing import Dict, Type, Union, Iterable, cast
 from typing_extensions import Literal
 
 import httpx
@@ -59,7 +59,7 @@ def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Model]:
+    ) -> Model:
         """
         Args:
           extra_headers: Send extra headers
@@ -208,7 +208,7 @@ async def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Model]:
+    ) -> Model:
         """
         Args:
           extra_headers: Send extra headers
diff --git a/src/llama_stack_client/resources/post_training/job.py b/src/llama_stack_client/resources/post_training/job.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import List, Type, Optional, cast
+from typing import List, Type, cast
 
 import httpx
 
@@ -81,7 +81,7 @@ def artifacts(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobArtifactsResponse]:
+    ) -> JobArtifactsResponse:
         """
         Args:
           extra_headers: Send extra headers
@@ -145,7 +145,7 @@ def status(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobStatusResponse]:
+    ) -> JobStatusResponse:
         """
         Args:
           extra_headers: Send extra headers
@@ -221,7 +221,7 @@ async def artifacts(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobArtifactsResponse]:
+    ) -> JobArtifactsResponse:
         """
         Args:
           extra_headers: Send extra headers
@@ -285,7 +285,7 @@ async def status(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[JobStatusResponse]:
+    ) -> JobStatusResponse:
         """
         Args:
           extra_headers: Send extra headers
diff --git a/src/llama_stack_client/resources/scoring_functions.py b/src/llama_stack_client/resources/scoring_functions.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
@@ -60,7 +60,7 @@ def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScoringFn]:
+    ) -> ScoringFn:
         """
         Args:
           extra_headers: Send extra headers
@@ -180,7 +180,7 @@ async def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ScoringFn]:
+    ) -> ScoringFn:
         """
         Args:
           extra_headers: Send extra headers
diff --git a/src/llama_stack_client/resources/shields.py b/src/llama_stack_client/resources/shields.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Type, Union, Iterable, Optional, cast
+from typing import Dict, Type, Union, Iterable, cast
 
 import httpx
 
@@ -58,7 +58,7 @@ def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Shield]:
+    ) -> Shield:
         """
         Args:
           extra_headers: Send extra headers
@@ -173,7 +173,7 @@ async def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[Shield]:
+    ) -> Shield:
         """
         Args:
           extra_headers: Send extra headers
diff --git a/src/llama_stack_client/resources/vector_dbs.py b/src/llama_stack_client/resources/vector_dbs.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Type, Optional, cast
+from typing import Type, cast
 
 import httpx
 
@@ -59,7 +59,7 @@ def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[VectorDBRetrieveResponse]:
+    ) -> VectorDBRetrieveResponse:
         """
         Args:
           extra_headers: Send extra headers
@@ -208,7 +208,7 @@ async def retrieve(
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[VectorDBRetrieveResponse]:
+    ) -> VectorDBRetrieveResponse:
         """
         Args:
           extra_headers: Send extra headers
diff --git a/src/llama_stack_client/types/dataset_iterrows_params.py b/src/llama_stack_client/types/dataset_iterrows_params.py
@@ -9,7 +9,7 @@
 
 class DatasetIterrowsParams(TypedDict, total=False):
     limit: int
-    """The number of rows to get per page."""
+    """The number of rows to get."""
 
     start_index: int
     """Index into dataset for the first row to get. Get all rows if None."""
diff --git a/src/llama_stack_client/types/dataset_iterrows_response.py b/src/llama_stack_client/types/dataset_iterrows_response.py
@@ -11,7 +11,7 @@ class DatasetIterrowsResponse(BaseModel):
     data: List[Dict[str, Union[bool, float, str, List[object], object, None]]]
     """The rows in the current page."""
 
-    next_index: Optional[int] = None
+    next_start_index: Optional[int] = None
     """Index into dataset for the first row in the next page.
 
     None if there are no more rows.
diff --git a/src/llama_stack_client/types/dataset_register_params.py b/src/llama_stack_client/types/dataset_register_params.py
@@ -27,8 +27,10 @@ class DatasetRegisterParams(TypedDict, total=False):
     source: Required[Source]
     """The data source of the dataset.
 
-    Examples: - { "type": "uri", "uri": "https://mywebsite.com/mydata.jsonl" } - {
-    "type": "uri", "uri": "lsfs://mydata.jsonl" } - { "type": "uri", "uri":
+    Ensure that the data source schema is compatible with the purpose of the
+    dataset. Examples: - { "type": "uri", "uri":
+    "https://mywebsite.com/mydata.jsonl" } - { "type": "uri", "uri":
+    "lsfs://mydata.jsonl" } - { "type": "uri", "uri":
     "data:csv;base64,{base64_content}" } - { "type": "uri", "uri":
     "huggingface://llamastack/simpleqa?split=train" } - { "type": "rows", "rows": [
     { "messages": [ {"role": "user", "content": "Hello, world!"}, {"role":
diff --git a/src/llama_stack_client/types/eval/job_status_response.py b/src/llama_stack_client/types/eval/job_status_response.py
@@ -1,8 +1,7 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Optional
 from typing_extensions import Literal, TypeAlias
 
 __all__ = ["JobStatusResponse"]
 
-JobStatusResponse: TypeAlias = Optional[Literal["completed", "in_progress", "failed", "scheduled"]]
+JobStatusResponse: TypeAlias = Literal["completed", "in_progress", "failed", "scheduled"]
diff --git a/tests/api_resources/eval/test_jobs.py b/tests/api_resources/eval/test_jobs.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Optional, cast
+from typing import Any, cast
 
 import pytest
 
@@ -120,7 +120,7 @@ def test_method_status(self, client: LlamaStackClient) -> None:
             job_id="job_id",
             benchmark_id="benchmark_id",
         )
-        assert_matches_type(Optional[JobStatusResponse], job, path=["response"])
+        assert_matches_type(JobStatusResponse, job, path=["response"])
 
     @parametrize
     def test_raw_response_status(self, client: LlamaStackClient) -> None:
@@ -132,7 +132,7 @@ def test_raw_response_status(self, client: LlamaStackClient) -> None:
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         job = response.parse()
-        assert_matches_type(Optional[JobStatusResponse], job, path=["response"])
+        assert_matches_type(JobStatusResponse, job, path=["response"])
 
     @parametrize
     def test_streaming_response_status(self, client: LlamaStackClient) -> None:
@@ -144,7 +144,7 @@ def test_streaming_response_status(self, client: LlamaStackClient) -> None:
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             job = response.parse()
-            assert_matches_type(Optional[JobStatusResponse], job, path=["response"])
+            assert_matches_type(JobStatusResponse, job, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
@@ -268,7 +268,7 @@ async def test_method_status(self, async_client: AsyncLlamaStackClient) -> None:
             job_id="job_id",
             benchmark_id="benchmark_id",
         )
-        assert_matches_type(Optional[JobStatusResponse], job, path=["response"])
+        assert_matches_type(JobStatusResponse, job, path=["response"])
 
     @parametrize
     async def test_raw_response_status(self, async_client: AsyncLlamaStackClient) -> None:
@@ -280,7 +280,7 @@ async def test_raw_response_status(self, async_client: AsyncLlamaStackClient) ->
         assert response.is_closed is True
         assert response.http_request.headers.get("X-Stainless-Lang") == "python"
         job = await response.parse()
-        assert_matches_type(Optional[JobStatusResponse], job, path=["response"])
+        assert_matches_type(JobStatusResponse, job, path=["response"])
 
     @parametrize
     async def test_streaming_response_status(self, async_client: AsyncLlamaStackClient) -> None:
@@ -292,7 +292,7 @@ async def test_streaming_response_status(self, async_client: AsyncLlamaStackClie
             assert response.http_request.headers.get("X-Stainless-Lang") == "python"
 
             job = await response.parse()
-            assert_matches_type(Optional[JobStatusResponse], job, path=["response"])
+            assert_matches_type(JobStatusResponse, job, path=["response"])
 
         assert cast(Any, response.is_closed) is True
 
diff --git a/tests/api_resources/post_training/test_job.py b/tests/api_resources/post_training/test_job.py
diff --git a/tests/api_resources/test_benchmarks.py b/tests/api_resources/test_benchmarks.py
diff --git a/tests/api_resources/test_datasets.py b/tests/api_resources/test_datasets.py
diff --git a/tests/api_resources/test_models.py b/tests/api_resources/test_models.py
diff --git a/tests/api_resources/test_scoring_functions.py b/tests/api_resources/test_scoring_functions.py
diff --git a/tests/api_resources/test_shields.py b/tests/api_resources/test_shields.py
diff --git a/tests/api_resources/test_vector_dbs.py b/tests/api_resources/test_vector_dbs.py
