From 40bfc5a96a29e34df5fbc0b7799cd0f96ace5473 Mon Sep 17 00:00:00 2001 From: Yingda Chen Date: Wed, 22 Jan 2025 23:32:01 +0800 Subject: [PATCH] add expandusr --- modelscope/utils/file_utils.py | 6 ++++-- modelscope/utils/test_utils.py | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modelscope/utils/file_utils.py b/modelscope/utils/file_utils.py index cb763229..54439f41 100644 --- a/modelscope/utils/file_utils.py +++ b/modelscope/utils/file_utils.py @@ -37,7 +37,8 @@ def get_default_modelscope_cache_dir(): """ default base dir: '~/.cache/modelscope' """ - default_cache_dir = Path.home().joinpath('.cache', 'modelscope', 'hub') + default_cache_dir = os.path.expanduser(Path.home().joinpath( + '.cache', 'modelscope', 'hub')) return default_cache_dir @@ -48,7 +49,8 @@ def get_modelscope_cache_dir() -> str: Returns: str: the modelscope cache root. """ - return os.getenv('MODELSCOPE_CACHE', get_default_modelscope_cache_dir()) + return os.path.expanduser( + os.getenv('MODELSCOPE_CACHE', get_default_modelscope_cache_dir())) def get_model_cache_root() -> str: diff --git a/modelscope/utils/test_utils.py b/modelscope/utils/test_utils.py index 3859be61..1e7722d1 100644 --- a/modelscope/utils/test_utils.py +++ b/modelscope/utils/test_utils.py @@ -25,11 +25,11 @@ TEST_LEVEL = 2 TEST_LEVEL_STR = 'TEST_LEVEL' # for user citest and sdkdev -TEST_ACCESS_TOKEN1 = os.environ.get('TEST_ACCESS_TOKEN_CITEST', None) -TEST_ACCESS_TOKEN2 = os.environ.get('TEST_ACCESS_TOKEN_SDKDEV', None) +TEST_ACCESS_TOKEN1 = '2febb9c2-0350-473d-bba4-d9999f8a075a' +TEST_ACCESS_TOKEN2 = '2febb9c2-0350-473d-bba4-d9999f8a075a' TEST_MODEL_CHINESE_NAME = '内部测试模型' -TEST_MODEL_ORG = 'citest' +TEST_MODEL_ORG = 'yingda' def delete_credential():