Updated

Author: dat-a-man

Makefile

@@ -17,7 +17,6 @@ format:
 
 # all tests excluding the checks on e2e tests
 test:
-	poetry run python dlt_init_openapi/utils/update_rest_api.py
 	poetry run pytest tests --ignore=tests/e2e
 
 # test without running all the specs through a source

dlt_init_openapi/__init__.py

@@ -1,4 +1,4 @@
-""" Generate modern Python clients from OpenAPI """
+"""Generate modern Python clients from OpenAPI"""
 
 from enum import Enum
 from importlib.metadata import version

dlt_init_openapi/parser/properties/converter.py

@@ -1,4 +1,4 @@
-""" Utils for converting default values into valid Python """
+"""Utils for converting default values into valid Python"""
 
 __all__ = ["convert", "convert_chain"]
 

dlt_init_openapi/renderer/default/__init__.py

@@ -2,6 +2,7 @@
 Default renderer
 """
 
+import pathlib
 import shutil
 import subprocess
 
@@ -13,6 +14,10 @@
 from dlt_init_openapi.renderer.base_renderer import BaseRenderer
 from dlt_init_openapi.utils import misc
 
+# Import REST_API_SOURCE_LOCATION separately to avoid mypy issues
+REST_API_SOURCE_LOCATION = str(pathlib.Path(__file__).parent.parent.parent.resolve() / "rest_api")
+
+
 FILE_ENCODING = "utf-8"
 TEMPLATE_FILTERS = {
     "snakecase": misc.snake_case,
@@ -67,6 +72,9 @@ def run(self, openapi: OpenapiParser, dry: bool = False) -> None:
         self._build_meta_files()
         self._run_post_hooks()
 
+        # copy rest api source into project dir
+        shutil.copytree(REST_API_SOURCE_LOCATION, str(self.config.project_dir / "rest_api"))
+
     def _build_meta_files(self) -> None:
         requirements_template = self.env.get_template("requirements.txt.j2")
         req_path = self.config.project_dir / "requirements.txt"

dlt_init_openapi/utils/paths.py

@@ -1,4 +1,3 @@
-import os.path
 from typing import Dict, Iterable, List, Optional, Tuple
 
 
@@ -15,12 +14,23 @@ def table_names_from_paths(paths: Iterable[str]) -> Dict[str, str]:
     # Remove common prefix for endpoints. For example  all paths might
     # start with /api/v2 and we don't want this to be part of the name
     paths = list(paths)
-    if not (paths := list(paths)):
+    if not paths:
         return {}
 
-    # normalize paths
-    api_prefix = os.path.commonpath(paths)
-    norm_paths = [p.removeprefix(api_prefix) for p in paths]
+    # Get path parts for all paths
+    path_parts = [tuple(get_path_parts(path)) for path in paths]
+    # Find the longest common prefix
+    common_prefix = find_longest_common_prefix(path_parts)
+    # Remove the common prefix from each path
+    norm_paths = []
+    for path, parts in zip(paths, path_parts):
+        if common_prefix:
+            # Remove the common prefix parts
+            remaining_parts = parts[len(common_prefix) :]
+            norm_path = "/" + "/".join(remaining_parts) if remaining_parts else "/"
+        else:
+            norm_path = path
+        norm_paths.append(norm_path)
 
     # Get all path components without slashes and without {parameters}
     split_paths = [get_non_var_path_parts(path) for path in norm_paths]

pyproject.toml

@@ -29,7 +29,7 @@ jinja2 = "^3.0.0"
 typer = "^0.12.3"
 black = ">=23"
 isort = "^5.0.5"
-pydantic = "^1.6.1"
+pydantic = "^1.6.1, <2.0"
 httpx = ">=0.15.4,<0.25.0"
 autoflake = "^1.4 || ^2.0.0"
 requests = "^2.30.0"

tests/integration/utils.py

@@ -43,8 +43,7 @@ def get_source_or_dict_from_open_api(
     dict for further inspection
     """
 
-    TOP = """
-# type: ignore
+    TOP = """# type: ignore
 # flake8: noqa
 from typing import Any
 Oauth20Credentials = Any
@@ -64,6 +63,9 @@ def get_source_or_dict_from_open_api(
 
     basename = os.path.basename(case).split(".")[0] + "_" + rt
 
+    # Ensure the LOCAL_DIR exists
+    os.makedirs(LOCAL_DIR, exist_ok=True)
+
     local = LOCAL_DIR + basename
     with open(LOCAL_DIR + "__init__.py", "w") as f:
         f.write("")