parser / schemas / add indirect reference resolution

Author: p1-ra

openapi_python_client/parser/properties/__init__.py

@@ -22,7 +22,7 @@
 from .enum_property import EnumProperty
 from .model_property import ModelProperty, build_model_property
 from .property import Property
-from .schemas import Class, Schemas, parse_reference_path, update_schemas_with_data
+from .schemas import Class, Schemas, parse_reference_path, update_schemas_with
 
 
 @attr.s(auto_attribs=True, frozen=True)
@@ -559,18 +559,17 @@ def build_schemas(
         next_round = []
         # Only accumulate errors from the last round, since we might fix some along the way
         for name, data in to_process:
-            if isinstance(data, oai.Reference):
-                schemas.errors.append(PropertyError(data=data, detail="Reference schemas are not supported."))
-                continue
             ref_path = parse_reference_path(f"#/components/schemas/{name}")
             if isinstance(ref_path, ParseError):
                 schemas.errors.append(PropertyError(detail=ref_path.detail, data=data))
                 continue
-            schemas_or_err = update_schemas_with_data(ref_path=ref_path, data=data, schemas=schemas, config=config)
+
+            schemas_or_err = update_schemas_with(ref_path=ref_path, data=data, schemas=schemas, config=config)
             if isinstance(schemas_or_err, PropertyError):
                 next_round.append((name, data))
                 errors.append(schemas_or_err)
                 continue
+
             schemas = schemas_or_err
             still_making_progress = True
         to_process = next_round

openapi_python_client/parser/properties/schemas.py

@@ -1,4 +1,4 @@
-__all__ = ["Class", "Schemas", "parse_reference_path", "update_schemas_with_data"]
+__all__ = ["Class", "Schemas", "parse_reference_path", "update_schemas_with"]
 
 from typing import TYPE_CHECKING, Dict, List, NewType, Union, cast
 from urllib.parse import urlparse
@@ -61,7 +61,30 @@ class Schemas:
     errors: List[ParseError] = attr.ib(factory=list)
 
 
-def update_schemas_with_data(
+def update_schemas_with(
+    *, ref_path: _ReferencePath, data: Union[oai.Reference, oai.Schema], schemas: Schemas, config: Config
+) -> Union[Schemas, PropertyError]:
+    if isinstance(data, oai.Reference):
+        return _update_schemas_with_reference(ref_path=ref_path, data=data, schemas=schemas, config=config)
+    else:
+        return _update_schemas_with_data(ref_path=ref_path, data=data, schemas=schemas, config=config)
+
+
+def _update_schemas_with_reference(
+    *, ref_path: _ReferencePath, data: oai.Reference, schemas: Schemas, config: Config
+) -> Union[Schemas, PropertyError]:
+    reference_pointer = parse_reference_path(data.ref)
+    if isinstance(reference_pointer, ParseError):
+        return PropertyError(detail=reference_pointer.detail, data=data)
+
+    resolved_reference = schemas.classes_by_reference.get(reference_pointer)
+    if resolved_reference:
+        return attr.evolve(schemas, classes_by_reference={ref_path: resolved_reference, **schemas.classes_by_reference})
+    else:
+        return PropertyError(f"Reference {ref_path} could not be resolved", data=data)
+
+
+def _update_schemas_with_data(
     *, ref_path: _ReferencePath, data: oai.Schema, schemas: Schemas, config: Config
 ) -> Union[Schemas, PropertyError]:
     from . import property_from_data