Поддержка camelCase

sofakingworld · sofakingworld · commit f5905fa1593a · 2024-06-27T23:07:43.000+03:00
diff --git a/openapi_python_client/__init__.py b/openapi_python_client/__init__.py
@@ -4,6 +4,8 @@
 import mimetypes
 import shutil
 import subprocess
+import pathlib
+
 from importlib.metadata import version
 from pathlib import Path
 from subprocess import CalledProcessError
@@ -79,7 +81,9 @@ def __init__(
         if config.meta_type == MetaType.NONE:
             self.package_dir = self.project_dir
         else:
-            self.package_dir = self.project_dir / self.package_name
+            self.package_dir = Path.cwd() / self.project_dir
+            self.project_dir = Path.cwd() / self.package_name
+
 
         self.package_description: str = utils.remove_string_escapes(
             f"A client library for accessing {self.openapi.title}"
@@ -110,7 +114,7 @@ def build(self) -> Sequence[GeneratorError]:
             shutil.rmtree(self.project_dir, ignore_errors=True)
 
         try:
-            self.project_dir.mkdir()
+            pathlib.Path(self.project_dir).mkdir()
         except FileExistsError:
             return [GeneratorError(detail="Directory already exists. Delete it or use the --overwrite option.")]
         self._create_package()
@@ -156,7 +160,7 @@ def _get_errors(self) -> List[GeneratorError]:
 
     def _create_package(self) -> None:
         if self.package_dir != self.project_dir:
-            self.package_dir.mkdir()
+            self.package_dir.mkdir(exist_ok=True)
         # Package __init__.py
         package_init = self.package_dir / "__init__.py"
 
diff --git a/openapi_python_client/parser/properties/__init__.py b/openapi_python_client/parser/properties/__init__.py
@@ -51,7 +51,7 @@ def _string_based_property(
 ) -> StringProperty | DateProperty | DateTimeProperty | FileProperty | PropertyError:
     """Construct a Property from the type "string" """
     string_format = data.schema_format
-    python_name = utils.PythonIdentifier(value=name, prefix=config.field_prefix)
+    python_name = utils.PythonIdentifier(value=name, prefix=config.field_prefix, skip_snake_case=True)
     if string_format == "date-time":
         return DateTimeProperty.build(
             name=name,
diff --git a/openapi_python_client/parser/properties/model_property.py b/openapi_python_client/parser/properties/model_property.py
@@ -110,7 +110,7 @@ def build(
             default=None,
             required=required,
             name=name,
-            python_name=utils.PythonIdentifier(value=name, prefix=config.field_prefix),
+            python_name=utils.PythonIdentifier(value=name, prefix=config.field_prefix, skip_snake_case=True),
             example=data.example,
         )
         if class_info.name in schemas.classes_by_name:

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ def build(`
`110`	`110`	`default=None,`
`111`	`111`	`required=required,`
`112`	`112`	`name=name,`
`113`		`- python_name=utils.PythonIdentifier(value=name, prefix=config.field_prefix),`
	`113`	`+ python_name=utils.PythonIdentifier(value=name, prefix=config.field_prefix, skip_snake_case=True),`
`114`	`114`	`example=data.example,`
`115`	`115`	`)`
`116`	`116`	`if class_info.name in schemas.classes_by_name:`