datachain 0.34.6__py3-none-any.whl → 0.35.0__py3-none-any.whl

datachain/data_storage/metastore.py

@@ -7,7 +7,7 @@ from collections.abc import Iterator
 from datetime import datetime, timezone
 from functools import cached_property, reduce
 from itertools import groupby
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 from sqlalchemy import (
@@ -83,7 +83,7 @@ class AbstractMetastore(ABC, Serializable):
 
     def __init__(
         self,
-        uri: Optional[StorageURI] = None,
+        uri: StorageURI | None = None,
     ):
         self.uri = uri or StorageURI("")
 
@@ -97,7 +97,7 @@ class AbstractMetastore(ABC, Serializable):
     @abstractmethod
     def clone(
         self,
-        uri: Optional[StorageURI] = None,
+        uri: StorageURI | None = None,
         use_new_connection: bool = False,
     ) -> "AbstractMetastore":
         """Clones AbstractMetastore implementation for some Storage input.
@@ -137,8 +137,8 @@ class AbstractMetastore(ABC, Serializable):
     def create_namespace(
         self,
         name: str,
-        description: Optional[str] = None,
-        uuid: Optional[str] = None,
+        description: str | None = None,
+        uuid: str | None = None,
         ignore_if_exists: bool = True,
         validate: bool = True,
         **kwargs,
@@ -185,8 +185,8 @@ class AbstractMetastore(ABC, Serializable):
         self,
         namespace_name: str,
         name: str,
-        description: Optional[str] = None,
-        uuid: Optional[str] = None,
+        description: str | None = None,
+        uuid: str | None = None,
         ignore_if_exists: bool = True,
         validate: bool = True,
         **kwargs,
@@ -219,7 +219,7 @@ class AbstractMetastore(ABC, Serializable):
         """Gets a single project by id"""
 
     @abstractmethod
-    def count_projects(self, namespace_id: Optional[int] = None) -> int:
+    def count_projects(self, namespace_id: int | None = None) -> int:
         """Counts projects in some namespace or in general."""
 
     @abstractmethod
@@ -227,7 +227,7 @@ class AbstractMetastore(ABC, Serializable):
         """Removes a single project by id"""
 
     @abstractmethod
-    def list_projects(self, namespace_id: Optional[int], conn=None) -> list[Project]:
+    def list_projects(self, namespace_id: int | None, conn=None) -> list[Project]:
         """Gets list of projects in some namespace or in general (in all namespaces)"""
 
     #
@@ -237,15 +237,15 @@ class AbstractMetastore(ABC, Serializable):
     def create_dataset(
         self,
         name: str,
-        project_id: Optional[int] = None,
+        project_id: int | None = None,
         status: int = DatasetStatus.CREATED,
-        sources: Optional[list[str]] = None,
-        feature_schema: Optional[dict] = None,
+        sources: list[str] | None = None,
+        feature_schema: dict | None = None,
         query_script: str = "",
-        schema: Optional[dict[str, Any]] = None,
+        schema: dict[str, Any] | None = None,
         ignore_if_exists: bool = False,
-        description: Optional[str] = None,
-        attrs: Optional[list[str]] = None,
+        description: str | None = None,
+        attrs: list[str] | None = None,
     ) -> DatasetRecord:
         """Creates new dataset."""
 
@@ -256,20 +256,20 @@ class AbstractMetastore(ABC, Serializable):
         version: str,
         status: int,
         sources: str = "",
-        feature_schema: Optional[dict] = None,
+        feature_schema: dict | None = None,
         query_script: str = "",
         error_message: str = "",
         error_stack: str = "",
         script_output: str = "",
-        created_at: Optional[datetime] = None,
-        finished_at: Optional[datetime] = None,
-        schema: Optional[dict[str, Any]] = None,
+        created_at: datetime | None = None,
+        finished_at: datetime | None = None,
+        schema: dict[str, Any] | None = None,
         ignore_if_exists: bool = False,
-        num_objects: Optional[int] = None,
-        size: Optional[int] = None,
-        preview: Optional[list[dict]] = None,
-        job_id: Optional[str] = None,
-        uuid: Optional[str] = None,
+        num_objects: int | None = None,
+        size: int | None = None,
+        preview: list[dict] | None = None,
+        job_id: str | None = None,
+        uuid: str | None = None,
     ) -> DatasetRecord:
         """Creates new dataset version."""
 
@@ -298,17 +298,17 @@ class AbstractMetastore(ABC, Serializable):
 
     @abstractmethod
     def list_datasets(
-        self, project_id: Optional[int] = None
+        self, project_id: int | None = None
     ) -> Iterator[DatasetListRecord]:
         """Lists all datasets in some project or in all projects."""
 
     @abstractmethod
-    def count_datasets(self, project_id: Optional[int] = None) -> int:
+    def count_datasets(self, project_id: int | None = None) -> int:
         """Counts datasets in some project or in all projects."""
 
     @abstractmethod
     def list_datasets_by_prefix(
-        self, prefix: str, project_id: Optional[int] = None
+        self, prefix: str, project_id: int | None = None
     ) -> Iterator["DatasetListRecord"]:
         """
         Lists all datasets which names start with prefix in some project or in all
@@ -319,8 +319,8 @@ class AbstractMetastore(ABC, Serializable):
     def get_dataset(
         self,
         name: str,  # normal, not full dataset name
-        namespace_name: Optional[str] = None,
-        project_name: Optional[str] = None,
+        namespace_name: str | None = None,
+        project_name: str | None = None,
         conn=None,
     ) -> DatasetRecord:
         """Gets a single dataset by name."""
@@ -330,7 +330,7 @@ class AbstractMetastore(ABC, Serializable):
         self,
         dataset: DatasetRecord,
         status: int,
-        version: Optional[str] = None,
+        version: str | None = None,
         error_message="",
         error_stack="",
         script_output="",
@@ -355,20 +355,20 @@ class AbstractMetastore(ABC, Serializable):
         self,
         source_dataset: DatasetRecord,
         source_dataset_version: str,
-        new_source_dataset: Optional[DatasetRecord] = None,
-        new_source_dataset_version: Optional[str] = None,
+        new_source_dataset: DatasetRecord | None = None,
+        new_source_dataset_version: str | None = None,
     ) -> None:
         """Updates dataset dependency source."""
 
     @abstractmethod
     def get_direct_dataset_dependencies(
         self, dataset: DatasetRecord, version: str
-    ) -> list[Optional[DatasetDependency]]:
+    ) -> list[DatasetDependency | None]:
         """Gets direct dataset dependencies."""
 
     @abstractmethod
     def remove_dataset_dependencies(
-        self, dataset: DatasetRecord, version: Optional[str] = None
+        self, dataset: DatasetRecord, version: str | None = None
     ) -> None:
         """
         When we remove dataset, we need to clean up it's dependencies as well.
@@ -376,7 +376,7 @@ class AbstractMetastore(ABC, Serializable):
 
     @abstractmethod
     def remove_dataset_dependants(
-        self, dataset: DatasetRecord, version: Optional[str] = None
+        self, dataset: DatasetRecord, version: str | None = None
     ) -> None:
         """
         When we remove dataset, we need to clear its references in other dataset
