ClearML/clearml-serving
1
0
Fork 0
mirror of https://github.com/clearml/clearml-serving synced 2025-02-12 07:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix passing --id and --project/--name

Browse Source
This commit is contained in:
allegroai 2021-06-02 14:18:39 +03:00
parent 3287e4e4ad
commit 9b81d5e02d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clearml_serving/__main__.py
View File

@ -13,7 +13,9 @@ def restore_state(args):
state = json.load(f) state = json.load(f)
except Exception: except Exception:
state = {} state = {}
# store command line passed ID
args.cmd_id = getattr(args, 'id', None)
# restore ID from state
args.id = getattr(args, 'id', None) or state.get('id') args.id = getattr(args, 'id', None) or state.get('id')
return args return args
@ -37,8 +39,8 @@ def cmd_triton(args):
if not args.id and not args.name: if not args.id and not args.name:
raise ValueError("Serving service must have a name, use --name <service_name>") raise ValueError("Serving service must have a name, use --name <service_name>")
if args.id and not args.project and not args.name: if args.cmd_id or (args.id and not args.project and not args.name):
a_serving = ServingService(task_id=args.id) a_serving = ServingService(task_id=args.cmd_id or args.id)
else: else:
a_serving = ServingService(task_project=args.project, task_name=args.name, engine_type='triton') a_serving = ServingService(task_project=args.project, task_name=args.name, engine_type='triton')
args.id = a_serving.get_id() args.id = a_serving.get_id()

14
clearml_serving/serving_service.py
View File

@ -45,10 +45,16 @@ class ServingService(object):
elif task_id: elif task_id:
self._task = Task.get_task(task_id=task_id) self._task = Task.get_task(task_id=task_id)
else: else:
# noinspection PyProtectedMember # try to get a Task if we can find one
if Task._query_tasks(project_name=task_project, task_name=task_name): self._task = None
self._task = Task.get_task(project_name=task_project, task_name=task_name) try:
else: # noinspection PyProtectedMember
if Task._query_tasks(project_name=task_project, task_name=task_name):
self._task = Task.get_task(project_name=task_project, task_name=task_name)
except ValueError:
pass
if not self._task:
self._task = Task.create( self._task = Task.create(
project_name=task_project, task_name=task_name, task_type=Task.TaskTypes.service, project_name=task_project, task_name=task_name, task_type=Task.TaskTypes.service,
repo="https://github.com/allegroai/clearml-serving.git", repo="https://github.com/allegroai/clearml-serving.git",