pixeltable 0.3.15__py3-none-any.whl → 0.4.0rc2__py3-none-any.whl

pixeltable/catalog/column.py

@@ -15,7 +15,6 @@ from .globals import MediaValidation, is_valid_identifier
 
 if TYPE_CHECKING:
     from .table_version import TableVersion
-    from .table_version_handle import TableVersionHandle
     from .table_version_path import TableVersionPath
 
 _logger = logging.getLogger('pixeltable')
@@ -44,7 +43,10 @@ class Column:
     _value_expr: Optional[exprs.Expr]
     value_expr_dict: Optional[dict[str, Any]]
     dependent_cols: set[Column]
-    tbl: Optional[TableVersionHandle]
+    # we store a TableVersion here, not a TableVersionHandle, because this column is owned by that TableVersion instance
+    # (re-resolving it later to a different instance doesn't make sense)
+    tbl: Optional[TableVersion]
+    # tbl: Optional[TableVersionHandle]
 
     def __init__(
         self,
@@ -138,7 +140,7 @@ class Column:
                 message = (
                     dedent(
                         f"""
-                        The computed column {self.name!r} in table {self.tbl.get().name!r} is no longer valid.
+                        The computed column {self.name!r} in table {self.tbl.name!r} is no longer valid.
                         {{validation_error}}
                         You can continue to query existing data from this column, but evaluating it on new data will raise an error.
                         """  # noqa: E501
@@ -175,8 +177,8 @@ class Column:
     #     multiple dependents)
     def get_idx_info(self, reference_tbl: Optional['TableVersionPath'] = None) -> dict[str, 'TableVersion.IndexInfo']:
         assert self.tbl is not None
-        tbl = reference_tbl.tbl_version if reference_tbl is not None else self.tbl
-        return {name: info for name, info in tbl.get().idxs_by_name.items() if info.col == self}
+        tbl = reference_tbl.tbl_version.get() if reference_tbl is not None else self.tbl
+        return {name: info for name, info in tbl.idxs_by_name.items() if info.col == self}
 
     @property
     def is_computed(self) -> bool:
@@ -199,14 +201,14 @@ class Column:
     @property
     def qualified_name(self) -> str:
         assert self.tbl is not None
-        return f'{self.tbl.get().name}.{self.name}'
+        return f'{self.tbl.name}.{self.name}'
 
     @property
     def media_validation(self) -> MediaValidation:
         if self._media_validation is not None:
             return self._media_validation
         assert self.tbl is not None
-        return self.tbl.get().media_validation
+        return self.tbl.media_validation
 
     @property
     def is_required_for_insert(self) -> bool:
@@ -256,7 +258,7 @@ class Column:
         return f'{self.name}: {self.col_type}'
 
     def __repr__(self) -> str:
-        return f'Column({self.id!r}, {self.name!r}, tbl={self.tbl.get().name!r})'
+        return f'Column({self.id!r}, {self.name!r}, tbl={self.tbl.name!r})'
 
     def __hash__(self) -> int:
         # TODO(aaron-siegel): This and __eq__ do not capture the table version. We need to rethink the Column

pixeltable/catalog/dir.py

@@ -38,13 +38,12 @@ class Dir(SchemaObject):
     def _display_name(cls) -> str:
         return 'directory'
 
-    @property
     def _path(self) -> str:
         """Returns the path to this schema object."""
         if self._dir_id is None:
             # we're the root dir
             return ''
-        return super()._path
+        return super()._path()
 
     def _move(self, new_name: str, new_dir_id: UUID) -> None:
         # print(

pixeltable/catalog/insertable_table.py

@@ -138,37 +138,40 @@ class InsertableTable(Table):
         print_stats: bool = False,
         **kwargs: Any,
     ) -> UpdateStatus:
+        from pixeltable.catalog import Catalog
         from pixeltable.io.table_data_conduit import UnkTableDataConduit
 
-        table = self
-        if source is None:
-            source = [kwargs]
-            kwargs = None
+        with Catalog.get().begin_xact(tbl_id=self._id, for_write=True):
+            table = self
+            if source is None:
+                source = [kwargs]
+                kwargs = None
 
-        tds = UnkTableDataConduit(
-            source, source_format=source_format, src_schema_overrides=schema_overrides, extra_fields=kwargs
-        )
-        data_source = tds.specialize()
-        if data_source.source_column_map is None:
-            data_source.src_pk = []
+            tds = UnkTableDataConduit(
+                source, source_format=source_format, src_schema_overrides=schema_overrides, extra_fields=kwargs
+            )
+            data_source = tds.specialize()
+            if data_source.source_column_map is None:
+                data_source.src_pk = []
 
-        assert isinstance(table, Table)
-        data_source.add_table_info(table)
-        data_source.prepare_for_insert_into_table()
+            assert isinstance(table, Table)
+            data_source.add_table_info(table)
+            data_source.prepare_for_insert_into_table()
 
-        fail_on_exception = OnErrorParameter.fail_on_exception(on_error)
-        return table.insert_table_data_source(
-            data_source=data_source, fail_on_exception=fail_on_exception, print_stats=print_stats
-        )
+            fail_on_exception = OnErrorParameter.fail_on_exception(on_error)
+            return table.insert_table_data_source(
+                data_source=data_source, fail_on_exception=fail_on_exception, print_stats=print_stats
+            )
 
     def insert_table_data_source(
         self, data_source: TableDataConduit, fail_on_exception: bool, print_stats: bool = False
     ) -> pxt.UpdateStatus:
         """Insert row batches into this table from a `TableDataConduit`."""
+        from pixeltable.catalog import Catalog
         from pixeltable.io.table_data_conduit import DFTableDataConduit
 
         status = pxt.UpdateStatus()
-        with Env.get().begin_xact():
+        with Catalog.get().begin_xact(tbl_id=self._id, for_write=True):
             if isinstance(data_source, DFTableDataConduit):
                 status += self._tbl_version.get().insert(
                     rows=None, df=data_source.pxt_df, print_stats=print_stats, fail_on_exception=fail_on_exception
@@ -226,7 +229,9 @@ class InsertableTable(Table):
 
             >>> tbl.delete(tbl.a > 5)
         """
-        with Env.get().begin_xact():
+        from pixeltable.catalog import Catalog
+
+        with Catalog.get().begin_xact(tbl_id=self._id, for_write=True):
             return self._tbl_version.get().delete(where=where)
 
     @property
@@ -238,4 +243,4 @@ class InsertableTable(Table):
         return []
 
     def _table_descriptor(self) -> str:
-        return f'Table {self._path!r}'
+        return f'Table {self._path()!r}'

pixeltable/catalog/schema_object.py

@@ -2,8 +2,6 @@ from abc import abstractmethod
 from typing import TYPE_CHECKING, Any, Optional
 from uuid import UUID
 
-from pixeltable.env import Env
-
 if TYPE_CHECKING:
     from pixeltable import catalog
 
@@ -28,24 +26,23 @@ class SchemaObject:
         """Returns the parent directory of this schema object."""
         from .catalog import Catalog
 
-        with Env.get().begin_xact():
+        with Catalog.get().begin_xact(for_write=False):
             if self._dir_id is None:
                 return None
             return Catalog.get().get_dir(self._dir_id)
 
-    @property
     def _path(self) -> str:
         """Returns the path to this schema object."""
         from .catalog import Catalog
 
         assert self._dir_id is not None
-        with Env.get().begin_xact():
+        with Catalog.get().begin_xact(for_write=False):
             path = Catalog.get().get_dir_path(self._dir_id)
             return str(path.append(self._name))
 
     def get_metadata(self) -> dict[str, Any]:
         """Returns metadata associated with this schema object."""
-        return {'name': self._name, 'path': self._path}
+        return {'name': self._name, 'path': self._path()}
 
     @classmethod
     @abstractmethod