@@ -398,9 +398,9 @@ class AbstractMetastore(ABC, Serializable):
         query_type: JobQueryType = JobQueryType.PYTHON,
         status: JobStatus = JobStatus.CREATED,
         workers: int = 1,
-        python_version: Optional[str] = None,
-        params: Optional[dict[str, str]] = None,
-        parent_job_id: Optional[str] = None,
+        python_version: str | None = None,
+        params: dict[str, str] | None = None,
+        parent_job_id: str | None = None,
     ) -> str:
         """
         Creates a new job.
@@ -408,19 +408,19 @@ class AbstractMetastore(ABC, Serializable):
         """
 
     @abstractmethod
-    def get_job(self, job_id: str) -> Optional[Job]:
+    def get_job(self, job_id: str) -> Job | None:
         """Returns the job with the given ID."""
 
     @abstractmethod
     def update_job(
         self,
         job_id: str,
-        status: Optional[JobStatus] = None,
-        error_message: Optional[str] = None,
-        error_stack: Optional[str] = None,
-        finished_at: Optional[datetime] = None,
-        metrics: Optional[dict[str, Any]] = None,
-    ) -> Optional["Job"]:
+        status: JobStatus | None = None,
+        error_message: str | None = None,
+        error_stack: str | None = None,
+        finished_at: datetime | None = None,
+        metrics: dict[str, Any] | None = None,
+    ) -> Job | None:
         """Updates job fields."""
 
     @abstractmethod
@@ -428,13 +428,13 @@ class AbstractMetastore(ABC, Serializable):
         self,
         job_id: str,
         status: JobStatus,
