structifyai 1.179.0__py3-none-any.whl → 1.182.0__py3-none-any.whl

structify/_base_client.py

@@ -86,6 +86,7 @@ from ._exceptions import (
     APIConnectionError,
     APIResponseValidationError,
 )
+from ._utils._json import openapi_dumps
 
 log: logging.Logger = logging.getLogger(__name__)
 
@@ -554,8 +555,10 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
                 kwargs["content"] = options.content
             elif isinstance(json_data, bytes):
                 kwargs["content"] = json_data
-            else:
-                kwargs["json"] = json_data if is_given(json_data) else None
+            elif not files:
+                # Don't set content when JSON is sent as multipart/form-data,
+                # since httpx's content param overrides other body arguments
+                kwargs["content"] = openapi_dumps(json_data) if is_given(json_data) and json_data is not None else None
             kwargs["files"] = files
         else:
             headers.pop("Content-Type", None)

structify/_compat.py

@@ -139,6 +139,7 @@ def model_dump(
     exclude_defaults: bool = False,
     warnings: bool = True,
     mode: Literal["json", "python"] = "python",
+    by_alias: bool | None = None,
 ) -> dict[str, Any]:
     if (not PYDANTIC_V1) or hasattr(model, "model_dump"):
         return model.model_dump(
@@ -148,13 +149,12 @@ def model_dump(
             exclude_defaults=exclude_defaults,
             # warnings are not supported in Pydantic v1
             warnings=True if PYDANTIC_V1 else warnings,
+            by_alias=by_alias,
         )
     return cast(
         "dict[str, Any]",
         model.dict(  # pyright: ignore[reportDeprecated, reportUnnecessaryCast]
-            exclude=exclude,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
+            exclude=exclude, exclude_unset=exclude_unset, exclude_defaults=exclude_defaults, by_alias=bool(by_alias)
         ),
     )
 

structify/_utils/_json.py

@@ -0,0 +1,35 @@
+import json
+from typing import Any
+from datetime import datetime
+from typing_extensions import override
+
+import pydantic
+
+from .._compat import model_dump
+
+
+def openapi_dumps(obj: Any) -> bytes:
+    """
+    Serialize an object to UTF-8 encoded JSON bytes.
+
+    Extends the standard json.dumps with support for additional types
+    commonly used in the SDK, such as `datetime`, `pydantic.BaseModel`, etc.
+    """
+    return json.dumps(
+        obj,
+        cls=_CustomEncoder,
+        # Uses the same defaults as httpx's JSON serialization
+        ensure_ascii=False,
+        separators=(",", ":"),
+        allow_nan=False,
+    ).encode()
+
+
+class _CustomEncoder(json.JSONEncoder):
+    @override
+    def default(self, o: Any) -> Any:
+        if isinstance(o, datetime):
+            return o.isoformat()
+        if isinstance(o, pydantic.BaseModel):
+            return model_dump(o, exclude_unset=True, mode="json", by_alias=True)
+        return super().default(o)

structify/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "structify"
-__version__ = "1.179.0"  # x-release-please-version
+__version__ = "1.182.0"  # x-release-please-version

structify/resources/__init__.py

@@ -133,7 +133,6 @@ from .entities import (
     EntitiesResourceWithStreamingResponse,
     AsyncEntitiesResourceWithStreamingResponse,
 )
-from .external import ExternalResource
 from .projects import (
     ProjectsResource,
     AsyncProjectsResource,
@@ -357,7 +356,6 @@ __all__ = [
     "PolarsResource",
     "PolarsResourceWithRawResponse",
     "PolarsResourceWithStreamingResponse",
-    "ExternalResource",
     "PublicSessionsResource",
     "AsyncPublicSessionsResource",
     "PublicSessionsResourceWithRawResponse",

structify/resources/connector_catalog/admin.py

@@ -332,6 +332,38 @@ class AdminResource(SyncAPIResource):
             cast_to=ConnectorAuthMethodScope,
         )
 
+    def delete_catalog(
+        self,
+        id: str,
+        *,
+        # 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,
+    ) -> None:
+        """
+        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
+        """
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return self._delete(
+            f"/admin/connector-catalog/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
     def delete_credential_field(
         self,
         id: str,
@@ -956,6 +988,38 @@ class AsyncAdminResource(AsyncAPIResource):
             cast_to=ConnectorAuthMethodScope,
         )
 
+    async def delete_catalog(
+        self,
+        id: str,
+        *,
+        # 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,
+    ) -> None:
+        """
+        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
+        """
+        if not id:
+            raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
+        extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        return await self._delete(
+            f"/admin/connector-catalog/{id}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=NoneType,
+        )
+
     async def delete_credential_field(
         self,
         id: str,
@@ -1328,6 +1392,9 @@ class AdminResourceWithRawResponse:
         self.create_scope = to_raw_response_wrapper(
             admin.create_scope,
         )
+        self.delete_catalog = to_raw_response_wrapper(
+            admin.delete_catalog,
+        )
         self.delete_credential_field = to_raw_response_wrapper(
             admin.delete_credential_field,
         )
@@ -1379,6 +1446,9 @@ class AsyncAdminResourceWithRawResponse:
         self.create_scope = async_to_raw_response_wrapper(
             admin.create_scope,
         )
+        self.delete_catalog = async_to_raw_response_wrapper(
+            admin.delete_catalog,
+        )
         self.delete_credential_field = async_to_raw_response_wrapper(
             admin.delete_credential_field,
         )
@@ -1430,6 +1500,9 @@ class AdminResourceWithStreamingResponse:
         self.create_scope = to_streamed_response_wrapper(
             admin.create_scope,
         )
+        self.delete_catalog = to_streamed_response_wrapper(
+            admin.delete_catalog,
+        )
         self.delete_credential_field = to_streamed_response_wrapper(
             admin.delete_credential_field,
         )
@@ -1481,6 +1554,9 @@ class AsyncAdminResourceWithStreamingResponse:
         self.create_scope = async_to_streamed_response_wrapper(
             admin.create_scope,
         )
+        self.delete_catalog = async_to_streamed_response_wrapper(
+            admin.delete_catalog,
+        )
         self.delete_credential_field = async_to_streamed_response_wrapper(
             admin.delete_credential_field,
         )

structify/resources/connectors/connectors.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Optional
+from typing import Any, Dict, Optional, cast
 from typing_extensions import Literal, overload
 
 import httpx
@@ -17,6 +17,7 @@ from ...types import (
     connector_create_secret_params,
     connector_search_tables_params,
     connector_update_column_params,
+    connector_add_schema_object_params,
     connector_get_explorer_chat_params,
     connector_list_with_snippets_params,
     connector_delete_schema_object_params,
@@ -53,6 +54,7 @@ from ...types.exploration_runs_response import ExplorationRunsResponse
 from ...types.connector_summaries_response import ConnectorSummariesResponse
 from ...types.delete_schema_object_response import DeleteSchemaObjectResponse
 from ...types.connector_search_tables_response import ConnectorSearchTablesResponse
+from ...types.connector_add_schema_object_response import ConnectorAddSchemaObjectResponse
 from ...types.connector_list_with_snippets_response import ConnectorListWithSnippetsResponse
 from ...types.connector_get_clarification_requests_response import ConnectorGetClarificationRequestsResponse
 
@@ -270,6 +272,177 @@ class ConnectorsResource(SyncAPIResource):
             cast_to=NoneType,
         )
 
+    @overload
+    def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        name: str,
+        type: Literal["database"],
+        description: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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
+        """
+        ...
+
+    @overload
+    def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        database_id: str,
+        name: str,
+        type: Literal["schema"],
+        description: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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
+        """
+        ...
+
+    @overload
+    def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        name: str,
+        schema_id: str,
+        type: Literal["table"],
+        description: Optional[str] | Omit = omit,
+        endpoint: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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
+        """
+        ...
+
+    @overload
+    def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        column_type: str,
+        name: str,
+        table_id: str,
+        type: Literal["column"],
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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", "type"],
+        ["database_id", "name", "type"],
+        ["name", "schema_id", "type"],
+        ["column_type", "name", "table_id", "type"],
+    )
+    def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        name: str,
+        type: Literal["database"] | Literal["schema"] | Literal["table"] | Literal["column"],
+        description: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        database_id: str | Omit = omit,
+        schema_id: str | Omit = omit,
+        endpoint: Optional[str] | Omit = omit,
+        column_type: str | Omit = omit,
+        table_id: str | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return cast(
+            ConnectorAddSchemaObjectResponse,
+            self._post(
+                f"/connectors/{connector_id}/schema_object",
+                body=maybe_transform(
+                    {
+                        "name": name,
+                        "type": type,
+                        "description": description,
+                        "notes": notes,
+                        "database_id": database_id,
+                        "schema_id": schema_id,
+                        "endpoint": endpoint,
+                        "column_type": column_type,
+                        "table_id": table_id,
+                    },
+                    connector_add_schema_object_params.ConnectorAddSchemaObjectParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, ConnectorAddSchemaObjectResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
     def create_secret(
         self,
         connector_id: str,
@@ -1207,6 +1380,177 @@ class AsyncConnectorsResource(AsyncAPIResource):
             cast_to=NoneType,
         )
 
+    @overload
+    async def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        name: str,
+        type: Literal["database"],
+        description: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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
+        """
+        ...
+
+    @overload
+    async def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        database_id: str,
+        name: str,
+        type: Literal["schema"],
+        description: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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
+        """
+        ...
+
+    @overload
+    async def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        name: str,
+        schema_id: str,
+        type: Literal["table"],
+        description: Optional[str] | Omit = omit,
+        endpoint: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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
+        """
+        ...
+
+    @overload
+    async def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        column_type: str,
+        name: str,
+        table_id: str,
+        type: Literal["column"],
+        notes: Optional[str] | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        """
+        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", "type"],
+        ["database_id", "name", "type"],
+        ["name", "schema_id", "type"],
+        ["column_type", "name", "table_id", "type"],
+    )
+    async def add_schema_object(
+        self,
+        connector_id: str,
+        *,
+        name: str,
+        type: Literal["database"] | Literal["schema"] | Literal["table"] | Literal["column"],
+        description: Optional[str] | Omit = omit,
+        notes: Optional[str] | Omit = omit,
+        database_id: str | Omit = omit,
+        schema_id: str | Omit = omit,
+        endpoint: Optional[str] | Omit = omit,
+        column_type: str | Omit = omit,
+        table_id: str | Omit = omit,
+        # 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,
+    ) -> ConnectorAddSchemaObjectResponse:
+        if not connector_id:
+            raise ValueError(f"Expected a non-empty value for `connector_id` but received {connector_id!r}")
+        return cast(
+            ConnectorAddSchemaObjectResponse,
+            await self._post(
+                f"/connectors/{connector_id}/schema_object",
+                body=await async_maybe_transform(
+                    {
+                        "name": name,
+                        "type": type,
+                        "description": description,
+                        "notes": notes,
+                        "database_id": database_id,
+                        "schema_id": schema_id,
+                        "endpoint": endpoint,
+                        "column_type": column_type,
+                        "table_id": table_id,
+                    },
+                    connector_add_schema_object_params.ConnectorAddSchemaObjectParams,
+                ),
+                options=make_request_options(
+                    extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                ),
+                cast_to=cast(
+                    Any, ConnectorAddSchemaObjectResponse
+                ),  # Union types cannot be passed in as arguments in the type system
+            ),
+        )
+
     async def create_secret(
         self,
         connector_id: str,
@@ -1951,6 +2295,9 @@ class ConnectorsResourceWithRawResponse:
         self.delete = to_raw_response_wrapper(
             connectors.delete,
         )
+        self.add_schema_object = to_raw_response_wrapper(
+            connectors.add_schema_object,
+        )
         self.create_secret = to_raw_response_wrapper(
             connectors.create_secret,
         )
@@ -2024,6 +2371,9 @@ class AsyncConnectorsResourceWithRawResponse:
         self.delete = async_to_raw_response_wrapper(
             connectors.delete,
         )
+        self.add_schema_object = async_to_raw_response_wrapper(
+            connectors.add_schema_object,
+        )
         self.create_secret = async_to_raw_response_wrapper(
             connectors.create_secret,
         )
@@ -2097,6 +2447,9 @@ class ConnectorsResourceWithStreamingResponse:
         self.delete = to_streamed_response_wrapper(
             connectors.delete,
         )
+        self.add_schema_object = to_streamed_response_wrapper(
+            connectors.add_schema_object,
+        )
         self.create_secret = to_streamed_response_wrapper(
             connectors.create_secret,
         )
@@ -2170,6 +2523,9 @@ class AsyncConnectorsResourceWithStreamingResponse:
         self.delete = async_to_streamed_response_wrapper(
             connectors.delete,
         )
+        self.add_schema_object = async_to_streamed_response_wrapper(
+            connectors.add_schema_object,
+        )
         self.create_secret = async_to_streamed_response_wrapper(
             connectors.create_secret,
         )

structify/resources/polars.py

@@ -26,7 +26,6 @@ from .._response import (
 )
 from ..types.table_param import Property
 from ..lib.cost_confirmation import request_cost_confirmation_if_needed
-from .external_dataframe_proxy import ServicesProxy
 from ..types.save_requirement_param import RequiredEntity, RequiredProperty
 from ..types.dataset_descriptor_param import DatasetDescriptorParam
 from ..types.structure_run_async_params import SourceWebWeb
@@ -48,11 +47,6 @@ def _collect_entities_with_job_ids(entities: Any) -> List[Dict[str, Any]]:
 
 
 class PolarsResource(SyncAPIResource):
-    @cached_property
-    def external(self) -> ServicesProxy:
-        """Access external whitelabel services with DataFrame batch processing."""
-        return ServicesProxy(self._client)
-
     @cached_property
     def with_raw_response(self) -> PolarsResourceWithRawResponse:
         """
@@ -1130,7 +1124,8 @@ class PolarsResource(SyncAPIResource):
         while True:
             remaining_embeddings = self._client.datasets.count_missing_embeddings(name=dataset_name).count
             count_history.append(remaining_embeddings)
-            tqdm_marker.update(total_embeddings - remaining_embeddings)
+            tqdm_marker.n = total_embeddings - remaining_embeddings
+            tqdm_marker.refresh()
             if remaining_embeddings == 0:
                 break
             # If we haven't updated any entities in a while, consider the embeddings as not updating and break