From 4cade81a35fb0fd6ee80403eafb149346941a38a Mon Sep 17 00:00:00 2001 From: Yingda Chen Date: Thu, 13 Mar 2025 14:30:08 +0800 Subject: [PATCH 1/3] use user-specified domain only when it is non-empty --- modelscope/hub/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modelscope/hub/api.py b/modelscope/hub/api.py index eb72a2b4..b6d68125 100644 --- a/modelscope/hub/api.py +++ b/modelscope/hub/api.py @@ -316,7 +316,8 @@ class HubApi: return the endpoint with which the given repo_id exists. if neither exists, throw 404 error """ - if MODELSCOPE_DOMAIN in os.environ: + s = os.environ.get(MODELSCOPE_DOMAIN) + if s is not None and s.strip() != '': endpoint = MODELSCOPE_URL_SCHEME + os.getenv(MODELSCOPE_DOMAIN) try: self.repo_exists(repo_id=repo_id, repo_type=repo_type, endpoint=endpoint, re_raise=True) From de27aea42736d3c7b3eb774bac0aba5d0a9fc393 Mon Sep 17 00:00:00 2001 From: Yingda Chen Date: Thu, 13 Mar 2025 17:04:27 +0800 Subject: [PATCH 2/3] refine log --- modelscope/hub/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modelscope/hub/api.py b/modelscope/hub/api.py index b6d68125..16440235 100644 --- a/modelscope/hub/api.py +++ b/modelscope/hub/api.py @@ -318,11 +318,11 @@ class HubApi: """ s = os.environ.get(MODELSCOPE_DOMAIN) if s is not None and s.strip() != '': - endpoint = MODELSCOPE_URL_SCHEME + os.getenv(MODELSCOPE_DOMAIN) + endpoint = MODELSCOPE_URL_SCHEME + s try: self.repo_exists(repo_id=repo_id, repo_type=repo_type, endpoint=endpoint, re_raise=True) except Exception: - logger.error(f'Repo {repo_id} not exists on {endpoint}.') + logger.error(f'Repo {repo_id} does not exist on {endpoint}.') raise return endpoint From 12d492e21fefd080e811c5593e0ce447a4d4fa57 Mon Sep 17 00:00:00 2001 From: Yingda Chen Date: Thu, 13 Mar 2025 17:23:01 +0800 Subject: [PATCH 3/3] fix log level --- modelscope/models/cv/image_try_on/landmark.py | 2 +- .../cv/video_depth_estimation/utils/load.py | 20 ------------------- modelscope/utils/logger.py | 1 + tests/hub/test_file_exists.py | 1 - tests/hub/test_hub_repository.py | 1 - tests/hub/test_hub_revision.py | 1 - tests/hub/test_hub_revision_release_mode.py | 1 - 7 files changed, 2 insertions(+), 25 deletions(-) diff --git a/modelscope/models/cv/image_try_on/landmark.py b/modelscope/models/cv/image_try_on/landmark.py index 489e59c3..e74d53c9 100644 --- a/modelscope/models/cv/image_try_on/landmark.py +++ b/modelscope/models/cv/image_try_on/landmark.py @@ -369,7 +369,7 @@ class VTONLandmark(nn.Module): 'SHIFT_HEATMAP': True }, 'DEBUG': { - 'DEBUG': True, + 'DEBUG': False, 'SAVE_BATCH_IMAGES_GT': True, 'SAVE_BATCH_IMAGES_PRED': True, 'SAVE_HEATMAPS_GT': True, diff --git a/modelscope/models/cv/video_depth_estimation/utils/load.py b/modelscope/models/cv/video_depth_estimation/utils/load.py index 8c2b326c..06a12e6d 100644 --- a/modelscope/models/cv/video_depth_estimation/utils/load.py +++ b/modelscope/models/cv/video_depth_estimation/utils/load.py @@ -1,9 +1,6 @@ # Part of the implementation is borrowed and modified from PackNet-SfM, # made publicly available under the MIT License at https://github.com/TRI-ML/packnet-sfm import importlib -import logging -import os -import warnings from collections import OrderedDict from inspect import signature @@ -16,23 +13,6 @@ from modelscope.models.cv.video_depth_estimation.utils.misc import (make_list, from modelscope.models.cv.video_depth_estimation.utils.types import is_str -def set_debug(debug): - """ - Enable or disable debug terminal logging - - Parameters - ---------- - debug : bool - Debugging flag (True to enable) - """ - # Disable logging if requested - if not debug: - os.environ['NCCL_DEBUG'] = '' - os.environ['WANDB_SILENT'] = 'false' - warnings.filterwarnings('ignore') - logging.disable(logging.CRITICAL) - - def filter_args(func, keys): """ Filters a dictionary so it only contains keys that are arguments of a function diff --git a/modelscope/utils/logger.py b/modelscope/utils/logger.py index bc471044..80f98730 100644 --- a/modelscope/utils/logger.py +++ b/modelscope/utils/logger.py @@ -11,6 +11,7 @@ formatter = logging.Formatter( '%(asctime)s - %(name)s - %(levelname)s - %(message)s') default_log_level = int(os.getenv('MODELSCOPE_LOG_LEVEL', str(logging.INFO))) +logging.getLogger('numba').setLevel(logging.INFO) def get_logger(log_file: Optional[str] = None, diff --git a/tests/hub/test_file_exists.py b/tests/hub/test_file_exists.py index 453541ce..e5ffe68c 100644 --- a/tests/hub/test_file_exists.py +++ b/tests/hub/test_file_exists.py @@ -5,7 +5,6 @@ from modelscope.hub.api import HubApi from modelscope.utils.logger import get_logger logger = get_logger() -logger.setLevel('DEBUG') DEFAULT_GIT_PATH = 'git' download_model_file_name = 'test.bin' diff --git a/tests/hub/test_hub_repository.py b/tests/hub/test_hub_repository.py index 7631f5db..92d89e74 100644 --- a/tests/hub/test_hub_repository.py +++ b/tests/hub/test_hub_repository.py @@ -21,7 +21,6 @@ from modelscope.utils.test_utils import (TEST_ACCESS_TOKEN1, TEST_MODEL_ORG, delete_credential) logger = get_logger() -logger.setLevel('DEBUG') DEFAULT_GIT_PATH = 'git' download_model_file_name = 'test.bin' diff --git a/tests/hub/test_hub_revision.py b/tests/hub/test_hub_revision.py index 642742bc..9a1e9f8a 100644 --- a/tests/hub/test_hub_revision.py +++ b/tests/hub/test_hub_revision.py @@ -18,7 +18,6 @@ from modelscope.utils.test_utils import (TEST_ACCESS_TOKEN1, TEST_MODEL_ORG) logger = get_logger() -logger.setLevel('DEBUG') download_model_file_name = 'test.bin' download_model_file_name2 = 'test2.bin' diff --git a/tests/hub/test_hub_revision_release_mode.py b/tests/hub/test_hub_revision_release_mode.py index 823e1d5d..74a48527 100644 --- a/tests/hub/test_hub_revision_release_mode.py +++ b/tests/hub/test_hub_revision_release_mode.py @@ -21,7 +21,6 @@ from modelscope.utils.test_utils import (TEST_ACCESS_TOKEN1, TEST_MODEL_ORG) logger = get_logger() -logger.setLevel('DEBUG') download_model_file_name = 'test.bin' download_model_file_name2 = 'test2.bin'