diff --git a/.stats.yml b/.stats.yml index de0574c..48f88c4 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1 +1 @@ -configured_endpoints: 44 +configured_endpoints: 43 diff --git a/api.md b/api.md index 6becc1e..e63b951 100644 --- a/api.md +++ b/api.md @@ -141,7 +141,7 @@ Methods: Types: ```python -from dataherald.types import SqlGenerationListResponse, SqlGenerationExecuteResponse +from dataherald.types import SqlGenerationListResponse ``` Methods: @@ -149,7 +149,6 @@ Methods: - client.sql_generations.create(\*\*params) -> SqlGenerationResponse - client.sql_generations.retrieve(id) -> SqlGenerationResponse - client.sql_generations.list(\*\*params) -> SqlGenerationListResponse -- client.sql_generations.execute(id, \*\*params) -> SqlGenerationExecuteResponse ## NlGenerations diff --git a/examples/.keep b/examples/.keep new file mode 100644 index 0000000..d8c73e9 --- /dev/null +++ b/examples/.keep @@ -0,0 +1,4 @@ +File generated from our OpenAPI spec by Stainless. + +This directory can be used to store example files demonstrating usage of this SDK. +It is ignored by Stainless code generation and its content (other than this keep file) won't be touched. \ No newline at end of file diff --git a/src/dataherald/_base_client.py b/src/dataherald/_base_client.py index 53a53d8..97c6bef 100644 --- a/src/dataherald/_base_client.py +++ b/src/dataherald/_base_client.py @@ -48,7 +48,6 @@ Body, Omit, Query, - ModelT, Headers, Timeout, NotGiven, @@ -61,7 +60,6 @@ HttpxSendArgs, AsyncTransport, RequestOptions, - UnknownResponse, ModelBuilderProtocol, BinaryResponseContent, ) @@ -142,7 +140,7 @@ def __init__( self.params = params -class BasePage(GenericModel, Generic[ModelT]): +class BasePage(GenericModel, Generic[_T]): """ Defines the core interface for pagination. @@ -155,7 +153,7 @@ class BasePage(GenericModel, Generic[ModelT]): """ _options: FinalRequestOptions = PrivateAttr() - _model: Type[ModelT] = PrivateAttr() + _model: Type[_T] = PrivateAttr() def has_next_page(self) -> bool: items = self._get_page_items() @@ -166,7 +164,7 @@ def has_next_page(self) -> bool: def next_page_info(self) -> Optional[PageInfo]: ... - def _get_page_items(self) -> Iterable[ModelT]: # type: ignore[empty-body] + def _get_page_items(self) -> Iterable[_T]: # type: ignore[empty-body] ... def _params_from_url(self, url: URL) -> httpx.QueryParams: @@ -191,13 +189,13 @@ def _info_to_options(self, info: PageInfo) -> FinalRequestOptions: raise ValueError("Unexpected PageInfo state") -class BaseSyncPage(BasePage[ModelT], Generic[ModelT]): +class BaseSyncPage(BasePage[_T], Generic[_T]): _client: SyncAPIClient = pydantic.PrivateAttr() def _set_private_attributes( self, client: SyncAPIClient, - model: Type[ModelT], + model: Type[_T], options: FinalRequestOptions, ) -> None: self._model = model @@ -212,7 +210,7 @@ def _set_private_attributes( # methods should continue to work as expected as there is an alternative method # to cast a model to a dictionary, model.dict(), which is used internally # by pydantic. - def __iter__(self) -> Iterator[ModelT]: # type: ignore + def __iter__(self) -> Iterator[_T]: # type: ignore for page in self.iter_pages(): for item in page._get_page_items(): yield item @@ -237,13 +235,13 @@ def get_next_page(self: SyncPageT) -> SyncPageT: return self._client._request_api_list(self._model, page=self.__class__, options=options) -class AsyncPaginator(Generic[ModelT, AsyncPageT]): +class AsyncPaginator(Generic[_T, AsyncPageT]): def __init__( self, client: AsyncAPIClient, options: FinalRequestOptions, page_cls: Type[AsyncPageT], - model: Type[ModelT], + model: Type[_T], ) -> None: self._model = model self._client = client @@ -266,7 +264,7 @@ def _parser(resp: AsyncPageT) -> AsyncPageT: return await self._client.request(self._page_cls, self._options) - async def __aiter__(self) -> AsyncIterator[ModelT]: + async def __aiter__(self) -> AsyncIterator[_T]: # https://github.com/microsoft/pyright/issues/3464 page = cast( AsyncPageT, @@ -276,12 +274,12 @@ async def __aiter__(self) -> AsyncIterator[ModelT]: yield item -class BaseAsyncPage(BasePage[ModelT], Generic[ModelT]): +class BaseAsyncPage(BasePage[_T], Generic[_T]): _client: AsyncAPIClient = pydantic.PrivateAttr() def _set_private_attributes( self, - model: Type[ModelT], + model: Type[_T], client: AsyncAPIClient, options: FinalRequestOptions, ) -> None: @@ -289,7 +287,7 @@ def _set_private_attributes( self._client = client self._options = options - async def __aiter__(self) -> AsyncIterator[ModelT]: + async def __aiter__(self) -> AsyncIterator[_T]: async for page in self.iter_pages(): for item in page._get_page_items(): yield item @@ -528,7 +526,7 @@ def _process_response_data( if data is None: return cast(ResponseT, None) - if cast_to is UnknownResponse: + if cast_to is object: return cast(ResponseT, data) try: @@ -970,7 +968,7 @@ def _retry_request( def _request_api_list( self, - model: Type[ModelT], + model: Type[object], page: Type[SyncPageT], options: FinalRequestOptions, ) -> SyncPageT: @@ -1132,7 +1130,7 @@ def get_api_list( self, path: str, *, - model: Type[ModelT], + model: Type[object], page: Type[SyncPageT], body: Body | None = None, options: RequestOptions = {}, @@ -1434,10 +1432,10 @@ async def _retry_request( def _request_api_list( self, - model: Type[ModelT], + model: Type[_T], page: Type[AsyncPageT], options: FinalRequestOptions, - ) -> AsyncPaginator[ModelT, AsyncPageT]: + ) -> AsyncPaginator[_T, AsyncPageT]: return AsyncPaginator(client=self, options=options, page_cls=page, model=model) @overload @@ -1584,13 +1582,12 @@ def get_api_list( self, path: str, *, - # TODO: support paginating `str` - model: Type[ModelT], + model: Type[_T], page: Type[AsyncPageT], body: Body | None = None, options: RequestOptions = {}, method: str = "get", - ) -> AsyncPaginator[ModelT, AsyncPageT]: + ) -> AsyncPaginator[_T, AsyncPageT]: opts = FinalRequestOptions.construct(method=method, url=path, json_data=body, **options) return self._request_api_list(model, page, opts) diff --git a/src/dataherald/_response.py b/src/dataherald/_response.py index 761f313..a947273 100644 --- a/src/dataherald/_response.py +++ b/src/dataherald/_response.py @@ -9,7 +9,7 @@ import httpx -from ._types import NoneType, UnknownResponse, BinaryResponseContent +from ._types import NoneType, BinaryResponseContent from ._utils import is_given, extract_type_var_from_base from ._models import BaseModel, is_basemodel from ._constants import RAW_RESPONSE_HEADER @@ -162,7 +162,7 @@ def _parse(self) -> R: # `ResponseT` TypeVar, however if that TypeVar is ever updated in the future, then # this function would become unsafe but a type checker would not report an error. if ( - cast_to is not UnknownResponse + cast_to is not object and not origin is list and not origin is dict and not origin is Union diff --git a/src/dataherald/_types.py b/src/dataherald/_types.py index abdbbef..eb2e4b5 100644 --- a/src/dataherald/_types.py +++ b/src/dataherald/_types.py @@ -258,11 +258,6 @@ class RequestOptions(TypedDict, total=False): idempotency_key: str -# Sentinel class used when the response type is an object with an unknown schema -class UnknownResponse: - ... - - # Sentinel class used until PEP 0661 is accepted class NotGiven: """ @@ -339,7 +334,17 @@ def get(self, __key: str) -> str | None: ResponseT = TypeVar( "ResponseT", - bound="Union[str, None, BaseModel, List[Any], Dict[str, Any], Response, UnknownResponse, ModelBuilderProtocol, BinaryResponseContent]", + bound=Union[ + object, + str, + None, + "BaseModel", + List[Any], + Dict[str, Any], + Response, + ModelBuilderProtocol, + BinaryResponseContent, + ], ) StrBytesIntFloat = Union[str, bytes, int, float] diff --git a/src/dataherald/lib/.keep b/src/dataherald/lib/.keep new file mode 100644 index 0000000..5e2c99f --- /dev/null +++ b/src/dataherald/lib/.keep @@ -0,0 +1,4 @@ +File generated from our OpenAPI spec by Stainless. + +This directory can be used to store custom files to expand the SDK. +It is ignored by Stainless code generation and its content (other than this keep file) won't be touched. \ No newline at end of file diff --git a/src/dataherald/resources/database_connections/database_connections.py b/src/dataherald/resources/database_connections/database_connections.py index 28dc501..1931e73 100644 --- a/src/dataherald/resources/database_connections/database_connections.py +++ b/src/dataherald/resources/database_connections/database_connections.py @@ -13,13 +13,7 @@ database_connection_update_params, ) from .drivers import Drivers, AsyncDrivers, DriversWithRawResponse, AsyncDriversWithRawResponse -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource diff --git a/src/dataherald/resources/database_connections/drivers.py b/src/dataherald/resources/database_connections/drivers.py index 9efa1ce..279c2c9 100644 --- a/src/dataherald/resources/database_connections/drivers.py +++ b/src/dataherald/resources/database_connections/drivers.py @@ -4,13 +4,7 @@ import httpx -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import to_raw_response_wrapper, async_to_raw_response_wrapper diff --git a/src/dataherald/resources/engine.py b/src/dataherald/resources/engine.py index 77d4217..9e99778 100644 --- a/src/dataherald/resources/engine.py +++ b/src/dataherald/resources/engine.py @@ -4,14 +4,7 @@ import httpx -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource from .._response import to_raw_response_wrapper, async_to_raw_response_wrapper @@ -43,7 +36,7 @@ def heartbeat( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) @@ -68,7 +61,7 @@ async def heartbeat( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) diff --git a/src/dataherald/resources/finetunings.py b/src/dataherald/resources/finetunings.py index 0a82a0f..cf3041b 100644 --- a/src/dataherald/resources/finetunings.py +++ b/src/dataherald/resources/finetunings.py @@ -12,13 +12,7 @@ finetuning_list_params, finetuning_create_params, ) -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._utils import maybe_transform from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource @@ -38,8 +32,9 @@ def with_raw_response(self) -> FinetuningsWithRawResponse: def create( self, *, - base_llm: finetuning_create_params.BaseLlm, db_connection_id: str, + alias: str | NotGiven = NOT_GIVEN, + base_llm: finetuning_create_params.BaseLlm | NotGiven = NOT_GIVEN, golden_records: List[str] | NotGiven = NOT_GIVEN, metadata: object | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. @@ -65,8 +60,9 @@ def create( "/api/finetunings", body=maybe_transform( { - "base_llm": base_llm, "db_connection_id": db_connection_id, + "alias": alias, + "base_llm": base_llm, "golden_records": golden_records, "metadata": metadata, }, @@ -155,8 +151,9 @@ def with_raw_response(self) -> AsyncFinetuningsWithRawResponse: async def create( self, *, - base_llm: finetuning_create_params.BaseLlm, db_connection_id: str, + alias: str | NotGiven = NOT_GIVEN, + base_llm: finetuning_create_params.BaseLlm | NotGiven = NOT_GIVEN, golden_records: List[str] | NotGiven = NOT_GIVEN, metadata: object | NotGiven = NOT_GIVEN, # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs. @@ -182,8 +179,9 @@ async def create( "/api/finetunings", body=maybe_transform( { - "base_llm": base_llm, "db_connection_id": db_connection_id, + "alias": alias, + "base_llm": base_llm, "golden_records": golden_records, "metadata": metadata, }, diff --git a/src/dataherald/resources/generations.py b/src/dataherald/resources/generations.py index 067a4e9..14625c8 100644 --- a/src/dataherald/resources/generations.py +++ b/src/dataherald/resources/generations.py @@ -13,13 +13,7 @@ generation_update_params, generation_sql_generation_params, ) -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._utils import maybe_transform from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource diff --git a/src/dataherald/resources/golden_sqls.py b/src/dataherald/resources/golden_sqls.py index 21d385c..2082d4b 100644 --- a/src/dataherald/resources/golden_sqls.py +++ b/src/dataherald/resources/golden_sqls.py @@ -12,14 +12,7 @@ golden_sql_list_params, golden_sql_upload_params, ) -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._utils import maybe_transform from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource @@ -142,7 +135,7 @@ def delete( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) def upload( @@ -288,7 +281,7 @@ async def delete( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) async def upload( diff --git a/src/dataherald/resources/heartbeat.py b/src/dataherald/resources/heartbeat.py index 44d159a..1a80edc 100644 --- a/src/dataherald/resources/heartbeat.py +++ b/src/dataherald/resources/heartbeat.py @@ -4,14 +4,7 @@ import httpx -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource from .._response import to_raw_response_wrapper, async_to_raw_response_wrapper @@ -43,7 +36,7 @@ def retrieve( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) @@ -68,7 +61,7 @@ async def retrieve( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) diff --git a/src/dataherald/resources/instructions/first.py b/src/dataherald/resources/instructions/first.py index 7438704..a1c8686 100644 --- a/src/dataherald/resources/instructions/first.py +++ b/src/dataherald/resources/instructions/first.py @@ -4,13 +4,7 @@ import httpx -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource from ..._response import to_raw_response_wrapper, async_to_raw_response_wrapper diff --git a/src/dataherald/resources/instructions/instructions.py b/src/dataherald/resources/instructions/instructions.py index a5d88d3..b397d3e 100644 --- a/src/dataherald/resources/instructions/instructions.py +++ b/src/dataherald/resources/instructions/instructions.py @@ -11,14 +11,7 @@ instruction_create_params, instruction_update_params, ) -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource @@ -188,7 +181,7 @@ def delete( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) @@ -349,7 +342,7 @@ async def delete( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) diff --git a/src/dataherald/resources/nl_generations.py b/src/dataherald/resources/nl_generations.py index d1d3b4c..9f86199 100644 --- a/src/dataherald/resources/nl_generations.py +++ b/src/dataherald/resources/nl_generations.py @@ -5,13 +5,7 @@ import httpx from ..types import NlGenerationListResponse, nl_generation_list_params, nl_generation_create_params -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._utils import maybe_transform from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource diff --git a/src/dataherald/resources/prompts/prompts.py b/src/dataherald/resources/prompts/prompts.py index 4313ac9..b3b5087 100644 --- a/src/dataherald/resources/prompts/prompts.py +++ b/src/dataherald/resources/prompts/prompts.py @@ -5,13 +5,7 @@ import httpx from ...types import PromptResponse, PromptListResponse, prompt_list_params, prompt_create_params -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource diff --git a/src/dataherald/resources/prompts/sql_generations.py b/src/dataherald/resources/prompts/sql_generations.py index 5b67629..71955ba 100644 --- a/src/dataherald/resources/prompts/sql_generations.py +++ b/src/dataherald/resources/prompts/sql_generations.py @@ -4,14 +4,7 @@ import httpx -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource @@ -122,7 +115,7 @@ def retrieve( sql_generation_retrieve_params.SqlGenerationRetrieveParams, ), ), - cast_to=UnknownResponse, + cast_to=object, ) def nl_generations( @@ -261,7 +254,7 @@ async def retrieve( sql_generation_retrieve_params.SqlGenerationRetrieveParams, ), ), - cast_to=UnknownResponse, + cast_to=object, ) async def nl_generations( diff --git a/src/dataherald/resources/sql_generations/nl_generations.py b/src/dataherald/resources/sql_generations/nl_generations.py index 618d322..4faa932 100644 --- a/src/dataherald/resources/sql_generations/nl_generations.py +++ b/src/dataherald/resources/sql_generations/nl_generations.py @@ -4,14 +4,7 @@ import httpx -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource @@ -114,7 +107,7 @@ def retrieve( nl_generation_retrieve_params.NlGenerationRetrieveParams, ), ), - cast_to=UnknownResponse, + cast_to=object, ) @@ -207,7 +200,7 @@ async def retrieve( nl_generation_retrieve_params.NlGenerationRetrieveParams, ), ), - cast_to=UnknownResponse, + cast_to=object, ) diff --git a/src/dataherald/resources/sql_generations/sql_generations.py b/src/dataherald/resources/sql_generations/sql_generations.py index df054e1..d588b9a 100644 --- a/src/dataherald/resources/sql_generations/sql_generations.py +++ b/src/dataherald/resources/sql_generations/sql_generations.py @@ -4,20 +4,8 @@ import httpx -from ...types import ( - SqlGenerationListResponse, - SqlGenerationExecuteResponse, - sql_generation_list_params, - sql_generation_create_params, - sql_generation_execute_params, -) -from ..._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, -) +from ...types import SqlGenerationListResponse, sql_generation_list_params, sql_generation_create_params +from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven from ..._utils import maybe_transform from ..._compat import cached_property from ..._resource import SyncAPIResource, AsyncAPIResource @@ -167,39 +155,6 @@ def list( cast_to=SqlGenerationListResponse, ) - def execute( - self, - id: str, - *, - max_rows: int, - # 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, - ) -> SqlGenerationExecuteResponse: - """ - Execute Sql Generation - - 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 - """ - return self._post( - f"/api/sql-generations/{id}/execute", - body=maybe_transform({"max_rows": max_rows}, sql_generation_execute_params.SqlGenerationExecuteParams), - options=make_request_options( - extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout - ), - cast_to=SqlGenerationExecuteResponse, - ) - class AsyncSqlGenerations(AsyncAPIResource): @cached_property @@ -332,39 +287,6 @@ async def list( cast_to=SqlGenerationListResponse, ) - async def execute( - self, - id: str, - *, - max_rows: int, - # 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, - ) -> SqlGenerationExecuteResponse: - """ - Execute Sql Generation - - 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 - """ - return await self._post( - f"/api/sql-generations/{id}/execute", - body=maybe_transform({"max_rows": max_rows}, sql_generation_execute_params.SqlGenerationExecuteParams), - options=make_request_options( - extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout - ), - cast_to=SqlGenerationExecuteResponse, - ) - class SqlGenerationsWithRawResponse: def __init__(self, sql_generations: SqlGenerations) -> None: @@ -379,9 +301,6 @@ def __init__(self, sql_generations: SqlGenerations) -> None: self.list = to_raw_response_wrapper( sql_generations.list, ) - self.execute = to_raw_response_wrapper( - sql_generations.execute, - ) class AsyncSqlGenerationsWithRawResponse: @@ -397,6 +316,3 @@ def __init__(self, sql_generations: AsyncSqlGenerations) -> None: self.list = async_to_raw_response_wrapper( sql_generations.list, ) - self.execute = async_to_raw_response_wrapper( - sql_generations.execute, - ) diff --git a/src/dataherald/resources/table_descriptions.py b/src/dataherald/resources/table_descriptions.py index d4566a9..968fb37 100644 --- a/src/dataherald/resources/table_descriptions.py +++ b/src/dataherald/resources/table_descriptions.py @@ -13,14 +13,7 @@ table_description_update_params, table_description_sync_schemas_params, ) -from .._types import ( - NOT_GIVEN, - Body, - Query, - Headers, - NotGiven, - UnknownResponse, -) +from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven from .._utils import maybe_transform from .._compat import cached_property from .._resource import SyncAPIResource, AsyncAPIResource @@ -190,7 +183,7 @@ def sync_schemas( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) @@ -352,7 +345,7 @@ async def sync_schemas( options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - cast_to=UnknownResponse, + cast_to=object, ) diff --git a/src/dataherald/types/__init__.py b/src/dataherald/types/__init__.py index 9b59f05..8e346b2 100644 --- a/src/dataherald/types/__init__.py +++ b/src/dataherald/types/__init__.py @@ -37,9 +37,7 @@ from .nl_generation_list_response import NlGenerationListResponse as NlGenerationListResponse from .sql_generation_create_params import SqlGenerationCreateParams as SqlGenerationCreateParams from .sql_generation_list_response import SqlGenerationListResponse as SqlGenerationListResponse -from .sql_generation_execute_params import SqlGenerationExecuteParams as SqlGenerationExecuteParams from .table_description_list_params import TableDescriptionListParams as TableDescriptionListParams -from .sql_generation_execute_response import SqlGenerationExecuteResponse as SqlGenerationExecuteResponse from .table_description_list_response import TableDescriptionListResponse as TableDescriptionListResponse from .table_description_update_params import TableDescriptionUpdateParams as TableDescriptionUpdateParams from .generation_sql_generation_params import GenerationSqlGenerationParams as GenerationSqlGenerationParams diff --git a/src/dataherald/types/finetuning_create_params.py b/src/dataherald/types/finetuning_create_params.py index c2c8657..d01fc31 100644 --- a/src/dataherald/types/finetuning_create_params.py +++ b/src/dataherald/types/finetuning_create_params.py @@ -9,10 +9,12 @@ class FinetuningCreateParams(TypedDict, total=False): - base_llm: Required[BaseLlm] - db_connection_id: Required[str] + alias: str + + base_llm: BaseLlm + golden_records: List[str] metadata: object diff --git a/src/dataherald/types/sql_generation_execute_params.py b/src/dataherald/types/sql_generation_execute_params.py deleted file mode 100644 index 2950a84..0000000 --- a/src/dataherald/types/sql_generation_execute_params.py +++ /dev/null @@ -1,11 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. - -from __future__ import annotations - -from typing_extensions import Required, TypedDict - -__all__ = ["SqlGenerationExecuteParams"] - - -class SqlGenerationExecuteParams(TypedDict, total=False): - max_rows: Required[int] diff --git a/src/dataherald/types/sql_generation_execute_response.py b/src/dataherald/types/sql_generation_execute_response.py deleted file mode 100644 index f324f79..0000000 --- a/src/dataherald/types/sql_generation_execute_response.py +++ /dev/null @@ -1,7 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. - -from typing import List - -__all__ = ["SqlGenerationExecuteResponse"] - -SqlGenerationExecuteResponse = List[object] diff --git a/tests/api_resources/test_finetunings.py b/tests/api_resources/test_finetunings.py index 53f92a6..0c94a1e 100644 --- a/tests/api_resources/test_finetunings.py +++ b/tests/api_resources/test_finetunings.py @@ -26,7 +26,6 @@ class TestFinetunings: @parametrize def test_method_create(self, client: Dataherald) -> None: finetuning = client.finetunings.create( - base_llm={}, db_connection_id="string", ) assert_matches_type(FinetuningResponse, finetuning, path=["response"]) @@ -34,12 +33,13 @@ def test_method_create(self, client: Dataherald) -> None: @parametrize def test_method_create_with_all_params(self, client: Dataherald) -> None: finetuning = client.finetunings.create( + db_connection_id="string", + alias="string", base_llm={ "_model_provider": "string", "_model_name": "string", "_model_parameters": {"foo": "string"}, }, - db_connection_id="string", golden_records=["string", "string", "string"], metadata={}, ) @@ -48,7 +48,6 @@ def test_method_create_with_all_params(self, client: Dataherald) -> None: @parametrize def test_raw_response_create(self, client: Dataherald) -> None: response = client.finetunings.with_raw_response.create( - base_llm={}, db_connection_id="string", ) assert response.http_request.headers.get("X-Stainless-Lang") == "python" @@ -96,7 +95,6 @@ class TestAsyncFinetunings: @parametrize async def test_method_create(self, client: AsyncDataherald) -> None: finetuning = await client.finetunings.create( - base_llm={}, db_connection_id="string", ) assert_matches_type(FinetuningResponse, finetuning, path=["response"]) @@ -104,12 +102,13 @@ async def test_method_create(self, client: AsyncDataherald) -> None: @parametrize async def test_method_create_with_all_params(self, client: AsyncDataherald) -> None: finetuning = await client.finetunings.create( + db_connection_id="string", + alias="string", base_llm={ "_model_provider": "string", "_model_name": "string", "_model_parameters": {"foo": "string"}, }, - db_connection_id="string", golden_records=["string", "string", "string"], metadata={}, ) @@ -118,7 +117,6 @@ async def test_method_create_with_all_params(self, client: AsyncDataherald) -> N @parametrize async def test_raw_response_create(self, client: AsyncDataherald) -> None: response = await client.finetunings.with_raw_response.create( - base_llm={}, db_connection_id="string", ) assert response.http_request.headers.get("X-Stainless-Lang") == "python" diff --git a/tests/api_resources/test_sql_generations.py b/tests/api_resources/test_sql_generations.py index 63028fc..9e18025 100644 --- a/tests/api_resources/test_sql_generations.py +++ b/tests/api_resources/test_sql_generations.py @@ -8,10 +8,7 @@ from dataherald import Dataherald, AsyncDataherald from tests.utils import assert_matches_type -from dataherald.types import ( - SqlGenerationListResponse, - SqlGenerationExecuteResponse, -) +from dataherald.types import SqlGenerationListResponse from dataherald._client import Dataherald, AsyncDataherald from dataherald.types.shared import SqlGenerationResponse @@ -99,24 +96,6 @@ def test_raw_response_list(self, client: Dataherald) -> None: sql_generation = response.parse() assert_matches_type(SqlGenerationListResponse, sql_generation, path=["response"]) - @parametrize - def test_method_execute(self, client: Dataherald) -> None: - sql_generation = client.sql_generations.execute( - "string", - max_rows=0, - ) - assert_matches_type(SqlGenerationExecuteResponse, sql_generation, path=["response"]) - - @parametrize - def test_raw_response_execute(self, client: Dataherald) -> None: - response = client.sql_generations.with_raw_response.execute( - "string", - max_rows=0, - ) - assert response.http_request.headers.get("X-Stainless-Lang") == "python" - sql_generation = response.parse() - assert_matches_type(SqlGenerationExecuteResponse, sql_generation, path=["response"]) - class TestAsyncSqlGenerations: strict_client = AsyncDataherald(base_url=base_url, api_key=api_key, _strict_response_validation=True) @@ -197,21 +176,3 @@ async def test_raw_response_list(self, client: AsyncDataherald) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" sql_generation = response.parse() assert_matches_type(SqlGenerationListResponse, sql_generation, path=["response"]) - - @parametrize - async def test_method_execute(self, client: AsyncDataherald) -> None: - sql_generation = await client.sql_generations.execute( - "string", - max_rows=0, - ) - assert_matches_type(SqlGenerationExecuteResponse, sql_generation, path=["response"]) - - @parametrize - async def test_raw_response_execute(self, client: AsyncDataherald) -> None: - response = await client.sql_generations.with_raw_response.execute( - "string", - max_rows=0, - ) - assert response.http_request.headers.get("X-Stainless-Lang") == "python" - sql_generation = response.parse() - assert_matches_type(SqlGenerationExecuteResponse, sql_generation, path=["response"])