Move services into a "services" super-module. (#33)

Author: lukesneeringer

packages/gapic-generator/gapic/generator/generator.py

@@ -14,6 +14,7 @@
 
 import collections
 import os
+import re
 from typing import Any, Iterable, Mapping, Sequence, Tuple
 
 import jinja2
@@ -180,13 +181,18 @@ def _get_filenames(
         # Replace the $name and $version variables.
         filename = filename.replace('$name_$version',
                                     self._api.naming.versioned_module_name)
+        filename = filename.replace('$version', self._api.naming.version)
         filename = filename.replace('$name', self._api.naming.module_name)
 
         # Replace the $service variable if applicable.
         if context and 'service' in context:
             filename = filename.replace('$service',
                                         context['service'].module_name)
 
+        # Paths may have empty path segments if components are empty
+        # (e.g. no $version); handle this.
+        filename = re.sub(r'/+', '/', filename)
+
         # Done, return the filename.
         return (filename,)
 

packages/gapic-generator/gapic/templates/$namespace/$name/__init__.py.j2

@@ -1,10 +1,13 @@
 {% extends '_base.py.j2' %}
 
 {% block content %}
+# Import each service from {{ api.naming.version }} into the unversioned namespace.
 {% for service in api.services.values() -%}
-from ..{{ api.naming.versioned_module_name }}.{{ service.name|snake_case }} import {{ service.name }}
+from ..{{ api.naming.versioned_module_name }}.services.{{ service.name|snake_case }} import {{ service.name }}
 {% endfor %}
+
 __all__ = (
+    '{{ api.naming.version }}',
     {%- for service in api.services.values() %}
     '{{ service.name }}',
     {%- endfor %}

packages/gapic-generator/gapic/templates/$namespace/$name_$version/__init__.py.j2

@@ -2,7 +2,7 @@
 
 {% block content %}
 {% for service in api.services.values() -%}
-from .{{ service.name|snake_case }} import {{ service.name }}
+from .services.{{ service.name|snake_case }} import {{ service.name }}
 {% endfor %}
 __all__ = (
     {%- for service in api.services.values() %}

…e/$name_$version/$service/__init__.py.j2 …version/services/$service/__init__.py.j2packages/gapic-generator/gapic/templates/$namespace/$name_$version/$service/__init__.py.j2 renamed to packages/gapic-generator/gapic/templates/$namespace/$name_$version/services/$service/__init__.py.j2 packages/gapic-generator/gapic/templates/$namespace/$name_$version/$service/__init__.py.j2 renamed to packages/gapic-generator/gapic/templates/$namespace/$name_$version/services/$service/__init__.py.j2

@@ -11,7 +11,7 @@ from google.auth import credentials
 {% for package, python_module in service.python_modules -%}
 from {{ package }} import {{ python_module }}
 {% endfor %}
-from ..utils import dispatch
+from ...utils import dispatch
 from .transports import get_transport_class
 from .transports import {{ service.name }}Transport
 

…ace/$name_$version/$service/client.py.j2 …_$version/services/$service/client.py.j2packages/gapic-generator/gapic/templates/$namespace/$name_$version/$service/client.py.j2 renamed to packages/gapic-generator/gapic/templates/$namespace/$name_$version/services/$service/client.py.j2 packages/gapic-generator/gapic/templates/$namespace/$name_$version/$service/client.py.j2 renamed to packages/gapic-generator/gapic/templates/$namespace/$name_$version/services/$service/client.py.j2

@@ -16,7 +16,7 @@
 
 from google.auth.credentials import AnonymousCredentials
 from google.showcase import Showcase
-from google.showcase_v1alpha1.showcase.transports.grpc import (
+from google.showcase_v1alpha1.services.showcase.transports.grpc import (
     ShowcaseGrpcTransport,
 )