Fixes the ambiguous schema validation issue as well (and reformats some stuff)

Author: jakedialpad

cli/client_gen/annotation.py

@@ -5,6 +5,7 @@
 
 """Utilities for converting OpenAPI schema pieces to Python type annotations."""
 
+
 def spec_type_to_py_type(s_type: str, s_format: Optional[str]) -> str:
   """Converts an OpenAPI type+format to a Python type string"""
   s_mapping = {
@@ -15,7 +16,7 @@ def spec_type_to_py_type(s_type: str, s_format: Optional[str]) -> str:
     (
       'string',
       'byte',
-    ): 'Annotated[str, \'base64\']',
+    ): "Annotated[str, 'base64']",
     (
       'string',
       'date-time',

test/test_client_methods.py

@@ -67,17 +67,14 @@ def request_matcher(request: requests.PreparedRequest):
           'items': [
             {'id': 1, 'display_name': 'User 1'},
             {'id': 2, 'display_name': 'User 2'},
-            {'id': 3, 'display_name': 'User 3'}
+            {'id': 3, 'display_name': 'User 3'},
           ],
-          'cursor': 'next_page_cursor'
+          'cursor': 'next_page_cursor',
         }
       elif cursor == 'next_page_cursor':
         # Second page: 2 users, no next cursor
         response_data = {
-          'items': [
-            {'id': 4, 'display_name': 'User 4'},
-            {'id': 5, 'display_name': 'User 5'}
-          ]
+          'items': [{'id': 4, 'display_name': 'User 4'}, {'id': 5, 'display_name': 'User 5'}]
         }
       else:
         # No more pages
@@ -120,12 +117,6 @@ def test_request_conformance(self, openapi_stub):
     # Construct a DialpadClient with a fake API key.
     dp = DialpadClient('123')
 
-    skip = set(
-      [
-        ('FaxLinesResource', 'assign'),
-      ]
-    )
-
     # Iterate through the attributes on the client object to find the API resource accessors.
     for a in dir(dp):
       resource_instance = getattr(dp, a)
@@ -151,21 +142,17 @@ def test_request_conformance(self, openapi_stub):
         if not callable(resource_method):
           continue
 
-        if (resource_instance.__class__.__name__, method_attr) in skip:
-          logger.info(
-            'Skipping %s.%s as it is explicitly excluded from this test',
-            resource_instance.__class__.__name__,
-            method_attr,
-          )
-          continue
-
         # Generate fake kwargs for the resource method.
         faked_kwargs = generate_faked_kwargs(resource_method)
         if (resource_instance.__class__.__name__, method_attr) == ('NumbersResource', 'swap'):
           # The openapi validator doesn't like that swap_details can be valid under multiple
           # OneOf schemas...
           faked_kwargs['request_body'].pop('swap_details', None)
 
+        if (resource_instance.__class__.__name__, method_attr) == ('FaxLinesResource', 'assign'):
+          # The openapi validator doesn't like it if "line" could be valid under multiple schemas.
+          faked_kwargs['request_body']['line'] = {'type': 'toll-free'}
+
         logger.info(
           'Testing resource method %s.%s with faked kwargs: %s',
           resource_instance.__class__.__name__,