From 9e8d7bed6a3ca72a9f1a21b2fbc71443a6c7d44b Mon Sep 17 00:00:00 2001 From: "mulin.lyh" Date: Wed, 21 Dec 2022 08:28:40 +0800 Subject: [PATCH] [to #46852519]fix: fix useragent string and a trainer invokedby Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/11164288 * [to #46852519]fix: fix useragent string and a trainer invokedby --- modelscope/hub/api.py | 4 ++-- modelscope/trainers/cv/image_classifition_trainer.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modelscope/hub/api.py b/modelscope/hub/api.py index 9297cc35..f1f8ed1e 100644 --- a/modelscope/hub/api.py +++ b/modelscope/hub/api.py @@ -809,7 +809,7 @@ class ModelScopeConfig: user_name, ) if isinstance(user_agent, dict): - ua += '; '.join(f'{k}/{v}' for k, v in user_agent.items()) + ua += '; ' + '; '.join(f'{k}/{v}' for k, v in user_agent.items()) elif isinstance(user_agent, str): - ua += ';' + user_agent + ua += '; ' + user_agent return ua diff --git a/modelscope/trainers/cv/image_classifition_trainer.py b/modelscope/trainers/cv/image_classifition_trainer.py index 21e98910..e285e4d7 100644 --- a/modelscope/trainers/cv/image_classifition_trainer.py +++ b/modelscope/trainers/cv/image_classifition_trainer.py @@ -18,7 +18,7 @@ from modelscope.msdatasets.ms_dataset import MsDataset from modelscope.preprocessors.base import Preprocessor from modelscope.trainers.base import BaseTrainer from modelscope.trainers.builder import TRAINERS -from modelscope.utils.constant import DEFAULT_MODEL_REVISION, ModelFile +from modelscope.utils.constant import DEFAULT_MODEL_REVISION, Invoke, ModelFile from modelscope.utils.logger import get_logger @@ -202,7 +202,9 @@ class ImageClassifitionTrainer(BaseTrainer): model) else os.path.dirname(model) else: self.model_dir = snapshot_download( - model, revision=model_revision) + model, + revision=model_revision, + user_agent={Invoke.KEY: Invoke.TRAINER}) if cfg_file is None: cfg_file = os.path.join(self.model_dir, ModelFile.CONFIGURATION)