diff --git a/clients/client-python/gravitino/__init__.py b/clients/client-python/gravitino/__init__.py index 4818e68989f..c9f4aac347b 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/api/file/__init__.py b/clients/client-python/gravitino/api/file/__init__.py new file mode 100644 index 00000000000..13a83393a91 --- /dev/null +++ b/clients/client-python/gravitino/api/file/__init__.py @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. 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/api/model/__init__.py b/clients/client-python/gravitino/api/model/__init__.py new file mode 100644 index 00000000000..13a83393a91 --- /dev/null +++ b/clients/client-python/gravitino/api/model/__init__.py @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. 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 2fd51d967fb..df0ecf579e2 100644 --- a/clients/client-python/gravitino/client/fileset_catalog.py +++ b/clients/client-python/gravitino/client/fileset_catalog.py @@ -21,8 +21,8 @@ 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 3b7aa5326c4..52a2975f98a 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 a5f0ef08c38..68c479232f6 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 89bf29be13a..17d6ed0f1cd 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 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 baf05ef51f5..cbeab85ac47 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 7f068373d0c..528ae3c74a6 100644 --- a/clients/client-python/gravitino/dto/fileset_dto.py +++ b/clients/client-python/gravitino/dto/fileset_dto.py @@ -20,7 +20,7 @@ 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 83287beacc9..cde6d5d8dc8 100644 --- a/clients/client-python/gravitino/dto/model_dto.py +++ b/clients/client-python/gravitino/dto/model_dto.py @@ -19,7 +19,7 @@ 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 d945cc39e8b..2b287069e7a 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 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 a7d8eaa0419..980287ba0e0 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 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 9a640d2071d..da7f4d7035f 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_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 5005f8737bb..91d5d5ec78a 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 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 cbbb67dd37c..ef084dad0e2 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 +```