read config changes solution

Author: ohmayr

packages/gapic-generator/gapic/schema/wrappers.py

@@ -70,6 +70,7 @@
 from gapic.utils import cached_proto_context
 from gapic.utils import uri_sample
 from gapic.utils import make_private
+from gapic.utils import Options
 
 
 @dataclasses.dataclass(frozen=True)
@@ -688,7 +689,16 @@ def resource_path(self) -> Optional[str]:
     @property
     def resource_type(self) -> Optional[str]:
         resource = self.options.Extensions[resource_pb2.resource]
-        return resource.type[resource.type.find("/") + 1 :] if resource else None
+        if not resource:
+            return None
+            
+        # Extract the standard short name (e.g., "Tool" from "ces.googleapis.com/Tool")
+        default_type = resource.type[resource.type.find("/") + 1 :]
+        
+        # Check if the CLI provided an alias for this specific resource path
+        aliases = getattr(Options, "resource_name_aliases_global", {})
+        
+        return aliases.get(resource.type, default_type)
 
     @property
     def resource_type_full_path(self) -> Optional[str]:

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2

@@ -76,11 +76,11 @@ class {{ service.async_client_name }}:
     _DEFAULT_ENDPOINT_TEMPLATE = {{ service.client_name }}._DEFAULT_ENDPOINT_TEMPLATE
     _DEFAULT_UNIVERSE = {{ service.client_name }}._DEFAULT_UNIVERSE
 
-    {% for message in service.resource_messages|sort(attribute="resource_type") %}
+    {% for message in service.resource_messages %}
     {{ message.resource_type|snake_case }}_path = staticmethod({{ service.client_name }}.{{ message.resource_type|snake_case }}_path)
     parse_{{ message.resource_type|snake_case}}_path = staticmethod({{ service.client_name }}.parse_{{ message.resource_type|snake_case }}_path)
     {% endfor %}
-    {% for resource_msg in service.common_resources.values()|sort(attribute="type_name") %}
+    {% for resource_msg in service.common_resources.values() %}
     common_{{ resource_msg.message_type.resource_type|snake_case }}_path = staticmethod({{ service.client_name }}.common_{{ resource_msg.message_type.resource_type|snake_case }}_path)
     parse_common_{{ resource_msg.message_type.resource_type|snake_case }}_path = staticmethod({{ service.client_name }}.parse_common_{{ resource_msg.message_type.resource_type|snake_case }}_path)
     {% endfor %}

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2

@@ -262,7 +262,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
         return self._transport
 
 
-    {% for message in service.resource_messages|sort(attribute="resource_type") %}
+    {% for message in service.resource_messages %}
     @staticmethod
     def {{ message.resource_type|snake_case }}_path({% for arg in message.resource_path_args %}{{ arg }}: str,{% endfor %}) -> str:
         """Returns a fully-qualified {{ message.resource_type|snake_case }} string."""

packages/gapic-generator/gapic/utils/options.py

@@ -51,6 +51,7 @@ class Options:
     rest_numeric_enums: bool = False
     proto_plus_deps: Tuple[str, ...] = dataclasses.field(default=("",))
     gapic_version: str = "0.0.0"
+    resource_name_aliases: Dict[str, str] = dataclasses.field(default_factory=dict)
 
     # Class constants
     PYTHON_GAPIC_PREFIX: str = "python-gapic-"
@@ -73,6 +74,7 @@ class Options:
             # For example, 'google.cloud.api.v1+google.cloud.anotherapi.v2'
             "proto-plus-deps",
             "gapic-version",  # A version string following https://peps.python.org/pep-0440
+            "resource-name-aliases",
         )
     )
 
@@ -187,6 +189,18 @@ def tweak_path(p):
         proto_plus_deps = tuple(opts.pop("proto-plus-deps", ""))
         if len(proto_plus_deps):
             proto_plus_deps = tuple(proto_plus_deps[0].split("+"))
+        
+        resource_name_aliases = {}
+        resource_alias_strings = opts.pop("resource-name-aliases", None)
+        if resource_alias_strings:
+            try:
+                # Strip single quotes that survive the Bazel/Shell transition
+                raw_string = resource_alias_strings[-1].strip("'")
+                resource_name_aliases = json.loads(raw_string)
+            except json.JSONDecodeError as e:
+                warnings.warn(f"Failed to parse resource-name-aliases JSON: {e} from string: {resource_alias_strings[-1]}")
+        
+        Options.resource_name_aliases_global = resource_name_aliases
 
         answer = Options(
             name=opts.pop("name", [""]).pop(),
@@ -210,6 +224,7 @@ def tweak_path(p):
             rest_numeric_enums=rest_numeric_enums,
             proto_plus_deps=proto_plus_deps,
             gapic_version=opts.pop("gapic-version", ["0.0.0"]).pop(),
+            resource_name_aliases=resource_name_aliases,
         )
 
         # Note: if we ever need to recursively check directories for sample