openapi-client-codegen 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

openapi_client_codegen/cli.py

@@ -3,71 +3,21 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Annotated
 
-from typer import Argument, Option, Typer
+from typer import Option, Typer
 
 from .client import generate_client
 from .downgrade import downgrade_openapi_3_1_to_3_0
-from .naming import DefaultNamingPolicy
-from .orchestrator import SpecProducer, generate_projects
+from .orchestrator import ClientNaming, ProjectsConfig, SpecProducer
 from .templates import regenerate_templates
 
 app = Typer(pretty_exceptions_show_locals=False)
 
 
 @app.command()
-def downgrade(
-    input_file: Annotated[Path, Argument(help="OpenAPI 3.1 JSON to downgrade to 3.0.3")],
-    output_file: Annotated[Path | None, Argument(help="Write here instead of overwriting input_file")] = None,
-) -> None:
-    schema = json.loads(input_file.read_text(encoding="utf-8"))
-    downgrade_openapi_3_1_to_3_0(schema)
-    destination = output_file if output_file is not None else input_file
-    destination.write_text(json.dumps(schema, indent=2), encoding="utf-8")
-
-
-@app.command()
-def generate(
-    spec_file: Annotated[Path, Argument(help="OpenAPI 3.0 spec JSON to generate from")],
-    output_dir: Annotated[Path, Argument(help="Directory to sync the generated client into")],
-    root_name: Annotated[str, Option(help="Root name handed to DefaultNamingPolicy")],
-    project: Annotated[str, Option(help="Project path; its last segment names the client")],
-    generator: Annotated[str, Option(help="openapi-generator generator name")] = "csharp",
-    npm_scope: Annotated[str | None, Option(help="npm scope composing the UPM package identity")] = None,
-    license_spdx: Annotated[str | None, Option(help="SPDX license id written to package.json")] = None,
-    repository_url: Annotated[str | None, Option(help="git repository URL written to package.json")] = None,
-) -> None:
-    with TemporaryDirectory() as templates_directory_string:
-        templates_directory = Path(templates_directory_string)
-        templates_dir = templates_directory if generator == "csharp" else None
-        if templates_dir is not None:
-            regenerate_templates(templates_dir)
-
-        generate_client(
-            spec_file.read_text(encoding="utf-8"),
-            generator,
-            output_dir,
-            DefaultNamingPolicy(root_name)(project),
-            templates_dir=templates_dir,
-            npm_scope=npm_scope,
-            license_spdx=license_spdx,
-            repository_url=repository_url,
-        )
-
-
-@app.command("generate-projects")
 def generate_projects_command(
-    config: Annotated[Path, Option(help="JSON file mapping project paths to client generator lists")],
-    root_name: Annotated[str, Option(help="Root name handed to DefaultNamingPolicy")],
-    generated_root: Annotated[Path, Option(help="Root directory the generated clients sync into")],
-    spec_command: Annotated[
-        str,
-        Option(
-            help="Shell command printing the project's raw OpenAPI JSON to stdout; runs with the project directory as cwd"
-        ),
+    config: Annotated[
+        Path, Option(help="JSON config carrying the projects mapping, the client identity, and the spec command")
     ],
-    npm_scope: Annotated[str | None, Option(help="npm scope composing the UPM package identity")] = None,
-    license_spdx: Annotated[str | None, Option(help="SPDX license id written to package.json")] = None,
-    repository_url: Annotated[str | None, Option(help="git repository URL written to package.json")] = None,
     project: Annotated[str | None, Option(help="Generate only this project, as keyed in the config")] = None,
     client: Annotated[str | None, Option(help="Generate only this client generator")] = None,
     no_cache: Annotated[
@@ -75,17 +25,56 @@ def generate_projects_command(
     ] = False,
     root: Annotated[Path, Option(help="Repository root the project paths resolve against")] = Path(),
 ) -> None:
-    projects: dict[str, list[str]] = json.loads(config.read_text(encoding="utf-8"))
-    generate_projects(
-        projects,
-        root_name=root_name,
-        generated_root=generated_root,
-        dump_spec=SpecProducer(spec_command),
-        npm_scope=npm_scope,
-        license_spdx=license_spdx,
-        repository_url=repository_url,
-        project=project,
-        client=client,
-        no_cache=no_cache,
-        root=root,
-    )
+    settings = ProjectsConfig.model_validate_json(config.read_text(encoding="utf-8"))
+    root = root.resolve()
+    dump_spec = SpecProducer(settings.spec_command, env=settings.spec_env)
+
+    with TemporaryDirectory() as templates_directory_string:
+        templates_directory = Path(templates_directory_string)
+        regenerate_templates(templates_directory)
+
+        for project_name, clients in settings.projects.items():
+            if project is not None and project != project_name:
+                continue
+
+            project_directory = root / project_name
+            print(f"Producing OpenAPI spec for project: {project_directory}")
+
+            openapi_json = json.loads(dump_spec(project_directory))
+            downgrade_openapi_3_1_to_3_0(openapi_json)
+            openapi_spec = json.dumps(openapi_json, indent=2)
+
+            spec_path = project_directory / "openapi.json"
+
+            if spec_path.exists():
+                old_spec = spec_path.read_text(encoding="utf-8")
+
+                if openapi_spec == old_spec and not no_cache:
+                    print("OpenAPI spec unchanged, skipping client generation")
+                    continue
+
+            spec_path.write_text(openapi_spec, encoding="utf-8")
+
+            base = f"{project_name.rsplit('/', maxsplit=1)[-1]}-client"
+            dashed = f"{settings.root_name}-{base}"
+            names = ClientNaming(
+                base=base,
+                dashed=dashed,
+                underscored=dashed.replace("-", "_"),
+                camel=f"{settings.root_name.capitalize()}{''.join(part.capitalize() for part in base.split('-'))}",
+            )
+
+            for client_name in clients:
+                if client is not None and client_name != client:
+                    continue
+
+                generate_client(
+                    openapi_spec,
+                    client_name,
+                    settings.generated_root / client_name / names.base,
+                    names,
+                    templates_dir=templates_directory,
+                    npm_scope=settings.npm_scope,
+                    license_spdx=settings.license_spdx,
+                    repository_url=settings.repository_url,
+                )

openapi_client_codegen/client.py

@@ -1,15 +1,20 @@
+from __future__ import annotations
+
 import json
 from os import walk
 from pathlib import Path
 from shutil import copytree
 from tempfile import NamedTemporaryFile, TemporaryDirectory
+from typing import TYPE_CHECKING
 
 from bashrun.bash import bash
 
 from .resources import CONFIGS_DIR, IGNORE_FILE, OPENAPI_GENERATOR_CLI_VERSION
-from .naming import ClientNaming
 from .unity import write_unity_package_metadata
 
+if TYPE_CHECKING:
+    from .orchestrator import ClientNaming
+
 _HTTP_METHODS = ("get", "put", "post", "delete", "patch", "options", "head", "trace")
 
 

openapi_client_codegen/orchestrator.py

@@ -1,95 +1,37 @@
 from __future__ import annotations
 
-import json
-from collections.abc import Callable
+from dataclasses import dataclass
 from pathlib import Path
-from tempfile import TemporaryDirectory
 
 from bashrun.bash import bash_output
+from pydantic import BaseModel, ConfigDict
 
-from .client import generate_client
-from .downgrade import downgrade_openapi_3_1_to_3_0
-from .naming import DefaultNamingPolicy
-from .templates import regenerate_templates
 
+class ProjectsConfig(BaseModel):
+    model_config = ConfigDict(extra="forbid")
 
-class SpecProducer:
-    def __init__(self, command: str) -> None:
-        self.command = command
-
-    def __call__(self, project: Path) -> str:
-        return bash_output(self.command, cwd=project)
-
-
-def generate_projects(
-    projects: dict[str, list[str]],
-    root_name: str,
-    generated_root: Path,
-    dump_spec: Callable[[Path], str],
-    npm_scope: str | None = None,
-    license_spdx: str | None = None,
-    repository_url: str | None = None,
-    project: str | None = None,
-    client: str | None = None,
-    no_cache: bool = False,
-    root: Path = Path(),
-) -> None:
-    root = root.resolve()
-    naming = DefaultNamingPolicy(root_name)
-
-    with TemporaryDirectory() as templates_directory_string:
-        templates_directory = Path(templates_directory_string)
-        regenerate_templates(templates_directory)
-
-        for project_name, clients in projects.items():
-            if project is not None and project != project_name:
-                continue
-
-            openapi_spec = _produce_and_cache_spec(root / project_name, dump_spec, no_cache)
-
-            if openapi_spec is None:
-                continue
-
-            names = naming(project_name)
+    projects: dict[str, list[str]]
+    root_name: str
+    generated_root: Path
+    spec_command: str
+    spec_env: dict[str, str] | None = None
+    npm_scope: str | None = None
+    license_spdx: str | None = None
+    repository_url: str | None = None
 
-            for client_name in clients:
-                if client is not None and client_name != client:
-                    continue
 
-                generate_client(
-                    openapi_spec,
-                    client_name,
-                    generated_root / client_name / names.base,
-                    names,
-                    templates_dir=templates_directory,
-                    npm_scope=npm_scope,
-                    license_spdx=license_spdx,
-                    repository_url=repository_url,
-                )
+@dataclass(frozen=True)
+class ClientNaming:
+    base: str
+    dashed: str
+    underscored: str
+    camel: str
 
 
-def dump_openapi_spec(project: Path) -> str:
-    # CODEGEN=1 gates a service package's heavy imports so the app imports cleanly for the spec
-    # dump; it reaches the child through bashrun's per-call env overlay.
-    return bash_output("uv run --project . python -m src.dump_openapi", cwd=project, env={"CODEGEN": "1"})
-
-
-def _produce_and_cache_spec(project: Path, dump_spec: Callable[[Path], str], no_cache: bool) -> str | None:
-    print(f"Producing OpenAPI spec for project: {project}")
-
-    openapi_json = json.loads(dump_spec(project))
-    downgrade_openapi_3_1_to_3_0(openapi_json)
-    openapi_spec = json.dumps(openapi_json, indent=2)
-
-    spec_path = project / "openapi.json"
-
-    if spec_path.exists():
-        old_spec = spec_path.read_text(encoding="utf-8")
-
-        if openapi_spec == old_spec and not no_cache:
-            print("OpenAPI spec unchanged, skipping client generation")
-            return None
-
-    spec_path.write_text(openapi_spec, encoding="utf-8")
+class SpecProducer:
+    def __init__(self, command: str, env: dict[str, str] | None = None) -> None:
+        self.command = command
+        self.env = env
 
-    return openapi_spec
+    def __call__(self, project: Path) -> str:
+        return bash_output(self.command, cwd=project, env=self.env)

{openapi_client_codegen-0.1.4.dist-info → openapi_client_codegen-0.1.6.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.5
 Name: openapi-client-codegen
-Version: 0.1.4
+Version: 0.1.6
 Summary: OpenAPI client-generation wrapper: Litestar spec dump, 3.1->3.0 downgrade, patched openapi-generator templates, Unity package metadata
 License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0
+Requires-Dist: pydantic>=2.11.7
 Requires-Dist: typer>=0.17.4

{openapi_client_codegen-0.1.4.dist-info → openapi_client_codegen-0.1.6.dist-info}/RECORD

@@ -1,9 +1,8 @@
 openapi_client_codegen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openapi_client_codegen/cli.py,sha256=2KZLSgzPrLc0Re2wtLrokO6QybFfIvqi2PbTBgpADrU,4145
-openapi_client_codegen/client.py,sha256=rQ2j24MyV9mcaAXDCIVrXeJuiKjsufcw5_h7wEv-xr8,4638
+openapi_client_codegen/cli.py,sha256=Gtv8sUzIf3othiPGcp2U6RPAbc8iQ1h1HRNe8s_FgNQ,3243
+openapi_client_codegen/client.py,sha256=-lflu6eix2nCcHFkMrbCp0YgL9PVyQuLQS1r5Zfd0YQ,4736
 openapi_client_codegen/downgrade.py,sha256=7cxQZJRgWR5lNpvyJT-6pg4lVj72LsMRfdYzsNF9DtY,5230
-openapi_client_codegen/naming.py,sha256=c-GmnQk0zb2bsOi0gXOaUD5P_1c-dLfw8FaaNLQxb1I,742
-openapi_client_codegen/orchestrator.py,sha256=83Kb1kT1R0fgfaq6MBA0HDBjw-L-Mo051cyqHROlSzI,3076
+openapi_client_codegen/orchestrator.py,sha256=AU_KvKiCZBeRx9J3dPIQfQnNi23tyupQED6cSETQr5s,893
 openapi_client_codegen/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openapi_client_codegen/resources.py,sha256=Vavy0_zqot1eDrFpDJ_BT4Sbx47vh7zuclPjQtW3QMw,266
 openapi_client_codegen/templates.py,sha256=ll3NQfdnpVgDOz4WJrEga5lHljEOOItSD1aeVP5Hp80,1198
@@ -18,9 +17,9 @@ openapi_client_codegen/_data/templates-patches/csharp/0004-csharp-support-hybrid
 openapi_client_codegen/_data/templates-patches/csharp/0006-csharp-streaming-download-response.patch,sha256=ma-QkJA94jmN3scbJifaVPMcg_NNZ8klVO2HUrLMz_Y,2417
 openapi_client_codegen/_data/templates-patches/csharp/0007-csharp-model-default-initializers.patch,sha256=_fIimm7K0Gh1IYE3_fYyhUom_g-Bm4HlN9jLgsP27IE,862
 openapi_client_codegen/_data/templates-patches/csharp/0008-csharp-redirect-documentation-file.patch,sha256=HQXDgm_CzFYK4oxOoqBkYAz4wrKKPlYpLgTNHI_0IYc,1363
-openapi_client_codegen-0.1.4.dist-info/METADATA,sha256=fOUz6g98d7WWBmFGt8nMcL7jBsBkCKLxXFlc3-IaKxw,336
-openapi_client_codegen-0.1.4.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-openapi_client_codegen-0.1.4.dist-info/entry_points.txt,sha256=mw8FL3PBefHSxRjhBJunBk9G1efUKgxNXwAlghbc31E,74
-openapi_client_codegen-0.1.4.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
-openapi_client_codegen-0.1.4.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
-openapi_client_codegen-0.1.4.dist-info/RECORD,,
+openapi_client_codegen-0.1.6.dist-info/METADATA,sha256=wXc2KsOyunO09qTp9UPPHXKYm_S8M10J55jIBNe_oQw,368
+openapi_client_codegen-0.1.6.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+openapi_client_codegen-0.1.6.dist-info/entry_points.txt,sha256=mw8FL3PBefHSxRjhBJunBk9G1efUKgxNXwAlghbc31E,74
+openapi_client_codegen-0.1.6.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
+openapi_client_codegen-0.1.6.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
+openapi_client_codegen-0.1.6.dist-info/RECORD,,

openapi_client_codegen/naming.py

@@ -1,26 +0,0 @@
-from dataclasses import dataclass
-from typing import Protocol
-
-
-@dataclass(frozen=True)
-class ClientNaming:
-    base: str
-    dashed: str
-    underscored: str
-    camel: str
-
-
-class NamingPolicy(Protocol):
-    def __call__(self, project: str) -> ClientNaming: ...
-
-
-@dataclass(frozen=True)
-class DefaultNamingPolicy:
-    root_name: str
-
-    def __call__(self, project: str) -> ClientNaming:
-        base = f"{project.rsplit('/', maxsplit=1)[-1]}-client"
-        dashed = f"{self.root_name}-{base}"
-        underscored = dashed.replace("-", "_")
-        camel = f"{self.root_name.capitalize()}{''.join(part.capitalize() for part in base.split('-'))}"
-        return ClientNaming(base=base, dashed=dashed, underscored=underscored, camel=camel)