python-service-builder 1.0.0__tar.gz → 1.0.2__tar.gz

{python-service-builder-1.0.0 → python-service-builder-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-service-builder
-Version: 1.0.0
+Version: 1.0.2
 Summary: Helper library for easier creation of Google services.
 Author-email: David Harcombe <david.harcombe@gmail.com>
 License: Apache 2.0
@@ -10,6 +10,20 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Requires-Dist: absl-py>=0.12.0
+Requires-Dist: dataclasses-json>=0.5.2
+Requires-Dist: gcs-oauth2-boto-plugin>=2.7
+Requires-Dist: google-api-core>=1.26.1
+Requires-Dist: google-api-python-client>=2.0.2
+Requires-Dist: google-auth-httplib2>=0.1.0
+Requires-Dist: google-auth-oauthlib>=0.4.3
+Requires-Dist: google-auth>=1.28.0
+Requires-Dist: google-reauth>=0.1.1
+Requires-Dist: googleapis-common-protos>=1.53.0
+Requires-Dist: httplib2>=0.19.0
+Requires-Dist: immutabledict>=2.2.1
+Requires-Dist: oauth2client>=4.1.3
+Requires-Dist: oauthlib>=3.1.0
 
 # Python Library for helping to create Python services from Google APIs
 

{python-service-builder-1.0.0 → python-service-builder-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "python-service-builder"
-version = "1.0.0"
+version = "1.0.2"
 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.0.0 → python-service-builder-1.0.2}/python_service_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-service-builder
-Version: 1.0.0
+Version: 1.0.2
 Summary: Helper library for easier creation of Google services.
 Author-email: David Harcombe <david.harcombe@gmail.com>
 License: Apache 2.0
@@ -10,6 +10,20 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+Requires-Dist: absl-py>=0.12.0
+Requires-Dist: dataclasses-json>=0.5.2
+Requires-Dist: gcs-oauth2-boto-plugin>=2.7
+Requires-Dist: google-api-core>=1.26.1
+Requires-Dist: google-api-python-client>=2.0.2
+Requires-Dist: google-auth-httplib2>=0.1.0
+Requires-Dist: google-auth-oauthlib>=0.4.3
+Requires-Dist: google-auth>=1.28.0
+Requires-Dist: google-reauth>=0.1.1
+Requires-Dist: googleapis-common-protos>=1.53.0
+Requires-Dist: httplib2>=0.19.0
+Requires-Dist: immutabledict>=2.2.1
+Requires-Dist: oauth2client>=4.1.3
+Requires-Dist: oauthlib>=3.1.0
 
 # Python Library for helping to create Python services from Google APIs
 

{python-service-builder-1.0.0 → python-service-builder-1.0.2}/service_framework/service_builder.py

@@ -28,12 +28,13 @@ from google.auth import exceptions
 from google.oauth2 import credentials as oauth
 from httplib2 import Http
 from oauth2client import service_account
+from oauth2client import client
 
 from service_framework.services import Service
 from service_framework import snake_field
 
 
-@dataclasses_json.dataclass_json
+@dataclasses_json.dataclass_json(undefined=dataclasses_json.Undefined.EXCLUDE)
 @dataclasses.dataclass
 class OAuthKey(object):
   """Dataclass from the json key.
@@ -75,22 +76,10 @@ def build_service(service: Service,
     if extra_scopes:
       kwargs['scopes'] = extra_scopes
 
-    try:
-      credentials = oauth.Credentials(**kwargs)
-      https = google_auth_httplib2.AuthorizedHttp(credentials)
-
-    except KeyError:
-      logging.exception(
-          'Invalid credentials received: missing a part of the credentials')
-      raise
-
-    except exceptions.RefreshError as error:
-      logging.exception('Invalid credentials received')
-      raise
+    credentials = oauth.Credentials(**kwargs)
 
   elif isinstance(key, oauth.Credentials):
     credentials = key
-    https = google_auth_httplib2.AuthorizedHttp(credentials)
 
   elif isinstance(key, str):
     kwargs = {
@@ -99,27 +88,20 @@ def build_service(service: Service,
     if extra_scopes:
       kwargs['scopes'] = extra_scopes
 
-    credentials = \
-        service_account.ServiceAccountCredentials.from_json_keyfile_name(
-            **kwargs)
-    https = credentials.authorize(Http())
+    credentials = oauth.Credentials.from_authorized_user_file(**kwargs)
 
   elif isinstance(key, Mapping):
-    kwargs = {
-        'keyfile_dict': key,
-    }
+    kwargs = OAuthKey(**key).to_dict()
 
     if extra_scopes:
       kwargs['scopes'] = extra_scopes
 
-    credentials = \
-        service_account.ServiceAccountCredentials.from_json_keyfile_dict(
-            key, scopes=extra_scopes)
-    https = credentials.authorize(Http())
+    credentials = oauth.Credentials(**kwargs)
 
   else:
     raise Exception('No valid credentials provided.')
 
+  https = google_auth_httplib2.AuthorizedHttp(credentials)
   discovery_args = {
       'http': https,
       'developerKey': api_key,

{python-service-builder-1.0.0 → python-service-builder-1.0.2}/service_framework/services.py

@@ -322,6 +322,7 @@ SERVICE_DEFINITIONS = \
         'WEBSECURITYSCANNER': ('websecurityscanner', 'v1'),
         'WORKFLOWEXECUTIONS': ('workflowexecutions', 'v1'),
         'WORKFLOWS': ('workflows', 'v1'),
+        'WORKSPACEEVENTS': {'workspaceevents', 'v1'},
         'YOUTUBE': ('youtube', 'v3'),
         'YOUTUBEANALYTICS': ('youtubeAnalytics', 'v2'),
         'YOUTUBEREPORTING': ('youtubereporting', 'v1')})