Skip to content

Idiomatic rest API changes #85

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 15, 2025
Merged

Idiomatic rest API changes #85

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
306 changes: 214 additions & 92 deletions src/llama_stack_client/_client.py
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions src/llama_stack_client/resources/agents/agents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
StepsResourceWithStreamingResponse,
AsyncStepsResourceWithStreamingResponse,
)
from ...types import agent_create_params, agent_delete_params
from ...types import agent_create_params
from .session import (
SessionResource,
AsyncSessionResource,
Expand Down Expand Up @@ -115,7 +115,7 @@ def create(
**(extra_headers or {}),
}
return self._post(
"/v1/agents/create",
"/v1/agents",
body=maybe_transform({"agent_config": agent_config}, agent_create_params.AgentCreateParams),
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
Expand All @@ -125,8 +125,8 @@ def create(

def delete(
self,
*,
agent_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 @@ -146,6 +146,8 @@ def delete(

timeout: Override the client-level default timeout for this request, in seconds
"""
if not agent_id:
raise ValueError(f"Expected a non-empty value for `agent_id` but received {agent_id!r}")
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
extra_headers = {
**strip_not_given(
Expand All @@ -156,9 +158,8 @@ def delete(
),
**(extra_headers or {}),
}
return self._post(
"/v1/agents/delete",
body=maybe_transform({"agent_id": agent_id}, agent_delete_params.AgentDeleteParams),
return self._delete(
f"/v1/agents/{agent_id}",
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand Down Expand Up @@ -231,7 +232,7 @@ async def create(
**(extra_headers or {}),
}
return await self._post(
"/v1/agents/create",
"/v1/agents",
body=await async_maybe_transform({"agent_config": agent_config}, agent_create_params.AgentCreateParams),
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
Expand All @@ -241,8 +242,8 @@ async def create(

async def delete(
self,
*,
agent_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 @@ -262,6 +263,8 @@ async def delete(

timeout: Override the client-level default timeout for this request, in seconds
"""
if not agent_id:
raise ValueError(f"Expected a non-empty value for `agent_id` but received {agent_id!r}")
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
extra_headers = {
**strip_not_given(
Expand All @@ -272,9 +275,8 @@ async def delete(
),
**(extra_headers or {}),
}
return await self._post(
"/v1/agents/delete",
body=await async_maybe_transform({"agent_id": agent_id}, agent_delete_params.AgentDeleteParams),
return await self._delete(
f"/v1/agents/{agent_id}",
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand Down
100 changes: 41 additions & 59 deletions src/llama_stack_client/resources/agents/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
async_to_streamed_response_wrapper,
)
from ..._base_client import make_request_options
from ...types.agents import session_create_params, session_delete_params, session_retrieve_params
from ...types.agents import session_create_params, session_retrieve_params
from ...types.agents.session import Session
from ...types.agents.session_create_response import SessionCreateResponse

Expand Down Expand Up @@ -50,8 +50,8 @@ def with_streaming_response(self) -> SessionResourceWithStreamingResponse:

def create(
self,
*,
agent_id: str,
*,
session_name: str,
x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
Expand All @@ -72,6 +72,8 @@ def create(

timeout: Override the client-level default timeout for this request, in seconds
"""
if not agent_id:
raise ValueError(f"Expected a non-empty value for `agent_id` but received {agent_id!r}")
extra_headers = {
**strip_not_given(
{
Expand All @@ -82,14 +84,8 @@ def create(
**(extra_headers or {}),
}
return self._post(
"/v1/agents/session/create",
body=maybe_transform(
{
"agent_id": agent_id,
"session_name": session_name,
},
session_create_params.SessionCreateParams,
),
f"/v1/agents/{agent_id}/session",
body=maybe_transform({"session_name": session_name}, session_create_params.SessionCreateParams),
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand All @@ -98,9 +94,9 @@ def create(

def retrieve(
self,
session_id: str,
*,
agent_id: str,
session_id: str,
turn_ids: List[str] | NotGiven = NOT_GIVEN,
x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
Expand All @@ -121,6 +117,10 @@ def retrieve(

timeout: Override the client-level default timeout for this request, in seconds
"""
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}")
extra_headers = {
**strip_not_given(
{
Expand All @@ -130,30 +130,23 @@ def retrieve(
),
**(extra_headers or {}),
}
return self._post(
"/v1/agents/session/get",
body=maybe_transform({"turn_ids": turn_ids}, session_retrieve_params.SessionRetrieveParams),
return self._get(
f"/v1/agents/{agent_id}/session/{session_id}",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
extra_body=extra_body,
timeout=timeout,
query=maybe_transform(
{
"agent_id": agent_id,
"session_id": session_id,
},
session_retrieve_params.SessionRetrieveParams,
),
query=maybe_transform({"turn_ids": turn_ids}, session_retrieve_params.SessionRetrieveParams),
),
cast_to=Session,
)

def delete(
self,
session_id: str,
*,
agent_id: str,
session_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 @@ -173,6 +166,10 @@ def delete(

timeout: Override the client-level default timeout for this request, in seconds
"""
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}")
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
extra_headers = {
**strip_not_given(
Expand All @@ -183,15 +180,8 @@ def delete(
),
**(extra_headers or {}),
}
return self._post(
"/v1/agents/session/delete",
body=maybe_transform(
{
"agent_id": agent_id,
"session_id": session_id,
},
session_delete_params.SessionDeleteParams,
),
return self._delete(
f"/v1/agents/{agent_id}/session/{session_id}",
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand Down Expand Up @@ -221,8 +211,8 @@ def with_streaming_response(self) -> AsyncSessionResourceWithStreamingResponse:

async def create(
self,
*,
agent_id: str,
*,
session_name: str,
x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
Expand All @@ -243,6 +233,8 @@ async def create(

timeout: Override the client-level default timeout for this request, in seconds
"""
if not agent_id:
raise ValueError(f"Expected a non-empty value for `agent_id` but received {agent_id!r}")
extra_headers = {
**strip_not_given(
{
Expand All @@ -253,14 +245,8 @@ async def create(
**(extra_headers or {}),
}
return await self._post(
"/v1/agents/session/create",
body=await async_maybe_transform(
{
"agent_id": agent_id,
"session_name": session_name,
},
session_create_params.SessionCreateParams,
),
f"/v1/agents/{agent_id}/session",
body=await async_maybe_transform({"session_name": session_name}, session_create_params.SessionCreateParams),
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand All @@ -269,9 +255,9 @@ async def create(

async def retrieve(
self,
session_id: str,
*,
agent_id: str,
session_id: str,
turn_ids: List[str] | NotGiven = NOT_GIVEN,
x_llama_stack_client_version: str | NotGiven = NOT_GIVEN,
x_llama_stack_provider_data: str | NotGiven = NOT_GIVEN,
Expand All @@ -292,6 +278,10 @@ async def retrieve(

timeout: Override the client-level default timeout for this request, in seconds
"""
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}")
extra_headers = {
**strip_not_given(
{
Expand All @@ -301,30 +291,25 @@ async def retrieve(
),
**(extra_headers or {}),
}
return await self._post(
"/v1/agents/session/get",
body=await async_maybe_transform({"turn_ids": turn_ids}, session_retrieve_params.SessionRetrieveParams),
return await self._get(
f"/v1/agents/{agent_id}/session/{session_id}",
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
extra_body=extra_body,
timeout=timeout,
query=await async_maybe_transform(
{
"agent_id": agent_id,
"session_id": session_id,
},
session_retrieve_params.SessionRetrieveParams,
{"turn_ids": turn_ids}, session_retrieve_params.SessionRetrieveParams
),
),
cast_to=Session,
)

async def delete(
self,
session_id: str,
*,
agent_id: str,
session_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 @@ -344,6 +329,10 @@ async def delete(

timeout: Override the client-level default timeout for this request, in seconds
"""
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}")
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
extra_headers = {
**strip_not_given(
Expand All @@ -354,15 +343,8 @@ async def delete(
),
**(extra_headers or {}),
}
return await self._post(
"/v1/agents/session/delete",
body=await async_maybe_transform(
{
"agent_id": agent_id,
"session_id": session_id,
},
session_delete_params.SessionDeleteParams,
),
return await self._delete(
f"/v1/agents/{agent_id}/session/{session_id}",
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
Expand Down
Loading
Loading