tap-belvo 0.0.1b5__py3-none-any.whl → 0.0.1b7__py3-none-any.whl

tap_belvo/client.py

@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 from abc import ABCMeta, abstractmethod
+from copy import deepcopy
 from typing import TYPE_CHECKING, Any
 from urllib.parse import ParseResult, parse_qsl
 
+from requests.auth import HTTPBasicAuth
 from requests_cache import install_cache
 from singer_sdk import RESTStream
 from singer_sdk._singerlib import resolve_schema_references
-from singer_sdk.authenticators import BasicAuthenticator
 from singer_sdk.helpers._typing import is_date_or_datetime_type
 from singer_sdk.pagination import BaseHATEOASPaginator
 
@@ -24,6 +25,37 @@ PAGE_SIZE = 1000
 install_cache("tap_belvo_cache", backend="sqlite", expire_after=3600)
 
 
+def _handle_schema_nullable(schema: dict[str, Any]) -> dict[str, Any]:
+    """Resolve x-nullable properties to standard JSON Schema nullable type.
+
+    Args:
+        schema: A JSON Schema dictionary.
+
+    Returns:
+        A new JSON Schema dictionary with 'x-nullable' resolved to [<type>, "null"].
+    """
+    result = deepcopy(schema)
+
+    if "object" in result["type"]:
+        for prop, prop_schema in result.get("properties", {}).items():
+            prop_type: str | list[str] = prop_schema.get("type", [])
+            types = [prop_type] if isinstance(prop_type, str) else prop_type
+            nullable: bool = prop_schema.get("nullable", False)
+
+            if nullable:
+                prop_schema["type"] = [*types, "null"]
+
+            result["properties"][prop] = _handle_schema_nullable(prop_schema)
+
+    elif "array" in result["type"]:
+        result["items"] = _handle_schema_nullable(result["items"])
+
+    if "enum" in result and None not in result["enum"]:
+        result["enum"].append(None)
+
+    return result
+
+
 class BelvoPaginator(BaseHATEOASPaginator):
     """Belvo API paginator class."""
 
@@ -36,10 +68,10 @@ class BelvoPaginator(BaseHATEOASPaginator):
         Returns:
             The next URL.
         """
-        return response.json().get("next")
+        return response.json().get("next")  # type: ignore[no-any-return]
 
 
-class BelvoStream(RESTStream, metaclass=ABCMeta):
+class BelvoStream(RESTStream[ParseResult], metaclass=ABCMeta):
     """Belvo stream class."""
 
     records_jsonpath = "$.results[*]"  # Or override `parse_response`.
@@ -51,26 +83,19 @@ class BelvoStream(RESTStream, metaclass=ABCMeta):
         Returns:
             str: The URL base.
         """
-        return self.config["base_url"]
+        return self.config["base_url"]  # type: ignore[no-any-return]
 
     @property
-    def authenticator(self) -> BasicAuthenticator:
+    def authenticator(self) -> HTTPBasicAuth:
         """Get an authenticator object.
 
         Returns:
             The authenticator instance for this REST stream.
         """
-        username = self.config["secret_id"]
-        password = self.config["password"]
-
-        return BasicAuthenticator.create_for_stream(
-            self,
-            username=username,
-            password=password,
-        )
+        return HTTPBasicAuth(self.config["secret_id"], self.config["password"])
 
     @property
-    def http_headers(self) -> dict:
+    def http_headers(self) -> dict[str, str]:
         """Return the http headers needed.
 
         Returns:
@@ -90,7 +115,7 @@ class BelvoStream(RESTStream, metaclass=ABCMeta):
 
     def get_url_params(
         self,
-        context: dict | None,
+        context: dict[Any, Any] | None,
         next_page_token: ParseResult | None,
     ) -> dict[str, Any]:
         """Get URL query parameters.
@@ -146,7 +171,7 @@ class BelvoStream(RESTStream, metaclass=ABCMeta):
         Returns:
             The schema for this stream.
         """
-        return self._resolve_openapi_ref()
+        return _handle_schema_nullable(self._resolve_openapi_ref())
 
     @property
     @abstractmethod