Skip to content

Sync SDK with latest API changes #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dineshyv merged 1 commit into from
Jan 16, 2025
Merged

Sync SDK with latest API changes #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
321 changes: 221 additions & 100 deletions src/llama_stack_client/_client.py
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 18 additions & 24 deletions src/llama_stack_client/resources/eval/eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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(
{
Expand All @@ -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,
),
Expand All @@ -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.
Expand All @@ -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(
{
Expand All @@ -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
),
Expand Down Expand Up @@ -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.
Expand All @@ -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(
{
Expand All @@ -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,
),
Expand All @@ -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.
Expand All @@ -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(
{
Expand All @@ -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
),
Expand Down
81 changes: 31 additions & 50 deletions src/llama_stack_client/resources/eval/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
import httpx

from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
from ..._utils import (
maybe_transform,
strip_not_given,
async_maybe_transform,
)
from ..._utils import strip_not_given
from ..._compat import cached_property
from ..._resource import SyncAPIResource, AsyncAPIResource
from ..._response import (
Expand All @@ -20,7 +16,6 @@
async_to_raw_response_wrapper,
async_to_streamed_response_wrapper,
)
from ...types.eval import job_cancel_params, job_status_params, job_retrieve_params
from ..._base_client import make_request_options
from ...types.evaluate_response import EvaluateResponse
from ...types.eval.job_status_response import JobStatusResponse
Expand Down Expand Up @@ -72,6 +67,8 @@ def retrieve(

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}")
if not job_id:
raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
extra_headers = {
Expand All @@ -84,21 +81,17 @@ def retrieve(
**(extra_headers or {}),
}
return self._get(
f"/v1/eval/jobs/{job_id}/result",
f"/v1/eval/tasks/{task_id}/jobs/{job_id}/result",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
extra_body=extra_body,
timeout=timeout,
query=maybe_transform({"task_id": task_id}, job_retrieve_params.JobRetrieveParams),
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=EvaluateResponse,
)

def cancel(
self,
*,
job_id: str,
*,
task_id: str,
x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
Expand All @@ -119,6 +112,10 @@ def cancel(

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}")
if not job_id:
raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
extra_headers = {
**strip_not_given(
Expand All @@ -129,15 +126,8 @@ def cancel(
),
**(extra_headers or {}),
}
return self._post(
"/v1/eval/jobs/cancel",
body=maybe_transform(
{
"job_id": job_id,
"task_id": task_id,
},
job_cancel_params.JobCancelParams,
),
return self._delete(
f"/v1/eval/tasks/{task_id}/jobs/{job_id}",
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand Down Expand Up @@ -168,6 +158,8 @@ def status(

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}")
if not job_id:
raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
extra_headers = {
Expand All @@ -180,13 +172,9 @@ def status(
**(extra_headers or {}),
}
return self._get(
f"/v1/eval/jobs/{job_id}",
f"/v1/eval/tasks/{task_id}/jobs/{job_id}",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
extra_body=extra_body,
timeout=timeout,
query=maybe_transform({"task_id": task_id}, job_status_params.JobStatusParams),
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=JobStatusResponse,
)
Expand Down Expand Up @@ -236,6 +224,8 @@ async def retrieve(

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}")
if not job_id:
raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
extra_headers = {
Expand All @@ -248,21 +238,17 @@ async def retrieve(
**(extra_headers or {}),
}
return await self._get(
f"/v1/eval/jobs/{job_id}/result",
f"/v1/eval/tasks/{task_id}/jobs/{job_id}/result",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
extra_body=extra_body,
timeout=timeout,
query=await async_maybe_transform({"task_id": task_id}, job_retrieve_params.JobRetrieveParams),
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=EvaluateResponse,
)

async def cancel(
self,
*,
job_id: str,
*,
task_id: str,
x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
Expand All @@ -283,6 +269,10 @@ async def cancel(

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}")
if not job_id:
raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
extra_headers = {
**strip_not_given(
Expand All @@ -293,15 +283,8 @@ async def cancel(
),
**(extra_headers or {}),
}
return await self._post(
"/v1/eval/jobs/cancel",
body=await async_maybe_transform(
{
"job_id": job_id,
"task_id": task_id,
},
job_cancel_params.JobCancelParams,
),
return await self._delete(
f"/v1/eval/tasks/{task_id}/jobs/{job_id}",
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand Down Expand Up @@ -332,6 +315,8 @@ async def status(

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}")
if not job_id:
raise ValueError(f"Expected a non-empty value for `job_id` but received {job_id!r}")
extra_headers = {
Expand All @@ -344,13 +329,9 @@ async def status(
**(extra_headers or {}),
}
return await self._get(
f"/v1/eval/jobs/{job_id}",
f"/v1/eval/tasks/{task_id}/jobs/{job_id}",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
extra_body=extra_body,
timeout=timeout,
query=await async_maybe_transform({"task_id": task_id}, job_status_params.JobStatusParams),
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=JobStatusResponse,
)
Expand Down
4 changes: 2 additions & 2 deletions src/llama_stack_client/resources/providers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def list(
**(extra_headers or {}),
}
return self._get(
"/v1/providers/list",
"/v1/inspect/providers",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
Expand Down Expand Up @@ -139,7 +139,7 @@ async def list(
**(extra_headers or {}),
}
return await self._get(
"/v1/providers/list",
"/v1/inspect/providers",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
Expand Down
Loading
Loading