-        error_message: Optional[str] = None,
-        error_stack: Optional[str] = None,
+        error_message: str | None = None,
+        error_stack: str | None = None,
     ) -> None:
         """Set the status of the given job."""
 
     @abstractmethod
-    def get_job_status(self, job_id: str) -> Optional[JobStatus]:
+    def get_job_status(self, job_id: str) -> JobStatus | None:
         """Returns the status of the given job."""
 
     #
@@ -442,11 +442,11 @@ class AbstractMetastore(ABC, Serializable):
     #
 
     @abstractmethod
-    def list_checkpoints(self, job_id: str, conn=None) -> Iterator["Checkpoint"]:
+    def list_checkpoints(self, job_id: str, conn=None) -> Iterator[Checkpoint]:
         """Returns all checkpoints related to some job"""
 
     @abstractmethod
-    def get_last_checkpoint(self, job_id: str, conn=None) -> Optional[Checkpoint]:
+    def get_last_checkpoint(self, job_id: str, conn=None) -> Checkpoint | None:
         """Get last created checkpoint for some job."""
 
     @abstractmethod
@@ -455,7 +455,7 @@ class AbstractMetastore(ABC, Serializable):
 
     def find_checkpoint(
         self, job_id: str, _hash: str, partial: bool = False, conn=None
-    ) -> Optional[Checkpoint]:
+    ) -> Checkpoint | None:
         """
         Tries to find checkpoint for a job with specific hash and optionally partial
         """
@@ -466,7 +466,7 @@ class AbstractMetastore(ABC, Serializable):
         job_id: str,
         _hash: str,
         partial: bool = False,
-        conn: Optional[Any] = None,
+        conn: Any | None = None,
     ) -> Checkpoint:
         """Creates new checkpoint"""
 
@@ -489,7 +489,7 @@ class AbstractDBMetastore(AbstractMetastore):
 
     db: "DatabaseEngine"
 
-    def __init__(self, uri: Optional[StorageURI] = None):
+    def __init__(self, uri: StorageURI | None = None):
         uri = uri or StorageURI("")
         super().__init__(uri)
 
