Bump black version

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
     "autoflake==2.3.1",
-    "black==23.12.1",
+    "black==24.10.0",
     "common-libs[client]@git+https://github.com/yugokato/common-libs",
     "isort==5.13.2",
     "inflect==7.0.0",

src/openapi_test_client/libraries/api/api_client_generator.py

@@ -285,11 +285,11 @@ def update_endpoint_functions(
         # endpoint path and endpoint options
         rf"(\n{tab}{{2}})?\"(?P<path>.+?)\"(?P<ep_options>,.+?)?(\n{tab})?\)\n"
         # function def
-        rf"(?P<func_def>{tab}def (?P<func_name>.+?)\((?P<signature>.+?){tab}?\) -> {RestResponse.__name__}:\n)"
+        rf"(?P<func_def>{tab}def (?P<func_name>.+?)\((?P<signature>.+?){tab}?\) -> {RestResponse.__name__}:\n?)"
         # docstring
         rf"({tab}{{2}}(?P<docstring>\"{{3}}.*?\"{{3}})\n)?"
         # function body
-        rf"(?P<func_body>\n*{tab}{{2}}(?:[^@]+|\.{{3}})\n)?$",
+        rf"(?P<func_body>(?:\n*{tab}{{2}}(?:[^@]+|\.{{3}})| \.{{3}})\n)?$",
         flags=re.MULTILINE | re.DOTALL,
     )
 
@@ -324,12 +324,12 @@ def update_existing_endpoints(target_api_class: type[APIClassType] = api_class):
             endpoint_str = f"{method.upper()} {path}"
             defined_endpoints.append((method, path))
 
-            # For troubleshooting
+            # # For troubleshooting
             # print(
             #     f"{method.upper()} {path}:\n"
             #     f" - matched: {repr(matched.group(0))}\n"
-            #     f" - decorators: {repr(decorators)}\n"
-            #     f" - func_def: {repr(matched.group("func_def"))}\n"
+            #     f" - decorators: {repr(matched.group('decorators'))}\n"
+            #     f" - func_def: {repr(func_def)}\n"
             #     f"   - func_name: {repr(func_name)}\n"
             #     f"   - signature: {repr(signature)}\n"
             #     f" - docstring: {repr(docstring)}\n"
@@ -387,8 +387,11 @@ def update_existing_endpoints(target_api_class: type[APIClassType] = api_class):
                     updated_api_func_code = updated_api_func_code.replace(docstring, expected_docstring)
             else:
                 updated_api_func_code = updated_api_func_code.replace(
-                    func_def, func_def + f"{TAB * 2}{expected_docstring}\n"
+                    func_def, func_def + f"\n{TAB * 2}{expected_docstring}\n"
                 )
+                if func_body == " ...\n":
+                    # New black format after v24.1.0 (#3796)
+                    updated_api_func_code = updated_api_func_code.replace(func_body, f"{TAB * 2}...\n")
 
             # Update API function signatures
             new_func_signature = endpoint_model_util.generate_func_signature_in_str(endpoint_model).replace(

src/openapi_test_client/libraries/api/types.py

@@ -100,14 +100,11 @@ class ParamGroup(tuple):
         def is_required(self) -> bool:
             return any(p.is_required for p in self)
 
-    class OneOf(ParamGroup):
-        ...
+    class OneOf(ParamGroup): ...
 
-    class AnyOf(ParamGroup):
-        ...
+    class AnyOf(ParamGroup): ...
 
-    class AllOf(ParamGroup):
-        ...
+    class AllOf(ParamGroup): ...
 
     @staticmethod
     @freeze_args

src/openapi_test_client/libraries/common/code.py

@@ -5,9 +5,11 @@
 import black
 import isort
 from common_libs.ansi_colors import ColorCodes, color
+from common_libs.logging import get_logger
 
 from openapi_test_client import _PROJECT_ROOT_DIR
 
+logger = get_logger(__name__)
 TAB = " " * 4
 
 
@@ -20,8 +22,11 @@ def format_code(code: str, remove_unused_imports: bool = True) -> str:
     - Run isort
     - Run black
     """
-
-    ast.parse(code)
+    try:
+        ast.parse(code)
+    except Exception:
+        logger.error(f"Failed to parse code:\n{code}")
+        raise
 
     # Apply autoflake
     code = autoflake.fix_code(code, remove_all_unused_imports=remove_unused_imports)
@@ -31,7 +36,6 @@ def format_code(code: str, remove_unused_imports: bool = True) -> str:
 
     # Apply black
     code = run_black(code)
-
     return code
 
 
@@ -52,6 +56,7 @@ class _BlackCtx:
         def __init__(self, src):
             self.default_map = {}
             self.params = {"src": src}
+            self.command = black.main
 
     ctx = _BlackCtx((_PROJECT_ROOT_DIR,))
     black.read_pyproject_toml(ctx, None, None)

tests/integration/test_script.py

@@ -122,7 +122,7 @@ def test_update_client(temp_app_client: OpenAPIClient, dry_run: bool, option: st
     for code_to_delete in [
         "from ..models.users import Metadata\n",
         "metadata: Optional[Metadata] = Unset,\n",
-        f"{create_user_func_docstring}\n",
+        f"{TAB*2}{create_user_func_docstring}\n",
     ]:
         assert code_to_delete in original_api_class_code
         modified_api_class_code = modified_api_class_code.replace(code_to_delete, "")

tests/unit/conftest.py

@@ -63,8 +63,7 @@ def EmptyParamModel() -> type[ParamModel]:
     """A ParamModel that has no attributes"""
 
     @dataclass
-    class Model(ParamModel):
-        ...
+    class Model(ParamModel): ...
 
     return Model