fix import reordering

Author: ohmayr

.generator/ruff.toml

@@ -1,16 +1,20 @@
 # .generator/ruff.toml
-
-# Match Black's line length
 line-length = 88
 
 [lint]
-# Enable Import sorting (isort)
 select = ["I"]
 
 [lint.isort]
-# Force 'google' to be recognized as a first-party import
+# 1. Force 'google' to be first-party (keeps google.* imports together)
 known-first-party = ["google"]
 
+# 2. Combine imports from the same module (Standard isort behavior)
+#    Prevents splitting "from x import a, b" into multiple lines.
+combine-as-imports = true
+
+# 3. Sort imports by module name, ignoring "from" vs "import" (Standard isort behavior)
+#    This minimizes diffs where isort mixed them but Ruff separated them.
+force-sort-within-sections = true
+
 [format]
-# Strictly enforce double quotes (Black style)
 quote-style = "double"

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/async_client.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from collections import OrderedDict
 import logging as std_logging
 import re
-from collections import OrderedDict
 from typing import (
     Callable,
     Dict,
@@ -29,14 +29,16 @@
     Union,
 )
 
-import google.protobuf
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1
-from google.api_core import retry_async as retries
+from google.api_core import (
+    exceptions as core_exceptions,
+    gapic_v1,
+    retry_async as retries,
+)
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.cloud.vision_v1 import gapic_version as package_version
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 try:
     OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/client.py

@@ -13,13 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from collections import OrderedDict
+from http import HTTPStatus
 import json
 import logging as std_logging
 import os
 import re
-import warnings
-from collections import OrderedDict
-from http import HTTPStatus
 from typing import (
     Callable,
     Dict,
@@ -33,18 +32,21 @@
     Union,
     cast,
 )
+import warnings
 
-import google.protobuf
-from google.api_core import client_options as client_options_lib
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1
-from google.api_core import retry as retries
+from google.api_core import (
+    client_options as client_options_lib,
+    exceptions as core_exceptions,
+    gapic_v1,
+    retry as retries,
+)
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.cloud.vision_v1 import gapic_version as package_version
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/transports/base.py

@@ -17,16 +17,19 @@
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
 
 import google.api_core
+from google.api_core import (
+    exceptions as core_exceptions,
+    gapic_v1,
+    operations_v1,
+    retry as retries,
+)
 import google.auth  # type: ignore
-import google.protobuf
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1, operations_v1
-from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.cloud.vision_v1 import gapic_version as package_version
 from google.cloud.vision_v1.types import image_annotator
 from google.longrunning import operations_pb2  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
     gapic_version=package_version.__version__

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/transports/grpc.py

@@ -16,20 +16,20 @@
 import json
 import logging as std_logging
 import pickle
-import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
+import warnings
 
 import grpc  # type: ignore
 import proto  # type: ignore
 
-import google.auth  # type: ignore
-import google.protobuf.message
 from google.api_core import gapic_v1, grpc_helpers, operations_v1
+import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.cloud.vision_v1.types import image_annotator
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf.json_format import MessageToJson
+import google.protobuf.message
 
 from .base import DEFAULT_CLIENT_INFO, ImageAnnotatorTransport
 

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/transports/grpc_asyncio.py

@@ -17,22 +17,26 @@
 import json
 import logging as std_logging
 import pickle
-import warnings
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
+import warnings
 
 import grpc  # type: ignore
-import proto  # type: ignore
 from grpc.experimental import aio  # type: ignore
+import proto  # type: ignore
 
-import google.protobuf.message
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1, grpc_helpers_async, operations_v1
-from google.api_core import retry_async as retries
+from google.api_core import (
+    exceptions as core_exceptions,
+    gapic_v1,
+    grpc_helpers_async,
+    operations_v1,
+    retry_async as retries,
+)
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.cloud.vision_v1.types import image_annotator
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf.json_format import MessageToJson
+import google.protobuf.message
 
 from .base import DEFAULT_CLIENT_INFO, ImageAnnotatorTransport
 from .grpc import ImageAnnotatorGrpcTransport

packages/google-cloud-vision/google/cloud/vision_v1/services/image_annotator/transports/rest.py

@@ -16,19 +16,24 @@
 import dataclasses
 import json  # type: ignore
 import logging
-import warnings
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union
+import warnings
 
 from requests import __version__ as requests_version
 
-import google.protobuf
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming
-from google.api_core import retry as retries
+from google.api_core import (
+    exceptions as core_exceptions,
+    gapic_v1,
+    operations_v1,
+    rest_helpers,
+    rest_streaming,
+    retry as retries,
+)
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.requests import AuthorizedSession  # type: ignore
 from google.cloud.vision_v1.types import image_annotator
 from google.longrunning import operations_pb2  # type: ignore
+import google.protobuf
 from google.protobuf import json_format
 
 from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO

packages/google-cloud-vision/google/cloud/vision_v1/services/product_search/async_client.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from collections import OrderedDict
 import logging as std_logging
 import re
-from collections import OrderedDict
 from typing import (
     Callable,
     Dict,
@@ -29,14 +29,16 @@
     Union,
 )
 
-import google.protobuf
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1
-from google.api_core import retry_async as retries
+from google.api_core import (
+    exceptions as core_exceptions,
+    gapic_v1,
+    retry_async as retries,
+)
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.cloud.vision_v1 import gapic_version as package_version
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 try:
     OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]

packages/google-cloud-vision/google/cloud/vision_v1/services/product_search/client.py

@@ -13,13 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from collections import OrderedDict
+from http import HTTPStatus
 import json
 import logging as std_logging
 import os
 import re
-import warnings
-from collections import OrderedDict
-from http import HTTPStatus
 from typing import (
     Callable,
     Dict,
@@ -33,18 +32,21 @@
     Union,
     cast,
 )
+import warnings
 
-import google.protobuf
-from google.api_core import client_options as client_options_lib
-from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1
-from google.api_core import retry as retries
+from google.api_core import (
+    client_options as client_options_lib,
+    exceptions as core_exceptions,
+    gapic_v1,
+    retry as retries,
+)
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.cloud.vision_v1 import gapic_version as package_version
 from google.oauth2 import service_account  # type: ignore
+import google.protobuf
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]

packages/google-cloud-vision/google/cloud/vision_v1/services/product_search/pagers.py

@@ -25,9 +25,7 @@
     Union,
 )
 
-from google.api_core import gapic_v1
-from google.api_core import retry as retries
-from google.api_core import retry_async as retries_async
+from google.api_core import gapic_v1, retry as retries, retry_async as retries_async
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]