[python] update circular import

Signed-off-by: ふぁ <[email protected]>
OpenAPITools · Sep 23, 2023 · fc3e024 · fc3e024
1 parent f36b540
commit fc3e024
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 25 deletions.
diff --git a/modules/openapi-generator/src/main/resources/python/api_doc_example.mustache b/modules/openapi-generator/src/main/resources/python/api_doc_example.mustache
@@ -34,5 +34,8 @@ from pprint import pprint
 {{#vendorExtensions.x-py-postponed-example-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-postponed-example-imports}}
-{{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+try:
+    {{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+except Exception:
+    pass
 {{/vendorExtensions.x-py-postponed-example-imports.size}}
diff --git a/modules/openapi-generator/src/main/resources/python/model_anyof.mustache b/modules/openapi-generator/src/main/resources/python/model_anyof.mustache
@@ -185,5 +185,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-postponed-model-imports}}
-{{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+try:
+    {{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+except Exception:
+    pass
 {{/vendorExtensions.x-py-postponed-model-imports.size}}
diff --git a/modules/openapi-generator/src/main/resources/python/model_generic.mustache b/modules/openapi-generator/src/main/resources/python/model_generic.mustache
@@ -369,5 +369,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-postponed-model-imports}}
-{{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+try:
+    {{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+except Exception:
+    pass
 {{/vendorExtensions.x-py-postponed-model-imports.size}}
diff --git a/modules/openapi-generator/src/main/resources/python/model_oneof.mustache b/modules/openapi-generator/src/main/resources/python/model_oneof.mustache
@@ -217,5 +217,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 {{#vendorExtensions.x-py-postponed-model-imports}}
 {{{.}}}
 {{/vendorExtensions.x-py-postponed-model-imports}}
-{{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+try:
+    {{classname}}.{{#usePydanticV2}}model_rebuild{{/usePydanticV2}}{{^usePydanticV2}}update_forward_refs{{/usePydanticV2}}()
+except Exception:
+    pass
 {{/vendorExtensions.x-py-postponed-model-imports.size}}
diff --git a/...est/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-pydantic-v2.yaml b/...est/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-pydantic-v2.yaml
@@ -2197,27 +2197,27 @@ components:
       properties:
         optionalDict:
           $ref: "#/components/schemas/DictWithAdditionalProperties"
-     #Circular-Reference-Model:
-     #  type: object
-     #  properties:
-     #    size:
-     #      type: integer
-     #    nested:
-     #      $ref: '#/components/schemas/FirstRef'
-     #FirstRef:
-     #  type: object
-     #  properties:
-     #    category:
-     #      type: string
-     #    self_ref:
-     #      $ref: '#/components/schemas/SecondRef'
-     #SecondRef:
-     #  type: object
-     #  properties:
-     #    category:
-     #      type: string
-     #    circular_ref:
-     #      $ref: '#/components/schemas/Circular-Reference-Model'
+    Circular-Reference-Model:
+      type: object
+      properties:
+        size:
+          type: integer
+        nested:
+          $ref: '#/components/schemas/FirstRef'
+    FirstRef:
+      type: object
+      properties:
+        category:
+          type: string
+        self_ref:
+          $ref: '#/components/schemas/SecondRef'
+    SecondRef:
+      type: object
+      properties:
+        category:
+          type: string
+        circular_ref:
+          $ref: '#/components/schemas/Circular-Reference-Model'
     InnerDictWithAdditionalProperties:
       type: object
       additionalProperties: