Skip to content

fix(api)!: better support union schemas with common properties #116

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
stainless-app merged 1 commit into from
Jan 9, 2025
Merged

fix(api)!: better support union schemas with common properties #116

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
210 changes: 4 additions & 206 deletions src/asktable/resources/datasources/meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
from __future__ import annotations

from typing import Dict
from typing_extensions import overload

import httpx

from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
required_args,
maybe_transform,
async_maybe_transform,
)
Expand Down Expand Up @@ -48,15 +46,14 @@ def with_streaming_response(self) -> MetaResourceWithStreamingResponse:
"""
return MetaResourceWithStreamingResponse(self)

@overload
def create(
self,
datasource_id: str,
*,
name: str,
async_process_meta: bool | NotGiven = NOT_GIVEN,
value_index: bool | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_create_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_create_params.Schemas] | NotGiven = NOT_GIVEN,
# 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,
Expand All @@ -82,58 +79,6 @@ def create(

timeout: Override the client-level default timeout for this request, in seconds
"""
...

@overload
def create(
self,
datasource_id: str,
*,
body: None,
async_process_meta: bool | NotGiven = NOT_GIVEN,
value_index: bool | NotGiven = NOT_GIVEN,
# 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,
) -> object:
"""
创建数据源的 meta，如果已经存在，则删除旧的

如果上传了 meta，则使用用户上传的数据创建。

否则从数据源中自动获取。

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
"""
...

@required_args(["name"], ["body"])
def create(
self,
datasource_id: str,
*,
name: str | NotGiven = NOT_GIVEN,
async_process_meta: bool | NotGiven = NOT_GIVEN,
value_index: bool | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_create_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
body: None | NotGiven = NOT_GIVEN,
# 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,
) -> object:
if not datasource_id:
raise ValueError(f"Expected a non-empty value for `datasource_id` but received {datasource_id!r}")
return self._post(
Expand All @@ -142,7 +87,6 @@ def create(
{
"name": name,
"schemas": schemas,
"body": body,
},
meta_create_params.MetaCreateParams,
),
Expand Down Expand Up @@ -195,13 +139,12 @@ def retrieve(
cast_to=Meta,
)

@overload
def update(
self,
datasource_id: str,
*,
name: str,
schemas: Dict[str, meta_update_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_update_params.Schemas] | NotGiven = NOT_GIVEN,
# 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,
Expand All @@ -223,50 +166,6 @@ def update(

timeout: Override the client-level default timeout for this request, in seconds
"""
...

@overload
def update(
self,
datasource_id: str,
*,
body: None,
# 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,
) -> object:
"""
用于更新 DB 类型的数据源的 Meta（增加新表或者删除老表）

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
"""
...

@required_args(["name"], ["body"])
def update(
self,
datasource_id: str,
*,
name: str | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_update_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
body: None | NotGiven = NOT_GIVEN,
# 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,
) -> object:
if not datasource_id:
raise ValueError(f"Expected a non-empty value for `datasource_id` but received {datasource_id!r}")
return self._put(
Expand All @@ -275,7 +174,6 @@ def update(
{
"name": name,
"schemas": schemas,
"body": body,
},
meta_update_params.MetaUpdateParams,
),
Expand Down Expand Up @@ -341,15 +239,14 @@ def with_streaming_response(self) -> AsyncMetaResourceWithStreamingResponse:
"""
return AsyncMetaResourceWithStreamingResponse(self)

@overload
async def create(
self,
datasource_id: str,
*,
name: str,
async_process_meta: bool | NotGiven = NOT_GIVEN,
value_index: bool | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_create_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_create_params.Schemas] | NotGiven = NOT_GIVEN,
# 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,
Expand All @@ -375,58 +272,6 @@ async def create(

timeout: Override the client-level default timeout for this request, in seconds
"""
...

@overload
async def create(
self,
datasource_id: str,
*,
body: None,
async_process_meta: bool | NotGiven = NOT_GIVEN,
value_index: bool | NotGiven = NOT_GIVEN,
# 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,
) -> object:
"""
创建数据源的 meta，如果已经存在，则删除旧的

如果上传了 meta，则使用用户上传的数据创建。

否则从数据源中自动获取。

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
"""
...

@required_args(["name"], ["body"])
async def create(
self,
datasource_id: str,
*,
name: str | NotGiven = NOT_GIVEN,
async_process_meta: bool | NotGiven = NOT_GIVEN,
value_index: bool | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_create_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
body: None | NotGiven = NOT_GIVEN,
# 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,
) -> object:
if not datasource_id:
raise ValueError(f"Expected a non-empty value for `datasource_id` but received {datasource_id!r}")
return await self._post(
Expand All @@ -435,7 +280,6 @@ async def create(
{
"name": name,
"schemas": schemas,
"body": body,
},
meta_create_params.MetaCreateParams,
),
Expand Down Expand Up @@ -488,13 +332,12 @@ async def retrieve(
cast_to=Meta,
)

@overload
async def update(
self,
datasource_id: str,
*,
name: str,
schemas: Dict[str, meta_update_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_update_params.Schemas] | NotGiven = NOT_GIVEN,
# 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,
Expand All @@ -516,50 +359,6 @@ async def update(

timeout: Override the client-level default timeout for this request, in seconds
"""
...

@overload
async def update(
self,
datasource_id: str,
*,
body: None,
# 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,
) -> object:
"""
用于更新 DB 类型的数据源的 Meta（增加新表或者删除老表）

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
"""
...

@required_args(["name"], ["body"])
async def update(
self,
datasource_id: str,
*,
name: str | NotGiven = NOT_GIVEN,
schemas: Dict[str, meta_update_params.MetaCreateSchemas] | NotGiven = NOT_GIVEN,
body: None | NotGiven = NOT_GIVEN,
# 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,
) -> object:
if not datasource_id:
raise ValueError(f"Expected a non-empty value for `datasource_id` but received {datasource_id!r}")
return await self._put(
Expand All @@ -568,7 +367,6 @@ async def update(
{
"name": name,
"schemas": schemas,
"body": body,
},
meta_update_params.MetaUpdateParams,
),
Expand Down
Loading