Sync updates from stainless branch: dineshyv/dev

Author: dineshyv

src/llama_stack_client/_client.py

@@ -0,0 +1,17 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Generic, TypeVar
+
+from ._models import GenericModel
+
+__all__ = ["DataWrapper"]
+
+_T = TypeVar("_T")
+
+
+class DataWrapper(GenericModel, Generic[_T]):
+    data: _T
+
+    @staticmethod
+    def _unwrapper(obj: "DataWrapper[_T]") -> _T:
+        return obj.data

src/llama_stack_client/_wrappers.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Union, Iterable, Optional
+from typing import Dict, Type, Union, Iterable, Optional, cast
 
 import httpx
 
@@ -21,6 +21,7 @@
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
+from .._wrappers import DataWrapper
 from .._base_client import make_request_options
 from ..types.shared_params.url import URL
 from ..types.dataset_list_response import DatasetListResponse
@@ -126,9 +127,13 @@ def list(
         return self._get(
             "/v1/datasets",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=DataWrapper[DatasetListResponse]._unwrapper,
             ),
-            cast_to=DatasetListResponse,
+            cast_to=cast(Type[DatasetListResponse], DataWrapper[DatasetListResponse]),
         )
 
     def register(
@@ -328,9 +333,13 @@ async def list(
         return await self._get(
             "/v1/datasets",
             options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=DataWrapper[DatasetListResponse]._unwrapper,
             ),
-            cast_to=DatasetListResponse,
+            cast_to=cast(Type[DatasetListResponse], DataWrapper[DatasetListResponse]),
         )
 
     async def register(

src/llama_stack_client/resources/datasets.py

@@ -62,11 +62,11 @@ def with_streaming_response(self) -> EvalResourceWithStreamingResponse:
 
     def evaluate_rows(
         self,
+        task_id: str,
         *,
         input_rows: Iterable[Dict[str, Union[bool, float, str, Iterable[object], object, None]]],
         scoring_functions: List[str],
         task_config: eval_evaluate_rows_params.TaskConfig,
-        task_id: str,
         x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
         x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -86,6 +86,8 @@ def evaluate_rows(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not task_id:
+            raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         extra_headers = {
             **strip_not_given(
                 {
@@ -96,13 +98,12 @@ def evaluate_rows(
             **(extra_headers or {}),
         }
         return self._post(
-            "/v1/eval/evaluate-rows",
+            f"/v1/eval/tasks/{task_id}/evaluations",
             body=maybe_transform(
                 {
                     "input_rows": input_rows,
                     "scoring_functions": scoring_functions,
                     "task_config": task_config,
-                    "task_id": task_id,
                 },
                 eval_evaluate_rows_params.EvalEvaluateRowsParams,
             ),
@@ -114,9 +115,9 @@ def evaluate_rows(
 
     def run_eval(
         self,
+        task_id: str,
         *,
         task_config: eval_run_eval_params.TaskConfig,
-        task_id: str,
         x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
         x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -136,6 +137,8 @@ def run_eval(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not task_id:
+            raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         extra_headers = {
             **strip_not_given(
                 {
@@ -146,14 +149,8 @@ def run_eval(
             **(extra_headers or {}),
         }
         return self._post(
-            "/v1/eval/run",
-            body=maybe_transform(
-                {
-                    "task_config": task_config,
-                    "task_id": task_id,
-                },
-                eval_run_eval_params.EvalRunEvalParams,
-            ),
+            f"/v1/eval/tasks/{task_id}/jobs",
+            body=maybe_transform({"task_config": task_config}, eval_run_eval_params.EvalRunEvalParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -187,11 +184,11 @@ def with_streaming_response(self) -> AsyncEvalResourceWithStreamingResponse:
 
     async def evaluate_rows(
         self,
+        task_id: str,
         *,
         input_rows: Iterable[Dict[str, Union[bool, float, str, Iterable[object], object, None]]],
         scoring_functions: List[str],
         task_config: eval_evaluate_rows_params.TaskConfig,
-        task_id: str,
         x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
         x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -211,6 +208,8 @@ async def evaluate_rows(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not task_id:
+            raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         extra_headers = {
             **strip_not_given(
                 {
@@ -221,13 +220,12 @@ async def evaluate_rows(
             **(extra_headers or {}),
         }
         return await self._post(
-            "/v1/eval/evaluate-rows",
+            f"/v1/eval/tasks/{task_id}/evaluations",
             body=await async_maybe_transform(
                 {
                     "input_rows": input_rows,
                     "scoring_functions": scoring_functions,
                     "task_config": task_config,
-                    "task_id": task_id,
                 },
                 eval_evaluate_rows_params.EvalEvaluateRowsParams,
             ),
@@ -239,9 +237,9 @@ async def evaluate_rows(
 
     async def run_eval(
         self,
+        task_id: str,
         *,
         task_config: eval_run_eval_params.TaskConfig,
-        task_id: str,
         x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
         x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -261,6 +259,8 @@ async def run_eval(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not task_id:
+            raise ValueError(f"Expected a non-empty value for `task_id` but received {task_id!r}")
         extra_headers = {
             **strip_not_given(
                 {
@@ -271,14 +271,8 @@ async def run_eval(
             **(extra_headers or {}),
         }
         return await self._post(
-            "/v1/eval/run",
-            body=await async_maybe_transform(
-                {
-                    "task_config": task_config,
-                    "task_id": task_id,
-                },
-                eval_run_eval_params.EvalRunEvalParams,
-            ),
+            f"/v1/eval/tasks/{task_id}/jobs",
+            body=await async_maybe_transform({"task_config": task_config}, eval_run_eval_params.EvalRunEvalParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),