Python: Move table module base.py classes to __init__.py (apache#5458)

Neuw84 · Aug 7, 2022 · b04f0cd · b04f0cd
1 parent 102f51f
commit b04f0cd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 34 deletions.
diff --git a/python/pyiceberg/catalog/__init__.py b/python/pyiceberg/catalog/__init__.py
@@ -21,7 +21,7 @@
 from dataclasses import dataclass
 
 from pyiceberg.schema import Schema
-from pyiceberg.table.base import Table
+from pyiceberg.table import Table
 from pyiceberg.table.partitioning import UNPARTITIONED_PARTITION_SPEC, PartitionSpec
 from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder
 from pyiceberg.typedef import Identifier, Properties

diff --git a/python/pyiceberg/catalog/hive.py b/python/pyiceberg/catalog/hive.py
@@ -57,7 +57,7 @@
     TableAlreadyExistsError,
 )
 from pyiceberg.schema import Schema
-from pyiceberg.table.base import Table
+from pyiceberg.table import Table
 from pyiceberg.table.partitioning import PartitionSpec
 from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder
 from pyiceberg.types import (

diff --git a/python/pyiceberg/catalog/rest.py b/python/pyiceberg/catalog/rest.py
@@ -52,7 +52,7 @@
     UnauthorizedError,
 )
 from pyiceberg.schema import Schema
-from pyiceberg.table.base import Table
+from pyiceberg.table import Table
 from pyiceberg.table.metadata import TableMetadataV1, TableMetadataV2
 from pyiceberg.table.partitioning import UNPARTITIONED_PARTITION_SPEC, PartitionSpec
 from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder

diff --git a/python/pyiceberg/table/__init__.py b/python/pyiceberg/table/__init__.py
@@ -14,3 +14,17 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
+from typing import Optional, Union
+
+from pydantic import Field
+
+from pyiceberg.table.metadata import TableMetadataV1, TableMetadataV2
+from pyiceberg.typedef import Identifier
+from pyiceberg.utils.iceberg_base_model import IcebergBaseModel
+
+
+class Table(IcebergBaseModel):
+    identifier: Identifier = Field()
+    metadata_location: Optional[str] = Field()
+    metadata: Optional[Union[TableMetadataV1, TableMetadataV2]] = Field()
diff --git a/python/pyiceberg/table/base.py b/python/pyiceberg/table/base.py
diff --git a/python/tests/catalog/test_base.py b/python/tests/catalog/test_base.py
@@ -39,7 +39,7 @@
     TableAlreadyExistsError,
 )
 from pyiceberg.schema import Schema
-from pyiceberg.table.base import Table
+from pyiceberg.table import Table
 from pyiceberg.table.metadata import INITIAL_SPEC_ID
 from pyiceberg.table.partitioning import UNPARTITIONED_PARTITION_SPEC, PartitionSpec
 from pyiceberg.table.sorting import UNSORTED_SORT_ORDER, SortOrder