From a510be20f36c135e0b992d98935c7e67beb6dd52 Mon Sep 17 00:00:00 2001 From: Sai-Suraj-27 Date: Wed, 4 Jun 2025 22:27:23 +0530 Subject: [PATCH] Updated deprecated typing imports with equivalents for Python 3.9+ (#38546) * Replace deprecated typing imports with collections.abc equivalents for Python 3.9+ * Fixed code quality --------- Co-authored-by: Yih-Dar <2521628+ydshieh@users.noreply.github.com> --- examples/3D_parallel.py | 2 +- examples/pytorch/3d_parallel_checks.py | 3 ++- src/transformers/cache_utils.py | 3 ++- src/transformers/commands/add_new_model_like.py | 3 ++- src/transformers/generation/logits_process.py | 3 ++- src/transformers/models/albert/configuration_albert.py | 2 +- src/transformers/models/aria/image_processing_aria.py | 3 ++- src/transformers/models/aria/modular_aria.py | 3 ++- src/transformers/models/bart/configuration_bart.py | 3 ++- src/transformers/models/beit/configuration_beit.py | 2 +- src/transformers/models/bert/configuration_bert.py | 2 +- src/transformers/models/big_bird/configuration_big_bird.py | 2 +- .../models/bigbird_pegasus/configuration_bigbird_pegasus.py | 3 ++- .../models/blenderbot/configuration_blenderbot.py | 3 ++- .../models/blenderbot_small/configuration_blenderbot_small.py | 3 ++- src/transformers/models/bloom/configuration_bloom.py | 3 ++- .../models/bridgetower/image_processing_bridgetower.py | 3 ++- .../models/bridgetower/image_processing_bridgetower_fast.py | 3 ++- src/transformers/models/camembert/configuration_camembert.py | 2 +- .../models/chinese_clip/configuration_chinese_clip.py | 3 ++- src/transformers/models/clip/configuration_clip.py | 3 ++- src/transformers/models/codegen/configuration_codegen.py | 3 ++- .../models/conditional_detr/configuration_conditional_detr.py | 2 +- .../conditional_detr/image_processing_conditional_detr.py | 3 ++- src/transformers/models/convbert/configuration_convbert.py | 2 +- src/transformers/models/convnext/configuration_convnext.py | 2 +- .../models/data2vec/configuration_data2vec_text.py | 2 +- .../models/data2vec/configuration_data2vec_vision.py | 2 +- src/transformers/models/deberta/configuration_deberta.py | 3 ++- src/transformers/models/deberta/modeling_tf_deberta.py | 3 ++- .../models/deberta_v2/configuration_deberta_v2.py | 3 ++- .../deformable_detr/image_processing_deformable_detr.py | 3 ++- src/transformers/models/deit/configuration_deit.py | 2 +- .../models/deprecated/deta/image_processing_deta.py | 3 ++- .../models/deprecated/graphormer/collating_graphormer.py | 3 ++- .../models/deprecated/graphormer/modeling_graphormer.py | 3 ++- src/transformers/models/deprecated/mega/configuration_mega.py | 2 +- src/transformers/models/detr/configuration_detr.py | 2 +- src/transformers/models/detr/image_processing_detr.py | 3 ++- src/transformers/models/dinov2/configuration_dinov2.py | 2 +- .../models/distilbert/configuration_distilbert.py | 2 +- src/transformers/models/dpt/image_processing_dpt.py | 3 ++- .../models/efficientnet/configuration_efficientnet.py | 3 ++- src/transformers/models/electra/configuration_electra.py | 2 +- src/transformers/models/emu3/image_processing_emu3.py | 3 ++- src/transformers/models/ernie/configuration_ernie.py | 2 +- src/transformers/models/esm/modeling_esmfold.py | 3 ++- src/transformers/models/esm/openfold_utils/chunk_utils.py | 3 ++- src/transformers/models/esm/openfold_utils/protein.py | 3 ++- .../models/esm/openfold_utils/residue_constants.py | 3 ++- src/transformers/models/esm/openfold_utils/rigid_utils.py | 3 ++- src/transformers/models/flaubert/configuration_flaubert.py | 2 +- src/transformers/models/flava/image_processing_flava.py | 3 ++- src/transformers/models/flava/image_processing_flava_fast.py | 3 ++- src/transformers/models/gpt2/configuration_gpt2.py | 3 ++- src/transformers/models/gpt_neo/configuration_gpt_neo.py | 3 ++- src/transformers/models/gptj/configuration_gptj.py | 3 ++- .../models/grounding_dino/image_processing_grounding_dino.py | 3 ++- src/transformers/models/groupvit/configuration_groupvit.py | 3 ++- src/transformers/models/ibert/configuration_ibert.py | 2 +- src/transformers/models/idefics2/image_processing_idefics2.py | 3 ++- src/transformers/models/idefics3/image_processing_idefics3.py | 3 ++- src/transformers/models/imagegpt/configuration_imagegpt.py | 3 ++- src/transformers/models/janus/image_processing_janus.py | 3 ++- src/transformers/models/janus/modular_janus.py | 3 ++- src/transformers/models/layoutlm/configuration_layoutlm.py | 3 ++- .../models/layoutlmv3/configuration_layoutlmv3.py | 3 ++- .../models/layoutlmv3/image_processing_layoutlmv3.py | 3 ++- src/transformers/models/levit/configuration_levit.py | 2 +- src/transformers/models/levit/image_processing_levit.py | 3 ++- .../models/llava_next/image_processing_llava_next.py | 3 ++- .../llava_onevision/image_processing_llava_onevision.py | 3 ++- .../models/llava_onevision/processing_llava_onevision.py | 3 ++- .../models/longformer/configuration_longformer.py | 3 ++- src/transformers/models/longt5/configuration_longt5.py | 2 +- src/transformers/models/m2m_100/configuration_m2m_100.py | 3 ++- src/transformers/models/marian/configuration_marian.py | 3 ++- ...vert_mask2former_original_pytorch_checkpoint_to_pytorch.py | 3 ++- .../models/mask2former/image_processing_mask2former.py | 3 ++- ...nvert_maskformer_original_pytorch_checkpoint_to_pytorch.py | 3 ++- .../models/maskformer/image_processing_maskformer.py | 3 ++- src/transformers/models/mbart/configuration_mbart.py | 3 ++- .../models/mobilebert/configuration_mobilebert.py | 2 +- .../models/mobilenet_v1/configuration_mobilenet_v1.py | 2 +- .../models/mobilenet_v2/configuration_mobilenet_v2.py | 2 +- src/transformers/models/mobilevit/configuration_mobilevit.py | 2 +- .../models/mobilevitv2/configuration_mobilevitv2.py | 2 +- src/transformers/models/mt5/configuration_mt5.py | 2 +- .../models/musicgen/convert_musicgen_transformers.py | 3 ++- .../musicgen_melody/convert_musicgen_melody_transformers.py | 3 ++- src/transformers/models/oneformer/convert_to_hf_oneformer.py | 3 ++- .../models/oneformer/image_processing_oneformer.py | 3 ++- src/transformers/models/owlvit/configuration_owlvit.py | 3 ++- src/transformers/models/perceiver/configuration_perceiver.py | 3 ++- src/transformers/models/perceiver/modeling_perceiver.py | 3 ++- src/transformers/models/plbart/configuration_plbart.py | 2 +- .../models/poolformer/configuration_poolformer.py | 2 +- .../image_processing_prompt_depth_anything.py | 3 ++- src/transformers/models/prophetnet/tokenization_prophetnet.py | 3 ++- src/transformers/models/pvt/configuration_pvt.py | 3 ++- src/transformers/models/pvt/modeling_pvt.py | 3 ++- src/transformers/models/rag/retrieval_rag.py | 3 ++- src/transformers/models/rembert/configuration_rembert.py | 2 +- src/transformers/models/resnet/configuration_resnet.py | 2 +- src/transformers/models/roberta/configuration_roberta.py | 2 +- .../configuration_roberta_prelayernorm.py | 2 +- src/transformers/models/roformer/configuration_roformer.py | 2 +- src/transformers/models/rt_detr/image_processing_rt_detr.py | 3 ++- src/transformers/models/segformer/configuration_segformer.py | 2 +- src/transformers/models/smolvlm/image_processing_smolvlm.py | 3 ++- .../models/squeezebert/configuration_squeezebert.py | 2 +- .../models/swiftformer/configuration_swiftformer.py | 2 +- src/transformers/models/swin/configuration_swin.py | 2 +- src/transformers/models/swin/modeling_tf_swin.py | 3 ++- src/transformers/models/t5/configuration_t5.py | 2 +- .../table_transformer/configuration_table_transformer.py | 2 +- src/transformers/models/tapas/tokenization_tapas.py | 3 ++- src/transformers/models/timesfm/modeling_timesfm.py | 3 ++- src/transformers/models/timesfm/modular_timesfm.py | 3 ++- src/transformers/models/tvp/image_processing_tvp.py | 3 ++- src/transformers/models/udop/modeling_udop.py | 3 ++- src/transformers/models/umt5/configuration_umt5.py | 2 +- src/transformers/models/vilt/image_processing_vilt.py | 3 ++- .../configuration_vision_encoder_decoder.py | 4 +++- src/transformers/models/vit/configuration_vit.py | 2 +- .../models/wav2vec2_with_lm/processing_wav2vec2_with_lm.py | 3 ++- src/transformers/models/whisper/configuration_whisper.py | 3 ++- src/transformers/models/whisper/english_normalizer.py | 4 +++- src/transformers/models/whisper/generation_whisper.py | 3 ++- src/transformers/models/xlm/configuration_xlm.py | 2 +- .../models/xlm_roberta/configuration_xlm_roberta.py | 2 +- .../models/xlm_roberta_xl/configuration_xlm_roberta_xl.py | 2 +- src/transformers/models/xmod/configuration_xmod.py | 2 +- src/transformers/models/yolos/configuration_yolos.py | 2 +- src/transformers/models/yolos/image_processing_yolos.py | 3 ++- src/transformers/models/zoedepth/image_processing_zoedepth.py | 3 ++- src/transformers/onnx/config.py | 3 ++- src/transformers/onnx/convert.py | 3 ++- src/transformers/tokenization_utils_base.py | 4 ++-- src/transformers/video_utils.py | 3 ++- 140 files changed, 234 insertions(+), 141 deletions(-) diff --git a/examples/3D_parallel.py b/examples/3D_parallel.py index fc6e3bd710..ebcfa55d65 100644 --- a/examples/3D_parallel.py +++ b/examples/3D_parallel.py @@ -32,8 +32,8 @@ ocalhost:29504 test_train.py import logging import os +from collections.abc import Iterable from contextlib import nullcontext -from typing import Iterable import torch import torch.distributed as dist diff --git a/examples/pytorch/3d_parallel_checks.py b/examples/pytorch/3d_parallel_checks.py index aeae85ab52..cf617dd483 100644 --- a/examples/pytorch/3d_parallel_checks.py +++ b/examples/pytorch/3d_parallel_checks.py @@ -31,8 +31,9 @@ ocalhost:29504 test_train.py import logging import os +from collections.abc import Iterable from contextlib import nullcontext -from typing import Dict, Iterable, Optional +from typing import Dict, Optional import torch import torch.distributed as dist diff --git a/src/transformers/cache_utils.py b/src/transformers/cache_utils.py index be6b18d216..55f5010fbb 100644 --- a/src/transformers/cache_utils.py +++ b/src/transformers/cache_utils.py @@ -2,8 +2,9 @@ import copy import importlib.metadata import json import os +from collections.abc import Iterable from dataclasses import dataclass -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from typing import Any, Dict, List, Optional, Tuple, Union import torch from packaging import version diff --git a/src/transformers/commands/add_new_model_like.py b/src/transformers/commands/add_new_model_like.py index a16a02c462..b0735138ec 100644 --- a/src/transformers/commands/add_new_model_like.py +++ b/src/transformers/commands/add_new_model_like.py @@ -21,7 +21,8 @@ from dataclasses import dataclass from datetime import date from itertools import chain from pathlib import Path -from typing import Any, Callable, Dict, List, Optional, Pattern, Tuple, Union +from re import Pattern +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import yaml diff --git a/src/transformers/generation/logits_process.py b/src/transformers/generation/logits_process.py index a4e8b5eda0..a6c6766b75 100644 --- a/src/transformers/generation/logits_process.py +++ b/src/transformers/generation/logits_process.py @@ -15,7 +15,8 @@ import inspect import math -from typing import TYPE_CHECKING, Callable, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import TYPE_CHECKING, Callable, List, Optional, Tuple, Union import numpy as np import torch diff --git a/src/transformers/models/albert/configuration_albert.py b/src/transformers/models/albert/configuration_albert.py index e1e2d4547c..6dd34ac6b0 100644 --- a/src/transformers/models/albert/configuration_albert.py +++ b/src/transformers/models/albert/configuration_albert.py @@ -16,7 +16,7 @@ """ALBERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/aria/image_processing_aria.py b/src/transformers/models/aria/image_processing_aria.py index eb9badef1e..512ebc1b19 100644 --- a/src/transformers/models/aria/image_processing_aria.py +++ b/src/transformers/models/aria/image_processing_aria.py @@ -18,7 +18,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/aria/modular_aria.py b/src/transformers/models/aria/modular_aria.py index 348da86bb1..24922deea3 100644 --- a/src/transformers/models/aria/modular_aria.py +++ b/src/transformers/models/aria/modular_aria.py @@ -12,7 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/bart/configuration_bart.py b/src/transformers/models/bart/configuration_bart.py index 4ce4316e3c..8561b4b8b4 100644 --- a/src/transformers/models/bart/configuration_bart.py +++ b/src/transformers/models/bart/configuration_bart.py @@ -16,7 +16,8 @@ import warnings from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/beit/configuration_beit.py b/src/transformers/models/beit/configuration_beit.py index 834988258c..75303ad01c 100644 --- a/src/transformers/models/beit/configuration_beit.py +++ b/src/transformers/models/beit/configuration_beit.py @@ -16,7 +16,7 @@ import warnings from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/bert/configuration_bert.py b/src/transformers/models/bert/configuration_bert.py index ea29fb81c4..f307100a95 100644 --- a/src/transformers/models/bert/configuration_bert.py +++ b/src/transformers/models/bert/configuration_bert.py @@ -16,7 +16,7 @@ """BERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/big_bird/configuration_big_bird.py b/src/transformers/models/big_bird/configuration_big_bird.py index 1019e008aa..8e29439bc4 100644 --- a/src/transformers/models/big_bird/configuration_big_bird.py +++ b/src/transformers/models/big_bird/configuration_big_bird.py @@ -15,7 +15,7 @@ """BigBird model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/bigbird_pegasus/configuration_bigbird_pegasus.py b/src/transformers/models/bigbird_pegasus/configuration_bigbird_pegasus.py index 5d9c9bf1a4..0dc765ce8f 100644 --- a/src/transformers/models/bigbird_pegasus/configuration_bigbird_pegasus.py +++ b/src/transformers/models/bigbird_pegasus/configuration_bigbird_pegasus.py @@ -15,7 +15,8 @@ """BigBirdPegasus model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/blenderbot/configuration_blenderbot.py b/src/transformers/models/blenderbot/configuration_blenderbot.py index c9f323210e..5030ad04c2 100644 --- a/src/transformers/models/blenderbot/configuration_blenderbot.py +++ b/src/transformers/models/blenderbot/configuration_blenderbot.py @@ -15,7 +15,8 @@ """Blenderbot model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/blenderbot_small/configuration_blenderbot_small.py b/src/transformers/models/blenderbot_small/configuration_blenderbot_small.py index 5865486370..a2174767de 100644 --- a/src/transformers/models/blenderbot_small/configuration_blenderbot_small.py +++ b/src/transformers/models/blenderbot_small/configuration_blenderbot_small.py @@ -15,7 +15,8 @@ """BlenderbotSmall model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/bloom/configuration_bloom.py b/src/transformers/models/bloom/configuration_bloom.py index fb6fc00b94..0e14e2e44c 100644 --- a/src/transformers/models/bloom/configuration_bloom.py +++ b/src/transformers/models/bloom/configuration_bloom.py @@ -15,7 +15,8 @@ """Bloom configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, List, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, List, Optional from packaging import version diff --git a/src/transformers/models/bridgetower/image_processing_bridgetower.py b/src/transformers/models/bridgetower/image_processing_bridgetower.py index 1f651eba1d..a88b7d3abf 100644 --- a/src/transformers/models/bridgetower/image_processing_bridgetower.py +++ b/src/transformers/models/bridgetower/image_processing_bridgetower.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for BridgeTower.""" -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Any, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/bridgetower/image_processing_bridgetower_fast.py b/src/transformers/models/bridgetower/image_processing_bridgetower_fast.py index 68d5b2c0f8..bfc7f548da 100644 --- a/src/transformers/models/bridgetower/image_processing_bridgetower_fast.py +++ b/src/transformers/models/bridgetower/image_processing_bridgetower_fast.py @@ -14,7 +14,8 @@ # limitations under the License. """Fast Image processor class for BridgeTower.""" -from typing import Dict, Iterable, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, Optional, Tuple, Union from ...image_processing_utils_fast import ( BaseImageProcessorFast, diff --git a/src/transformers/models/camembert/configuration_camembert.py b/src/transformers/models/camembert/configuration_camembert.py index eaf8c94b89..140006381d 100644 --- a/src/transformers/models/camembert/configuration_camembert.py +++ b/src/transformers/models/camembert/configuration_camembert.py @@ -16,7 +16,7 @@ """CamemBERT configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/chinese_clip/configuration_chinese_clip.py b/src/transformers/models/chinese_clip/configuration_chinese_clip.py index c52b563cb2..53c5e62175 100644 --- a/src/transformers/models/chinese_clip/configuration_chinese_clip.py +++ b/src/transformers/models/chinese_clip/configuration_chinese_clip.py @@ -15,7 +15,8 @@ """Chinese-CLIP model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional if TYPE_CHECKING: diff --git a/src/transformers/models/clip/configuration_clip.py b/src/transformers/models/clip/configuration_clip.py index 3f5cb47cdd..0626a7334f 100644 --- a/src/transformers/models/clip/configuration_clip.py +++ b/src/transformers/models/clip/configuration_clip.py @@ -15,7 +15,8 @@ """CLIP model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional if TYPE_CHECKING: diff --git a/src/transformers/models/codegen/configuration_codegen.py b/src/transformers/models/codegen/configuration_codegen.py index 7ed03ab3f6..550274a558 100644 --- a/src/transformers/models/codegen/configuration_codegen.py +++ b/src/transformers/models/codegen/configuration_codegen.py @@ -15,7 +15,8 @@ """CodeGen model configuration""" from collections import OrderedDict -from typing import Any, List, Mapping, Optional +from collections.abc import Mapping +from typing import Any, List, Optional from ... import PreTrainedTokenizer, TensorType, is_torch_available from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/conditional_detr/configuration_conditional_detr.py b/src/transformers/models/conditional_detr/configuration_conditional_detr.py index 7eecc6eda0..8cef8b7461 100644 --- a/src/transformers/models/conditional_detr/configuration_conditional_detr.py +++ b/src/transformers/models/conditional_detr/configuration_conditional_detr.py @@ -15,7 +15,7 @@ """Conditional DETR model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/conditional_detr/image_processing_conditional_detr.py b/src/transformers/models/conditional_detr/image_processing_conditional_detr.py index 83dc0f2c8b..9634452de8 100644 --- a/src/transformers/models/conditional_detr/image_processing_conditional_detr.py +++ b/src/transformers/models/conditional_detr/image_processing_conditional_detr.py @@ -17,7 +17,8 @@ import io import pathlib from collections import defaultdict -from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/convbert/configuration_convbert.py b/src/transformers/models/convbert/configuration_convbert.py index 558ef5638c..a107c7209e 100644 --- a/src/transformers/models/convbert/configuration_convbert.py +++ b/src/transformers/models/convbert/configuration_convbert.py @@ -15,7 +15,7 @@ """ConvBERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/convnext/configuration_convnext.py b/src/transformers/models/convnext/configuration_convnext.py index 9f9ed3bfd4..2fa8ef5447 100644 --- a/src/transformers/models/convnext/configuration_convnext.py +++ b/src/transformers/models/convnext/configuration_convnext.py @@ -15,7 +15,7 @@ """ConvNeXT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/data2vec/configuration_data2vec_text.py b/src/transformers/models/data2vec/configuration_data2vec_text.py index 3aa9a6b7bf..a00985f6e7 100644 --- a/src/transformers/models/data2vec/configuration_data2vec_text.py +++ b/src/transformers/models/data2vec/configuration_data2vec_text.py @@ -15,7 +15,7 @@ """Data2VecText configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/data2vec/configuration_data2vec_vision.py b/src/transformers/models/data2vec/configuration_data2vec_vision.py index b822b03ef3..0b2a456393 100644 --- a/src/transformers/models/data2vec/configuration_data2vec_vision.py +++ b/src/transformers/models/data2vec/configuration_data2vec_vision.py @@ -15,7 +15,7 @@ """Data2VecVision model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/deberta/configuration_deberta.py b/src/transformers/models/deberta/configuration_deberta.py index 835c16080a..191ba7c9bc 100644 --- a/src/transformers/models/deberta/configuration_deberta.py +++ b/src/transformers/models/deberta/configuration_deberta.py @@ -15,7 +15,8 @@ """DeBERTa model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional, Union +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional, Union from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/deberta/modeling_tf_deberta.py b/src/transformers/models/deberta/modeling_tf_deberta.py index cad1517113..afc8ba2abb 100644 --- a/src/transformers/models/deberta/modeling_tf_deberta.py +++ b/src/transformers/models/deberta/modeling_tf_deberta.py @@ -17,7 +17,8 @@ from __future__ import annotations import math -from typing import Dict, Optional, Sequence, Tuple, Union +from collections.abc import Sequence +from typing import Dict, Optional, Tuple, Union import numpy as np import tensorflow as tf diff --git a/src/transformers/models/deberta_v2/configuration_deberta_v2.py b/src/transformers/models/deberta_v2/configuration_deberta_v2.py index 3b1aaa3f04..3d74086aa2 100644 --- a/src/transformers/models/deberta_v2/configuration_deberta_v2.py +++ b/src/transformers/models/deberta_v2/configuration_deberta_v2.py @@ -15,7 +15,8 @@ """DeBERTa-v2 model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional, Union +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional, Union from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py index 81cc3b8f33..77252cac77 100644 --- a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py +++ b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py @@ -17,7 +17,8 @@ import io import pathlib from collections import defaultdict -from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/deit/configuration_deit.py b/src/transformers/models/deit/configuration_deit.py index 63d772067c..7a321ebe29 100644 --- a/src/transformers/models/deit/configuration_deit.py +++ b/src/transformers/models/deit/configuration_deit.py @@ -15,7 +15,7 @@ """DeiT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/deprecated/deta/image_processing_deta.py b/src/transformers/models/deprecated/deta/image_processing_deta.py index e76228fb6b..80dcc97a47 100644 --- a/src/transformers/models/deprecated/deta/image_processing_deta.py +++ b/src/transformers/models/deprecated/deta/image_processing_deta.py @@ -15,7 +15,8 @@ """Image processor class for Deformable DETR.""" import pathlib -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/deprecated/graphormer/collating_graphormer.py b/src/transformers/models/deprecated/graphormer/collating_graphormer.py index 1c2342913d..70e9e235dc 100644 --- a/src/transformers/models/deprecated/graphormer/collating_graphormer.py +++ b/src/transformers/models/deprecated/graphormer/collating_graphormer.py @@ -1,7 +1,8 @@ # Copyright (c) Microsoft Corporation and HuggingFace # Licensed under the MIT License. -from typing import Any, Dict, List, Mapping +from collections.abc import Mapping +from typing import Any, Dict, List import numpy as np import torch diff --git a/src/transformers/models/deprecated/graphormer/modeling_graphormer.py b/src/transformers/models/deprecated/graphormer/modeling_graphormer.py index 7b91a429b0..b30caa51e2 100755 --- a/src/transformers/models/deprecated/graphormer/modeling_graphormer.py +++ b/src/transformers/models/deprecated/graphormer/modeling_graphormer.py @@ -15,7 +15,8 @@ """PyTorch Graphormer model.""" import math -from typing import Iterable, Iterator, List, Optional, Tuple, Union +from collections.abc import Iterable, Iterator +from typing import List, Optional, Tuple, Union import torch import torch.nn as nn diff --git a/src/transformers/models/deprecated/mega/configuration_mega.py b/src/transformers/models/deprecated/mega/configuration_mega.py index 3b9d53d520..0ede2cac66 100644 --- a/src/transformers/models/deprecated/mega/configuration_mega.py +++ b/src/transformers/models/deprecated/mega/configuration_mega.py @@ -15,7 +15,7 @@ """MEGA configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ....configuration_utils import PretrainedConfig from ....onnx import OnnxConfig diff --git a/src/transformers/models/detr/configuration_detr.py b/src/transformers/models/detr/configuration_detr.py index 3dd37c36a4..d0373505bb 100644 --- a/src/transformers/models/detr/configuration_detr.py +++ b/src/transformers/models/detr/configuration_detr.py @@ -15,7 +15,7 @@ """DETR model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/detr/image_processing_detr.py b/src/transformers/models/detr/image_processing_detr.py index 0b365eafa1..50a4b27341 100644 --- a/src/transformers/models/detr/image_processing_detr.py +++ b/src/transformers/models/detr/image_processing_detr.py @@ -17,7 +17,8 @@ import io import pathlib from collections import defaultdict -from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/dinov2/configuration_dinov2.py b/src/transformers/models/dinov2/configuration_dinov2.py index f4b29273a5..c629cde12c 100644 --- a/src/transformers/models/dinov2/configuration_dinov2.py +++ b/src/transformers/models/dinov2/configuration_dinov2.py @@ -15,7 +15,7 @@ """DINOv2 model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/distilbert/configuration_distilbert.py b/src/transformers/models/distilbert/configuration_distilbert.py index 9a28c8e5d0..0aa6d2dfd7 100644 --- a/src/transformers/models/distilbert/configuration_distilbert.py +++ b/src/transformers/models/distilbert/configuration_distilbert.py @@ -15,7 +15,7 @@ """DistilBERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/dpt/image_processing_dpt.py b/src/transformers/models/dpt/image_processing_dpt.py index b948f9886e..5eebeebbe1 100644 --- a/src/transformers/models/dpt/image_processing_dpt.py +++ b/src/transformers/models/dpt/image_processing_dpt.py @@ -15,7 +15,8 @@ """Image processor class for DPT.""" import math -from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union from ...utils.import_utils import requires diff --git a/src/transformers/models/efficientnet/configuration_efficientnet.py b/src/transformers/models/efficientnet/configuration_efficientnet.py index 29df2ce0e3..f76e49b7e6 100644 --- a/src/transformers/models/efficientnet/configuration_efficientnet.py +++ b/src/transformers/models/efficientnet/configuration_efficientnet.py @@ -15,7 +15,8 @@ """EfficientNet model configuration""" from collections import OrderedDict -from typing import List, Mapping +from collections.abc import Mapping +from typing import List from packaging import version diff --git a/src/transformers/models/electra/configuration_electra.py b/src/transformers/models/electra/configuration_electra.py index 20b242c0f8..c88b44532e 100644 --- a/src/transformers/models/electra/configuration_electra.py +++ b/src/transformers/models/electra/configuration_electra.py @@ -16,7 +16,7 @@ """ELECTRA model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/emu3/image_processing_emu3.py b/src/transformers/models/emu3/image_processing_emu3.py index 3cbe6fe5dc..be57f8f21e 100644 --- a/src/transformers/models/emu3/image_processing_emu3.py +++ b/src/transformers/models/emu3/image_processing_emu3.py @@ -15,7 +15,8 @@ # limitations under the License. import math -from typing import Dict, Iterable, List, Optional, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Union import numpy as np diff --git a/src/transformers/models/ernie/configuration_ernie.py b/src/transformers/models/ernie/configuration_ernie.py index 655e40e163..e212292c48 100644 --- a/src/transformers/models/ernie/configuration_ernie.py +++ b/src/transformers/models/ernie/configuration_ernie.py @@ -16,7 +16,7 @@ """ERNIE model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/esm/modeling_esmfold.py b/src/transformers/models/esm/modeling_esmfold.py index 203aa9a69a..b29423a3f9 100644 --- a/src/transformers/models/esm/modeling_esmfold.py +++ b/src/transformers/models/esm/modeling_esmfold.py @@ -14,9 +14,10 @@ # limitations under the License. import math import sys +from collections.abc import Sequence from dataclasses import dataclass from functools import partial -from typing import Callable, Dict, List, Optional, Sequence, Tuple, Union +from typing import Callable, Dict, List, Optional, Tuple, Union import numpy as np import torch diff --git a/src/transformers/models/esm/openfold_utils/chunk_utils.py b/src/transformers/models/esm/openfold_utils/chunk_utils.py index 51ff6b74d6..4cce395daf 100644 --- a/src/transformers/models/esm/openfold_utils/chunk_utils.py +++ b/src/transformers/models/esm/openfold_utils/chunk_utils.py @@ -13,8 +13,9 @@ # limitations under the License. import logging import math +from collections.abc import Iterable, Sequence from functools import partial -from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Union +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import torch diff --git a/src/transformers/models/esm/openfold_utils/protein.py b/src/transformers/models/esm/openfold_utils/protein.py index ae9d8c1327..6e51642c19 100644 --- a/src/transformers/models/esm/openfold_utils/protein.py +++ b/src/transformers/models/esm/openfold_utils/protein.py @@ -18,7 +18,8 @@ import dataclasses import re import string -from typing import Any, Dict, Iterator, List, Mapping, Optional, Sequence, Tuple +from collections.abc import Iterator, Mapping, Sequence +from typing import Any, Dict, List, Optional, Tuple import numpy as np diff --git a/src/transformers/models/esm/openfold_utils/residue_constants.py b/src/transformers/models/esm/openfold_utils/residue_constants.py index b05a603fb2..13d5239f5c 100644 --- a/src/transformers/models/esm/openfold_utils/residue_constants.py +++ b/src/transformers/models/esm/openfold_utils/residue_constants.py @@ -18,8 +18,9 @@ import collections import copy import functools +from collections.abc import Mapping, Sequence from importlib import resources -from typing import Dict, List, Mapping, Sequence, Tuple +from typing import Dict, List, Tuple import numpy as np diff --git a/src/transformers/models/esm/openfold_utils/rigid_utils.py b/src/transformers/models/esm/openfold_utils/rigid_utils.py index 4d0f2f69b3..5e5f2c50e8 100644 --- a/src/transformers/models/esm/openfold_utils/rigid_utils.py +++ b/src/transformers/models/esm/openfold_utils/rigid_utils.py @@ -15,8 +15,9 @@ from __future__ import annotations +from collections.abc import Sequence from functools import lru_cache -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple +from typing import Any, Callable, Dict, List, Optional, Tuple import numpy as np import torch diff --git a/src/transformers/models/flaubert/configuration_flaubert.py b/src/transformers/models/flaubert/configuration_flaubert.py index 93e4645da5..071a74fe69 100644 --- a/src/transformers/models/flaubert/configuration_flaubert.py +++ b/src/transformers/models/flaubert/configuration_flaubert.py @@ -15,7 +15,7 @@ """Flaubert configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/flava/image_processing_flava.py b/src/transformers/models/flava/image_processing_flava.py index caa03dca8c..8dc5ed7e08 100644 --- a/src/transformers/models/flava/image_processing_flava.py +++ b/src/transformers/models/flava/image_processing_flava.py @@ -16,8 +16,9 @@ import math import random +from collections.abc import Iterable from functools import lru_cache -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from typing import Any, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/flava/image_processing_flava_fast.py b/src/transformers/models/flava/image_processing_flava_fast.py index 09e0606f78..49fec8ed4f 100644 --- a/src/transformers/models/flava/image_processing_flava_fast.py +++ b/src/transformers/models/flava/image_processing_flava_fast.py @@ -16,8 +16,9 @@ import math import random +from collections.abc import Iterable from functools import lru_cache -from typing import Any, Dict, Iterable, Optional, Tuple, Union +from typing import Any, Dict, Optional, Tuple, Union from ...image_processing_utils_fast import ( BaseImageProcessorFast, diff --git a/src/transformers/models/gpt2/configuration_gpt2.py b/src/transformers/models/gpt2/configuration_gpt2.py index fb582998bf..ea06a00229 100644 --- a/src/transformers/models/gpt2/configuration_gpt2.py +++ b/src/transformers/models/gpt2/configuration_gpt2.py @@ -16,7 +16,8 @@ """OpenAI GPT-2 configuration""" from collections import OrderedDict -from typing import Any, List, Mapping, Optional +from collections.abc import Mapping +from typing import Any, List, Optional from ... import PreTrainedTokenizer, TensorType, is_torch_available from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/gpt_neo/configuration_gpt_neo.py b/src/transformers/models/gpt_neo/configuration_gpt_neo.py index a8f358e721..875a170277 100644 --- a/src/transformers/models/gpt_neo/configuration_gpt_neo.py +++ b/src/transformers/models/gpt_neo/configuration_gpt_neo.py @@ -15,7 +15,8 @@ """GPT Neo model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer, TensorType, is_torch_available from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/gptj/configuration_gptj.py b/src/transformers/models/gptj/configuration_gptj.py index 5b59d309c2..3ca7e4e94f 100644 --- a/src/transformers/models/gptj/configuration_gptj.py +++ b/src/transformers/models/gptj/configuration_gptj.py @@ -15,7 +15,8 @@ """GPT-J model configuration""" from collections import OrderedDict -from typing import Any, List, Mapping, Optional +from collections.abc import Mapping +from typing import Any, List, Optional from ... import PreTrainedTokenizer, TensorType, is_torch_available from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/grounding_dino/image_processing_grounding_dino.py b/src/transformers/models/grounding_dino/image_processing_grounding_dino.py index f32d3095ff..f23be1626c 100644 --- a/src/transformers/models/grounding_dino/image_processing_grounding_dino.py +++ b/src/transformers/models/grounding_dino/image_processing_grounding_dino.py @@ -17,7 +17,8 @@ import io import pathlib from collections import defaultdict -from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/groupvit/configuration_groupvit.py b/src/transformers/models/groupvit/configuration_groupvit.py index e55346f503..43a3768482 100644 --- a/src/transformers/models/groupvit/configuration_groupvit.py +++ b/src/transformers/models/groupvit/configuration_groupvit.py @@ -15,7 +15,8 @@ """GroupViT model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/ibert/configuration_ibert.py b/src/transformers/models/ibert/configuration_ibert.py index f56d13efc9..1d36cf70b7 100644 --- a/src/transformers/models/ibert/configuration_ibert.py +++ b/src/transformers/models/ibert/configuration_ibert.py @@ -17,7 +17,7 @@ """I-BERT configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/idefics2/image_processing_idefics2.py b/src/transformers/models/idefics2/image_processing_idefics2.py index 239a266d9b..02fc697a86 100644 --- a/src/transformers/models/idefics2/image_processing_idefics2.py +++ b/src/transformers/models/idefics2/image_processing_idefics2.py @@ -14,7 +14,8 @@ # limitations under the License. -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Any, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/idefics3/image_processing_idefics3.py b/src/transformers/models/idefics3/image_processing_idefics3.py index e84c4157b2..912c168cce 100644 --- a/src/transformers/models/idefics3/image_processing_idefics3.py +++ b/src/transformers/models/idefics3/image_processing_idefics3.py @@ -14,7 +14,8 @@ # limitations under the License. import math -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Any, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/imagegpt/configuration_imagegpt.py b/src/transformers/models/imagegpt/configuration_imagegpt.py index 1a4e238b0e..8cfa8d5e47 100644 --- a/src/transformers/models/imagegpt/configuration_imagegpt.py +++ b/src/transformers/models/imagegpt/configuration_imagegpt.py @@ -15,7 +15,8 @@ """OpenAI ImageGPT configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/janus/image_processing_janus.py b/src/transformers/models/janus/image_processing_janus.py index 5138768453..d7d77e78ee 100644 --- a/src/transformers/models/janus/image_processing_janus.py +++ b/src/transformers/models/janus/image_processing_janus.py @@ -19,7 +19,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/janus/modular_janus.py b/src/transformers/models/janus/modular_janus.py index 0d484ffb0c..599348026d 100644 --- a/src/transformers/models/janus/modular_janus.py +++ b/src/transformers/models/janus/modular_janus.py @@ -14,8 +14,9 @@ # limitations under the License. import copy +from collections.abc import Iterable from dataclasses import dataclass -from typing import Callable, Dict, Iterable, List, Optional, Tuple, Union +from typing import Callable, Dict, List, Optional, Tuple, Union import numpy as np import torch diff --git a/src/transformers/models/layoutlm/configuration_layoutlm.py b/src/transformers/models/layoutlm/configuration_layoutlm.py index e0f9ef60f6..0f5fdf1d90 100644 --- a/src/transformers/models/layoutlm/configuration_layoutlm.py +++ b/src/transformers/models/layoutlm/configuration_layoutlm.py @@ -15,7 +15,8 @@ """LayoutLM model configuration""" from collections import OrderedDict -from typing import Any, List, Mapping, Optional +from collections.abc import Mapping +from typing import Any, List, Optional from ... import PretrainedConfig, PreTrainedTokenizer from ...onnx import OnnxConfig, PatchingSpec diff --git a/src/transformers/models/layoutlmv3/configuration_layoutlmv3.py b/src/transformers/models/layoutlmv3/configuration_layoutlmv3.py index a13d7fa7cd..c845bb43b3 100644 --- a/src/transformers/models/layoutlmv3/configuration_layoutlmv3.py +++ b/src/transformers/models/layoutlmv3/configuration_layoutlmv3.py @@ -15,7 +15,8 @@ """LayoutLMv3 model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional from packaging import version diff --git a/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py b/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py index 705a5e5123..1a93d76e92 100644 --- a/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py +++ b/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for LayoutLMv3.""" -from typing import Dict, Iterable, Optional, Union +from collections.abc import Iterable +from typing import Dict, Optional, Union import numpy as np diff --git a/src/transformers/models/levit/configuration_levit.py b/src/transformers/models/levit/configuration_levit.py index b15cc11226..f8befdb78d 100644 --- a/src/transformers/models/levit/configuration_levit.py +++ b/src/transformers/models/levit/configuration_levit.py @@ -15,7 +15,7 @@ """LeViT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/levit/image_processing_levit.py b/src/transformers/models/levit/image_processing_levit.py index 8b3e4e4cf1..fc1e9678e7 100644 --- a/src/transformers/models/levit/image_processing_levit.py +++ b/src/transformers/models/levit/image_processing_levit.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for LeViT.""" -from typing import Dict, Iterable, Optional, Union +from collections.abc import Iterable +from typing import Dict, Optional, Union import numpy as np diff --git a/src/transformers/models/llava_next/image_processing_llava_next.py b/src/transformers/models/llava_next/image_processing_llava_next.py index 06601b45c5..a1c26183c9 100644 --- a/src/transformers/models/llava_next/image_processing_llava_next.py +++ b/src/transformers/models/llava_next/image_processing_llava_next.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for LLaVa-NeXT.""" -from typing import Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/llava_onevision/image_processing_llava_onevision.py b/src/transformers/models/llava_onevision/image_processing_llava_onevision.py index 6a471d712a..e7ed7d4b0d 100644 --- a/src/transformers/models/llava_onevision/image_processing_llava_onevision.py +++ b/src/transformers/models/llava_onevision/image_processing_llava_onevision.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for LLaVa-Onevision.""" -from typing import Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/llava_onevision/processing_llava_onevision.py b/src/transformers/models/llava_onevision/processing_llava_onevision.py index 00cf4b579e..cae50bd9bf 100644 --- a/src/transformers/models/llava_onevision/processing_llava_onevision.py +++ b/src/transformers/models/llava_onevision/processing_llava_onevision.py @@ -17,7 +17,8 @@ Processor class for LLaVa-Onevision. """ import math -from typing import Iterable, List, Union +from collections.abc import Iterable +from typing import List, Union import numpy as np diff --git a/src/transformers/models/longformer/configuration_longformer.py b/src/transformers/models/longformer/configuration_longformer.py index 16bcba9fbb..178d1a07f2 100644 --- a/src/transformers/models/longformer/configuration_longformer.py +++ b/src/transformers/models/longformer/configuration_longformer.py @@ -15,7 +15,8 @@ """Longformer configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, List, Mapping, Optional, Union +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, List, Optional, Union from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/longt5/configuration_longt5.py b/src/transformers/models/longt5/configuration_longt5.py index f54ec03c8f..245e9948a1 100644 --- a/src/transformers/models/longt5/configuration_longt5.py +++ b/src/transformers/models/longt5/configuration_longt5.py @@ -14,7 +14,7 @@ # limitations under the License. """LongT5 model configuration""" -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxSeq2SeqConfigWithPast diff --git a/src/transformers/models/m2m_100/configuration_m2m_100.py b/src/transformers/models/m2m_100/configuration_m2m_100.py index 906a958e3d..8b2ae78c1f 100644 --- a/src/transformers/models/m2m_100/configuration_m2m_100.py +++ b/src/transformers/models/m2m_100/configuration_m2m_100.py @@ -15,7 +15,8 @@ """M2M100 model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/marian/configuration_marian.py b/src/transformers/models/marian/configuration_marian.py index e74958ea6e..19073b91a6 100644 --- a/src/transformers/models/marian/configuration_marian.py +++ b/src/transformers/models/marian/configuration_marian.py @@ -15,7 +15,8 @@ """Marian model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/mask2former/convert_mask2former_original_pytorch_checkpoint_to_pytorch.py b/src/transformers/models/mask2former/convert_mask2former_original_pytorch_checkpoint_to_pytorch.py index 3fd28acad3..b61cf5e52d 100644 --- a/src/transformers/models/mask2former/convert_mask2former_original_pytorch_checkpoint_to_pytorch.py +++ b/src/transformers/models/mask2former/convert_mask2former_original_pytorch_checkpoint_to_pytorch.py @@ -15,10 +15,11 @@ import json import sys from argparse import ArgumentParser +from collections.abc import Iterator from dataclasses import dataclass from pathlib import Path from pprint import pformat -from typing import Any, Dict, Iterator, List, Set, Tuple +from typing import Any, Dict, List, Set, Tuple import requests import torch diff --git a/src/transformers/models/mask2former/image_processing_mask2former.py b/src/transformers/models/mask2former/image_processing_mask2former.py index 2a3faf1831..f697713250 100644 --- a/src/transformers/models/mask2former/image_processing_mask2former.py +++ b/src/transformers/models/mask2former/image_processing_mask2former.py @@ -15,7 +15,8 @@ """Image processor class for Mask2Former.""" import math -from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import Any, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/maskformer/convert_maskformer_original_pytorch_checkpoint_to_pytorch.py b/src/transformers/models/maskformer/convert_maskformer_original_pytorch_checkpoint_to_pytorch.py index b55b0e8714..8c0a8bd785 100644 --- a/src/transformers/models/maskformer/convert_maskformer_original_pytorch_checkpoint_to_pytorch.py +++ b/src/transformers/models/maskformer/convert_maskformer_original_pytorch_checkpoint_to_pytorch.py @@ -14,10 +14,11 @@ # limitations under the License. import sys from argparse import ArgumentParser +from collections.abc import Iterator from dataclasses import dataclass from pathlib import Path from pprint import pformat -from typing import Any, Dict, Iterator, List, Set, Tuple +from typing import Any, Dict, List, Set, Tuple import requests import torch diff --git a/src/transformers/models/maskformer/image_processing_maskformer.py b/src/transformers/models/maskformer/image_processing_maskformer.py index 32fc423f08..63b7d4e4ae 100644 --- a/src/transformers/models/maskformer/image_processing_maskformer.py +++ b/src/transformers/models/maskformer/image_processing_maskformer.py @@ -16,7 +16,8 @@ import math import warnings -from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/mbart/configuration_mbart.py b/src/transformers/models/mbart/configuration_mbart.py index 878f46b607..76941cb02f 100644 --- a/src/transformers/models/mbart/configuration_mbart.py +++ b/src/transformers/models/mbart/configuration_mbart.py @@ -15,7 +15,8 @@ """MBART model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional +from collections.abc import Mapping +from typing import Any, Optional from ... import PreTrainedTokenizer from ...configuration_utils import PretrainedConfig diff --git a/src/transformers/models/mobilebert/configuration_mobilebert.py b/src/transformers/models/mobilebert/configuration_mobilebert.py index 742864573a..3b37289e07 100644 --- a/src/transformers/models/mobilebert/configuration_mobilebert.py +++ b/src/transformers/models/mobilebert/configuration_mobilebert.py @@ -15,7 +15,7 @@ """MobileBERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/mobilenet_v1/configuration_mobilenet_v1.py b/src/transformers/models/mobilenet_v1/configuration_mobilenet_v1.py index 59e977b952..c18d72d550 100644 --- a/src/transformers/models/mobilenet_v1/configuration_mobilenet_v1.py +++ b/src/transformers/models/mobilenet_v1/configuration_mobilenet_v1.py @@ -15,7 +15,7 @@ """MobileNetV1 model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/mobilenet_v2/configuration_mobilenet_v2.py b/src/transformers/models/mobilenet_v2/configuration_mobilenet_v2.py index 6cf64847e2..b344593bff 100644 --- a/src/transformers/models/mobilenet_v2/configuration_mobilenet_v2.py +++ b/src/transformers/models/mobilenet_v2/configuration_mobilenet_v2.py @@ -15,7 +15,7 @@ """MobileNetV2 model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/mobilevit/configuration_mobilevit.py b/src/transformers/models/mobilevit/configuration_mobilevit.py index 2ef891a96f..7f3cd6381b 100644 --- a/src/transformers/models/mobilevit/configuration_mobilevit.py +++ b/src/transformers/models/mobilevit/configuration_mobilevit.py @@ -15,7 +15,7 @@ """MobileViT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/mobilevitv2/configuration_mobilevitv2.py b/src/transformers/models/mobilevitv2/configuration_mobilevitv2.py index ff9a597792..49c3e63c53 100644 --- a/src/transformers/models/mobilevitv2/configuration_mobilevitv2.py +++ b/src/transformers/models/mobilevitv2/configuration_mobilevitv2.py @@ -15,7 +15,7 @@ """MobileViTV2 model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/mt5/configuration_mt5.py b/src/transformers/models/mt5/configuration_mt5.py index 8b903b908e..bad66e63b1 100644 --- a/src/transformers/models/mt5/configuration_mt5.py +++ b/src/transformers/models/mt5/configuration_mt5.py @@ -14,7 +14,7 @@ # limitations under the License. """mT5 model configuration""" -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxSeq2SeqConfigWithPast diff --git a/src/transformers/models/musicgen/convert_musicgen_transformers.py b/src/transformers/models/musicgen/convert_musicgen_transformers.py index f4afd24df0..4eba801229 100644 --- a/src/transformers/models/musicgen/convert_musicgen_transformers.py +++ b/src/transformers/models/musicgen/convert_musicgen_transformers.py @@ -15,8 +15,9 @@ """Convert MusicGen checkpoints from the original repository.""" import argparse +from collections import OrderedDict from pathlib import Path -from typing import Dict, OrderedDict, Tuple +from typing import Dict, Tuple import torch from audiocraft.models import MusicGen diff --git a/src/transformers/models/musicgen_melody/convert_musicgen_melody_transformers.py b/src/transformers/models/musicgen_melody/convert_musicgen_melody_transformers.py index 52980f73ec..ec22afd82f 100644 --- a/src/transformers/models/musicgen_melody/convert_musicgen_melody_transformers.py +++ b/src/transformers/models/musicgen_melody/convert_musicgen_melody_transformers.py @@ -15,8 +15,9 @@ """Convert Musicgen Melody checkpoints from the original repository.""" import argparse +from collections import OrderedDict from pathlib import Path -from typing import Dict, OrderedDict, Tuple +from typing import Dict, Tuple import torch from audiocraft.models import MusicGen diff --git a/src/transformers/models/oneformer/convert_to_hf_oneformer.py b/src/transformers/models/oneformer/convert_to_hf_oneformer.py index 960634f9f4..94aca98c13 100644 --- a/src/transformers/models/oneformer/convert_to_hf_oneformer.py +++ b/src/transformers/models/oneformer/convert_to_hf_oneformer.py @@ -18,10 +18,11 @@ import os import sys from argparse import ArgumentParser +from collections.abc import Iterator from dataclasses import dataclass from pathlib import Path from pprint import pformat -from typing import Any, Dict, Iterator, List, Set, Tuple +from typing import Any, Dict, List, Set, Tuple import requests import torch diff --git a/src/transformers/models/oneformer/image_processing_oneformer.py b/src/transformers/models/oneformer/image_processing_oneformer.py index 068d6afd21..e13d65be79 100644 --- a/src/transformers/models/oneformer/image_processing_oneformer.py +++ b/src/transformers/models/oneformer/image_processing_oneformer.py @@ -16,7 +16,8 @@ import json import os -from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import Any, Dict, List, Optional, Set, Tuple, Union import numpy as np from huggingface_hub import hf_hub_download diff --git a/src/transformers/models/owlvit/configuration_owlvit.py b/src/transformers/models/owlvit/configuration_owlvit.py index d80ac73d57..458f7fe70d 100644 --- a/src/transformers/models/owlvit/configuration_owlvit.py +++ b/src/transformers/models/owlvit/configuration_owlvit.py @@ -15,7 +15,8 @@ """OWL-ViT model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Dict, Optional if TYPE_CHECKING: diff --git a/src/transformers/models/perceiver/configuration_perceiver.py b/src/transformers/models/perceiver/configuration_perceiver.py index fc9da1d650..4605f1fb52 100644 --- a/src/transformers/models/perceiver/configuration_perceiver.py +++ b/src/transformers/models/perceiver/configuration_perceiver.py @@ -15,7 +15,8 @@ """Perceiver model configuration""" from collections import OrderedDict -from typing import Any, Mapping, Optional, Union +from collections.abc import Mapping +from typing import Any, Optional, Union from ...configuration_utils import PretrainedConfig from ...feature_extraction_utils import FeatureExtractionMixin diff --git a/src/transformers/models/perceiver/modeling_perceiver.py b/src/transformers/models/perceiver/modeling_perceiver.py index 14c969a412..e6903cf205 100755 --- a/src/transformers/models/perceiver/modeling_perceiver.py +++ b/src/transformers/models/perceiver/modeling_perceiver.py @@ -16,10 +16,11 @@ import abc import math +from collections.abc import Mapping from dataclasses import dataclass from functools import reduce from operator import __add__ -from typing import Any, Callable, Dict, List, Mapping, Optional, Tuple, Union +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import numpy as np import torch diff --git a/src/transformers/models/plbart/configuration_plbart.py b/src/transformers/models/plbart/configuration_plbart.py index 30871c4b72..141bdde47f 100644 --- a/src/transformers/models/plbart/configuration_plbart.py +++ b/src/transformers/models/plbart/configuration_plbart.py @@ -15,7 +15,7 @@ """PLBART model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfigWithPast diff --git a/src/transformers/models/poolformer/configuration_poolformer.py b/src/transformers/models/poolformer/configuration_poolformer.py index cdaf130631..eaaa89f670 100644 --- a/src/transformers/models/poolformer/configuration_poolformer.py +++ b/src/transformers/models/poolformer/configuration_poolformer.py @@ -15,7 +15,7 @@ """PoolFormer model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/prompt_depth_anything/image_processing_prompt_depth_anything.py b/src/transformers/models/prompt_depth_anything/image_processing_prompt_depth_anything.py index 00fcd2b17a..e0fc90dee2 100644 --- a/src/transformers/models/prompt_depth_anything/image_processing_prompt_depth_anything.py +++ b/src/transformers/models/prompt_depth_anything/image_processing_prompt_depth_anything.py @@ -13,7 +13,8 @@ """Image processor class for PromptDepthAnything.""" import math -from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union if TYPE_CHECKING: diff --git a/src/transformers/models/prophetnet/tokenization_prophetnet.py b/src/transformers/models/prophetnet/tokenization_prophetnet.py index 51257f76db..f1baeaa0f7 100644 --- a/src/transformers/models/prophetnet/tokenization_prophetnet.py +++ b/src/transformers/models/prophetnet/tokenization_prophetnet.py @@ -16,7 +16,8 @@ import collections import os import unicodedata -from typing import Iterable, List, Optional, Tuple +from collections.abc import Iterable +from typing import List, Optional, Tuple from ...tokenization_utils import PreTrainedTokenizer, _is_control, _is_punctuation, _is_whitespace from ...utils import logging diff --git a/src/transformers/models/pvt/configuration_pvt.py b/src/transformers/models/pvt/configuration_pvt.py index c97c2703ef..ff7a375fa6 100644 --- a/src/transformers/models/pvt/configuration_pvt.py +++ b/src/transformers/models/pvt/configuration_pvt.py @@ -17,7 +17,8 @@ """Pvt model configuration""" from collections import OrderedDict -from typing import Callable, List, Mapping +from collections.abc import Mapping +from typing import Callable, List from packaging import version diff --git a/src/transformers/models/pvt/modeling_pvt.py b/src/transformers/models/pvt/modeling_pvt.py index c4b63ee743..a299ad8729 100755 --- a/src/transformers/models/pvt/modeling_pvt.py +++ b/src/transformers/models/pvt/modeling_pvt.py @@ -18,7 +18,8 @@ import collections import math -from typing import Iterable, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Optional, Tuple, Union import torch import torch.nn.functional as F diff --git a/src/transformers/models/rag/retrieval_rag.py b/src/transformers/models/rag/retrieval_rag.py index c7a592a644..6aa4c68b46 100644 --- a/src/transformers/models/rag/retrieval_rag.py +++ b/src/transformers/models/rag/retrieval_rag.py @@ -17,7 +17,8 @@ import os import pickle import time -from typing import Iterable, List, Optional, Tuple +from collections.abc import Iterable +from typing import List, Optional, Tuple import numpy as np diff --git a/src/transformers/models/rembert/configuration_rembert.py b/src/transformers/models/rembert/configuration_rembert.py index b4b1fbc325..4b7456a20f 100644 --- a/src/transformers/models/rembert/configuration_rembert.py +++ b/src/transformers/models/rembert/configuration_rembert.py @@ -15,7 +15,7 @@ """RemBERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/resnet/configuration_resnet.py b/src/transformers/models/resnet/configuration_resnet.py index 42bc19a8bc..fa7c64f8da 100644 --- a/src/transformers/models/resnet/configuration_resnet.py +++ b/src/transformers/models/resnet/configuration_resnet.py @@ -15,7 +15,7 @@ """ResNet model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/roberta/configuration_roberta.py b/src/transformers/models/roberta/configuration_roberta.py index 35ff80115f..2e2221738a 100644 --- a/src/transformers/models/roberta/configuration_roberta.py +++ b/src/transformers/models/roberta/configuration_roberta.py @@ -16,7 +16,7 @@ """RoBERTa configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/roberta_prelayernorm/configuration_roberta_prelayernorm.py b/src/transformers/models/roberta_prelayernorm/configuration_roberta_prelayernorm.py index 71ecbd4474..a5685db407 100644 --- a/src/transformers/models/roberta_prelayernorm/configuration_roberta_prelayernorm.py +++ b/src/transformers/models/roberta_prelayernorm/configuration_roberta_prelayernorm.py @@ -16,7 +16,7 @@ """RoBERTa-PreLayerNorm configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/roformer/configuration_roformer.py b/src/transformers/models/roformer/configuration_roformer.py index 1852509199..876b42a922 100644 --- a/src/transformers/models/roformer/configuration_roformer.py +++ b/src/transformers/models/roformer/configuration_roformer.py @@ -15,7 +15,7 @@ """RoFormer model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/rt_detr/image_processing_rt_detr.py b/src/transformers/models/rt_detr/image_processing_rt_detr.py index cdefc9ff94..714ae9467f 100644 --- a/src/transformers/models/rt_detr/image_processing_rt_detr.py +++ b/src/transformers/models/rt_detr/image_processing_rt_detr.py @@ -15,7 +15,8 @@ """Image processor class for RT-DETR.""" import pathlib -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/segformer/configuration_segformer.py b/src/transformers/models/segformer/configuration_segformer.py index 58683a86c7..4e5a76db16 100644 --- a/src/transformers/models/segformer/configuration_segformer.py +++ b/src/transformers/models/segformer/configuration_segformer.py @@ -16,7 +16,7 @@ import warnings from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/smolvlm/image_processing_smolvlm.py b/src/transformers/models/smolvlm/image_processing_smolvlm.py index 0d788e2011..37db39540b 100644 --- a/src/transformers/models/smolvlm/image_processing_smolvlm.py +++ b/src/transformers/models/smolvlm/image_processing_smolvlm.py @@ -20,7 +20,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import math -from typing import Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/squeezebert/configuration_squeezebert.py b/src/transformers/models/squeezebert/configuration_squeezebert.py index a659517545..4b3c080a3d 100644 --- a/src/transformers/models/squeezebert/configuration_squeezebert.py +++ b/src/transformers/models/squeezebert/configuration_squeezebert.py @@ -15,7 +15,7 @@ """SqueezeBERT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/swiftformer/configuration_swiftformer.py b/src/transformers/models/swiftformer/configuration_swiftformer.py index 00a0aaddfa..4d16d690f7 100644 --- a/src/transformers/models/swiftformer/configuration_swiftformer.py +++ b/src/transformers/models/swiftformer/configuration_swiftformer.py @@ -15,7 +15,7 @@ """SwiftFormer model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/swin/configuration_swin.py b/src/transformers/models/swin/configuration_swin.py index da6ba98714..cfc00021cb 100644 --- a/src/transformers/models/swin/configuration_swin.py +++ b/src/transformers/models/swin/configuration_swin.py @@ -15,7 +15,7 @@ """Swin Transformer model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/swin/modeling_tf_swin.py b/src/transformers/models/swin/modeling_tf_swin.py index c1c4fb1620..6929f58c88 100644 --- a/src/transformers/models/swin/modeling_tf_swin.py +++ b/src/transformers/models/swin/modeling_tf_swin.py @@ -19,9 +19,10 @@ from __future__ import annotations import collections.abc import math import warnings +from collections.abc import Iterable from dataclasses import dataclass from functools import partial -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import tensorflow as tf diff --git a/src/transformers/models/t5/configuration_t5.py b/src/transformers/models/t5/configuration_t5.py index a22286449a..21d2552008 100644 --- a/src/transformers/models/t5/configuration_t5.py +++ b/src/transformers/models/t5/configuration_t5.py @@ -14,7 +14,7 @@ # limitations under the License. """T5 model configuration""" -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxSeq2SeqConfigWithPast diff --git a/src/transformers/models/table_transformer/configuration_table_transformer.py b/src/transformers/models/table_transformer/configuration_table_transformer.py index 458be0eea3..39eef3fced 100644 --- a/src/transformers/models/table_transformer/configuration_table_transformer.py +++ b/src/transformers/models/table_transformer/configuration_table_transformer.py @@ -15,7 +15,7 @@ """Table Transformer model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/tapas/tokenization_tapas.py b/src/transformers/models/tapas/tokenization_tapas.py index a23868c6dd..e19ad5a5a3 100644 --- a/src/transformers/models/tapas/tokenization_tapas.py +++ b/src/transformers/models/tapas/tokenization_tapas.py @@ -22,8 +22,9 @@ import math import os import re import unicodedata +from collections.abc import Generator from dataclasses import dataclass -from typing import Callable, Dict, Generator, List, Optional, Tuple, Union +from typing import Callable, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/timesfm/modeling_timesfm.py b/src/transformers/models/timesfm/modeling_timesfm.py index 63ea960028..f754d1f782 100644 --- a/src/transformers/models/timesfm/modeling_timesfm.py +++ b/src/transformers/models/timesfm/modeling_timesfm.py @@ -20,8 +20,9 @@ # limitations under the License. import math +from collections.abc import Sequence from dataclasses import dataclass -from typing import Callable, Optional, Sequence, Union +from typing import Callable, Optional, Union import torch import torch.nn as nn diff --git a/src/transformers/models/timesfm/modular_timesfm.py b/src/transformers/models/timesfm/modular_timesfm.py index 8918705f3a..b3fd1c5041 100644 --- a/src/transformers/models/timesfm/modular_timesfm.py +++ b/src/transformers/models/timesfm/modular_timesfm.py @@ -15,8 +15,9 @@ """PyTorch TimesFM model.""" import math +from collections.abc import Sequence from dataclasses import dataclass -from typing import Callable, Optional, Sequence, Union +from typing import Callable, Optional, Union import torch import torch.nn as nn diff --git a/src/transformers/models/tvp/image_processing_tvp.py b/src/transformers/models/tvp/image_processing_tvp.py index 81129a54f1..119a88c9c8 100644 --- a/src/transformers/models/tvp/image_processing_tvp.py +++ b/src/transformers/models/tvp/image_processing_tvp.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for TVP.""" -from typing import Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/udop/modeling_udop.py b/src/transformers/models/udop/modeling_udop.py index 478baddc50..9089c2daa8 100644 --- a/src/transformers/models/udop/modeling_udop.py +++ b/src/transformers/models/udop/modeling_udop.py @@ -19,9 +19,10 @@ import logging import math import random from abc import ABC, abstractmethod +from collections.abc import Sequence from copy import deepcopy from dataclasses import dataclass -from typing import Any, Dict, Optional, Sequence, Tuple, Union +from typing import Any, Dict, Optional, Tuple, Union import torch from torch import Tensor, nn diff --git a/src/transformers/models/umt5/configuration_umt5.py b/src/transformers/models/umt5/configuration_umt5.py index 82e7dfeba5..c23f171e4d 100644 --- a/src/transformers/models/umt5/configuration_umt5.py +++ b/src/transformers/models/umt5/configuration_umt5.py @@ -14,7 +14,7 @@ # limitations under the License. """UMT5 model configuration""" -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxSeq2SeqConfigWithPast diff --git a/src/transformers/models/vilt/image_processing_vilt.py b/src/transformers/models/vilt/image_processing_vilt.py index 4bd7ac55ee..3c557f311f 100644 --- a/src/transformers/models/vilt/image_processing_vilt.py +++ b/src/transformers/models/vilt/image_processing_vilt.py @@ -14,7 +14,8 @@ # limitations under the License. """Image processor class for Vilt.""" -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import Any, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/models/vision_encoder_decoder/configuration_vision_encoder_decoder.py b/src/transformers/models/vision_encoder_decoder/configuration_vision_encoder_decoder.py index 941dfee11d..248bf73ff9 100644 --- a/src/transformers/models/vision_encoder_decoder/configuration_vision_encoder_decoder.py +++ b/src/transformers/models/vision_encoder_decoder/configuration_vision_encoder_decoder.py @@ -14,7 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import TYPE_CHECKING, Any, Mapping, Optional, OrderedDict +from collections import OrderedDict +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional from packaging import version diff --git a/src/transformers/models/vit/configuration_vit.py b/src/transformers/models/vit/configuration_vit.py index 13ad3a7715..ead272d008 100644 --- a/src/transformers/models/vit/configuration_vit.py +++ b/src/transformers/models/vit/configuration_vit.py @@ -15,7 +15,7 @@ """ViT model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/wav2vec2_with_lm/processing_wav2vec2_with_lm.py b/src/transformers/models/wav2vec2_with_lm/processing_wav2vec2_with_lm.py index f569b4f625..5d7685163a 100644 --- a/src/transformers/models/wav2vec2_with_lm/processing_wav2vec2_with_lm.py +++ b/src/transformers/models/wav2vec2_with_lm/processing_wav2vec2_with_lm.py @@ -18,10 +18,11 @@ Speech processor class for Wav2Vec2 import os import warnings +from collections.abc import Iterable from contextlib import contextmanager, nullcontext from dataclasses import dataclass from multiprocessing import Pool, get_context, get_start_method -from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Union +from typing import TYPE_CHECKING, Dict, List, Optional, Union import numpy as np diff --git a/src/transformers/models/whisper/configuration_whisper.py b/src/transformers/models/whisper/configuration_whisper.py index 8ad742558e..3a1489a4ec 100644 --- a/src/transformers/models/whisper/configuration_whisper.py +++ b/src/transformers/models/whisper/configuration_whisper.py @@ -15,7 +15,8 @@ """Whisper model configuration""" from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Mapping, Optional, Union +from collections.abc import Mapping +from typing import TYPE_CHECKING, Any, Optional, Union from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig, OnnxSeq2SeqConfigWithPast diff --git a/src/transformers/models/whisper/english_normalizer.py b/src/transformers/models/whisper/english_normalizer.py index 7f6aab4ad2..e2b9ac6564 100644 --- a/src/transformers/models/whisper/english_normalizer.py +++ b/src/transformers/models/whisper/english_normalizer.py @@ -15,8 +15,10 @@ import re import unicodedata +from collections.abc import Iterator from fractions import Fraction -from typing import Iterator, List, Match, Optional, Union +from re import Match +from typing import List, Optional, Union import regex diff --git a/src/transformers/models/whisper/generation_whisper.py b/src/transformers/models/whisper/generation_whisper.py index 08552d4114..e4a1d1db30 100644 --- a/src/transformers/models/whisper/generation_whisper.py +++ b/src/transformers/models/whisper/generation_whisper.py @@ -16,7 +16,8 @@ import copy import math import warnings import zlib -from typing import Callable, Iterator, List, Optional, Tuple, Union +from collections.abc import Iterator +from typing import Callable, List, Optional, Tuple, Union import numpy as np import torch diff --git a/src/transformers/models/xlm/configuration_xlm.py b/src/transformers/models/xlm/configuration_xlm.py index ebd2c290f3..d4c85bf582 100644 --- a/src/transformers/models/xlm/configuration_xlm.py +++ b/src/transformers/models/xlm/configuration_xlm.py @@ -15,7 +15,7 @@ """XLM configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/xlm_roberta/configuration_xlm_roberta.py b/src/transformers/models/xlm_roberta/configuration_xlm_roberta.py index 3b17f33ed6..33bdaacf40 100644 --- a/src/transformers/models/xlm_roberta/configuration_xlm_roberta.py +++ b/src/transformers/models/xlm_roberta/configuration_xlm_roberta.py @@ -16,7 +16,7 @@ """XLM-RoBERTa configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/xlm_roberta_xl/configuration_xlm_roberta_xl.py b/src/transformers/models/xlm_roberta_xl/configuration_xlm_roberta_xl.py index dce18640a5..90a7fc6d1b 100644 --- a/src/transformers/models/xlm_roberta_xl/configuration_xlm_roberta_xl.py +++ b/src/transformers/models/xlm_roberta_xl/configuration_xlm_roberta_xl.py @@ -15,7 +15,7 @@ """XLM_ROBERTa_XL configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/xmod/configuration_xmod.py b/src/transformers/models/xmod/configuration_xmod.py index 68ad14307f..1cb4482ee4 100644 --- a/src/transformers/models/xmod/configuration_xmod.py +++ b/src/transformers/models/xmod/configuration_xmod.py @@ -16,7 +16,7 @@ """X-MOD configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from ...configuration_utils import PretrainedConfig from ...onnx import OnnxConfig diff --git a/src/transformers/models/yolos/configuration_yolos.py b/src/transformers/models/yolos/configuration_yolos.py index a488216cf8..307b2e6f33 100644 --- a/src/transformers/models/yolos/configuration_yolos.py +++ b/src/transformers/models/yolos/configuration_yolos.py @@ -15,7 +15,7 @@ """YOLOS model configuration""" from collections import OrderedDict -from typing import Mapping +from collections.abc import Mapping from packaging import version diff --git a/src/transformers/models/yolos/image_processing_yolos.py b/src/transformers/models/yolos/image_processing_yolos.py index 681ed17f2f..06536d89e5 100644 --- a/src/transformers/models/yolos/image_processing_yolos.py +++ b/src/transformers/models/yolos/image_processing_yolos.py @@ -15,7 +15,8 @@ """Image processor class for YOLOS.""" import pathlib -from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union +from collections.abc import Iterable +from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union import numpy as np diff --git a/src/transformers/models/zoedepth/image_processing_zoedepth.py b/src/transformers/models/zoedepth/image_processing_zoedepth.py index 47920c29c6..6407a3cf95 100644 --- a/src/transformers/models/zoedepth/image_processing_zoedepth.py +++ b/src/transformers/models/zoedepth/image_processing_zoedepth.py @@ -15,7 +15,8 @@ """Image processor class for ZoeDepth.""" import math -from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Tuple, Union +from collections.abc import Iterable +from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union import numpy as np diff --git a/src/transformers/onnx/config.py b/src/transformers/onnx/config.py index bba2592f3c..5a9cb33c1c 100644 --- a/src/transformers/onnx/config.py +++ b/src/transformers/onnx/config.py @@ -16,7 +16,8 @@ import dataclasses import warnings from abc import ABC, abstractmethod from collections import OrderedDict -from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Mapping, Optional, Tuple, Union +from collections.abc import Iterable, Mapping +from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union import numpy as np from packaging import version diff --git a/src/transformers/onnx/convert.py b/src/transformers/onnx/convert.py index 58bc51f8e8..f1cfb6b136 100644 --- a/src/transformers/onnx/convert.py +++ b/src/transformers/onnx/convert.py @@ -13,10 +13,11 @@ # limitations under the License. import warnings +from collections.abc import Iterable from inspect import signature from itertools import chain from pathlib import Path -from typing import TYPE_CHECKING, Iterable, List, Optional, Tuple, Union +from typing import TYPE_CHECKING, List, Optional, Tuple, Union import numpy as np from packaging.version import Version, parse diff --git a/src/transformers/tokenization_utils_base.py b/src/transformers/tokenization_utils_base.py index 1a0b70e10a..74e2f2c1e7 100644 --- a/src/transformers/tokenization_utils_base.py +++ b/src/transformers/tokenization_utils_base.py @@ -24,11 +24,11 @@ import os import re import warnings from collections import UserDict -from collections.abc import Mapping, Sized +from collections.abc import Mapping, Sequence, Sized from contextlib import contextmanager from dataclasses import dataclass from pathlib import Path -from typing import TYPE_CHECKING, Any, Callable, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union +from typing import TYPE_CHECKING, Any, Callable, Dict, List, NamedTuple, Optional, Tuple, Union import numpy as np from packaging import version diff --git a/src/transformers/video_utils.py b/src/transformers/video_utils.py index af9d80bab7..b4840fdba0 100644 --- a/src/transformers/video_utils.py +++ b/src/transformers/video_utils.py @@ -14,10 +14,11 @@ # limitations under the License. import os +from collections.abc import Iterable from contextlib import redirect_stdout from dataclasses import dataclass from io import BytesIO -from typing import Callable, Dict, Iterable, List, Optional, Tuple, Union +from typing import Callable, Dict, List, Optional, Tuple, Union from urllib.parse import urlparse import numpy as np