Skip to content

Commit

Permalink
fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
tastelikefeet committed Sep 13, 2024
1 parent 6947716 commit 4acf5ec
Showing 1 changed file with 31 additions and 43 deletions.
74 changes: 31 additions & 43 deletions modelscope/utils/hf_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ def user_agent(invoked_by=None):
return uagent


def _try_login(token: Optional[str] = None):
from modelscope.hub.api import HubApi
api = HubApi()
if token is None:
token = os.environ.get('MODELSCOPE_API_TOKEN')
if token:
api.login(token)


def _file_exists(
self,
repo_id: str,
Expand All @@ -52,62 +61,41 @@ def _file_exists(
token: Union[str, bool, None] = None,
):
"""Patch huggingface_hub.file_exists"""
logger.warning(
'The passed in repo_type will not be used in modelscope. Now only model repo can be queried.'
)
if repo_type is not None:
logger.warning(
'The passed in repo_type will not be used in modelscope. Now only model repo can be queried.'
)
_try_login(token)
from modelscope.hub.api import HubApi
api = HubApi()
if token is None:
token = os.environ.get('MODELSCOPE_API_TOKEN')
if token:
api.login(token)

return api.file_exists(repo_id, filename, revision=revision)


def _file_download(
repo_id: str,
filename: str,
*,
subfolder: Optional[str] = None,
repo_type: Optional[str] = None,
revision: Optional[str] = None,
library_name: Optional[str] = None,
library_version: Optional[str] = None,
cache_dir: Union[str, Path, None] = None,
local_dir: Union[str, Path, None] = None,
user_agent: Union[Dict, str, None] = None,
force_download: bool = False,
proxies: Optional[Dict] = None,
etag_timeout: float = 10,
token: Union[bool, str, None] = None,
local_files_only: bool = False,
headers: Optional[Dict[str, str]] = None,
endpoint: Optional[str] = None,
# Deprecated args
legacy_cache_layout: bool = False,
resume_download: Optional[bool] = None,
force_filename: Optional[str] = None,
local_dir_use_symlinks: Union[bool, Literal['auto']] = 'auto',
):
def _file_download(repo_id: str,
filename: str,
*,
subfolder: Optional[str] = None,
repo_type: Optional[str] = None,
revision: Optional[str] = None,
cache_dir: Union[str, Path, None] = None,
local_dir: Union[str, Path, None] = None,
token: Union[bool, str, None] = None,
local_files_only: bool = False,
**kwargs):
"""Patch huggingface_hub.hf_hub_download"""
logger.warning(
'The passed in library_name,library_version,user_agent,force_download,proxies'
'etag_timeout,headers,endpoint '
'will not be used in modelscope.')
if len(kwargs) > 0:
logger.warning(
'The passed in library_name,library_version,user_agent,force_download,proxies'
'etag_timeout,headers,endpoint '
'will not be used in modelscope.')
assert repo_type in (
None, 'model',
'dataset'), f'repo_type={repo_type} is not supported in ModelScope'
if repo_type in (None, 'model'):
from modelscope.hub.file_download import model_file_download as file_download
else:
from modelscope.hub.file_download import dataset_file_download as file_download
if token is None:
token = os.environ.get('MODELSCOPE_API_TOKEN')
if token:
from modelscope.hub.api import HubApi
api = HubApi()
api.login(token)
_try_login(token)
return file_download(
repo_id,
file_path=os.path.join(subfolder, filename) if subfolder else filename,
Expand Down

0 comments on commit 4acf5ec

Please sign in to comment.