@@ -781,8 +781,8 @@ class AbstractDBMetastore(AbstractMetastore):
     def create_namespace(
         self,
         name: str,
-        description: Optional[str] = None,
-        uuid: Optional[str] = None,
+        description: str | None = None,
+        uuid: str | None = None,
         ignore_if_exists: bool = True,
         validate: bool = True,
         **kwargs,
@@ -846,8 +846,8 @@ class AbstractDBMetastore(AbstractMetastore):
         self,
         namespace_name: str,
         name: str,
-        description: Optional[str] = None,
-        uuid: Optional[str] = None,
+        description: str | None = None,
+        uuid: str | None = None,
         ignore_if_exists: bool = True,
         validate: bool = True,
         **kwargs,
@@ -925,7 +925,7 @@ class AbstractDBMetastore(AbstractMetastore):
             raise ProjectNotFoundError(f"Project with id {project_id} not found.")
         return self.project_class.parse(*rows[0])
 
-    def count_projects(self, namespace_id: Optional[int] = None) -> int:
+    def count_projects(self, namespace_id: int | None = None) -> int:
         p = self._projects
 
         query = self._projects_base_query()
@@ -949,7 +949,7 @@ class AbstractDBMetastore(AbstractMetastore):
             self.db.execute(self._projects_delete().where(p.c.id == project_id))
 
     def list_projects(
-        self, namespace_id: Optional[int] = None, conn=None
+        self, namespace_id: int | None = None, conn=None
     ) -> list[Project]:
         """
         Gets a list of projects inside some namespace, or in all namespaces
@@ -972,15 +972,15 @@ class AbstractDBMetastore(AbstractMetastore):
     def create_dataset(
         self,
         name: str,
-        project_id: Optional[int] = None,
+        project_id: int | None = None,
         status: int = DatasetStatus.CREATED,
-        sources: Optional[list[str]] = None,
-        feature_schema: Optional[dict] = None,
+        sources: list[str] | None = None,
+        feature_schema: dict | None = None,
         query_script: str = "",
-        schema: Optional[dict[str, Any]] = None,
+        schema: dict[str, Any] | None = None,
         ignore_if_exists: bool = False,
-        description: Optional[str] = None,
-        attrs: Optional[list[str]] = None,
+        description: str | None = None,
+        attrs: list[str] | None = None,
         **kwargs,  # TODO registered = True / False
     ) -> DatasetRecord:
         """Creates new dataset."""
@@ -1020,20 +1020,20 @@ class AbstractDBMetastore(AbstractMetastore):
         version: str,
         status: int,
         sources: str = "",
-        feature_schema: Optional[dict] = None,
+        feature_schema: dict | None = None,
         query_script: str = "",
         error_message: str = "",
         error_stack: str = "",
         script_output: str = "",
-        created_at: Optional[datetime] = None,
-        finished_at: Optional[datetime] = None,
-        schema: Optional[dict[str, Any]] = None,
+        created_at: datetime | None = None,
+        finished_at: datetime | None = None,
+        schema: dict[str, Any] | None = None,
         ignore_if_exists: bool = False,
-        num_objects: Optional[int] = None,
-        size: Optional[int] = None,
-        preview: Optional[list[dict]] = None,
-        job_id: Optional[str] = None,
-        uuid: Optional[str] = None,
+        num_objects: int | None = None,
+        size: int | None = None,
+        preview: list[dict] | None = None,
+        job_id: str | None = None,
+        uuid: str | None = None,
         conn=None,
     ) -> DatasetRecord:
         """Creates new dataset version."""
@@ -1205,13 +1205,13 @@ class AbstractDBMetastore(AbstractMetastore):
             f"Dataset {dataset.name} does not have version {version}"
         )
 
-    def _parse_dataset(self, rows) -> Optional[DatasetRecord]:
+    def _parse_dataset(self, rows) -> DatasetRecord | None:
         versions = [self.dataset_class.parse(*r) for r in rows]
         if not versions:
             return None
         return reduce(lambda ds, version: ds.merge_versions(version), versions)
 
-    def _parse_list_dataset(self, rows) -> Optional[DatasetListRecord]:
+    def _parse_list_dataset(self, rows) -> DatasetListRecord | None:
         versions = [self.dataset_list_class.parse(*r) for r in rows]
         if not versions:
             return None
@@ -1274,7 +1274,7 @@ class AbstractDBMetastore(AbstractMetastore):
         )
 
     def list_datasets(
-        self, project_id: Optional[int] = None
+        self, project_id: int | None = None
     ) -> Iterator["DatasetListRecord"]:
         d = self._datasets
         query = self._base_list_datasets_query().order_by(
@@ -1284,7 +1284,7 @@ class AbstractDBMetastore(AbstractMetastore):
             query = query.where(d.c.project_id == project_id)
         yield from self._parse_dataset_list(self.db.execute(query))
 
-    def count_datasets(self, project_id: Optional[int] = None) -> int:
+    def count_datasets(self, project_id: int | None = None) -> int:
         d = self._datasets
         query = self._datasets_select()
         if project_id:
@@ -1295,7 +1295,7 @@ class AbstractDBMetastore(AbstractMetastore):
         return next(self.db.execute(query))[0]
 
     def list_datasets_by_prefix(
-        self, prefix: str, project_id: Optional[int] = None, conn=None
+        self, prefix: str, project_id: int | None = None, conn=None
     ) -> Iterator["DatasetListRecord"]:
         d = self._datasets
         query = self._base_list_datasets_query()
@@ -1307,8 +1307,8 @@ class AbstractDBMetastore(AbstractMetastore):
     def get_dataset(
         self,
         name: str,  # normal, not full dataset name
-        namespace_name: Optional[str] = None,
-        project_name: Optional[str] = None,
+        namespace_name: str | None = None,
+        project_name: str | None = None,
         conn=None,
     ) -> DatasetRecord:
         """
@@ -1369,7 +1369,7 @@ class AbstractDBMetastore(AbstractMetastore):
         self,
         dataset: DatasetRecord,
         status: int,
-        version: Optional[str] = None,
+        version: str | None = None,
         error_message="",
         error_stack="",
         script_output="",
@@ -1423,8 +1423,8 @@ class AbstractDBMetastore(AbstractMetastore):
         self,
         source_dataset: DatasetRecord,
         source_dataset_version: str,
-        new_source_dataset: Optional[DatasetRecord] = None,
-        new_source_dataset_version: Optional[str] = None,
+        new_source_dataset: DatasetRecord | None = None,
+        new_source_dataset_version: str | None = None,
     ) -> None:
         dd = self._datasets_dependencies
 
