Skip to content

[FSTORE-1260] Hsfs should not use hsml client to get embedding model #1233

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.

Sign up for GitHub

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

Merged
kennethmhc merged 3 commits into from
Feb 21, 2024
Merged

[FSTORE-1260] Hsfs should not use hsml client to get embedding model #1233

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bee606
use hsfs client
kennethmhc Feb 21, 2024
6c23776
fix style
kennethmhc Feb 21, 2024
586dac7
Merge branch 'master' into fix-embedding-model
kennethmhc Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions python/hsfs/embedding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#

from dataclasses import dataclass
from hsfs import client
from hsfs.client.exceptions import FeatureStoreException
from typing import Type
import json
Expand Down Expand Up @@ -59,16 +60,27 @@ def from_model(cls, model):
# should get from backend because of authorisation check (unshared project etc)
def get_model(self):
try:
from hsml.core.model_api import ModelApi
from hsml.model import Model
except ModuleNotFoundError:
raise FeatureStoreException(
"Model is attached to embedding feature but hsml library is not installed."
"Install hsml library before getting the feature group."
)

return ModelApi().get(
self.model_name, self.model_version, self.model_registry_id
path_params = [
"project",
client.get_instance()._project_id,
"modelregistries",
self.model_registry_id,
"models",
self.model_name + "_" + str(self.model_version),
]
query_params = {"expand": "trainingdatasets"}

model_json = client.get_instance()._send_request(
"GET", path_params, query_params
)
return Model.from_response_json(model_json)

def json(self):
return json.dumps(self, cls=util.FeatureStoreEncoder)
Expand Down