pyspiral 0.3.1__cp310-abi3-macosx_11_0_arm64.whl → 0.4.1__cp310-abi3-macosx_11_0_arm64.whl

{pyspiral-0.3.1.dist-info → pyspiral-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyspiral
-Version: 0.3.1
+Version: 0.4.1
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -17,34 +17,30 @@ Requires-Dist: google-re2>=1.1.20240702
 Requires-Dist: grpclib>=0.4.7
 Requires-Dist: hishel>=0.0.30
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: numpy>=1.26.3
-Requires-Dist: pyarrow>=17.0.0
+Requires-Dist: numpy>=2
+Requires-Dist: pyarrow>=21.0.0
 Requires-Dist: pydantic-settings>=2.3.4
 Requires-Dist: pydantic[email]>=2.5.3
 Requires-Dist: pyjwt[crypto]>=2.9.0
 Requires-Dist: questionary>=2.0.1
 Requires-Dist: tqdm>=4.66.5
-Requires-Dist: typer>=0.12.3
+Requires-Dist: typer>=0.16
 Requires-Dist: xxhash>=3.4.1
 Requires-Dist: nanoid>=2.0.0
 Requires-Dist: sqlglot[rs]>=25.25.1
 Requires-Dist: pyperclip>=1.9.0
-Requires-Dist: boto3>=1.35.36
-Requires-Dist: polars>=1.6.0 ; extra == 'polars'
-Requires-Dist: duckdb>=1.1.1 ; extra == 'duckdb'
-Requires-Dist: pyiceberg>=0.9.0 ; extra == 'pyiceberg'
+Requires-Dist: polars>=1.31.0 ; extra == 'polars'
+Requires-Dist: duckdb>=1.3.2 ; extra == 'duckdb'
+Requires-Dist: pyiceberg>=0.9.1 ; extra == 'pyiceberg'
 Provides-Extra: polars
 Provides-Extra: duckdb
 Provides-Extra: pyiceberg
-Summary: Python implementation of Spiral table format.
-Keywords: vortex,spiraldb
+Summary: Python client for Spiral.
 Home-Page: https://spiraldb.com
-Author: Spiral<hello@spiraldb.com>
 Author-email: SpiralDB <hello@spiraldb.com>
-License: Proprietary
+License: Proprietary License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Source Code, https://github.com/spiraldb/spiraldb
 
 # PySpiral
 

pyspiral-0.4.1.dist-info/RECORD

@@ -0,0 +1,98 @@
+pyspiral-0.4.1.dist-info/METADATA,sha256=nPb5bevTsjXvNMRCM-l_rtrImARfU0_P7DXuLo-KT1U,1610
+pyspiral-0.4.1.dist-info/WHEEL,sha256=Mdosfxua6Dx1zYgObRH97e3wyiELqBbLtoRJj4RUSQE,103
+pyspiral-0.4.1.dist-info/entry_points.txt,sha256=uft7u-a6g40NLt4Q6BleWbK4NY0M8nZuYPpP8DV0EOk,45
+spiral/__init__.py,sha256=Jv1vbcnnmcTsBLN5mSNjnX3ae4C_mgojXDSBFaqIhN0,208
+spiral/_lib.abi3.so,sha256=dSWSUTQtz-KlVIdBtYHLyblCuf_j5HxFM3Gt_7G_BTA,61525328
+spiral/adbc.py,sha256=HcvR60uQeEK2oggSAK6y5VYtIrACIiCQ-85MEf18EZc,14199
+spiral/api/__init__.py,sha256=_7BS1RhqEFjnt3XwFWZNCHVEQeSKpezPevAiGCsvDbE,1776
+spiral/api/admin.py,sha256=A1iVR1XYJSObZivPAD5UzmPuMgupXc9kaHNYYa_kwfs,585
+spiral/api/client.py,sha256=9-L6T8niQAXo90jRxllJD4hXXmcGfHj7CW9X3XTYa5Q,4551
+spiral/api/filesystems.py,sha256=5Ky_otnresGj7WdsR8Xi7DDM3lkB8UES6Lru_xWAGDM,4559
+spiral/api/organizations.py,sha256=B-8zZ7lFJANGK7dUNbo_aU-cgI959JBP9VcWb6wdgi0,1895
+spiral/api/projects.py,sha256=JBGof9A2Ivasu2jrULMjHBwlna0M8WRrTNqU-Es4GJ8,5673
+spiral/api/telemetry.py,sha256=tfdA3E_EWJwFVxkQfkm8tiYGRubnx2LuE5nbfsk1oG4,474
+spiral/api/types.py,sha256=zx-BRKsi1GHg9aL9gMUaVQWYYMXJcP0A8OQUc7jSIAc,653
+spiral/api/workloads.py,sha256=XAyXV7vgZcoyyoPoGvOT4jTpyFKFMvrrAfhL6d1h1kE,1748
+spiral/arrow_.py,sha256=T1LZ7bh9aMDbXfpUsf0dR0E1roTQyAYSgZ2mL4s8J_4,7681
+spiral/cli/__init__.py,sha256=ooAFz_iCpVCKHE0TiVElIynbP2PtTgD9cUw46Vh1lcw,2145
+spiral/cli/__main__.py,sha256=kNaKM2xgJo7GRogf83nYldLM-RGUR6vymdGwZxywQu0,71
+spiral/cli/admin.py,sha256=7WbU_tr05clUjmZ-RkKTlvcf1pbXIElRfHRJlCItFGk,326
+spiral/cli/app.py,sha256=-k0rrLbfJRLay_2_MOCt57PLcx0VnNMCkrnKV7j7nos,1725
+spiral/cli/console.py,sha256=6JHbAQV6MFWz3P-VzqPOjhHpkIQagsCdzTMvmuDKMkU,2580
+spiral/cli/fs.py,sha256=dVPoAoAbuQ9yJlfI-JiFgS9VdnPmeBMygVHgehJRj34,4367
+spiral/cli/iceberg/__init__.py,sha256=IQV_gwCFSj6Ubxs58VM9Pal1ymgG2bxdDgOPuk9E5bs,214
+spiral/cli/iceberg/namespaces.py,sha256=x9pvHlcXtcATYYjqimHa6CtkyL3taQUJ--ni_Bfoemc,1510
+spiral/cli/iceberg/tables.py,sha256=nSR4-t54otJfCmubB6vXnbOkbqPVGV0sHBlc-t9cIVg,1930
+spiral/cli/indexes/__init__.py,sha256=-USfxCIdckzZKBNQ-DXqe3V5ttWVo_Fsa1Mfcx5hdIw,467
+spiral/cli/login.py,sha256=InKMnpV8NATW5RPgB3ZL-DSVPzUuUByyK4Fx7pZEgfg,607
+spiral/cli/orgs.py,sha256=V-4ZTT3FwFQLcs1-BenC8uCgvWOJcxkZPSdCPfsexhc,2848
+spiral/cli/printer.py,sha256=W83KAE-7meoDD1yRltLQrZqrA2olGapBGy_2USWkY08,1778
+spiral/cli/projects.py,sha256=TKXu_VzkIUccwXzdlg-wQMkrB-Py33g052NrbuJx-D4,5096
+spiral/cli/state.py,sha256=10wTIVQ0SJkY67Z6-KQ1LFlt3aVIPmZhoHFdTwp4kNA,130
+spiral/cli/tables/__init__.py,sha256=lkGLDeU28IVnuxJdlYSUh6QSB9fQ4_1MeZJL73iXcHo,3660
+spiral/cli/telemetry.py,sha256=ABDCyV5QJGOIJp4AxvK0LG5xNPIysP37K5haL38T7P4,586
+spiral/cli/types.py,sha256=YG1eHhRLaqlVU_18DQBuF_YMsabhMZLBY0V9CvbSxjY,1369
+spiral/cli/workloads.py,sha256=SbxgwiBlX1AuqpOLV3gs7DFkH-Tbeend7qJTwq0Je84,1994
+spiral/client.py,sha256=K-OuMOTgYxOA9vef5jSANjmPRBfGrzQ65fg6Fd-rHMY,2683
+spiral/core/__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/core/client/__init__.pyi,sha256=FFpUCPyQjH_VxldflqWmvniSugLuDiQv11vMim9HhDY,3466
+spiral/core/index/__init__.pyi,sha256=NPOG1ztFO6siBGpmJU3boRzX26xfxw--2TiCydosGvo,314
+spiral/core/table/__init__.pyi,sha256=dwOaxcOl6ZIlxoLjOnC3CNUgGetWfnEV1Jx06aCH8M8,3265
+spiral/core/table/manifests/__init__.pyi,sha256=3V59-K1qr1z2dGfgRKXaHSVheK8NNw8Q8PFhfbeQd_4,1065
+spiral/core/table/metastore/__init__.pyi,sha256=dMqySDnsjPUTBuFU2MaQGyocKEoGkWpeTQmUP2iIKbc,1880
+spiral/core/table/spec/__init__.pyi,sha256=D4GQp9RWwyLKTlRW7eDXcQE-xA5rF2iBcXZ8y7b48EE,5595
+spiral/datetime_.py,sha256=1TA1RYIRU22qcUuipIjVhAtGnPDVn2z9WttuhkmfkwY,964
+spiral/expressions/__init__.py,sha256=QAEtghxWoT-obmMsHpWwPloRh5EZFpeQ7H_i9F4PG5c,6556
+spiral/expressions/base.py,sha256=q_W9XslcdFQtOIE_d1VkEmLickaXKOAoIcFeMoh-nqQ,4751
+spiral/expressions/http.py,sha256=begUydWoFHEqjeLkATvI_v66Ez6_rR-OQBWO5cHbb9c,2742
+spiral/expressions/io.py,sha256=gJ2a0FKMmdxarWKENulPRwH7KDvSJTIh_OUxX306xAM,3045
+spiral/expressions/list_.py,sha256=MMt5lf5H1M3O-x6N_PvqOLGq9NOk6Ukv0fPWwPC_uy4,1809
+spiral/expressions/mp4.py,sha256=R-fcVYRI6KaH1Nwpmqnsc1VYd9wA7Nuiy2UDcNxEzpw,2165
+spiral/expressions/png.py,sha256=KO8X0OmMzUFwpg2I_j0JTyldPzVXDWIMzjWMWDV9vIY,506
+spiral/expressions/qoi.py,sha256=gvIbb6fXb_Bb080sn9wkpbGGrPs2UEcTXCfuv4-kcYQ,506
+spiral/expressions/refs.py,sha256=ISMtJtUL--BjHF6rsvgN3Um4QcvVqQE9URngOxjQrhw,2115
+spiral/expressions/str_.py,sha256=tY8RXW3JWvr1-bEfCZtk5FAf11wKJnXPuA9EoeJ9tA4,1265
+spiral/expressions/struct.py,sha256=pGAnCDh6AK0BK1XfZ1qG4ce4ranIQEE1HQsgmzBcfwQ,2038
+spiral/expressions/text.py,sha256=-02gBWYoyNQ3qQ1--9HTa8IryUDojYQVIp8C7rgnOWQ,1893
+spiral/expressions/tiff.py,sha256=fQwIn0kLFBM2Y3YYIHmTgb_EIRHKT2fNc77nioDQQw4,8044
+spiral/expressions/udf.py,sha256=r6398z2Aj7KnXtwEvCiGNbgOXa6xsb_bnnG-FEvFxV4,1370
+spiral/grpc_.py,sha256=f3czdP1Mxme42Y5--a5ogYq1TTiWn-J_MlGjwJ2mWwM,1015
+spiral/iceberg/__init__.py,sha256=jSIlTxWauAbJV5gsWglZisFbnfNNzLYN90scoYcdWzc,65
+spiral/iceberg/client.py,sha256=E6FyE_h2HLgDW1cAFg1XgglJr6rbVOCWjRtRmqoMVkM,1003
+spiral/indexes/__init__.py,sha256=TXLQ-_3xso3lFIp2lM58_ip9OPNwPKFv1FdsWiUF-d8,178
+spiral/indexes/client.py,sha256=NsFBILEHMjyCUruFrUEKucRQRrN4OvqgbL4pmzWs07g,5600
+spiral/indexes/index.py,sha256=4CmSFlZYp46B2CjqtiyZ7VF5EH3duiutz3nWFnyApLA,973
+spiral/indexes/scan.py,sha256=B2m-UgNuawNB90HXK33GTQfMy2WLdNNxiiB6cIjFW2Y,697
+spiral/project.py,sha256=0uJ1Jb88Ie-cCNnSdX3QfFtCUqrjLka4zCm_TxCpVak,1189
+spiral/protogen/_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/protogen/_/arrow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/protogen/_/arrow/flight/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/protogen/_/arrow/flight/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/protogen/_/arrow/flight/protocol/sql/__init__.py,sha256=_xhj9QkWEW1qZ-iVxcQ8k4EjYr7KJ5ofitJGqVUGQi4,79921
+spiral/protogen/_/scandal/__init__.py,sha256=X5YJqErZDIXxTESw8fLqJp3P2wZlqAglBzPs3LpTd-w,5145
+spiral/protogen/_/spiral/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/protogen/_/spiral/table/__init__.py,sha256=o_aNyTuJBIRY6MlAWceMsjbfaSUuZphRxiG_IXmC0mU,629
+spiral/protogen/_/substrait/__init__.py,sha256=pV4-T-lwAHKkfFrNYSUGY4IkbIvuKjSo_imzF7BLj_s,126526
+spiral/protogen/_/substrait/extensions/__init__.py,sha256=yD7dg0TBqn-GK_L0qeVof1GKnwSLg_kPyQSV3kcSljs,3655
+spiral/protogen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/protogen/substrait/__init__.py,sha256=pV4-T-lwAHKkfFrNYSUGY4IkbIvuKjSo_imzF7BLj_s,126526
+spiral/protogen/substrait/extensions/__init__.py,sha256=yD7dg0TBqn-GK_L0qeVof1GKnwSLg_kPyQSV3kcSljs,3655
+spiral/protogen/util.py,sha256=smnvVo6nYH3FfDm9jqhNLaXz4bbTBaQezHQDCTvZyiQ,1486
+spiral/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/server.py,sha256=ztBmB5lBnUz-smQxR_tC8AI5SOhz17wH0MI3GuzDUdM,600
+spiral/settings.py,sha256=PIQV2ljtB3pEOWoMRVSRzSGJNrXviO2JBgZ5ZY_Nq2E,2794
+spiral/substrait_.py,sha256=RNSmfbGFT_5uyo8AFtzS9A7IHW3DkacMTw2vKnj0Das,12762
+spiral/tables/__init__.py,sha256=iiP7BkHA117em37_e75jtdvoZC10xCXtld18gRnPbTw,430
+spiral/tables/client.py,sha256=l_wJJRf3BPD5lg4Q1Ll2lAqQIuBCnKwC6JtsAui91Tc,4915
+spiral/tables/dataset.py,sha256=DuHeKVCJfXLsbxmde9QW6yvesW5uhswG6qAxV5X0ZgA,7890
+spiral/tables/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+spiral/tables/debug/manifests.py,sha256=E_-DiMBg2EPL97cl9hLWhiqEsFtjEBgh_C7jZy8EWYc,2594
+spiral/tables/debug/metrics.py,sha256=XdRDcjggtsLNGCAjam6IxG9072pz_d2C8iLApNRFUtk,2044
+spiral/tables/debug/scan.py,sha256=-IWX_UjO4QP9Hj7PtZ1rLlbswJcryOin56GT-exqFm4,8942
+spiral/tables/maintenance.py,sha256=7Xa2Jdu_OY1Qu6iN1sPVdywVZtk_Mv3EaC3G93cmQvI,305
+spiral/tables/scan.py,sha256=3lPf5fSyF1fHGdGJ-pvu5HxPWoonf_XL7neWTqzB-0I,7582
+spiral/tables/snapshot.py,sha256=2NTuVEp2uJ1pV3Q5tLj7FOzPSc9axlfb6uOITwHnj0g,2229
+spiral/tables/table.py,sha256=4B2drwwfaoL6aIJ-5Ll-Bqza-EBeDIfMkuszSOZqSpk,5326
+spiral/tables/transaction.py,sha256=3a64R-mf_cmR54BNn8U-05jmWonp6Ivxhe6u01Dyjzo,1573
+spiral/types_.py,sha256=W_jyO7F6rpPiH69jhgSgV7OxQZbOlb1Ho3InpKUP6Eo,155
+pyspiral-0.4.1.dist-info/RECORD,,

{pyspiral-0.3.1.dist-info → pyspiral-0.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.8.3)
+Generator: maturin (1.9.3)
 Root-Is-Purelib: false
 Tag: cp310-abi3-macosx_11_0_arm64

spiral/__init__.py

@@ -1,13 +1,10 @@
-"""Python client for the Spiral warehouse."""
+"""Python client for Spiral"""
 
+# This is here to make sure we load the native extension first
 from spiral import _lib
-from spiral.catalog import Spiral
-from spiral.maintenance import Maintenance
-from spiral.scan_ import Scan, scan
-from spiral.table import Table
-from spiral.txn import Transaction
 
-# Eagerly import the Spiral library
-assert _lib, "Spiral library"
+assert _lib
 
-__all__ = ["scan", "Scan", "Table", "Spiral", "Transaction", "Maintenance"]
+from spiral.client import Spiral  # noqa: E402, I001
+
+__all__ = ["Spiral"]

spiral/adbc.py

@@ -4,7 +4,6 @@ import logging
 from concurrent.futures import ThreadPoolExecutor
 from urllib.parse import urlparse
 
-import duckdb
 import pyarrow as pa
 import pyarrow.compute as pc
 import sqlglot
@@ -25,8 +24,9 @@ from pyarrow.flight import (
 )
 
 from spiral import Spiral
-from spiral.proto._.arrow.flight.protocol import sql as rpc
-from spiral.proto._.arrow.flight.protocol.sql import (
+from spiral.api.projects import TableResource
+from spiral.protogen._.arrow.flight.protocol import sql as rpc
+from spiral.protogen._.arrow.flight.protocol.sql import (
     CommandGetCatalogs,
     CommandGetDbSchemas,
     CommandGetSqlInfo,
@@ -37,6 +37,7 @@ from spiral.proto._.arrow.flight.protocol.sql import (
 )
 
 log = logging.getLogger(__name__)
+logging.getLogger("sqlx").setLevel(logging.WARNING)
 
 
 def debuggable(func):
@@ -63,6 +64,7 @@ def debuggable(func):
     return wrapper_decorator
 
 
+# TODO(marko): This should work for Iceberg tables.
 class ADBCServerBase:
     def get_sql_info(self, _req: CommandGetSqlInfo) -> pa.RecordBatchReader:
         """Default implementation that reports no support for any complex features."""
@@ -71,7 +73,7 @@ class ADBCServerBase:
             SqlInfo.FLIGHT_SQL_SERVER_VERSION: "0.0.1",
             SqlInfo.FLIGHT_SQL_SERVER_ARROW_VERSION: pa.__version__,
             SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY: True,
-            SqlInfo.FLIGHT_SQL_SERVER_TRANSACTION: SqlSupportedTransaction.SQL_SUPPORTED_TRANSACTION_NONE.value,
+            SqlInfo.FLIGHT_SQL_SERVER_TRANSACTION: SqlSupportedTransaction.NONE.value,
         }
 
         # See https://github.com/apache/arrow-adbc/blob/38c21c2311a59803559cb0091b3f34180c28b25f/rust/core/src/schemas.rs#L35
@@ -147,7 +149,7 @@ class SpiralADBCServer(ADBCServerBase):
         @debuggable
         def batches():
             yield pa.RecordBatch.from_arrays(
-                [list(self.sp.list_project_ids())],
+                [[p.id for p in self.sp.list_projects()]],
                 schema=schema,
             )
 
@@ -171,12 +173,13 @@ class SpiralADBCServer(ADBCServerBase):
 
             # Otherwise, catalog is either the project ID, or None.
             if req.catalog is None:
-                projects = list(self.sp.list_projects())
+                projects = self.sp.list_projects()
             else:
                 projects = [self.sp.project(req.catalog)]
 
             for project in projects:
-                datasets = {dt[0] for dt in project.list_table_names()}
+                datasets = {dt.dataset for dt in project.tables.list_tables()}
+
                 batch = pa.RecordBatch.from_arrays(
                     [
                         [project.id] * len(datasets),
@@ -218,21 +221,20 @@ class SpiralADBCServer(ADBCServerBase):
                 projects = [self.sp.project(req.catalog)]
 
             def _process_project(project):
-                tables = project.list_tables()
+                tables: list[TableResource] = project.tables.list_tables()
 
                 rows = []
                 for table in tables:
-                    _project_id, dataset, name = str(table).split(".")
-
                     row = {
                         "catalog_name": project.id,
-                        "db_schema_name": dataset,
-                        "table_name": name,
+                        "db_schema_name": table.dataset,
+                        "table_name": table.table,
                         "table_type": "TABLE",
                     }
 
                     if req.include_schema:
-                        row["table_schema"] = table.to_dataset().schema.serialize().to_pybytes()
+                        open_table = project.tables.table(f"{table.project_id}.{table.dataset}.{table.table}")
+                        row["table_schema"] = open_table.snapshot().to_dataset().schema.serialize().to_pybytes()
 
                     rows.append(row)
 
@@ -251,9 +253,14 @@ class SpiralADBCServer(ADBCServerBase):
             # This lets us insert a PyArrow Dataset into Python locals such that
             # DuckDB will pick up on it for the query.
             name = exp.table_name(tbl)
-            locals()[name] = self.sp.project(tbl.catalog).table(f"{tbl.db}.{tbl.name}").to_dataset()
+            locals()[name] = self.sp.tables.table(f"{tbl.catalog}.{tbl.db}.{tbl.name}").snapshot().to_dataset()
             tbl.replace(exp.table_(table=name))
 
+        try:
+            import duckdb
+        except ImportError:
+            raise FlightError("DuckDB is required for SQL queries.")
+
         try:
             sql = duckdb.sql(expr.sql(dialect="duckdb"))
         except Exception as e:

spiral/api/__init__.py

@@ -1,163 +1,23 @@
-import abc
-import base64
-import logging
 import os
-import re
-import socket
-import time
-from collections.abc import Iterable, Iterator
-from typing import TYPE_CHECKING, Annotated, Generic, TypeVar
+from typing import TYPE_CHECKING
 
-import betterproto
 import httpx
-import pyarrow as pa
-from httpx import HTTPStatusError
-from pydantic import (
-    BaseModel,
-    BeforeValidator,
-    Field,
-    GetPydanticSchema,
-    PlainSerializer,
-    StringConstraints,
-    TypeAdapter,
-)
+
+from .client import _Client
 
 if TYPE_CHECKING:
+    from spiral.core.client import Authn
+
     from .admin import AdminService
     from .filesystems import FileSystemService
     from .organizations import OrganizationService
     from .projects import ProjectService
-    from .tables import TableService
-    from .tokens import TokenService
+    from .telemetry import TelemetryService
     from .workloads import WorkloadService
 
-log = logging.getLogger(__name__)
-
-RE_ID = re.compile("[a-zA-Z0-9-]+")
-
-OrganizationId = Annotated[str, StringConstraints(min_length=1, max_length=64)]  # , pattern=RE_ID)]
-ProjectId = Annotated[str, StringConstraints(min_length=1, max_length=64)]  # , pattern=RE_ID)]
-RoleId = str
-
-#: Annotations to implement pa.Schema serde with byte arrays
-ArrowSchema = Annotated[
-    pa.Schema,
-    GetPydanticSchema(lambda tp, handler: handler(object)),
-    BeforeValidator(
-        lambda v: v
-        if isinstance(v, pa.Schema)
-        else pa.ipc.read_schema(pa.ipc.read_message(base64.urlsafe_b64decode(v)))
-    ),
-    PlainSerializer(lambda schema: base64.urlsafe_b64encode(schema.serialize().to_pybytes())),
-]
-
-E = TypeVar("E")
-
-
-class PagedRequest(BaseModel):
-    page_token: str | None = None
-    page_size: int = 50
-
-
-class PagedResponse(BaseModel, Generic[E]):
-    items: list[E] = Field(default_factory=list)
-    next_page_token: str | None = None
-
-
-PagedReqT = TypeVar("PagedReqT", bound=PagedRequest)
-
-
-class Paged(Iterable[E], Generic[E]):
-    def __init__(
-        self,
-        client: "_Client",
-        path: str,
-        request: PagedRequest,
-        response_cls: type[PagedResponse[E]],
-    ):
-        self._client = client
-        self._path = path
-        self._request: PagedRequest = request
-        self._response_cls = response_cls
-
-        self._response: PagedResponse[E] = client.put(path, request, response_cls)
-
-    @property
-    def page(self) -> PagedResponse[E]:
-        return self._response
-
-    def __iter__(self) -> Iterator[E]:
-        while True:
-            yield from self._response.items
-
-            if self._response.next_page_token is None:
-                break
-
-            self._request = self._request.model_copy(update=dict(page_token=self._response.next_page_token))
-            self._response = self._client.put(self._path, self._request, self._response_cls)
-
-
-class ServiceBase:
-    def __init__(self, client: "_Client"):
-        self.client = client
-
-
-class Authn:
-    """An abstract class for credential providers."""
-
-    @abc.abstractmethod
-    def token(self) -> str | None:
-        """Return a token, if available."""
-
-
-class _Client:
-    RequestT = TypeVar("RequestT")
-    ResponseT = TypeVar("ResponseT")
-
-    def __init__(self, http: httpx.Client, authn: Authn):
-        self.http = http
-        self.authn = authn
-
-    def get(self, path: str, response_cls: type[ResponseT]) -> ResponseT:
-        return self.request("GET", path, None, response_cls)
-
-    def post(self, path: str, req: RequestT, response_cls: type[ResponseT]) -> ResponseT:
-        return self.request("POST", path, req, response_cls)
-
-    def put(self, path: str, req: RequestT, response_cls: type[ResponseT]) -> ResponseT:
-        return self.request("PUT", path, req, response_cls)
-
-    def request(self, method: str, path: str, req: RequestT | None, response_cls: type[ResponseT]) -> ResponseT:
-        if isinstance(req, betterproto.Message):
-            try:
-                req = dict(content=bytes(req))
-            except:
-                raise
-        elif req is not None:
-            req = dict(json=TypeAdapter(req.__class__).dump_python(req, mode="json") if req is not None else None)
-        else:
-            req = dict()
-
-        token = self.authn.token()
-        resp = self.http.request(method, path, headers={"authorization": f"Bearer {token}" if token else None}, **req)
-
-        try:
-            resp.raise_for_status()
-        except HTTPStatusError as e:
-            # Enrich the exception with the response body
-            raise HTTPStatusError(f"{str(e)}: {resp.text}", request=e.request, response=e.response)
-
-        if issubclass(response_cls, betterproto.Message):
-            return response_cls().parse(resp.content)
-        else:
-            return TypeAdapter(response_cls).validate_python(resp.json())
-
-    def paged(self, path: str, req: PagedRequest, response_cls: type[PagedResponse[E]]) -> Paged[E]:
-        return Paged(self, path, req, response_cls)
-
 
 class SpiralAPI:
-    def __init__(self, authn: Authn, base_url: str | None = None):
+    def __init__(self, authn: "Authn", base_url: str | None = None):
         self.base_url = base_url or os.environ.get("SPIRAL_URL", "https://api.spiraldb.com")
         self.client = _Client(
             httpx.Client(
@@ -173,24 +33,12 @@ class SpiralAPI:
 
         return AdminService(self.client)
 
-    @property
-    def file_system(self) -> "FileSystemService":
-        from .filesystems import FileSystemService
-
-        return FileSystemService(self.client)
-
     @property
     def organization(self) -> "OrganizationService":
         from .organizations import OrganizationService
 
         return OrganizationService(self.client)
 
-    @property
-    def token(self) -> "TokenService":
-        from .tokens import TokenService
-
-        return TokenService(self.client)
-
     @property
     def project(self) -> "ProjectService":
         from .projects import ProjectService
@@ -198,10 +46,10 @@ class SpiralAPI:
         return ProjectService(self.client)
 
     @property
-    def table(self) -> "TableService":
-        from .tables import TableService
+    def file_system(self) -> "FileSystemService":
+        from .filesystems import FileSystemService
 
-        return TableService(self.client)
+        return FileSystemService(self.client)
 
     @property
     def workload(self) -> "WorkloadService":
@@ -209,17 +57,8 @@ class SpiralAPI:
 
         return WorkloadService(self.client)
 
+    @property
+    def telemetry(self) -> "TelemetryService":
+        from .telemetry import TelemetryService
 
-def wait_for_port(port: int, host: str = "localhost", timeout: float = 5.0):
-    """Wait until a port starts accepting TCP connections."""
-    start_time = time.time()
-    while True:
-        try:
-            with socket.create_connection((host, port), timeout=timeout):
-                break
-        except OSError as ex:
-            time.sleep(0.01)
-            if time.time() - start_time >= timeout:
-                raise TimeoutError(
-                    f"Waited too long for the port {port} on host {host} to start accepting " "connections."
-                ) from ex
+        return TelemetryService(self.client)

spiral/api/admin.py

@@ -1,29 +1,15 @@
-from pydantic import BaseModel
-
-from . import OrganizationId, Paged, PagedRequest, PagedResponse, ServiceBase
-
-
-class SyncOrgs:
-    class Request(PagedRequest): ...
-
-    class Response(PagedResponse[OrganizationId]): ...
-
-
-class Membership(BaseModel):
-    user_id: str
-    organization_id: str
-
-
-class SyncMemberships:
-    class Request(PagedRequest):
-        organization_id: OrganizationId | None = None
-
-    class Response(PagedResponse[Membership]): ...
+from .client import Paged, PagedResponse, ServiceBase
+from .organizations import OrgMembership
+from .types import OrgId
 
 
 class AdminService(ServiceBase):
-    def sync_orgs(self, request: SyncOrgs.Request) -> Paged[SyncOrgs.Response]:
-        return self.client.paged("/admin/sync-orgs", request, SyncOrgs.Response)
-
-    def sync_memberships(self, request: SyncMemberships.Request) -> Paged[Membership]:
-        return self.client.paged("/admin/sync-memberships", request, SyncMemberships.Response)
+    def sync_memberships(self, org_id: OrgId | None = None) -> Paged[OrgMembership]:
+        params = {}
+        if org_id:
+            params["org_id"] = str(org_id)
+        return self.client.paged("/v1/admin/sync-memberships", PagedResponse[OrgMembership], params=params)
+
+    def sync_orgs(self) -> Paged[OrgId]:
+        params = {}
+        return self.client.paged("/v1/admin/sync-orgs", PagedResponse[OrgId], params=params)