Merge branch 'master' into add-model_template_dir-option

koxudaxi · Dec 14, 2024 · e48f987 · e48f987
2 parents f0036cc + 7801309
commit e48f987
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 95 deletions.
diff --git a/fastapi_code_generator/__main__.py b/fastapi_code_generator/__main__.py
@@ -144,6 +144,7 @@ def generate_code(
         data_type_manager_type=data_model_types.data_type_manager,
         dump_resolve_reference_action=data_model_types.dump_resolve_reference_action,
         custom_template_dir=model_template_dir,
+        target_python_version=python_version,
     )
 
     with chdir(output_dir):

diff --git a/fastapi_code_generator/parser.py b/fastapi_code_generator/parser.py
@@ -262,11 +262,12 @@ def get_parameter_type(
         path: List[str],
     ) -> Optional[Argument]:
         parameters = self.resolve_object(parameters, ParameterObject)
+        if parameters.name is None:
+            raise RuntimeError("parameters.name is None")  # pragma: no cover
         orig_name = parameters.name
+        name = self.model_resolver.get_valid_field_name(parameters.name)
         if snake_case:
-            name = stringcase.snakecase(parameters.name)
-        else:
-            name = parameters.name
+            name = stringcase.snakecase(name)
 
         schema: Optional[JsonSchemaObject] = None
         data_type: Optional[DataType] = None
@@ -307,8 +308,6 @@ def get_parameter_type(
             default = repr(schema.default) if schema.has_default else None
         self.imports_for_fastapi.append(field.imports)
         self.data_types.append(field.data_type)
-        if field.name is None:
-            raise RuntimeError("field.name is None")  # pragma: no cover
         return Argument(
             name=UsefulStr(field.name),
             type_hint=UsefulStr(field.type_hint),