This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new e50e00ed84 [#6407] improve(client-python): Reorganize the python
package (#6408)
e50e00ed84 is described below
commit e50e00ed84b73e45e268dd2da00d08dfecbca530
Author: Jerry Shao <jerrys...@datastrato.com>
AuthorDate: Sat Feb 8 10:01:03 2025 +0800
[#6407] improve(client-python): Reorganize the python package (#6408)
### What changes were proposed in this pull request?
Move the `Fileset` and `Model` related classes to the sub-package for
better organized.
### Why are the changes needed?
For better organized.
Fix: #6407
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Existing tests.
---
clients/client-python/gravitino/__init__.py | 4 ++--
clients/client-python/gravitino/{ => api/file}/__init__.py | 12 ------------
clients/client-python/gravitino/api/{ => file}/fileset.py | 0
.../client-python/gravitino/api/{ => file}/fileset_change.py | 0
clients/client-python/gravitino/{ => api/model}/__init__.py | 12 ------------
clients/client-python/gravitino/api/{ => model}/model.py | 0
.../client-python/gravitino/api/{ => model}/model_version.py | 0
clients/client-python/gravitino/client/fileset_catalog.py | 4 ++--
clients/client-python/gravitino/client/generic_fileset.py | 2 +-
clients/client-python/gravitino/client/generic_model.py | 2 +-
.../client-python/gravitino/client/generic_model_catalog.py | 4 ++--
.../client-python/gravitino/client/generic_model_version.py | 2 +-
clients/client-python/gravitino/dto/fileset_dto.py | 2 +-
clients/client-python/gravitino/dto/model_dto.py | 2 +-
clients/client-python/gravitino/dto/model_version_dto.py | 2 +-
.../gravitino/dto/requests/fileset_create_request.py | 2 +-
.../gravitino/dto/requests/fileset_update_request.py | 2 +-
.../client-python/tests/unittests/test_model_catalog_api.py | 4 ++--
docs/how-to-use-gvfs.md | 2 +-
19 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/clients/client-python/gravitino/__init__.py
b/clients/client-python/gravitino/__init__.py
index 4818e68989..c9f4aac347 100644
--- a/clients/client-python/gravitino/__init__.py
+++ b/clients/client-python/gravitino/__init__.py
@@ -17,8 +17,8 @@
from gravitino.api.catalog import Catalog
from gravitino.api.schema import Schema
-from gravitino.api.fileset import Fileset
-from gravitino.api.fileset_change import FilesetChange
+from gravitino.api.file.fileset import Fileset
+from gravitino.api.file.fileset_change import FilesetChange
from gravitino.api.metalake_change import MetalakeChange
from gravitino.api.schema_change import SchemaChange
from gravitino.client.gravitino_client import GravitinoClient
diff --git a/clients/client-python/gravitino/__init__.py
b/clients/client-python/gravitino/api/file/__init__.py
similarity index 57%
copy from clients/client-python/gravitino/__init__.py
copy to clients/client-python/gravitino/api/file/__init__.py
index 4818e68989..13a83393a9 100644
--- a/clients/client-python/gravitino/__init__.py
+++ b/clients/client-python/gravitino/api/file/__init__.py
@@ -14,15 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-from gravitino.api.catalog import Catalog
-from gravitino.api.schema import Schema
-from gravitino.api.fileset import Fileset
-from gravitino.api.fileset_change import FilesetChange
-from gravitino.api.metalake_change import MetalakeChange
-from gravitino.api.schema_change import SchemaChange
-from gravitino.client.gravitino_client import GravitinoClient
-from gravitino.client.gravitino_admin_client import GravitinoAdminClient
-from gravitino.client.gravitino_metalake import GravitinoMetalake
-from gravitino.name_identifier import NameIdentifier
-from gravitino.filesystem import gvfs
diff --git a/clients/client-python/gravitino/api/fileset.py
b/clients/client-python/gravitino/api/file/fileset.py
similarity index 100%
rename from clients/client-python/gravitino/api/fileset.py
rename to clients/client-python/gravitino/api/file/fileset.py
diff --git a/clients/client-python/gravitino/api/fileset_change.py
b/clients/client-python/gravitino/api/file/fileset_change.py
similarity index 100%
rename from clients/client-python/gravitino/api/fileset_change.py
rename to clients/client-python/gravitino/api/file/fileset_change.py
diff --git a/clients/client-python/gravitino/__init__.py
b/clients/client-python/gravitino/api/model/__init__.py
similarity index 57%
copy from clients/client-python/gravitino/__init__.py
copy to clients/client-python/gravitino/api/model/__init__.py
index 4818e68989..13a83393a9 100644
--- a/clients/client-python/gravitino/__init__.py
+++ b/clients/client-python/gravitino/api/model/__init__.py
@@ -14,15 +14,3 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-from gravitino.api.catalog import Catalog
-from gravitino.api.schema import Schema
-from gravitino.api.fileset import Fileset
-from gravitino.api.fileset_change import FilesetChange
-from gravitino.api.metalake_change import MetalakeChange
-from gravitino.api.schema_change import SchemaChange
-from gravitino.client.gravitino_client import GravitinoClient
-from gravitino.client.gravitino_admin_client import GravitinoAdminClient
-from gravitino.client.gravitino_metalake import GravitinoMetalake
-from gravitino.name_identifier import NameIdentifier
-from gravitino.filesystem import gvfs
diff --git a/clients/client-python/gravitino/api/model.py
b/clients/client-python/gravitino/api/model/model.py
similarity index 100%
rename from clients/client-python/gravitino/api/model.py
rename to clients/client-python/gravitino/api/model/model.py
diff --git a/clients/client-python/gravitino/api/model_version.py
b/clients/client-python/gravitino/api/model/model_version.py
similarity index 100%
rename from clients/client-python/gravitino/api/model_version.py
rename to clients/client-python/gravitino/api/model/model_version.py
diff --git a/clients/client-python/gravitino/client/fileset_catalog.py
b/clients/client-python/gravitino/client/fileset_catalog.py
index 2fd51d967f..df0ecf579e 100644
--- a/clients/client-python/gravitino/client/fileset_catalog.py
+++ b/clients/client-python/gravitino/client/fileset_catalog.py
@@ -21,8 +21,8 @@ from typing import List, Dict
from gravitino.api.catalog import Catalog
from gravitino.api.credential.supports_credentials import SupportsCredentials
from gravitino.api.credential.credential import Credential
-from gravitino.api.fileset import Fileset
-from gravitino.api.fileset_change import FilesetChange
+from gravitino.api.file.fileset import Fileset
+from gravitino.api.file.fileset_change import FilesetChange
from gravitino.audit.caller_context import CallerContextHolder, CallerContext
from gravitino.client.base_schema_catalog import BaseSchemaCatalog
from gravitino.client.generic_fileset import GenericFileset
diff --git a/clients/client-python/gravitino/client/generic_fileset.py
b/clients/client-python/gravitino/client/generic_fileset.py
index 3b7aa5326c..52a2975f98 100644
--- a/clients/client-python/gravitino/client/generic_fileset.py
+++ b/clients/client-python/gravitino/client/generic_fileset.py
@@ -16,7 +16,7 @@
# under the License.
from typing import Optional, Dict, List
-from gravitino.api.fileset import Fileset
+from gravitino.api.file.fileset import Fileset
from gravitino.api.metadata_object import MetadataObject
from gravitino.api.credential.supports_credentials import SupportsCredentials
from gravitino.api.credential.credential import Credential
diff --git a/clients/client-python/gravitino/client/generic_model.py
b/clients/client-python/gravitino/client/generic_model.py
index a5f0ef08c3..68c479232f 100644
--- a/clients/client-python/gravitino/client/generic_model.py
+++ b/clients/client-python/gravitino/client/generic_model.py
@@ -16,7 +16,7 @@
# under the License.
from typing import Optional
-from gravitino.api.model import Model
+from gravitino.api.model.model import Model
from gravitino.dto.audit_dto import AuditDTO
from gravitino.dto.model_dto import ModelDTO
diff --git a/clients/client-python/gravitino/client/generic_model_catalog.py
b/clients/client-python/gravitino/client/generic_model_catalog.py
index 89bf29be13..17d6ed0f1c 100644
--- a/clients/client-python/gravitino/client/generic_model_catalog.py
+++ b/clients/client-python/gravitino/client/generic_model_catalog.py
@@ -19,8 +19,8 @@ from typing import Dict, List
from gravitino.name_identifier import NameIdentifier
from gravitino.api.catalog import Catalog
-from gravitino.api.model import Model
-from gravitino.api.model_version import ModelVersion
+from gravitino.api.model.model import Model
+from gravitino.api.model.model_version import ModelVersion
from gravitino.client.base_schema_catalog import BaseSchemaCatalog
from gravitino.client.generic_model import GenericModel
from gravitino.client.generic_model_version import GenericModelVersion
diff --git a/clients/client-python/gravitino/client/generic_model_version.py
b/clients/client-python/gravitino/client/generic_model_version.py
index baf05ef51f..cbeab85ac4 100644
--- a/clients/client-python/gravitino/client/generic_model_version.py
+++ b/clients/client-python/gravitino/client/generic_model_version.py
@@ -16,7 +16,7 @@
# under the License.
from typing import Optional, Dict, List
-from gravitino.api.model_version import ModelVersion
+from gravitino.api.model.model_version import ModelVersion
from gravitino.dto.audit_dto import AuditDTO
from gravitino.dto.model_version_dto import ModelVersionDTO
diff --git a/clients/client-python/gravitino/dto/fileset_dto.py
b/clients/client-python/gravitino/dto/fileset_dto.py
index 7f068373d0..528ae3c74a 100644
--- a/clients/client-python/gravitino/dto/fileset_dto.py
+++ b/clients/client-python/gravitino/dto/fileset_dto.py
@@ -20,7 +20,7 @@ from typing import Optional, Dict
from dataclasses_json import config, DataClassJsonMixin
-from gravitino.api.fileset import Fileset
+from gravitino.api.file.fileset import Fileset
from gravitino.dto.audit_dto import AuditDTO
diff --git a/clients/client-python/gravitino/dto/model_dto.py
b/clients/client-python/gravitino/dto/model_dto.py
index 83287beacc..cde6d5d8dc 100644
--- a/clients/client-python/gravitino/dto/model_dto.py
+++ b/clients/client-python/gravitino/dto/model_dto.py
@@ -19,7 +19,7 @@ from typing import Optional, Dict
from dataclasses_json import DataClassJsonMixin, config
-from gravitino.api.model import Model
+from gravitino.api.model.model import Model
from gravitino.dto.audit_dto import AuditDTO
diff --git a/clients/client-python/gravitino/dto/model_version_dto.py
b/clients/client-python/gravitino/dto/model_version_dto.py
index d945cc39e8..2b287069e7 100644
--- a/clients/client-python/gravitino/dto/model_version_dto.py
+++ b/clients/client-python/gravitino/dto/model_version_dto.py
@@ -20,7 +20,7 @@ from typing import Optional, Dict, List
from dataclasses_json import DataClassJsonMixin, config
-from gravitino.api.model_version import ModelVersion
+from gravitino.api.model.model_version import ModelVersion
from gravitino.dto.audit_dto import AuditDTO
diff --git
a/clients/client-python/gravitino/dto/requests/fileset_create_request.py
b/clients/client-python/gravitino/dto/requests/fileset_create_request.py
index a7d8eaa041..980287ba0e 100644
--- a/clients/client-python/gravitino/dto/requests/fileset_create_request.py
+++ b/clients/client-python/gravitino/dto/requests/fileset_create_request.py
@@ -20,7 +20,7 @@ from typing import Optional, Dict
from dataclasses_json import config
-from gravitino.api.fileset import Fileset
+from gravitino.api.file.fileset import Fileset
from gravitino.rest.rest_message import RESTRequest
diff --git
a/clients/client-python/gravitino/dto/requests/fileset_update_request.py
b/clients/client-python/gravitino/dto/requests/fileset_update_request.py
index 9a640d2071..da7f4d7035 100644
--- a/clients/client-python/gravitino/dto/requests/fileset_update_request.py
+++ b/clients/client-python/gravitino/dto/requests/fileset_update_request.py
@@ -20,7 +20,7 @@ from dataclasses import dataclass, field
from dataclasses_json import config
-from gravitino.api.fileset_change import FilesetChange
+from gravitino.api.file.fileset_change import FilesetChange
from gravitino.rest.rest_message import RESTRequest
diff --git a/clients/client-python/tests/unittests/test_model_catalog_api.py
b/clients/client-python/tests/unittests/test_model_catalog_api.py
index 5005f8737b..91d5d5ec78 100644
--- a/clients/client-python/tests/unittests/test_model_catalog_api.py
+++ b/clients/client-python/tests/unittests/test_model_catalog_api.py
@@ -20,8 +20,8 @@ from http.client import HTTPResponse
from unittest.mock import Mock, patch
from gravitino import NameIdentifier, GravitinoClient
-from gravitino.api.model import Model
-from gravitino.api.model_version import ModelVersion
+from gravitino.api.model.model import Model
+from gravitino.api.model.model_version import ModelVersion
from gravitino.dto.audit_dto import AuditDTO
from gravitino.dto.model_dto import ModelDTO
from gravitino.dto.model_version_dto import ModelVersionDTO
diff --git a/docs/how-to-use-gvfs.md b/docs/how-to-use-gvfs.md
index cbbb67dd37..ef084dad0e 100644
--- a/docs/how-to-use-gvfs.md
+++ b/docs/how-to-use-gvfs.md
@@ -585,4 +585,4 @@ options = {
}
fs = gvfs.GravitinoVirtualFileSystem(server_uri="http://localhost:8090";,
metalake_name="test_metalake", options=options)
print(fs.ls("gvfs://fileset/fileset_catlaog/tmp/test_fileset"))
-```
\ No newline at end of file
+```
