order this

fern-api · Sep 10, 2024 · 1b8d71a · 1b8d71a
1 parent 7a80c07
commit 1b8d71a
Show file tree

Hide file tree

Showing 98 changed files with 259 additions and 249 deletions.
diff --git a/generators/python/src/fern_python/generators/context/pydantic_generator_context.py b/generators/python/src/fern_python/generators/context/pydantic_generator_context.py
@@ -10,6 +10,7 @@
 from fern_python.declaration_referencer import AbstractDeclarationReferencer
 from fern_python.generators.pydantic_model.custom_config import UnionNamingVersions
 from fern_python.source_file_factory.source_file_factory import SourceFileFactory
+from ordered_set import OrderedSet
 
 from ..core_utilities import CoreUtilities
 
@@ -94,6 +95,10 @@ def does_type_reference_reference_other_type(
     def get_referenced_types(self, type_id: ir_types.TypeId) -> Set[ir_types.TypeId]:
         ...
 
+    @abstractmethod
+    def get_referenced_types_ordered(self, type_id: ir_types.TypeId) -> OrderedSet[ir_types.TypeId]:
+        ...
+
     @abstractmethod
     def get_class_name_for_type_id(self, type_id: ir_types.TypeId, as_request: bool) -> str:
         ...

diff --git a/generators/python/src/fern_python/generators/context/pydantic_generator_context_impl.py b/generators/python/src/fern_python/generators/context/pydantic_generator_context_impl.py
@@ -6,6 +6,7 @@
 from fern_python.codegen import AST, Filepath
 from fern_python.declaration_referencer import AbstractDeclarationReferencer
 from fern_python.generators.pydantic_model.custom_config import UnionNamingVersions
+from ordered_set import OrderedSet
 
 from .pydantic_generator_context import PydanticGeneratorContext
 from .type_reference_to_type_hint_converter import TypeReferenceToTypeHintConverter
@@ -180,6 +181,10 @@ def does_type_reference_reference_other_type(
     def get_referenced_types(self, type_id: ir_types.TypeId) -> Set[ir_types.TypeId]:
         declaration = self.ir.types[type_id]
         return self.get_referenced_types_of_type_declaration(declaration)
+
+    def get_referenced_types_ordered(self, type_id: ir_types.TypeId) -> OrderedSet[ir_types.TypeId]:
+        declaration = self.ir.types[type_id]
+        return OrderedSet(list(sorted(self.get_referenced_types_of_type_declaration(declaration))))
 
     def get_declaration_for_type_id(
         self,

diff --git a/generators/python/src/fern_python/generators/pydantic_model/fern_aware_pydantic_model.py b/generators/python/src/fern_python/generators/pydantic_model/fern_aware_pydantic_model.py
@@ -279,7 +279,7 @@ def finish(self) -> None:
 
         # Now take any transitive circular dependencies and add them as ghost references and update their forward refs
         if self._type_name is not None:
-            for referenced_type in self._context.get_referenced_types(self._type_name.type_id):
+            for referenced_type in self._context.get_referenced_types_ordered(self._type_name.type_id):
                 self._add_update_forward_ref_for_transitive_circular_dependency(referenced_type)
 
         self._pydantic_model.finish()

diff --git a/seed/fastapi/simple-fhir/types/account.py b/seed/fastapi/simple-fhir/types/account.py
diff --git a/seed/fastapi/simple-fhir/types/base_resource.py b/seed/fastapi/simple-fhir/types/base_resource.py
diff --git a/seed/fastapi/simple-fhir/types/memo.py b/seed/fastapi/simple-fhir/types/memo.py
diff --git a/seed/fastapi/simple-fhir/types/patient.py b/seed/fastapi/simple-fhir/types/patient.py
diff --git a/seed/fastapi/simple-fhir/types/practitioner.py b/seed/fastapi/simple-fhir/types/practitioner.py
diff --git a/seed/fastapi/simple-fhir/types/script.py b/seed/fastapi/simple-fhir/types/script.py
diff --git a/seed/fastapi/trace/resources/commons/types/variable_type.py b/seed/fastapi/trace/resources/commons/types/variable_type.py
diff --git a/seed/fastapi/trace/resources/problem/types/create_problem_request.py b/seed/fastapi/trace/resources/problem/types/create_problem_request.py
diff --git a/seed/fastapi/trace/resources/problem/types/problem_info.py b/seed/fastapi/trace/resources/problem/types/problem_info.py
diff --git a/seed/fastapi/trace/resources/problem/types/variable_type_and_name.py b/seed/fastapi/trace/resources/problem/types/variable_type_and_name.py
diff --git a/seed/fastapi/trace/resources/submission/types/code_execution_update.py b/seed/fastapi/trace/resources/submission/types/code_execution_update.py
diff --git a/seed/fastapi/trace/resources/submission/types/get_submission_state_response.py b/seed/fastapi/trace/resources/submission/types/get_submission_state_response.py
diff --git a/seed/fastapi/trace/resources/submission/types/submission_response.py b/seed/fastapi/trace/resources/submission/types/submission_response.py
diff --git a/seed/fastapi/trace/resources/submission/types/submission_status_for_test_case.py b/seed/fastapi/trace/resources/submission/types/submission_status_for_test_case.py
diff --git a/seed/fastapi/trace/resources/submission/types/submission_status_v_2.py b/seed/fastapi/trace/resources/submission/types/submission_status_v_2.py
diff --git a/seed/fastapi/trace/resources/submission/types/submission_type_state.py b/seed/fastapi/trace/resources/submission/types/submission_type_state.py
diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_state.py b/seed/fastapi/trace/resources/submission/types/test_submission_state.py
diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_status.py b/seed/fastapi/trace/resources/submission/types/test_submission_status.py