make lint passing

Author: rambleraptor

pyiceberg/catalog/__init__.py

@@ -688,10 +688,10 @@ def drop_view(self, identifier: str | Identifier) -> None:
     @abstractmethod
     def create_view(
         self,
-        identifier: Union[str, Identifier],
-        schema: Union[Schema, "pa.Schema"],
+        identifier: str | Identifier,
+        schema: Schema | pa.Schema,
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         """Create a view.

pyiceberg/catalog/bigquery_metastore.py

@@ -14,8 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from __future__ import annotations
+
 import json
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any
 
 from google.api_core.exceptions import NotFound
 from google.cloud.bigquery import Client, Dataset, DatasetReference, TableReference
@@ -39,6 +41,8 @@
 from pyiceberg.table.update import TableRequirement, TableUpdate
 from pyiceberg.typedef import EMPTY_DICT, Identifier, Properties
 from pyiceberg.utils.config import Config
+from pyiceberg.view import View
+from pyiceberg.view.metadata import ViewVersion
 
 if TYPE_CHECKING:
     import pyarrow as pa
@@ -101,7 +105,7 @@ def __init__(self, name: str, **properties: str):
     def create_table(
         self,
         identifier: str | Identifier,
-        schema: Union[Schema, "pa.Schema"],
+        schema: Schema | pa.Schema,
         location: str | None = None,
         partition_spec: PartitionSpec = UNPARTITIONED_PARTITION_SPEC,
         sort_order: SortOrder = UNSORTED_SORT_ORDER,
@@ -272,7 +276,7 @@ def register_table(self, identifier: str | Identifier, metadata_location: str) -
         """Register a new table using existing metadata.
 
         Args:
-            identifier (Union[str, Identifier]): Table identifier for the table
+            identifier (str | Identifier): Table identifier for the table
             metadata_location (str): The location to the metadata
 
         Returns:
@@ -299,6 +303,16 @@ def register_table(self, identifier: str | Identifier, metadata_location: str) -
 
         return self.load_table(identifier=identifier)
 
+    def create_view(
+        self,
+        identifier: str | Identifier,
+        schema: Schema | pa.Schema,
+        view_version: ViewVersion,
+        location: str | None = None,
+        properties: Properties = EMPTY_DICT,
+    ) -> View:
+        raise NotImplementedError
+
     def list_views(self, namespace: str | Identifier) -> list[Identifier]:
         raise NotImplementedError
 

pyiceberg/catalog/dynamodb.py

@@ -541,10 +541,10 @@ def update_namespace_properties(
 
     def create_view(
         self,
-        identifier: Union[str, Identifier],
+        identifier: str | Identifier,
         schema: Union[Schema, "pa.Schema"],
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         raise NotImplementedError

pyiceberg/catalog/glue.py

@@ -813,10 +813,10 @@ def update_namespace_properties(
 
     def create_view(
         self,
-        identifier: Union[str, Identifier],
+        identifier: str | Identifier,
         schema: Union[Schema, "pa.Schema"],
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         raise NotImplementedError

pyiceberg/catalog/hive.py

@@ -438,10 +438,10 @@ def create_table(
 
     def create_view(
         self,
-        identifier: Union[str, Identifier],
-        schema: Union[Schema, "pa.Schema"],
+        identifier: str | Identifier,
+        schema: Schema | pa.Schema,
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         raise NotImplementedError

pyiceberg/catalog/noop.py

@@ -135,13 +135,10 @@ def drop_view(self, identifier: str | Identifier) -> None:
 
     def create_view(
         self,
-        identifier: Union[str, Identifier],
-        schema: Union[Schema, "pa.Schema"],
+        identifier: str | Identifier,
+        schema: Schema | pa.Schema,
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         raise NotImplementedError
-
-    def drop_view(self, identifier: str | Identifier) -> None:
-        raise NotImplementedError

pyiceberg/catalog/rest/__init__.py

@@ -14,12 +14,13 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
+from __future__ import annotations
+
 from collections import deque
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Any,
-    Union,
 )
 from urllib.parse import quote, unquote
 
@@ -117,7 +118,7 @@ def __str__(self) -> str:
         return f"{self.http_method.value} {self.path}"
 
     @classmethod
-    def from_string(cls, endpoint: str) -> "Endpoint":
+    def from_string(cls, endpoint: str) -> Endpoint:
         elements = endpoint.strip().split(None, 1)
         if len(elements) != 2:
             raise ValueError(f"Invalid endpoint (must consist of two elements separated by a single space): {endpoint}")
@@ -268,7 +269,7 @@ class TableResponse(IcebergBaseModel):
 
 
 class ViewResponse(IcebergBaseModel):
-    metadata_location: Optional[str] = Field(alias="metadata-location", default=None)
+    metadata_location: str | None = Field(alias="metadata-location", default=None)
     metadata: ViewMetadata
     config: Properties = Field(default_factory=dict)
 
@@ -290,13 +291,13 @@ def transform_properties_dict_value_to_str(cls, properties: Properties) -> dict[
 
 class CreateViewRequest(IcebergBaseModel):
     name: str = Field()
-    location: Optional[str] = Field()
+    location: str | None = Field()
     view_schema: Schema = Field(alias="schema")
     view_version: ViewVersion = Field(alias="view-version")
     properties: Properties = Field(default_factory=dict)
 
     @field_validator("properties", mode="before")
-    def transform_properties_dict_value_to_str(cls, properties: Properties) -> Dict[str, str]:
+    def transform_properties_dict_value_to_str(cls, properties: Properties) -> dict[str, str]:
         return transform_dict_value_to_str(properties)
 
 
@@ -778,7 +779,7 @@ def _response_to_staged_table(self, identifier_tuple: tuple[str, ...], table_res
             catalog=self,
         )
 
-    def _response_to_view(self, identifier_tuple: Tuple[str, ...], view_response: ViewResponse) -> View:
+    def _response_to_view(self, identifier_tuple: tuple[str, ...], view_response: ViewResponse) -> View:
         return View(
             identifier=identifier_tuple,
             metadata=view_response.metadata,
@@ -803,7 +804,7 @@ def _config_headers(self, session: Session) -> None:
     def _create_table(
         self,
         identifier: str | Identifier,
-        schema: Union[Schema, "pa.Schema"],
+        schema: Schema | pa.Schema,
         location: str | None = None,
         partition_spec: PartitionSpec = UNPARTITIONED_PARTITION_SPEC,
         sort_order: SortOrder = UNSORTED_SORT_ORDER,
@@ -846,7 +847,7 @@ def _create_table(
     def create_table(
         self,
         identifier: str | Identifier,
-        schema: Union[Schema, "pa.Schema"],
+        schema: Schema | pa.Schema,
         location: str | None = None,
         partition_spec: PartitionSpec = UNPARTITIONED_PARTITION_SPEC,
         sort_order: SortOrder = UNSORTED_SORT_ORDER,
@@ -867,7 +868,7 @@ def create_table(
     def create_table_transaction(
         self,
         identifier: str | Identifier,
-        schema: Union[Schema, "pa.Schema"],
+        schema: Schema | pa.Schema,
         location: str | None = None,
         partition_spec: PartitionSpec = UNPARTITIONED_PARTITION_SPEC,
         sort_order: SortOrder = UNSORTED_SORT_ORDER,
@@ -888,10 +889,10 @@ def create_table_transaction(
     @retry(**_RETRY_ARGS)
     def create_view(
         self,
-        identifier: Union[str, Identifier],
-        schema: Union[Schema, "pa.Schema"],
+        identifier: str | Identifier,
+        schema: Schema | pa.Schema,
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         iceberg_schema = self._convert_schema_if_needed(schema)

pyiceberg/catalog/sql.py

@@ -15,9 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+from __future__ import annotations
+
 from typing import (
     TYPE_CHECKING,
-    Union,
 )
 
 from sqlalchemy import (
@@ -174,7 +175,7 @@ def _convert_orm_to_iceberg(self, orm_table: IcebergTables) -> Table:
     def create_table(
         self,
         identifier: str | Identifier,
-        schema: Union[Schema, "pa.Schema"],
+        schema: Schema | pa.Schema,
         location: str | None = None,
         partition_spec: PartitionSpec = UNPARTITIONED_PARTITION_SPEC,
         sort_order: SortOrder = UNSORTED_SORT_ORDER,
@@ -726,10 +727,10 @@ def update_namespace_properties(
 
     def create_view(
         self,
-        identifier: Union[str, Identifier],
-        schema: Union[Schema, "pa.Schema"],
+        identifier: str | Identifier,
+        schema: Schema | pa.Schema,
         view_version: ViewVersion,
-        location: Optional[str] = None,
+        location: str | None = None,
         properties: Properties = EMPTY_DICT,
     ) -> View:
         raise NotImplementedError

pyiceberg/view/metadata.py

@@ -16,7 +16,7 @@
 # under the License.
 from __future__ import annotations
 
-from typing import Dict, List, Literal, Optional
+from typing import Literal
 
 from pydantic import Field, RootModel, field_validator
 
@@ -50,11 +50,11 @@ class ViewVersion(IcebergBaseModel):
     """ID of the schema for the view version"""
     timestamp_ms: int = Field(alias="timestamp-ms")
     """Timestamp when the version was created (ms from epoch)"""
-    summary: Dict[str, str] = Field()
+    summary: dict[str, str] = Field()
     """A string to string map of summary metadata about the version"""
-    representations: List[ViewRepresentation] = Field()
+    representations: list[ViewRepresentation] = Field()
     """A list of representations for the view definition"""
-    default_catalog: Optional[str] = Field(alias="default-catalog", default=None)
+    default_catalog: str | None = Field(alias="default-catalog", default=None)
     """Catalog name to use when a reference in the SELECT does not contain a catalog"""
     default_namespace: Identifier = Field(alias="default-namespace")
     """Namespace to use when a reference in the SELECT is a single identifier"""
@@ -78,17 +78,17 @@ class ViewMetadata(IcebergBaseModel):
     """An integer version number for the view format; must be 1"""
     location: str = Field()
     """The view's base location; used to create metadata file locations"""
-    schemas: List[Schema] = Field()
+    schemas: list[Schema] = Field()
     """A list of known schemas"""
     current_version_id: int = Field(alias="current-version-id")
     """ID of the current version of the view (version-id)"""
-    versions: List[ViewVersion] = Field()
+    versions: list[ViewVersion] = Field()
     """A list of known versions of the view"""
-    version_log: List[ViewHistoryEntry] = Field(alias="version-log")
+    version_log: list[ViewHistoryEntry] = Field(alias="version-log")
     """A list of version log entries"""
     properties: Properties = Field(default_factory=dict)
     """A string to string map of view properties"""
 
     @field_validator("properties", mode="before")
-    def transform_properties_dict_value_to_str(cls, properties: Properties) -> Dict[str, str]:
+    def transform_properties_dict_value_to_str(cls, properties: Properties) -> dict[str, str]:
         return transform_dict_value_to_str(properties)

tests/catalog/test_rest.py

@@ -15,6 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 # pylint: disable=redefined-outer-name,unused-argument
+from __future__ import annotations
+
 import base64
 import os
 from collections.abc import Callable
@@ -142,7 +144,7 @@ def example_table_metadata_no_snapshot_v1_rest_json(example_table_metadata_no_sn
 
 
 @pytest.fixture
-def example_view_metadata_rest_json(example_view_metadata_v1: Dict[str, Any]) -> Dict[str, Any]:
+def example_view_metadata_rest_json(example_view_metadata_v1: dict[str, Any]) -> dict[str, Any]:
     return {
         "metadata-location": "s3://warehouse/database/table/metadata/00001-5f2f8166-244c-4eae-ac36-384ecdec81fc.gz.metadata.json",
         "metadata": example_view_metadata_v1,
@@ -1282,7 +1284,7 @@ def test_create_table_409(rest_mock: Mocker, table_schema_simple: Schema) -> Non
     assert "Table already exists" in str(e.value)
 
 
-def test_create_view_200(rest_mock: Mocker, table_schema_simple: Schema, example_view_metadata_rest_json: Dict[str, Any]) -> None:
+def test_create_view_200(rest_mock: Mocker, table_schema_simple: Schema, example_view_metadata_rest_json: dict[str, Any]) -> None:
     rest_mock.post(
         f"{TEST_URI}v1/namespaces/fokko/views",
         json=example_view_metadata_rest_json,