CI fix ; increased coverage

Author: SamuelMarks

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
@@ -30,7 +30,7 @@ jobs:
     - name: Build WASM
       run: make build_wasm
     - name: Upload Build Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: python-build
         path: dist/
@@ -40,12 +40,12 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v4
       with:
         name: python-build
         path: dist/
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         files: dist/**/*

.gitignore

@@ -1,3 +1,5 @@
+docs/
+out_server/
 build/
 dist/
 *.xml

README.md

@@ -120,3 +120,32 @@ dual licensed as above, without any additional terms or conditions.
 | WebAssembly (WASM) Build | [x] | [ ] | |
 
 For more details, see [WASM.md](WASM.md).
+\n## CLI Usage\n\n```
+usage: cdd-python [-h] [--version]
+                  {from_openapi,to_openapi,sync,to_docs_json,server_json_rpc}
+                  ...
+
+CDD Python Client generator and extractor.
+
+positional arguments:
+  {from_openapi,to_openapi,sync,to_docs_json,server_json_rpc}
+    from_openapi        Generate code from OpenAPI
+    to_openapi          Extract OpenAPI from code
+    sync                Sync a directory containing client.py, mock_server.py,
+                        test_client.py, cli_main.py
+    to_docs_json        Generate JSON documentation
+    server_json_rpc     Run JSON-RPC server
+
+options:
+  -h, --help            show this help message and exit
+  --version             show program's version number and exit
+```\n
+```
+usage: cdd-python from_openapi [-h] {to_sdk,to_sdk_cli,to_server} ...
+
+positional arguments:
+  {to_sdk,to_sdk_cli,to_server}
+
+options:
+  -h, --help            show this help message and exit
+```\n

client.py

@@ -0,0 +1,8 @@
+from urllib3 import PoolManager
+from typing import Any, Dict, Optional, List
+from pydantic import BaseModel, Field
+
+class Client:
+    def __init__(self, base_url: str):
+        self.base_url = base_url
+        self.http = PoolManager()

docs.json

@@ -0,0 +1,15 @@
+[
+  {
+    "language": "python",
+    "operations": [
+      {
+        "method": "GET",
+        "path": "/test",
+        "code": {
+          "snippet": "response = client.getTest()"
+        },
+        "operationId": "getTest"
+      }
+    ]
+  }
+]

parse_spec.py

@@ -12,6 +12,7 @@ dependencies = [
     "pydantic>=2.0",
     "libcst",
     "urllib3",
+    "python-cdd>=0.0.98",
 ]
 
 [project.optional-dependencies]

pyproject.toml

@@ -0,0 +1,12 @@
+{
+  "openapi": "3.2.0",
+  "info": {"title": "Test", "version": "1.0"},
+  "paths": {
+    "/test": {
+      "get": {
+        "operationId": "getTest",
+        "responses": {"200": {"description": "OK"}}
+      }
+    }
+  }
+}

spec.json

@@ -99,7 +99,7 @@ def generate_docs_json(
 
     out_json = json.dumps(output, indent=2)
     if output_file:
-        Path(output_file).write_text(out_json, encoding="utf-8")
+        Path(output_file).write_text(out_json + "\n", encoding="utf-8")
     else:
         print(out_json)
 
@@ -168,7 +168,12 @@ def process_from_openapi(
     """Process from_openapi subcommands."""
     if not output_dir:
         output_dir = "."
-    out_dir = Path(output_dir)
+    out_path = Path(output_dir)
+    if out_path.suffix:  # It's a file path
+        out_dir = out_path.parent
+    else:
+        out_dir = out_path
+
     out_dir.mkdir(parents=True, exist_ok=True)
 
     if input_path:
@@ -196,10 +201,21 @@ def process_from_openapi(
             (out_dir / "client.py").write_text(
                 generator.generate_code(), encoding="utf-8"
             )
+            from openapi_client.cli_sdk_cdd.emit import emit_cli_sdk
+
             (out_dir / "cli_main.py").write_text(emit_cli_sdk(spec), encoding="utf-8")
         elif subcommand == "to_server":
-            mock_module = emit_mock_server(spec)
-            (out_dir / "mock_server.py").write_text(mock_module.code, encoding="utf-8")
+            from openapi_client.fastapi.emit import emit_fastapi
+            from openapi_client.sqlalchemy_cdd.emit import emit_sqlalchemy
+
+            # Emit FastAPI server
+            fastapi_code = emit_fastapi(spec)
+            (out_dir / "main.py").write_text(fastapi_code, encoding="utf-8")
+
+            # Emit SQLAlchemy models
+            sa_code = emit_sqlalchemy(spec)
+            if sa_code:
+                (out_dir / "models.py").write_text(sa_code, encoding="utf-8")
 
     if not no_installable_package:
         scaffold_package(out_dir)