@@ -1456,7 +1456,7 @@ class AbstractDBMetastore(AbstractMetastore):
 
     def get_direct_dataset_dependencies(
         self, dataset: DatasetRecord, version: str
-    ) -> list[Optional[DatasetDependency]]:
+    ) -> list[DatasetDependency | None]:
         n = self._namespaces
         p = self._projects
         d = self._datasets
@@ -1484,7 +1484,7 @@ class AbstractDBMetastore(AbstractMetastore):
         return [self.dependency_class.parse(*r) for r in self.db.execute(query)]
 
     def remove_dataset_dependencies(
-        self, dataset: DatasetRecord, version: Optional[str] = None
+        self, dataset: DatasetRecord, version: str | None = None
     ) -> None:
         """
         When we remove dataset, we need to clean up it's dependencies as well
@@ -1503,7 +1503,7 @@ class AbstractDBMetastore(AbstractMetastore):
         self.db.execute(q)
 
     def remove_dataset_dependants(
-        self, dataset: DatasetRecord, version: Optional[str] = None
+        self, dataset: DatasetRecord, version: str | None = None
     ) -> None:
         """
         When we remove dataset, we need to clear its references in other dataset
@@ -1600,10 +1600,10 @@ class AbstractDBMetastore(AbstractMetastore):
         query_type: JobQueryType = JobQueryType.PYTHON,
         status: JobStatus = JobStatus.CREATED,
         workers: int = 1,
-        python_version: Optional[str] = None,
-        params: Optional[dict[str, str]] = None,
-        parent_job_id: Optional[str] = None,
-        conn: Optional[Any] = None,
+        python_version: str | None = None,
+        params: dict[str, str] | None = None,
+        parent_job_id: str | None = None,
+        conn: Any = None,
     ) -> str:
         """
         Creates a new job.
@@ -1630,7 +1630,7 @@ class AbstractDBMetastore(AbstractMetastore):
         )
         return job_id
 
-    def get_job(self, job_id: str, conn=None) -> Optional[Job]:
+    def get_job(self, job_id: str, conn=None) -> Job | None:
         """Returns the job with the given ID."""
         query = self._jobs_select(self._jobs).where(self._jobs.c.id == job_id)
         results = list(self.db.execute(query, conn=conn))
@@ -1641,13 +1641,13 @@ class AbstractDBMetastore(AbstractMetastore):
     def update_job(
         self,
         job_id: str,
-        status: Optional[JobStatus] = None,
-        error_message: Optional[str] = None,
-        error_stack: Optional[str] = None,
-        finished_at: Optional[datetime] = None,
-        metrics: Optional[dict[str, Any]] = None,
-        conn: Optional[Any] = None,
-    ) -> Optional["Job"]:
+        status: JobStatus | None = None,
+        error_message: str | None = None,
+        error_stack: str | None = None,
+        finished_at: datetime | None = None,
+        metrics: dict[str, Any] | None = None,
+        conn: Any | None = None,
+    ) -> Job | None:
         """Updates job fields."""
         values: dict = {}
         if status is not None:
@@ -1674,9 +1674,9 @@ class AbstractDBMetastore(AbstractMetastore):
         self,
         job_id: str,
         status: JobStatus,
-        error_message: Optional[str] = None,
-        error_stack: Optional[str] = None,
-        conn: Optional[Any] = None,
+        error_message: str | None = None,
+        error_stack: str | None = None,
+        conn: Any | None = None,
     ) -> None:
         """Set the status of the given job."""
         values: dict = {"status": status}
@@ -1694,8 +1694,8 @@ class AbstractDBMetastore(AbstractMetastore):
     def get_job_status(
         self,
         job_id: str,
-        conn: Optional[Any] = None,
-    ) -> Optional[JobStatus]:
+        conn: Any | None = None,
+    ) -> JobStatus | None:
         """Returns the status of the given job."""
         results = list(
             self.db.execute(
@@ -1761,7 +1761,7 @@ class AbstractDBMetastore(AbstractMetastore):
         job_id: str,
         _hash: str,
         partial: bool = False,
-        conn: Optional[Any] = None,
+        conn: Any | None = None,
     ) -> Checkpoint:
         """
         Creates a new job query step.
@@ -1797,7 +1797,7 @@ class AbstractDBMetastore(AbstractMetastore):
 
     def find_checkpoint(
         self, job_id: str, _hash: str, partial: bool = False, conn=None
-    ) -> Optional[Checkpoint]:
+    ) -> Checkpoint | None:
         """
         Tries to find checkpoint for a job with specific hash and optionally partial
         """
