convexity-sdk 0.17.0.dev313__tar.gz → 0.17.0.dev317__tar.gz

{convexity_sdk-0.17.0.dev313 → convexity_sdk-0.17.0.dev317}/.gitignore

@@ -44,7 +44,7 @@ ducklake_data/
 .playwright-mcp
 
 # Generated CLI API client (regenerated via `npm run generate:api`)
-packages/.generated/
+packages/py/generated/
 .wrangler
 pp_perfume/
 data/

{convexity_sdk-0.17.0.dev313 → convexity_sdk-0.17.0.dev317}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: convexity-sdk
-Version: 0.17.0.dev313
+Version: 0.17.0.dev317
 Summary: Convexity Python SDK - programmatic access to the Convexity platform
 Requires-Python: >=3.12
 Requires-Dist: convexity-api-client

{convexity_sdk-0.17.0.dev313 → convexity_sdk-0.17.0.dev317}/convexity_sdk/resources/olap.py

@@ -2,6 +2,10 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass, field
+import json
+from typing import Any
+
 from convexity_api_client import AuthenticatedClient, Client
 from convexity_api_client.api.v1 import (
     get_olap_connection_v1_olap_connection_get as _get_olap_connection,
@@ -12,21 +16,48 @@ from convexity_api_client.api.v1 import (
 from convexity_api_client.api.v1 import (
     list_olap_tables_v1_olap_tables_get as _list_olap_tables,
 )
-from convexity_api_client.api.v1 import (
-    run_olap_query_v1_olap_query_post as _run_olap_query,
-)
 from convexity_api_client.api.v1 import (
     vacuum_olap_v1_olap_vacuum_post as _vacuum_olap,
 )
 from convexity_api_client.models.olap_connection_response import OlapConnectionResponse
-from convexity_api_client.models.olap_query_request import OlapQueryRequest
-from convexity_api_client.models.olap_query_request_params import OlapQueryRequestParams
-from convexity_api_client.models.olap_query_response import OlapQueryResponse
 from convexity_api_client.models.olap_table import OlapTable
 from convexity_api_client.models.olap_table_list import OlapTableList
 from convexity_api_client.models.olap_table_schema import OlapTableSchema
 from convexity_api_client.models.olap_vacuum_response import OlapVacuumResponse
-from convexity_api_client.types import UNSET, Unset
+from convexity_api_client.types import Unset
+
+
+@dataclass
+class OlapQueryColumn:
+    """A column in an OLAP query result."""
+
+    name: str
+    type_: str | None = None
+
+
+@dataclass
+class OlapQueryRow:
+    """A single OLAP query result row (column name -> value)."""
+
+    additional_properties: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass
+class OlapQueryResult:
+    """Result of a server-side OLAP query.
+
+    Defined locally in the SDK because the ``/olap/query`` endpoint is
+    intentionally excluded from the generated client contract — reading the
+    Iceberg tables directly with the vended S3 credentials is the recommended
+    path. This convenience wrapper posts to the endpoint and parses the JSON
+    response into a stable shape.
+    """
+
+    columns: list[OlapQueryColumn] = field(default_factory=list)
+    rows: list[OlapQueryRow] = field(default_factory=list)
+    row_count: int = 0
+    truncated: bool = False
+    elapsed_ms: int = 0
 
 
 class Olap:
@@ -72,17 +103,37 @@ class Olap:
         *,
         params: dict[str, object] | None = None,
         max_rows: int = 10000,
-    ) -> OlapQueryResponse:
-        """Run a read-only (SELECT/WITH) query against the project's Iceberg tables."""
-        query_params: OlapQueryRequestParams | Unset = UNSET
+    ) -> OlapQueryResult:
+        """Run a read-only (SELECT/WITH) query against the project's Iceberg tables.
+
+        Prefer reading the tables directly with the vended S3 credentials
+        (``get_connection`` + ``list_tables_detailed`` + a local Iceberg engine
+        such as DuckDB). This server-side query endpoint is a convenience
+        fallback and is intentionally excluded from the generated client
+        contract, so the request/response are handled here directly.
+        """
+        body: dict[str, Any] = {"sql": sql, "maxRows": max_rows}
         if params is not None:
-            query_params = OlapQueryRequestParams()
-            query_params.additional_properties = dict(params)
-        body = OlapQueryRequest(sql=sql, params=query_params, max_rows=max_rows)
-        result = _run_olap_query.sync(client=self._client, body=body, project_id=project_id)
-        if not isinstance(result, OlapQueryResponse):
-            raise ValueError(f"Unexpected response when running OLAP query: {result}")
-        return result
+            body["params"] = dict(params)
+        raw_body = json.dumps(body).encode("utf-8")
+        response = self._client.get_httpx_client().post(
+            "/v1/olap/query",
+            params={"projectId": project_id},
+            content=raw_body,
+            headers={"Content-Type": "application/json"},
+        )
+        if response.status_code != 200:
+            raise ValueError(f"OLAP query failed ({response.status_code}): {response.text}")
+        data = response.json()
+        columns = [OlapQueryColumn(name=col.get("name", ""), type_=col.get("type")) for col in data.get("columns", [])]
+        rows = [OlapQueryRow(additional_properties=dict(row)) for row in data.get("rows", [])]
+        return OlapQueryResult(
+            columns=columns,
+            rows=rows,
+            row_count=int(data.get("rowCount", len(rows))),
+            truncated=bool(data.get("truncated", False)),
+            elapsed_ms=int(data.get("elapsedMs", 0)),
+        )
 
     def vacuum(self, project_id: str) -> OlapVacuumResponse:
         """Drop orphaned Iceberg tables from the project's OLAP namespace.

{convexity_sdk-0.17.0.dev313 → convexity_sdk-0.17.0.dev317}/pyproject.toml

@@ -15,7 +15,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.hatch.version]
-path = "../../package.json"
+path = "../../../package.json"
 pattern = '"version":\s*"(?P<version>[^"]+)"'
 
 [tool.hatch.build.targets.wheel]