Adapt the moved files

Author: aversey

Diff for: python/hopsworks/version.py

@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.version import (
+    __version__,
+)
+
+
+__all__ = [
+    __version__,
+]

Diff for: python/hopsworks_common/code.py

@@ -13,11 +13,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 import json
 
-from hsfs import util
+from hopsworks_common import util
 
 
 class Code:

Diff for: python/hopsworks_common/core/code_api.py

@@ -13,9 +13,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
-from hsfs import client
+from hopsworks_common import client
 
 
 class CodeApi:

Diff for: python/hopsworks_common/core/code_engine.py

@@ -13,13 +13,14 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 import datetime
 import os
 
-from hsfs import code
-from hsfs.core import code_api
+from hopsworks_common import code
+from hopsworks_common.core import code_api
 
 
 class CodeEngine:

Diff for: python/hopsworks_common/core/hosts_api.py

@@ -13,11 +13,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 from typing import Any, List
 
-from hsfs import client
+from hopsworks_common import client
 
 
 class HostsApi:

Diff for: python/hopsworks_common/core/kafka_api.py

@@ -13,11 +13,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 from typing import Any, Dict, Union
 
-from hsfs import client
+from hopsworks_common import client
 
 
 class KafkaApi:

Diff for: python/hopsworks_common/core/opensearch.py

@@ -13,6 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 import logging
@@ -21,9 +22,12 @@
 
 import opensearchpy
 import urllib3
-from hsfs import client
-from hsfs.client.exceptions import FeatureStoreException, VectorDatabaseException
-from hsfs.core.opensearch_api import OpenSearchApi
+from hopsworks_common import client
+from hopsworks_common.client.exceptions import (
+    FeatureStoreException,
+    VectorDatabaseException,
+)
+from hopsworks_common.core.opensearch_api import OpenSearchApi
 from opensearchpy import OpenSearch
 from opensearchpy.exceptions import (
     AuthenticationException,

Diff for: python/hopsworks_common/core/opensearch_api.py

@@ -13,14 +13,15 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 from typing import Any, Dict
 
 from furl import furl
-from hsfs import client
-from hsfs.client.exceptions import FeatureStoreException
-from hsfs.core.variable_api import VariableApi
+from hopsworks_common import client
+from hopsworks_common.client.exceptions import FeatureStoreException
+from hopsworks_common.core.variable_api import VariableApi
 
 
 class OPENSEARCH_CONFIG:

Diff for: python/hopsworks_common/core/project_api.py

@@ -13,9 +13,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
-from hsfs import client
+from hopsworks_common import client
 
 
 class ProjectApi:

Diff for: python/hopsworks_common/core/services_api.py

@@ -13,11 +13,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 from typing import Any, Dict
 
-from hsfs import client
+from hopsworks_common import client
 
 
 class ServicesApi:

Diff for: python/hopsworks_common/core/type_systems.py

@@ -13,6 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
 from __future__ import annotations
 
 import ast
@@ -21,7 +22,7 @@
 from typing import TYPE_CHECKING, Literal, Union
 
 import pytz
-from hsfs.core.constants import HAS_ARROW, HAS_PANDAS, HAS_POLARS
+from hopsworks_common.core.constants import HAS_ARROW, HAS_PANDAS, HAS_POLARS
 
 
 if TYPE_CHECKING:

Diff for: python/hsfs/code.py

@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.code import (
+    Code,
+)
+
+
+__all__ = [
+    Code,
+]

Diff for: python/hsfs/core/code_api.py

@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.code_api import (
+    CodeApi,
+)
+
+
+__all__ = [
+    CodeApi,
+]

Diff for: python/hsfs/core/code_engine.py

@@ -0,0 +1,26 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.code_engine import (
+    CodeEngine,
+    RunType,
+)
+
+
+__all__ = [
+    CodeEngine,
+    RunType,
+]

Diff for: python/hsfs/core/hosts_api.py

@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.hosts_api import (
+    HostsApi,
+)
+
+
+__all__ = [
+    HostsApi,
+]

Diff for: python/hsfs/core/kafka_api.py

@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.kafka_api import (
+    KafkaApi,
+)
+
+
+__all__ = [
+    KafkaApi,
+]

Diff for: python/hsfs/core/opensearch.py

@@ -0,0 +1,26 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.opensearch import (
+    OpenSearchClientSingleton,
+    OpensearchRequestOption,
+)
+
+
+__all__ = [
+    OpenSearchClientSingleton,
+    OpensearchRequestOption,
+]

Diff for: python/hsfs/core/opensearch_api.py

@@ -0,0 +1,26 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.opensearch_api import (
+    OPENSEARCH_CONFIG,
+    OpenSearchApi,
+)
+
+
+__all__ = [
+    OPENSEARCH_CONFIG,
+    OpenSearchApi,
+]

Diff for: python/hsfs/core/project_api.py

@@ -0,0 +1,24 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed 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.
+#
+
+from hopsworks_common.core.project_api import (
+    ProjectApi,
+)
+
+
+__all__ = [
+    ProjectApi,
+]