@@ -1810,7 +1810,7 @@ class AbstractDBMetastore(AbstractMetastore):
             return None
         return self.checkpoint_class.parse(*rows[0])
 
-    def get_last_checkpoint(self, job_id: str, conn=None) -> Optional[Checkpoint]:
+    def get_last_checkpoint(self, job_id: str, conn=None) -> Checkpoint | None:
         query = (
             self._checkpoints_query()
             .where(self._checkpoints.c.job_id == job_id)

datachain/data_storage/schema.py

@@ -1,12 +1,6 @@
 import inspect
 from collections.abc import Iterable, Iterator, Sequence
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Generic,
-    Optional,
-    TypeVar,
-)
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
 
 import sqlalchemy as sa
 from sqlalchemy.sql import func as f
@@ -96,11 +90,11 @@ class DirExpansion:
     def __init__(self, column: str):
         self.column = column
 
-    def col_name(self, name: str, column: Optional[str] = None) -> str:
+    def col_name(self, name: str, column: str | None = None) -> str:
         column = column or self.column
         return col_name(name, column)
 
-    def c(self, query, name: str, column: Optional[str] = None) -> str:
+    def c(self, query, name: str, column: str | None = None) -> str:
         return getattr(query.c, self.col_name(name, column=column))
 
     def base_select(self, q):
@@ -161,7 +155,7 @@ class DataTable:
         self,
         name: str,
         engine: "DatabaseEngine",
-        column_types: Optional[dict[str, SQLType]] = None,
+        column_types: dict[str, SQLType] | None = None,
         column: str = "file",
     ):
         self.name: str = name
@@ -172,12 +166,12 @@ class DataTable:
     @staticmethod
     def copy_column(
         column: sa.Column,
-        primary_key: Optional[bool] = None,
-        index: Optional[bool] = None,
-        nullable: Optional[bool] = None,
-        default: Optional[Any] = None,
-        server_default: Optional[Any] = None,
-        unique: Optional[bool] = None,
+        primary_key: bool | None = None,
+        index: bool | None = None,
+        nullable: bool | None = None,
+        default: Any | None = None,
+        server_default: Any | None = None,
+        unique: bool | None = None,
     ) -> sa.Column:
         """
         Copy a sqlalchemy Column object intended for use as a signal column.
@@ -206,8 +200,8 @@ class DataTable:
     def new_table(
         cls,
         name: str,
-        columns: Sequence["sa.Column"] = (),
-        metadata: Optional["sa.MetaData"] = None,
+        columns: Sequence[sa.Column] = (),
+        metadata: sa.MetaData | None = None,
     ):
         # copy columns, since reusing the same objects from another table
         # may raise an error
@@ -218,7 +212,7 @@ class DataTable:
             metadata = sa.MetaData()
         return sa.Table(name, metadata, *columns)
 
-    def get_table(self) -> "sa.Table":
+    def get_table(self) -> sa.Table:
         table = self.engine.get_table(self.name)
 
         column_types = self.column_types | {c.name: c.type for c in self.sys_columns()}
@@ -233,19 +227,19 @@ class DataTable:
     def columns(self) -> "ReadOnlyColumnCollection[str, sa.Column[Any]]":
         return self.table.columns
 
-    def col_name(self, name: str, column: Optional[str] = None) -> str:
+    def col_name(self, name: str, column: str | None = None) -> str:
         column = column or self.column
         return col_name(name, column)
 
-    def without_object(self, column_name: str, column: Optional[str] = None) -> str:
+    def without_object(self, column_name: str, column: str | None = None) -> str:
         column = column or self.column
         return column_name.removeprefix(f"{column}{DEFAULT_DELIMITER}")
 
-    def c(self, name: str, column: Optional[str] = None):
+    def c(self, name: str, column: str | None = None):
         return getattr(self.columns, self.col_name(name, column=column))
 
     @property
-    def table(self) -> "sa.Table":
+    def table(self) -> sa.Table:
         return self.get_table()
 
     def apply_conditions(self, query: "Executable") -> "Executable":
@@ -303,7 +297,7 @@ PARTITION_COLUMN_ID = "partition_id"
 partition_col_names = [PARTITION_COLUMN_ID]
 
 
-def partition_columns() -> Sequence["sa.Column"]:
+def partition_columns() -> Sequence[sa.Column]:
     return [
         sa.Column(PARTITION_COLUMN_ID, sa.Integer),
     ]