Fix init import_structure sorting (#20477)

* Fix init import_structure sorting

* Fix rebase

src/transformers/models/speech_to_text/__init__.py

@@ -47,7 +47,12 @@ except OptionalDependencyNotAvailable:
 else:
     _import_structure["feature_extraction_speech_to_text"] = ["Speech2TextFeatureExtractor"]
 
-    if is_sentencepiece_available():
+try:
+    if not (is_speech_available() and is_sentencepiece_available()):
+        raise OptionalDependencyNotAvailable()
+except OptionalDependencyNotAvailable:
+    pass
+else:
     _import_structure["processing_speech_to_text"] = ["Speech2TextProcessor"]
 
 try:
@@ -96,7 +101,12 @@ if TYPE_CHECKING:
     else:
         from .feature_extraction_speech_to_text import Speech2TextFeatureExtractor
 
-        if is_sentencepiece_available():
+    try:
+        if not (is_speech_available() and is_sentencepiece_available()):
+            raise OptionalDependencyNotAvailable()
+    except OptionalDependencyNotAvailable:
+        pass
+    else:
         from .processing_speech_to_text import Speech2TextProcessor
 
     try:

utils/custom_init_isort.py

@@ -200,9 +200,9 @@ def sort_imports(file, check_only=True):
         indent = get_indent(block_lines[1])
         # Slit the internal block into blocks of indent level 1.
         internal_blocks = split_code_in_indented_blocks(internal_block_code, indent_level=indent)
-        # We have two categories of import key: list or _import_structu[key].append/extend
-        pattern = _re_direct_key if "_import_structure" in block_lines[0] else _re_indirect_key
-        # Grab the keys, but there is a trap: some lines are empty or jsut comments.
+        # We have two categories of import key: list or _import_structure[key].append/extend
+        pattern = _re_direct_key if "_import_structure = {" in block_lines[0] else _re_indirect_key
+        # Grab the keys, but there is a trap: some lines are empty or just comments.
         keys = [(pattern.search(b).groups()[0] if pattern.search(b) is not None else None) for b in internal_blocks]
         # We only sort the lines with a key.
         keys_to_sort = [(i, key) for i, key in enumerate(keys) if key is not None]