pyspiral 0.7.0__cp312-abi3-manylinux_2_28_x86_64.whl → 0.7.1__cp312-abi3-manylinux_2_28_x86_64.whl

{pyspiral-0.7.0.dist-info → pyspiral-0.7.1.dist-info}/METADATA

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

{pyspiral-0.7.0.dist-info → pyspiral-0.7.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pyspiral-0.7.0.dist-info/METADATA,sha256=zP3jypGjswSz8nqMxMj8N6a4udG_LoZZLQAf8Xepg64,1874
-pyspiral-0.7.0.dist-info/WHEEL,sha256=ydlpo1_yEJ2g1Axq3LoOd_OfioJa2swc2j5IDCa4uho,107
-pyspiral-0.7.0.dist-info/entry_points.txt,sha256=R96Y3FpYX6XbQu9qMPfUTgiCcf4qM9OBQQZTDdBkZwA,74
+pyspiral-0.7.1.dist-info/METADATA,sha256=WQ0LCz8jtz9qHpU6Zim1I_134EwD3Ve8V4bW0nU_t-0,1874
+pyspiral-0.7.1.dist-info/WHEEL,sha256=ydlpo1_yEJ2g1Axq3LoOd_OfioJa2swc2j5IDCa4uho,107
+pyspiral-0.7.1.dist-info/entry_points.txt,sha256=R96Y3FpYX6XbQu9qMPfUTgiCcf4qM9OBQQZTDdBkZwA,74
 spiral/__init__.py,sha256=gAysTwG_oEeKVMdCOfOzDhl0bM2miiK8Ds2vvUihBWw,1153
-spiral/_lib.abi3.so,sha256=CiermZMoK6hdHhdtLPUU_1qA5Ljq0s7Pl0VPA5osDig,67483448
+spiral/_lib.abi3.so,sha256=WqIyQu2RIN27T4K326ZBRMIVXysE6p-GW2ENnNueOm0,67478232
 spiral/adbc.py,sha256=7IxfWIeQN-fh0W5OdN_PP2x3pzQYg6ZUOLsHg3jktqw,14842
 spiral/api/__init__.py,sha256=ULBlVq3PnfNOO6T5naE_ULmmii-83--qTuN2PpAUQN0,2241
 spiral/api/admin.py,sha256=A1iVR1XYJSObZivPAD5UzmPuMgupXc9kaHNYYa_kwfs,585
@@ -35,7 +35,7 @@ spiral/cli/telemetry.py,sha256=Uxo1Q1FkKJ6n6QNGOUmL3j_pRRWRx0qWIhoP-U9BuR0,589
 spiral/cli/text.py,sha256=DlWGe4JrkdERAiqyITNpk91Wqb63Re99rNYlIFsIamc,4031
 spiral/cli/types.py,sha256=XYzo1GgX7dBBItoBSrHI4vO5C2lLmS2sktb-2GnGH3E,1362
 spiral/cli/workloads.py,sha256=2_SLfQTFN6y73R9H0i9dk8VIOVagKxSxOpHXC56yptY,2015
-spiral/client.py,sha256=zMp-xXGL4R1Py_rYrC5o3jFLam1oA74azi50dvMP-_o,6329
+spiral/client.py,sha256=53dVv8wxYMmozUfR8MVcUufKGqdVIdb0yZ0gchczBoQ,6426
 spiral/core/__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spiral/core/_tools/__init__.pyi,sha256=b2KLfTOQ67pjfbYt07o0IGiTu5o2bZw69lllV8v0Dps,143
 spiral/core/authn/__init__.pyi,sha256=z_GWyIS62fuiYQrYO8hzw4W8oGaiciqS1u5qtAt54VY,769
@@ -60,7 +60,7 @@ spiral/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spiral/debug/manifests.py,sha256=7f1O3ba9mrA5nXpOF9cEIQuUAteP5wiBkFy_diQJ7No,3216
 spiral/debug/metrics.py,sha256=XdRDcjggtsLNGCAjam6IxG9072pz_d2C8iLApNRFUtk,2044
 spiral/debug/scan.py,sha256=UEm_aRnql5pwDPTpZgakMLNjlzkKL4RurBFFqH_BLAQ,9526
-spiral/enrichment.py,sha256=aXkKgV24w_0XmhTel_SOshJ2xCgkmXsFGZvaE7yXQ8k,6075
+spiral/enrichment.py,sha256=4j5W68YEJOABw5CXrt0A5gMILdR8KaXPjeMLlAQ4Gi4,6072
 spiral/expressions/__init__.py,sha256=vMNFeeozkWph3dBpEkHPThUhZdT9ZZzxHe71HnkWlDU,8020
 spiral/expressions/base.py,sha256=PvhJkcUSsPSIaxirHVzM9zlqyBXiaiia1HXohXdOmL4,5377
 spiral/expressions/file.py,sha256=HRzGjc3goIlUlKjysoirexDaflNdnj9OoZ6j2uTKZnA,388
@@ -102,8 +102,8 @@ spiral/streaming_/__init__.py,sha256=s7MlW2ERsuZmZGExLFL6RcZon2e0tNBocBg5ANgki7k
 spiral/streaming_/reader.py,sha256=tl_lC9xgh1-QFhsZn4xQT7It3PVTzHCEUT2BG2dWBRQ,4166
 spiral/streaming_/stream.py,sha256=DM1hBDHnWm1ZFKZ-hZ4zxeSXITcUI6kWzwdJZvywI8o,5915
 spiral/substrait_.py,sha256=AKeOD4KIXvz2J4TYxnIneOiHddtBIyOhuNxVO_uH0eg,12592
-spiral/table.py,sha256=prjDBcm6Qerdq3ypXzfbXb7ngAcO0j-Z9aTeZvzKoqs,12209
+spiral/table.py,sha256=ep8ZYtl6POebkPViR2FrekhFazNmAbOAESoLUODlup8,12242
 spiral/text_index.py,sha256=FQ9rgIEGLSJryS9lFdMhKtPFey18BXoWbPXyvZPJJ04,442
 spiral/transaction.py,sha256=KQhx3DvQyxG2C8md-YGsF_PgBRfayI0r_7ebMItDHdI,3938
 spiral/types_.py,sha256=W_jyO7F6rpPiH69jhgSgV7OxQZbOlb1Ho3InpKUP6Eo,155
-pyspiral-0.7.0.dist-info/RECORD,,
+pyspiral-0.7.1.dist-info/RECORD,,

spiral/client.py

@@ -116,6 +116,8 @@ class Spiral:
             asof = timestamp_micros(asof)
 
         # Combine all projections into a single struct.
+        if not projections:
+            raise ValueError("At least one projection is required.")
         projection = se.merge(*projections)
         if where is not None:
             where = se.lift(where)

spiral/enrichment.py

@@ -8,7 +8,7 @@ from spiral.core.table.spec import Operation
 from spiral.expressions import Expr
 
 if TYPE_CHECKING:
-    from spiral import KeySpaceIndex, Table
+    from spiral import KeySpaceIndex, Scan, Table
 
 logger = logging.getLogger(__name__)
 
@@ -47,16 +47,17 @@ class Enrichment:
         """The filter expression."""
         return self._where
 
+    def _scan(self) -> "Scan":
+        return self._table.spiral.scan(self._projection, where=self._where)
+
     def apply(self, *, batch_readahead: int | None = None, partition_size_bytes: int | None = None) -> None:
         """Apply the enrichment onto the table in a streaming fashion.
 
         For large tables, consider using `apply_dask` for distributed execution.
         """
-        scan = self._table.spiral.scan(self._projection, where=self._where)
-
         with self._table.txn() as txn:
             txn.writeback(
-                scan,
+                self._scan(),
                 partition_size_bytes=partition_size_bytes,
                 batch_readahead=batch_readahead,
             )
@@ -99,7 +100,7 @@ class Enrichment:
 
         # Start a transaction BEFORE the planning scan.
         tx = self._table.txn()
-        plan_scan = self._table.spiral.scan(self._projection, where=self._where)
+        plan_scan = self._scan()
 
         # Determine the "tasks". Use the index if provided.
         shards = plan_scan.shards()

spiral/table.py

@@ -134,9 +134,9 @@ class Table(Expr):
         """
         from spiral import expressions as se
 
-        # Combine table with all projections into a single struct.
-        # The table is included to ensure key columns are present in the scan output.
-        projection = se.merge(self, *projections)
+        # TODO(marko): This shouldn't need to happen. We should be able to read keys from writeback scan.
+        # Include key columns in the projection.
+        projection = se.merge(self.select(*self.key_schema.names), *projections)
         if where is not None:
             where = se.lift(where)