From 76bb518d75818ce8e19afa0f0b775b00ac9a72cd Mon Sep 17 00:00:00 2001 From: "jiangyu.xzy" Date: Tue, 1 Nov 2022 16:59:47 +0800 Subject: [PATCH] fix format --- modelscope/hub/utils/utils.py | 8 +++----- modelscope/trainers/trainer.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modelscope/hub/utils/utils.py b/modelscope/hub/utils/utils.py index 312647c2..f9a75cce 100644 --- a/modelscope/hub/utils/utils.py +++ b/modelscope/hub/utils/utils.py @@ -2,10 +2,11 @@ import hashlib import os +import requests from datetime import datetime from typing import Optional -import requests +from modelscope.hub.api import ModelScopeConfig from modelscope.hub.constants import (DEFAULT_MODELSCOPE_DOMAIN, DEFAULT_MODELSCOPE_GROUP, MODEL_ID_SEPARATOR, MODELSCOPE_SDK_DEBUG, @@ -13,7 +14,6 @@ from modelscope.hub.constants import (DEFAULT_MODELSCOPE_DOMAIN, from modelscope.hub.errors import FileIntegrityError from modelscope.utils.file_utils import get_default_cache_dir from modelscope.utils.logger import get_logger -from modelscope.hub.api import ModelScopeConfig logger = get_logger() @@ -89,9 +89,7 @@ def file_integrity_validation(file_path, expected_sha256): raise FileIntegrityError(msg) -def create_library_statistics(method: str, - name: str, - cn_name: Optional[str]): +def create_library_statistics(method: str, name: str, cn_name: Optional[str]): try: path = f'{get_endpoint()}/api/v1/statistics/library' headers = {'user-agent': ModelScopeConfig.get_user_agent()} diff --git a/modelscope/trainers/trainer.py b/modelscope/trainers/trainer.py index 2e79667f..d59c3dfc 100644 --- a/modelscope/trainers/trainer.py +++ b/modelscope/trainers/trainer.py @@ -14,6 +14,7 @@ from torch.utils.data import DataLoader, Dataset from torch.utils.data.dataloader import default_collate from torch.utils.data.distributed import DistributedSampler +from modelscope.hub.utils.utils import create_library_statistics from modelscope.hub.snapshot_download import snapshot_download from modelscope.metainfo import Trainers from modelscope.metrics import build_metric, task_default_metrics @@ -39,7 +40,6 @@ from modelscope.utils.logger import get_logger from modelscope.utils.registry import build_from_cfg from modelscope.utils.torch_utils import (get_dist_info, get_local_rank, init_dist, set_random_seed) -from modelscope.hub.utils.utils import create_library_statistics from .base import BaseTrainer from .builder import TRAINERS from .default_config import merge_cfg