ClearML/clearml-serving
1
0
Fork 0
mirror of https://github.com/clearml/clearml-serving synced 2025-06-26 18:16:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Preprocess.model_endpoint

Browse Source
This commit is contained in:
allegroai 2022-04-18 23:24:30 +03:00
parent 49e5acba53
commit 409fc156fd
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clearml_serving/preprocess/preprocess_template.py
View File

@ -12,7 +12,8 @@ class Preprocess(object):
def __init__(self): def __init__(self):
# set internal state, this will be called only once. (i.e. not per request) # set internal state, this will be called only once. (i.e. not per request)
pass # it will also set the internal model_endpoint to reference the specific model endpoint object being served
self.model_endpoint = None # type: clearml_serving.serving.endpoints.ModelEndpoint
def load(self, local_file_name: str) -> Optional[Any]: # noqa def load(self, local_file_name: str) -> Optional[Any]: # noqa
""" """

3
clearml_serving/serving/model_request_processor.py
View File

@ -228,7 +228,8 @@ class ModelRequestProcessor(object):
if len(models) > 1: if len(models) > 1:
print("Warning: Found multiple Models for \'{}\', selecting id={}".format(model_query, models[0].id)) print("Warning: Found multiple Models for \'{}\', selecting id={}".format(model_query, models[0].id))
endpoint.model_id = models[0].id endpoint.model_id = models[0].id
elif not endpoint.model_id: elif not endpoint.model_id and endpoint.engine_type != "custom":
# if the "engine_type" is "custom" it might be there is no model_id attached
print("Warning: No Model provided for \'{}\'".format(url)) print("Warning: No Model provided for \'{}\'".format(url))
# upload as new artifact # upload as new artifact

4
clearml_serving/serving/preprocess_service.py
View File

@ -71,6 +71,8 @@ class BasePreprocessRequest(object):
Preprocess.send_request = BasePreprocessRequest._preprocess_send_request Preprocess.send_request = BasePreprocessRequest._preprocess_send_request
# create preprocess class # create preprocess class
self._preprocess = Preprocess() self._preprocess = Preprocess()
# update the model endpoint on the instance we created
self._preprocess.model_endpoint = self.model_endpoint
# custom model load callback function # custom model load callback function
if callable(getattr(self._preprocess, 'load', None)): if callable(getattr(self._preprocess, 'load', None)):
self._model = self._preprocess.load(self._get_local_model_file()) self._model = self._preprocess.load(self._get_local_model_file())
@ -129,6 +131,8 @@ class BasePreprocessRequest(object):
pass pass
def _get_local_model_file(self): def _get_local_model_file(self):
if not self.model_endpoint.model_id:
return None
model_repo_object = Model(model_id=self.model_endpoint.model_id) model_repo_object = Model(model_id=self.model_endpoint.model_id)
return model_repo_object.get_local_copy() return model_repo_object.get_local_copy()