[FSTORE-1451] Merge pyproject from hsfs and hsml

.github/workflows/mkdocs-main.yml

@@ -21,10 +21,10 @@ jobs:
 
       - name: install deps
         working-directory: ./python
-        run: cp ../README.md . && pip3 install -r ../requirements-docs.txt && pip3 install -e .[dev]
+        run: cp ../README.md . && pip3 install -e .[dev]
 
       - name: generate autodoc
-        run: python3 auto_doc.py
+        run: python3 ./python/auto_doc.py
 
       - name: setup git
         run: |

.github/workflows/mkdocs-release.yml

@@ -26,10 +26,10 @@ jobs:
 
       - name: install deps
         working-directory: ./python
-        run: cp ../README.md . && pip3 install -r ../requirements-docs.txt && pip3 install -e .[dev]
+        run: cp ../README.md . && pip3 install -e .[dev]
 
       - name: generate autodoc
-        run: python3 auto_doc.py
+        run: python3 ./python/auto_doc.py
 
       - name: setup git
         run: |

auto_doc.py → python/auto_doc.py

@@ -19,6 +19,7 @@
 
 import keras_autodoc
 
+
 JSON_METHODS = [
     "extract_fields_from_json",
     "from_json",
@@ -682,7 +683,7 @@
     },
 }
 
-hw_dir = pathlib.Path(__file__).resolve().parents[0]
+hw_dir = pathlib.Path(__file__).resolve().parents[1]
 if "GITHUB_SHA" in os.environ:
     commit_sha = os.environ["GITHUB_SHA"]
     project_url = (

python/hopsworks/project.py

@@ -17,6 +17,7 @@
 
 import json
 
+import hsfs.feature_store
 import humps
 from hopsworks import client, constants, util
 from hopsworks.client.external import Client
@@ -29,7 +30,6 @@
     kafka_api,
     opensearch_api,
 )
-from hsfs import feature_store
 
 
 class Project:
@@ -103,7 +103,9 @@ def created(self):
         """Timestamp when the project was created"""
         return self._created
 
-    def get_feature_store(self, name: str = None, engine: str = None) -> feature_store.FeatureStore:
+    def get_feature_store(
+        self, name: str = None, engine: str = None
+    ) -> hsfs.feature_store.FeatureStore:
         """Connect to Project's Feature Store.
 
         Defaulting to the project name of default feature store. To get a
@@ -142,7 +144,9 @@ def get_feature_store(self, name: str = None, engine: str = None) -> feature_sto
                 engine=engine,
             ).get_feature_store(name)
         else:
-            return connection(engine=engine).get_feature_store(name)  # If internal client
+            return connection(engine=engine).get_feature_store(
+                name
+            )  # If internal client
 
     def get_model_registry(self):
         """Connect to Project's Model Registry API.