pyspiral 0.4.2__cp310-abi3-macosx_11_0_arm64.whl → 0.4.4__cp310-abi3-macosx_11_0_arm64.whl

{pyspiral-0.4.2.dist-info → pyspiral-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyspiral
-Version: 0.4.2
+Version: 0.4.4
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python

{pyspiral-0.4.2.dist-info → pyspiral-0.4.4.dist-info}/RECORD

@@ -1,13 +1,13 @@
-pyspiral-0.4.2.dist-info/METADATA,sha256=W906pGIyblyn1G1AQyofZ5ADgObxdRnngwqOMep-kog,1610
-pyspiral-0.4.2.dist-info/WHEEL,sha256=Mdosfxua6Dx1zYgObRH97e3wyiELqBbLtoRJj4RUSQE,103
-pyspiral-0.4.2.dist-info/entry_points.txt,sha256=uft7u-a6g40NLt4Q6BleWbK4NY0M8nZuYPpP8DV0EOk,45
+pyspiral-0.4.4.dist-info/METADATA,sha256=lVusDQ4LmIf3tRllkl2_hUNn1y0P_yMfNKhkRbpNLW0,1610
+pyspiral-0.4.4.dist-info/WHEEL,sha256=Mdosfxua6Dx1zYgObRH97e3wyiELqBbLtoRJj4RUSQE,103
+pyspiral-0.4.4.dist-info/entry_points.txt,sha256=uft7u-a6g40NLt4Q6BleWbK4NY0M8nZuYPpP8DV0EOk,45
 spiral/__init__.py,sha256=Jv1vbcnnmcTsBLN5mSNjnX3ae4C_mgojXDSBFaqIhN0,208
-spiral/_lib.abi3.so,sha256=G_dDlzsUq3V4_z5ReNTWwk_PzMHFWTbP4D8IlBsm6H8,61524000
+spiral/_lib.abi3.so,sha256=5-2gLMM7XOEgX6lXbIBu-_ucQsC5zUZWqZaH7oXkdSE,59883120
 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/filesystems.py,sha256=EA4iqhTeaIlvObvEUxHmZl0pQ24IOxUVWM3GPhFLw8o,4969
 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
@@ -35,22 +35,22 @@ 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/client/__init__.pyi,sha256=Tn1OJmkO1rQUsPE9BtfEyxIjoife6s16qOd8XiyHi2c,3475
 spiral/core/index/__init__.pyi,sha256=NPOG1ztFO6siBGpmJU3boRzX26xfxw--2TiCydosGvo,314
-spiral/core/table/__init__.pyi,sha256=dwOaxcOl6ZIlxoLjOnC3CNUgGetWfnEV1Jx06aCH8M8,3265
+spiral/core/table/__init__.pyi,sha256=agrxN1dYx--dte_edQOKgAXT8yPDeh_cHA8dYAOodbE,3290
 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/__init__.py,sha256=T8PIb0_UB9kynK0dpWbUD4No5lKRTG-wKnao8xOcXjY,6381
 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/mp4.py,sha256=_xGVnkygddzxP9a8OACJ8_KXnejuVbYCVKBCXBQ798Y,2151
 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/refs.py,sha256=omeHBQ5o6N4xgZ3x5Xz7IRrWwYBBtQY8DYK0NNAxeGo,2109
 spiral/expressions/str_.py,sha256=tY8RXW3JWvr1-bEfCZtk5FAf11wKJnXPuA9EoeJ9tA4,1265
 spiral/expressions/struct.py,sha256=pGAnCDh6AK0BK1XfZ1qG4ce4ranIQEE1HQsgmzBcfwQ,2038
 spiral/expressions/text.py,sha256=-02gBWYoyNQ3qQ1--9HTa8IryUDojYQVIp8C7rgnOWQ,1893
@@ -81,7 +81,7 @@ 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/substrait_.py,sha256=2BYvwFGcCwJ0JXNhXOLdPuhM1PqFyaeSqFpQCtv-M4E,12581
 spiral/tables/__init__.py,sha256=iiP7BkHA117em37_e75jtdvoZC10xCXtld18gRnPbTw,430
 spiral/tables/client.py,sha256=l_wJJRf3BPD5lg4Q1Ll2lAqQIuBCnKwC6JtsAui91Tc,4915
 spiral/tables/dataset.py,sha256=DuHeKVCJfXLsbxmde9QW6yvesW5uhswG6qAxV5X0ZgA,7890
@@ -92,7 +92,7 @@ spiral/tables/debug/scan.py,sha256=-IWX_UjO4QP9Hj7PtZ1rLlbswJcryOin56GT-exqFm4,8
 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/table.py,sha256=VM93Rsm67sJFendI1_VhlkFORIdBGfhCMBUBK4dve9I,4910
 spiral/tables/transaction.py,sha256=3a64R-mf_cmR54BNn8U-05jmWonp6Ivxhe6u01Dyjzo,1573
 spiral/types_.py,sha256=W_jyO7F6rpPiH69jhgSgV7OxQZbOlb1Ho3InpKUP6Eo,155
-pyspiral-0.4.2.dist-info/RECORD,,
+pyspiral-0.4.4.dist-info/RECORD,,

spiral/api/filesystems.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from types import NoneType
 from typing import Annotated, Literal
 
 from pydantic import AfterValidator, BaseModel, Field
@@ -17,6 +18,7 @@ def _validate_directory_path(path: str) -> str:
 
 DirectoryPath = Annotated[str, AfterValidator(_validate_directory_path)]
 FilePath = str  # Path or directory
+FsLoc = str
 
 
 class BuiltinFileSystem(BaseModel):
@@ -120,6 +122,12 @@ class CreateMountResponse(BaseModel):
     mount: Mount
 
 
+class GetMountAndFileSystemResponse(BaseModel):
+    mount: Mount
+    file_system: FileSystem
+    fs_loc: FsLoc
+
+
 class FileSystemService(ServiceBase):
     """Service for file system operations."""
 
@@ -148,6 +156,10 @@ class FileSystemService(ServiceBase):
         """Get a mount."""
         return self.client.get(f"/v1/mounts/{mount_id}", Mount)
 
+    def get_mount_and_file_system(self, mount_id: str) -> GetMountAndFileSystemResponse:
+        """Get the mount and its associated file system."""
+        return self.client.get(f"/v1/mounts/{mount_id}/with-filesystem", GetMountAndFileSystemResponse)
+
     def remove_mount(self, mount_id: str) -> None:
         """Remove mount."""
-        return self.client.delete(f"/v1/mounts/{mount_id}", None)
+        return self.client.delete(f"/v1/mounts/{mount_id}", NoneType)

spiral/core/client/__init__.pyi

@@ -110,7 +110,8 @@ class Spiral:
         ...
 
     def _sync_snapshot(self, index_id: str, snapshot: TableSnapshot) -> None:
-        """Synchronize an index with a table snapshot.
+        """
+        Synchronize an index with a table snapshot.
 
         IMPORTANT: This is only exposed for testing purposes and should not be used.
         """

spiral/core/table/__init__.pyi

@@ -36,6 +36,7 @@ class Table:
 
     id: str
     root_uri: str
+    mount_id: str | None
     key_schema: Schema
     metastore: PyMetastore
 

spiral/expressions/__init__.py

@@ -47,7 +47,7 @@ __all__ = [
     "not_",
     "or_",
     "pack",
-    "keyed",
+    "aux",
     "ref",
     "refs",
     "scalar",
@@ -116,26 +116,17 @@ def lift(expr: ExprLike) -> Expr:
     return scalar(expr)
 
 
-def key(name: builtins.str) -> Expr:
-    """Create a variable expression referencing a key column.
+def aux(name: builtins.str, dtype: pa.DataType) -> Expr:
+    """Create a variable expression referencing a column in the auxiliary table.
 
-    Args:
-        name: variable name
-    """
-    return Expr(_lib.expr.keyed(name))
-
-
-def keyed(name: builtins.str, dtype: pa.DataType) -> Expr:
-    """Create a variable expression referencing a column in the key table.
-
-    Key table is optionally given to `Scan#to_record_batches` function when reading only specific keys
+    Auxiliary table is optionally given to `Scan#to_record_batches` function when reading only specific keys
     or doing cell pushdown.
 
     Args:
         name: variable name
-        dtype: must match dtype of the column in the key table.
+        dtype: must match dtype of the column in the auxiliary table.
     """
-    return Expr(_lib.expr.keyed(name, dtype))
+    return Expr(_lib.expr.aux(name, dtype))
 
 
 def scalar(value: Any) -> Expr:

spiral/expressions/mp4.py

@@ -20,13 +20,13 @@ def read(expr: ExprLike | str, frames: ExprLike | str, crop: ExprLike | str):
 
     Args:
         expr: The referenced `Mp4` bytes.
-            A str is assumed to be the `se.keyed` expression.
+            A str is assumed to be the `se.aux` expression.
         frames: The range of frames to read. Each element must be a list of two uint32,
             frame start and frame end, or null / empty list to read all frames.
-            A str is assumed to be the `se.keyed` expression.
+            A str is assumed to be the `se.aux` expression.
         crop: The crop of the frames to read. Each element must be a list of four uint32,
             x, y, width, height or null / empty list to read full frames.
-            A str is assumed to be the `se.keyed` expression.
+            A str is assumed to be the `se.aux` expression.
 
     Returns:
         An array where each element is a decoded cropped video with fields:
@@ -36,17 +36,17 @@ def read(expr: ExprLike | str, frames: ExprLike | str, crop: ExprLike | str):
             frames: Number of frames with type `pa.uint32()`.
     """
     from spiral import _lib
-    from spiral.expressions import keyed, lift
+    from spiral.expressions import aux, lift
 
     if isinstance(expr, str):
-        expr = keyed(
+        expr = aux(
             expr,
             pa.struct([("__ref__", pa.struct([("id", pa.string()), ("begin", pa.uint64()), ("end", pa.uint64())]))]),
         )
     if isinstance(frames, str):
-        frames = keyed(frames, pa.list_(pa.uint32()))
+        frames = aux(frames, pa.list_(pa.uint32()))
     if isinstance(crop, str):
-        crop = keyed(crop, pa.list_(pa.uint32()))
+        crop = aux(crop, pa.list_(pa.uint32()))
 
     expr = lift(expr)
     frames = lift(frames)

spiral/expressions/refs.py

@@ -29,15 +29,15 @@ def deref(expr: ExprLike | str, field: str | None = None) -> Expr:
     column back into their original form, e.g. binary.
 
     Args:
-        expr: The expression to de-reference. A str is assumed to be the `se.keyed` expression.
+        expr: The expression to de-reference. A str is assumed to be the `se.aux` expression.
         field: If the expr evaluates into struct, the field name of that struct that should be de-referenced.
             If `None`, the expr must evaluate into a reference type.
     """
     from spiral import _lib
-    from spiral.expressions import keyed, lift
+    from spiral.expressions import aux, lift
 
     if isinstance(expr, str):
-        expr = keyed(
+        expr = aux(
             expr,
             pa.struct([("__ref__", pa.struct([("id", pa.string()), ("begin", pa.uint64()), ("end", pa.uint64())]))]),
         )

spiral/substrait_.py

@@ -248,11 +248,6 @@ class SubstraitConverter:
             case "struct_field", ref:
                 ref: ExpressionReferenceSegmentStructField
                 field_name = scope_type.field(ref.field).name
-
-                if field_name in self.key_names:
-                    # This is a key column, so we need to select it from the scope.
-                    return se.key(field_name)
-
                 scope = se.getitem(scope, field_name)
                 scope_type = scope_type.field(ref.field).type
                 if ref.is_set("child"):

spiral/tables/table.py

@@ -71,11 +71,6 @@ class Table(Expr):
         return f'Table("{self.identifier}")'
 
     def __getitem__(self, item: str) -> Expr:
-        from spiral import expressions as se
-
-        if item in self._key_columns:
-            return se.key(name=item)
-
         return super().__getitem__(item)
 
     def select(self, *paths: str, exclude: list[str] = None) -> "Expr":
@@ -86,14 +81,7 @@ class Table(Expr):
                     "Cannot use 'exclude' arg with key columns. Use 'exclude_keys' and an explicit select of keys."
                 )
 
-        key_paths = set(paths) & self._key_columns
-        other_paths = set(paths) - key_paths
-        if not key_paths:
-            return super().select(*paths, exclude=exclude)
-
-        from spiral import expressions as se
-
-        return se.merge(se.pack({key: se.key(key) for key in key_paths}), super().select(*other_paths, exclude=exclude))
+        return super().select(*paths, exclude=exclude)
 
     @property
     def key_schema(self) -> Schema: