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.

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

Update MII to switch from modelid to id #507

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Update MII to switch from modelid to id #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd4a28a
Update MII to switch from modelid to id
loadams Jul 22, 2024
eb8c67c
Merge branch 'main' into loadams/modelid-fixes-hf
loadams Jul 24, 2024
09aefb6
Merge branch 'main' into loadams/modelid-fixes-hf
loadams Jul 25, 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
4 changes: 2 additions & 2 deletions mii/legacy/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def _get_hf_models_by_type(model_type=None, task=None):
if (model_data["cache_time"] + cache_expiration_seconds) < current_time:
api = HfApi()
model_data["model_list"] = [
SimpleNamespace(modelId=m.modelId,
SimpleNamespace(id=m.id,
pipeline_tag=m.pipeline_tag,
tags=m.tags) for m in api.list_models()
]
Expand All @@ -60,7 +60,7 @@ def _get_hf_models_by_type(model_type=None, task=None):
models = [m for m in models if m.pipeline_tag == task]

# Extract model IDs
model_ids = [m.modelId for m in models]
model_ids = [m.id for m in models]

if task == TaskType.TEXT_GENERATION:
# TODO: this is a temp solution to get around some HF models not having the correct tags
Expand Down
6 changes: 3 additions & 3 deletions mii/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

@dataclass
class ModelInfo:
modelId: str
id: str
pipeline_tag: str
tags: List[str]

Expand All @@ -53,7 +53,7 @@ def _hf_model_list() -> List[ModelInfo]:
if (model_data["cache_time"] + cache_expiration_seconds) < current_time:
api = HfApi()
model_data["model_list"] = [
ModelInfo(modelId=m.modelId,
ModelInfo(id=m.id,
pipeline_tag=m.pipeline_tag,
tags=m.tags) for m in api.list_models()
]
Expand All @@ -70,7 +70,7 @@ def get_default_task(model_name_or_path: str) -> str:
model_name = get_model_name(model_name_or_path)
models = _hf_model_list()
for m in models:
if m.modelId == model_name:
if m.id == model_name:
task = m.pipeline_tag
logger.info(f"Detected default task as '{task}' for model '{model_name}'")
return task
Expand Down
2 changes: 1 addition & 1 deletion scripts/model_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __init__(self, model_str):

def hf_model(model_str):
api = HfApi()
models = [m.modelId for m in api.list_models()]
models = [m.id for m in api.list_models()]
if model_str in models:
return model_str
else:
Expand Down