💥 Render code into src directory; reserve extras sub-package for authored code. Change openapi document location to lapidary/openapi

Author: rafalkrupinski

docs/index.md

@@ -10,7 +10,6 @@
 class Config(pydantic.BaseModel):
     document_path: str | None = None
     """URL or path relative to ./openapi/"""
-    extra_sources: Sequence[str] = ()
     origin: pydantic.AnyHttpUrl | None = None
     """Origin URL in case"""
     package: str

src/lapidary/render/config.py

@@ -31,7 +31,7 @@ async def init_project(
     document_handler = document_handler_for(anyio.Path(), document_path)
 
     if save_document:
-        document_root = anyio.Path('src/openapi')
+        document_root = anyio.Path('lapidary/openapi')
         target_dir = project_root / document_root
         await target_dir.mkdir(parents=True)
         file_name = await document_handler.save_to(target_dir)
@@ -87,8 +87,7 @@ def progress(module: python.AbstractModule) -> None:
 
         await update_project(
             model.modules,
-            project_root / config.extra_sources[0] if config.extra_sources else None,
-            project_root / 'gen',
+            project_root / 'src',
             config.package,
             progress,
         )

src/lapidary/render/main.py

@@ -1,6 +1,6 @@
 import logging
-import shutil
-from collections.abc import Callable, Iterable, Sequence
+from collections.abc import Callable, Iterable
+from pathlib import PurePath
 
 import anyio
 import asyncclick
@@ -32,13 +32,13 @@ def mk_module(module: python.AbstractModule) -> cst.Module | None:
 
 async def update_project(
     modules: Iterable[python.AbstractModule],
-    src_root: anyio.Path | None,
     target_root: anyio.Path,
     root_package: str,
     update_progress: Callable[[python.AbstractModule], None],
 ):
     await target_root.mkdir(parents=True, exist_ok=True)
     written: list[anyio.Path] = []
+    package_extras = PurePath(root_package) / 'extras'
     for module in modules:
         update_progress(module)
         cst_module = mk_module(module)
@@ -57,25 +57,18 @@ async def update_project(
     await (target_root / root_package / 'py.typed').write_text('', newline='')
     written.append(anyio.Path(root_package, 'py.typed'))
 
-    if src_root:
-
-        def cp(src: str, names: list[str]) -> Sequence[str]:
-            local_src = anyio.Path(src)
-            written.extend((local_src / name).relative_to(src_root) for name in names)
-            return ()
-
-        shutil.copytree(src_root, target_root, ignore=cp, dirs_exist_ok=True)
-
     with asyncclick.progressbar(length=0, label='Removing stale files') as bar:
         async for parent, dirs, files in target_root.walk(False):
+            package = parent.relative_to(target_root)
             files_ = set(files)
-            for existing in files:
-                path = (parent / existing).relative_to(target_root)
-
-                if path not in written:
-                    bar.update(1, str(path))
-                    files_.remove(existing)
-                    await (parent / existing).unlink()
+            if package != package_extras:
+                for existing in files:
+                    path = (parent / existing).relative_to(target_root)
+
+                    if path not in written:
+                        bar.update(1, str(path))
+                        files_.remove(existing)
+                        await (parent / existing).unlink()
             if not files_ and not dirs:
                 bar.update(1, str(parent))
                 await parent.rmdir()

src/lapidary/render/writer.py

@@ -9,13 +9,13 @@ version = "0.1.0"
 authors = []
 license = ""
 packages = [
-    { include = 'test_dummy', from = "gen" },
+    { include = 'test_dummy', from = "src" },
 ]
 
 [tool.poetry.dependencies]
 python = "^3.9"
 lapidary = {path="../../../../../lapidary"}
 
 [tool.lapidary]
-document_path = "dummy.yaml"
+document_path = "lapidary/openapi/dummy.yaml"
 package = "test_dummy"