Browse Source

remove get_pipeline_by_model_name

* remove some logic which may result in strange error when get hub info failed

Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/10924091
master^2
wenmeng.zwm 3 years ago
parent
commit
a4e6c5226c
2 changed files with 1 additions and 21 deletions
  1. +0
    -19
      modelscope/pipelines/builder.py
  2. +1
    -2
      modelscope/pipelines/util.py

+ 0
- 19
modelscope/pipelines/builder.py View File

@@ -310,9 +310,6 @@ def pipeline(task: str = None,
model[0], revision=model_revision)
check_config(cfg)
pipeline_name = cfg.pipeline.type
else:
# used for test case, when model is str and is not hub path
pipeline_name = get_pipeline_by_model_name(task, model)
elif model is not None:
# get pipeline info from Model object
first_model = model[0] if isinstance(model, list) else model
@@ -375,19 +372,3 @@ def get_default_pipeline_info(task):
else:
pipeline_name, default_model = DEFAULT_MODEL_FOR_PIPELINE[task]
return pipeline_name, default_model


def get_pipeline_by_model_name(task: str, model: Union[str, List[str]]):
""" Get pipeline name by task name and model name

Args:
task (str): task name.
model (str| list[str]): model names
"""
if isinstance(model, str):
model_key = model
else:
model_key = '_'.join(model)
assert model_key in PIPELINES.modules[task], \
f'pipeline for task {task} model {model_key} not found.'
return model_key

+ 1
- 2
modelscope/pipelines/util.py View File

@@ -35,8 +35,7 @@ def is_official_hub_path(path: Union[str, List],
_ = HubApi().get_model(path, revision=revision)
return True
except Exception as e:
logger.warning(f'get model exception: {e}')
return False
raise ValueError(f'invalid model repo path {e}')

if isinstance(path, str):
return is_official_hub_impl(path)


Loading…
Cancel
Save