clean up

Author: aaronsteers

airbyte_cdk/sources/utils/schema_helpers.py

@@ -8,17 +8,7 @@
 import os
 import pkgutil
 from copy import deepcopy
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    ClassVar,
-    Dict,
-    List,
-    Mapping,
-    MutableMapping,
-    Optional,
-    Tuple,
-)
+from typing import TYPE_CHECKING, Any, ClassVar, Dict, List, Mapping, MutableMapping, Tuple
 
 import jsonref
 from jsonschema import validate
@@ -80,7 +70,7 @@ def resolve_ref_links(obj: Any) -> Any:
 def get_ref_resolver_registry(schema: dict[str, Any]) -> Registry:
     """Get a reference resolver registry for the given schema."""
     resource: Resource = Resource.from_contents(
-        contents=deepcopy(schema),
+        contents=schema,
         default_specification=DRAFT7,
     )
     return Registry().with_resource(

airbyte_cdk/sources/utils/transform.py

@@ -207,23 +207,29 @@ def normalizator(
             validators parameter for detailed description.
             :
             """
-            # Very first step is to expand references in the schema itself
+            # Very first step is to expand references in the schema itself:
             expand_refs(schema)
+
+            # Now we can expand references in the property value:
             if isinstance(property_value, dict):
                 expand_refs(property_value)
+
+            # Now we can validate the entries:
+
+            # TODO: Delete all the below commented-out code if tests pass (simplified above)
             # resolver_registry: Registry = get_ref_resolver_registry(schema)
             # ref_resolver: Resolver = resolver_registry.resolver()
 
-            def resolve(subschema: dict[str, Any]) -> dict[str, Any]:
-                # if "$ref" in subschema:
-                #     try:
-                #         resolved = ref_resolver.lookup(subschema["$ref"]).contents
-                #     except Unresolvable as e:
-                #         raise ValidationError(
-                #             f"Failed to resolve $ref '{subschema['$ref']}' from {ref_resolver!r} and schema {schema!r}: {e}"
-                #         ) from e
-                #     return cast(dict[str, Any], resolved)
-                return subschema
+            # def resolve(subschema: dict[str, Any]) -> dict[str, Any]:
+            #     if "$ref" in subschema:
+            #         try:
+            #             resolved = ref_resolver.lookup(subschema["$ref"]).contents
+            #         except Unresolvable as e:
+            #             raise ValidationError(
+            #                 f"Failed to resolve $ref '{subschema['$ref']}' from {ref_resolver!r} and schema {schema!r}: {e}"
+            #             ) from e
+            #         return cast(dict[str, Any], resolved)
+            #     return subschema
 
             # Transform object and array values before running json schema type checking for each element.
             # Recursively normalize every value of the "instance" sub-object,