Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FSTORE-1451] Merge pyproject from hsfs and hsml #223

Merged
merged 15 commits into from
Jul 16, 2024
Merged
2 changes: 1 addition & 1 deletion .github/workflows/mkdocs-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: cp ../README.md . && pip3 install -r ../requirements-docs.txt && pip3 install -e .[dev]

- name: generate autodoc
run: python3 auto_doc.py
run: python3 ./python/auto_doc.py

- name: setup git
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mkdocs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: cp ../README.md . && pip3 install -r ../requirements-docs.txt && pip3 install -e .[dev]

- name: generate autodoc
run: python3 auto_doc.py
run: python3 ./python/auto_doc.py

- name: setup git
run: |
Expand Down
173 changes: 0 additions & 173 deletions hsfs/python/pyproject.toml

This file was deleted.

136 changes: 0 additions & 136 deletions hsml/python/pyproject.toml

This file was deleted.

3 changes: 2 additions & 1 deletion auto_doc.py → python/auto_doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import keras_autodoc


JSON_METHODS = [
"extract_fields_from_json",
"from_json",
Expand Down Expand Up @@ -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 = (
Expand Down
10 changes: 7 additions & 3 deletions python/hopsworks/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import json

import hsfs.feature_store
import humps
from hopsworks import client, constants, util
from hopsworks.client.external import Client
Expand All @@ -29,7 +30,6 @@
kafka_api,
opensearch_api,
)
from hsfs import feature_store


class Project:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
Loading