fix: Callbacks forward ref support.

Author: mike-oakley

openapi_pydantic/v3/v3_0_3/__init__.py

@@ -6,38 +6,39 @@
 https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.3.md#table-of-contents
 """
 
-from .open_api import OpenAPI as OpenAPI
-from .info import Info as Info
-from .contact import Contact as Contact
-from .license import License as License
-from .server import Server as Server
-from .server_variable import ServerVariable as ServerVariable
+from .callback import Callback as Callback
 from .components import Components as Components
-from .paths import Paths as Paths
-from .path_item import PathItem as PathItem
-from .operation import Operation as Operation
-from .external_documentation import ExternalDocumentation as ExternalDocumentation
-from .parameter import Parameter as Parameter, ParameterLocation as ParameterLocation
-from .request_body import RequestBody as RequestBody
-from .media_type import MediaType as MediaType
+from .contact import Contact as Contact
+from .discriminator import Discriminator as Discriminator
 from .encoding import Encoding as Encoding
-from .responses import Responses as Responses
-from .response import Response as Response
-from .callback import Callback as Callback
 from .example import Example as Example
-from .link import Link as Link
+from .external_documentation import ExternalDocumentation as ExternalDocumentation
 from .header import Header as Header
-from .tag import Tag as Tag
+from .info import Info as Info
+from .license import License as License
+from .link import Link as Link
+from .media_type import MediaType as MediaType
+from .oauth_flow import OAuthFlow as OAuthFlow
+from .oauth_flows import OAuthFlows as OAuthFlows
+from .open_api import OpenAPI as OpenAPI
+from .operation import Operation as Operation
+from .parameter import Parameter as Parameter
+from .parameter import ParameterLocation as ParameterLocation
+from .path_item import PathItem as PathItem
+from .paths import Paths as Paths
 from .reference import Reference as Reference
+from .request_body import RequestBody as RequestBody
+from .response import Response as Response
+from .responses import Responses as Responses
 from .schema import Schema as Schema
-from .discriminator import Discriminator as Discriminator
-from .xml import XML as XML
-from .security_scheme import SecurityScheme as SecurityScheme
-from .oauth_flows import OAuthFlows as OAuthFlows
-from .oauth_flow import OAuthFlow as OAuthFlow
 from .security_requirement import SecurityRequirement as SecurityRequirement
-
+from .security_scheme import SecurityScheme as SecurityScheme
+from .server import Server as Server
+from .server_variable import ServerVariable as ServerVariable
+from .tag import Tag as Tag
+from .xml import XML as XML
 
 # resolve forward references
 Encoding.update_forward_refs(Header=Header)
 Schema.update_forward_refs()
+Operation.update_forward_refs(PathItem=PathItem)

openapi_pydantic/v3/v3_1_0/__init__.py

@@ -6,37 +6,39 @@
 https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#table-of-contents
 """
 
-from .open_api import OpenAPI as OpenAPI
-from .info import Info as Info
-from .contact import Contact as Contact
-from .license import License as License
-from .server import Server as Server
-from .server_variable import ServerVariable as ServerVariable
+from .callback import Callback as Callback
 from .components import Components as Components
-from .paths import Paths as Paths
-from .path_item import PathItem as PathItem
-from .operation import Operation as Operation
-from .external_documentation import ExternalDocumentation as ExternalDocumentation
-from .parameter import Parameter as Parameter, ParameterLocation as ParameterLocation
-from .request_body import RequestBody as RequestBody
-from .media_type import MediaType as MediaType
+from .contact import Contact as Contact
+from .discriminator import Discriminator as Discriminator
 from .encoding import Encoding as Encoding
-from .responses import Responses as Responses
-from .response import Response as Response
-from .callback import Callback as Callback
 from .example import Example as Example
-from .link import Link as Link
+from .external_documentation import ExternalDocumentation as ExternalDocumentation
 from .header import Header as Header
-from .tag import Tag as Tag
+from .info import Info as Info
+from .license import License as License
+from .link import Link as Link
+from .media_type import MediaType as MediaType
+from .oauth_flow import OAuthFlow as OAuthFlow
+from .oauth_flows import OAuthFlows as OAuthFlows
+from .open_api import OpenAPI as OpenAPI
+from .operation import Operation as Operation
+from .parameter import Parameter as Parameter
+from .parameter import ParameterLocation as ParameterLocation
+from .path_item import PathItem as PathItem
+from .paths import Paths as Paths
 from .reference import Reference as Reference
+from .request_body import RequestBody as RequestBody
+from .response import Response as Response
+from .responses import Responses as Responses
 from .schema import Schema as Schema
-from .discriminator import Discriminator as Discriminator
-from .xml import XML as XML
-from .security_scheme import SecurityScheme as SecurityScheme
-from .oauth_flows import OAuthFlows as OAuthFlows
-from .oauth_flow import OAuthFlow as OAuthFlow
 from .security_requirement import SecurityRequirement as SecurityRequirement
+from .security_scheme import SecurityScheme as SecurityScheme
+from .server import Server as Server
+from .server_variable import ServerVariable as ServerVariable
+from .tag import Tag as Tag
+from .xml import XML as XML
 
 # resolve forward references
 Encoding.update_forward_refs(Header=Header)
 Schema.update_forward_refs()
+Operation.update_forward_refs(PathItem=PathItem)

tests/test_openapi.py

@@ -0,0 +1,37 @@
+import pytest
+
+from openapi_pydantic.v3 import v3_0_3, v3_1_0
+
+
+@pytest.mark.parametrize("version", ["3.0.3", "3.1.0"])
+def test_parse_with_callback(version: str) -> None:
+    data = {
+        "openapi": version,
+        "info": {"title": "API with Callback", "version": ""},
+        "paths": {
+            "/create": {
+                "post": {
+                    "responses": {"200": {"description": "Success"}},
+                    "callbacks": {
+                        "event": {
+                            "callback": {
+                                "post": {
+                                    "responses": {"200": {"description": "Success"}}
+                                }
+                            }
+                        }
+                    },
+                }
+            }
+        },
+    }
+
+    if version == "3.0.3":
+        module = v3_0_3
+    else:
+        module = v3_1_0
+
+    open_api = module.OpenAPI.parse_obj(data)
+    create_endpoint = open_api.paths["/create"]
+    assert "200" in create_endpoint.post.responses
+    assert "200" in create_endpoint.post.callbacks["event"]["callback"].post.responses