From 780a3e9c5e646c6643d96acb14f9303d072d3661 Mon Sep 17 00:00:00 2001 From: suluyan Date: Mon, 20 Jul 2026 19:16:10 +0800 Subject: [PATCH] fix lint --- docker/build_image.py | 44 +++++++++++++--------------- tests/msdatasets/test_stream_load.py | 18 +++++------- tests/utils/test_hf_util.py | 20 +++++-------- 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/docker/build_image.py b/docker/build_image.py index 8fab7f96..5aaf2286 100644 --- a/docker/build_image.py +++ b/docker/build_image.py @@ -1,5 +1,4 @@ import argparse -import json import os import platform import re @@ -10,6 +9,8 @@ from copy import copy from datetime import datetime from typing import Any, List, Optional +import json + docker_registry = os.environ['DOCKER_REGISTRY'] assert docker_registry, 'You must pass a valid DOCKER_REGISTRY' timestamp = datetime.now() @@ -507,9 +508,8 @@ class AmdImageBuilder(Builder): @classmethod def _fetch_rocm_tags(cls, page_size: int = 100) -> List[dict]: tags: List[dict] = [] - url = ( - f'https://hub.docker.com/v2/repositories/{VLLM_ROCM_REPO}/tags' - f'?page_size={page_size}&ordering=-last_updated') + url = (f'https://hub.docker.com/v2/repositories/{VLLM_ROCM_REPO}/tags' + f'?page_size={page_size}&ordering=-last_updated') while url: req = urllib.request.Request( url, headers={'User-Agent': 'modelscope-docker-builder'}) @@ -569,8 +569,8 @@ class AmdImageBuilder(Builder): def init_args(self, args: Any) -> Any: # Auto-discover from Docker Hub unless an explicit override is given. override = getattr(args, 'base_image_tag', None) - if override and str(override).strip() and str(override).strip().lower( - ) not in {'auto', 'latest'}: + if override and str(override).strip() and str( + override).strip().lower() not in {'auto', 'latest'}: args.base_image_tag = str(override).strip() if not self._is_specific_release_tag(args.base_image_tag): raise ValueError( @@ -630,9 +630,9 @@ class AmdImageBuilder(Builder): ' if os.environ.get(k): info[k.lower()]=os.environ[k]\n' 'print(json.dumps(info))\n') for py in ('python3', 'python'): - result = cls._run_capture( - 'docker', 'run', '--rm', '--network', 'none', '--entrypoint', - py, base_image, '-c', script) + result = cls._run_capture('docker', 'run', '--rm', '--network', + 'none', '--entrypoint', py, base_image, + '-c', script) if result.returncode == 0 and result.stdout.strip(): try: return json.loads(result.stdout.strip().splitlines()[-1]) @@ -714,9 +714,11 @@ class AmdImageBuilder(Builder): versions = { 'rocm': cls._normalize_version(rocm) if rocm else None, - 'python': cls._normalize_version(python_ver) if python_ver else None, + 'python': + cls._normalize_version(python_ver) if python_ver else None, 'torch': cls._normalize_version(torch_ver) if torch_ver else None, - 'ubuntu': cls._normalize_version(ubuntu_ver) if ubuntu_ver else None, + 'ubuntu': + cls._normalize_version(ubuntu_ver) if ubuntu_ver else None, } print('Probed AMD base image versions:') for key, value in versions.items(): @@ -744,9 +746,8 @@ class AmdImageBuilder(Builder): raise RuntimeError( 'AMD image tag requires probed rocm/python/torch versions. ' f'Got rocm={rocm}, python={py_tag}, torch={torch}') - return ( - f'{docker_registry}:ubuntu{ubuntu}-rocm{rocm}-{py_tag}-' - f'torch{torch}-{self.args.modelscope_version}-test') + return (f'{docker_registry}:ubuntu{ubuntu}-rocm{rocm}-{py_tag}-' + f'torch{torch}-{self.args.modelscope_version}-test') def _log_base_image_info(self) -> int: base_image = self.args.base_image @@ -767,8 +768,8 @@ class AmdImageBuilder(Builder): print(f'AMD base image inspect warning: {result.stderr.strip()}') versions = self.probe_base_image_versions(base_image) - if not versions.get('rocm') or not versions.get('python') or not versions.get( - 'torch'): + if not versions.get('rocm') or not versions.get( + 'python') or not versions.get('torch'): print('ERROR: failed to probe rocm/python/torch from base image') return 1 self.args.amd_rocm_version = versions['rocm'] @@ -779,9 +780,7 @@ class AmdImageBuilder(Builder): self.args.amd_ubuntu_version = versions['ubuntu'] else: self.args.amd_ubuntu_version = self.args.ubuntu_version - print( - f'AMD output image tag will be: {self.image()}' - ) + print(f'AMD output image tag will be: {self.image()}') print('=' * 60) return 0 @@ -801,10 +800,9 @@ class AmdImageBuilder(Builder): rocm = self.args.amd_rocm_version py_tag = self.args.amd_python_tag torch = self.args.amd_torch_version - image_tag2 = ( - f'{docker_registry}:ubuntu{ubuntu}-rocm{rocm}-{py_tag}-' - f'torch{torch}-{self.args.modelscope_version}-' - f'{formatted_time}-test') + image_tag2 = (f'{docker_registry}:ubuntu{ubuntu}-rocm{rocm}-{py_tag}-' + f'torch{torch}-{self.args.modelscope_version}-' + f'{formatted_time}-test') ret = self.run_cmd('docker', 'tag', image_name, image_tag2) if ret != 0: return ret diff --git a/tests/msdatasets/test_stream_load.py b/tests/msdatasets/test_stream_load.py index 87bbf096..4ed0c3f3 100644 --- a/tests/msdatasets/test_stream_load.py +++ b/tests/msdatasets/test_stream_load.py @@ -44,15 +44,12 @@ class TestStreamLoad(unittest.TestCase): pass self.assertIs(HfFileSystem._open, hf_datasets_util._hf_fs_open) - self.assertIsNot( - hf_datasets_util._hf_fs_open_original, - hf_datasets_util._hf_fs_open) - self.assertIs( - HfFileSystem.__init__, - hf_datasets_util._hf_fs_init_with_cookie) - self.assertIsNot( - hf_datasets_util._hf_fs_init_original, - hf_datasets_util._hf_fs_init_with_cookie) + self.assertIsNot(hf_datasets_util._hf_fs_open_original, + hf_datasets_util._hf_fs_open) + self.assertIs(HfFileSystem.__init__, + hf_datasets_util._hf_fs_init_with_cookie) + self.assertIsNot(hf_datasets_util._hf_fs_init_original, + hf_datasets_util._hf_fs_init_with_cookie) finally: HfFileSystem._open = hf_fs_open_before HfFileSystem.__init__ = hf_fs_init_before @@ -75,7 +72,8 @@ class TestStreamLoad(unittest.TestCase): 'load_dataset', side_effect=RuntimeError('load failed')): with self.assertRaises(RuntimeError): - with hf_datasets_util.load_dataset_with_ctx(streaming=True): + with hf_datasets_util.load_dataset_with_ctx( + streaming=True): pass self.assertIs(HfFileSystem._open, hf_fs_open_clean) diff --git a/tests/utils/test_hf_util.py b/tests/utils/test_hf_util.py index 33e04ceb..4e98d57f 100644 --- a/tests/utils/test_hf_util.py +++ b/tests/utils/test_hf_util.py @@ -259,7 +259,8 @@ class HFUtilTest(unittest.TestCase): cache_root = parent candidates = [ os.path.join(cache_root, 'nomic-ai', 'nomic-bert-2048'), - os.path.join(cache_root, 'models', 'nomic-ai--nomic-bert-2048'), + os.path.join(cache_root, 'models', + 'nomic-ai--nomic-bert-2048'), ] for model_dir_2 in candidates: if not os.path.exists(model_dir_2): @@ -307,18 +308,15 @@ class HFUtilTest(unittest.TestCase): captured = {} - def fake_origin(class_reference, - pretrained_model_name_or_path, - *args, + def fake_origin(class_reference, pretrained_model_name_or_path, *args, **kwargs): # Signature must match transformers so has_pretrained_arg is True. captured['class_reference'] = class_reference captured['pretrained'] = pretrained_model_name_or_path return type('DummyConfig', (), {}) - class_ref = ( - 'nomic-ai/nomic-bert-2048--' - 'configuration_hf_nomic_bert.NomicBertConfig') + class_ref = ('nomic-ai/nomic-bert-2048--' + 'configuration_hf_nomic_bert.NomicBertConfig') # create=True: do not permanently leave origin_* on the module # (would break test_import_not_pollute_dynamic_module). @@ -355,9 +353,7 @@ class HFUtilTest(unittest.TestCase): captured = {} - def fake_origin(class_reference, - pretrained_model_name_or_path, - *args, + def fake_origin(class_reference, pretrained_model_name_or_path, *args, **kwargs): captured['class_reference'] = class_reference captured['pretrained'] = pretrained_model_name_or_path @@ -398,9 +394,7 @@ class HFUtilTest(unittest.TestCase): captured = {} - def fake_origin(class_reference, - pretrained_model_name_or_path, - *args, + def fake_origin(class_reference, pretrained_model_name_or_path, *args, **kwargs): captured['class_reference'] = class_reference captured['pretrained'] = pretrained_model_name_or_path