ci: regenerated with OpenAPI Doc 0.1.0, Speakeay CLI 1.7.1

Author: speakeasybot

RELEASES.md

@@ -50,4 +50,12 @@ Based on:
 - OpenAPI Doc 0.1.0 ./openapi.yaml
 - Speakeasy CLI 1.6.0 https://github.com/speakeasy-api/speakeasy
 ### Releases
-- [PyPI v0.3.0] https://pypi.org/project/fabra/0.3.0 - ./
+- [PyPI v0.3.0] https://pypi.org/project/fabra/0.3.0 - ./
+
+## Version 0.4.0
+### Changes
+Based on:
+- OpenAPI Doc 0.1.0 ./openapi.yaml
+- Speakeasy CLI 1.7.1 https://github.com/speakeasy-api/speakeasy
+### Releases
+- [PyPI v0.4.0] https://pypi.org/project/fabra/0.4.0 - ./

gen.yaml

@@ -2,12 +2,12 @@ configVersion: 1.0.0
 management:
     docChecksum: 5bdbad96d6d347d81789110337cf504a
     docVersion: 0.1.0
-    speakeasyVersion: 1.6.0
+    speakeasyVersion: 1.7.1
 generation:
     telemetryEnabled: false
     sdkClassName: Fabra
 python:
-    version: 0.3.0
+    version: 0.4.0
     author: fabra
     description: Python Client SDK Generated by Speakeasy
     packageName: fabra

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="fabra",
-    version="0.3.0",
+    version="0.4.0",
     author="fabra",
     description="Python Client SDK Generated by Speakeasy",
     long_description=long_description,

src/fabra/sdk.py

@@ -26,8 +26,8 @@ class Fabra:
     _security: shared.Security
     _server_url: str = SERVERS[0]
     _language: str = "python"
-    _sdk_version: str = "0.3.0"
-    _gen_version: str = "1.6.0"
+    _sdk_version: str = "0.4.0"
+    _gen_version: str = "1.7.1"
 
     def __init__(self) -> None:
         self._client = requests.Session()

src/fabra/utils/utils.py

@@ -41,9 +41,13 @@ def configure_security_client(client: requests.Session, security: dataclass):
             continue
         if metadata.get('option'):
             _parse_security_option(client, value)
-            return
+            return client
         elif metadata.get('scheme'):
-            _parse_security_scheme(client, metadata, value)
+            # Special case for basic auth which could be a flattened struct
+            if metadata.get("sub_type") == "basic" and not is_dataclass(value):
+                _parse_security_scheme(client, metadata, security)
+            else:
+                _parse_security_scheme(client, metadata, value)
 
     return client
 
@@ -54,47 +58,60 @@ def _parse_security_option(client: SecurityClient, option: dataclass):
         metadata = opt_field.metadata.get('security')
         if metadata is None or metadata.get('scheme') is None:
             continue
-        _parse_security_scheme(client, metadata.get(
-            'scheme'), getattr(option, opt_field.name))
+        _parse_security_scheme(
+            client, metadata, getattr(option, opt_field.name))
 
 
-def _parse_security_scheme(client: SecurityClient, scheme_metadata: dict, scheme: dataclass):
+def _parse_security_scheme(client: SecurityClient, scheme_metadata: dict, scheme: any):
     scheme_type = scheme_metadata.get('type')
     sub_type = scheme_metadata.get('sub_type')
 
-    if scheme_type == 'http' and sub_type == 'basic':
-        _parse_basic_auth_scheme(client, scheme)
-        return
+    if is_dataclass(scheme):
+        if scheme_type == 'http' and sub_type == 'basic':
+            _parse_basic_auth_scheme(client, scheme)
+            return
 
-    scheme_fields: Tuple[Field, ...] = fields(scheme)
-    for scheme_field in scheme_fields:
-        metadata = scheme_field.metadata.get('security')
-        if metadata is None or metadata.get('field_name') is None:
-            continue
+        scheme_fields: Tuple[Field, ...] = fields(scheme)
+        for scheme_field in scheme_fields:
+            metadata = scheme_field.metadata.get('security')
+            if metadata is None or metadata.get('field_name') is None:
+                continue
 
-        header_name = metadata.get('field_name')
-        value = getattr(scheme, scheme_field.name)
+            value = getattr(scheme, scheme_field.name)
 
-        if scheme_type == "apiKey":
-            if sub_type == 'header':
-                client.client.headers[header_name] = value
-            elif sub_type == 'query':
-                client.query_params[header_name] = value
-            elif sub_type == 'cookie':
-                client.client.cookies[header_name] = value
-            else:
-                raise Exception('not supported')
-        elif scheme_type == "openIdConnect":
+            _parse_security_scheme_value(
+                client, scheme_metadata, metadata, value)
+    else:
+        _parse_security_scheme_value(
+            client, scheme_metadata, scheme_metadata, scheme)
+
+
+def _parse_security_scheme_value(client: SecurityClient, scheme_metadata: dict, security_metadata: dict, value: any):
+    scheme_type = scheme_metadata.get('type')
+    sub_type = scheme_metadata.get('sub_type')
+
+    header_name = security_metadata.get('field_name')
+
+    if scheme_type == "apiKey":
+        if sub_type == 'header':
             client.client.headers[header_name] = value
-        elif scheme_type == 'oauth2':
+        elif sub_type == 'query':
+            client.query_params[header_name] = value
+        elif sub_type == 'cookie':
+            client.client.cookies[header_name] = value
+        else:
+            raise Exception('not supported')
+    elif scheme_type == "openIdConnect":
+        client.client.headers[header_name] = value
+    elif scheme_type == 'oauth2':
+        client.client.headers[header_name] = value
+    elif scheme_type == 'http':
+        if sub_type == 'bearer':
             client.client.headers[header_name] = value
-        elif scheme_type == 'http':
-            if sub_type == 'bearer':
-                client.client.headers[header_name] = value
-            else:
-                raise Exception('not supported')
         else:
             raise Exception('not supported')
+    else:
+        raise Exception('not supported')
 
 
 def _parse_basic_auth_scheme(client: SecurityClient, scheme: dataclass):