python-service-builder 1.3.0__tar.gz → 2.0.0__tar.gz

{python_service_builder-1.3.0/python_service_builder.egg-info → python_service_builder-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-service-builder
-Version: 1.3.0
+Version: 2.0.0
 Summary: Helper library for easier creation of Google services.
 Author-email: David Harcombe <david.harcombe@gmail.com>
 License-Expression: Apache-2.0

{python_service_builder-1.3.0 → python_service_builder-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "python-service-builder"
-version = "1.3.0"
+version = "2.0.0"
 authors = [{ name = "David Harcombe", email = "david.harcombe@gmail.com" }]
 description = "Helper library for easier creation of Google services."
 readme = "README.md"

{python_service_builder-1.3.0 → python_service_builder-2.0.0/python_service_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-service-builder
-Version: 1.3.0
+Version: 2.0.0
 Summary: Helper library for easier creation of Google services.
 Author-email: David Harcombe <david.harcombe@gmail.com>
 License-Expression: Apache-2.0

{python_service_builder-1.3.0 → python_service_builder-2.0.0}/service_framework/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import dataclasses
-from typing import Any, Callable, Mapping
+from typing import Any, Callable, Mapping, Optional
 
 import dataclasses_json
 
@@ -113,3 +113,12 @@ def camel_field(default: Any = None,
   """
   return field(default=default, default_factory=default_factory,
                letter_case=dataclasses_json.LetterCase.CAMEL, **kwargs)
+
+
+@dataclasses_json.dataclass_json
+@dataclasses.dataclass
+class ServiceDefinition(object):
+  """Defines a Google Service for the builder."""
+  service_name: Optional[str] = camel_field()
+  version: Optional[str] = camel_field()
+  discovery_service_url: Optional[str] = camel_field()

{python_service_builder-1.3.0 → python_service_builder-2.0.0}/service_framework/list_services.py

@@ -21,7 +21,6 @@ from pprint import pprint
 from typing import Mapping
 from urllib.request import urlopen
 
-import aenum as enum
 from absl import app
 
 from service_framework.services import ServiceDefinition
@@ -30,21 +29,19 @@ from service_framework.services import ServiceDefinition
 """
 
 
-class ServiceFinder(enum.EnumMeta):
+class ServiceFinder(object):
   def __call__(cls, value, *args, **kwargs):
     api = ServiceLister().find(name=value.lower())
     if api:
-      (service_name, version) = api[0]
+      (service_name, version, url) = api[value.upper()]
       definition = ServiceDefinition(
           service_name=service_name,
           version=version,
-          discovery_service_url=(
-              f'https://{service_name}.googleapis.com/$discovery/rest'
-              f'?version={version}'))
+          discovery_service_url=url)
       return definition
 
     else:
-      raise Exception(f'No service found for {value}')
+      raise Exception(f'No Google service found with the name {value}')
 
 
 class ServiceLister(object):
@@ -59,8 +56,7 @@ class ServiceLister(object):
 
     apis = {}
 
-    parameters = {#'fields': 'items.name,items.version',
-                  'preferred': 'true'}
+    parameters = {'preferred': 'true'}
     if name:
       parameters |= {'name': name}
 
@@ -90,7 +86,9 @@ def main(unused) -> None:
 
   # apis = ServiceLister().find(name='CHAT'.lower())
   apis = ServiceLister().find_all()
-  pprint(apis, indent=2)
+  # pprint(apis, indent=2)
+  for k, v in apis.items():
+    print(f'{k} = ServiceDefinition{v}')
 
 
 if __name__ == '__main__':