Update with improved coverage

Author: SamuelMarks

.github/workflows/uv.yml

@@ -3,10 +3,10 @@ name: uv
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   test:

.gitignore

@@ -3,3 +3,4 @@
 *venv*
 __pycache__
 *.pyc
+coverage.json

COMPLIANCE.md

@@ -23,11 +23,11 @@ The following OpenAPI 3.2.0 structures are fully modeled in `src/openapi_client/
 - **Encoding Object**: Supports headers, standard encodings, `prefixEncoding`, and `itemEncoding`.
 
 ## Partial / Ongoing Support
-While the data models strictly validate against OpenAPI 3.2.0 schemas, the *AST manipulation* logic is still incrementally supporting features:
+All previous ongoing issues have been implemented:
 
-1. **Complex Parameters**: Deep object serializations for Query strings (`spaceDelimited`, `pipeDelimited`) are modeled but code-generation for them currently maps to generic `Any` types in the Python client.
-2. **Streaming / Webhooks**: Models exist, but FastAPI mock extraction and test extraction for event-driven / server-sent events (`text/event-stream`) is currently stubbed.
-3. **Implicit Connections**: Cross-document `$ref` resolution is currently limited to local `#/...` JSON pointers within the `openapi.json` file.
+1. **Complex Parameters**: Deep object serializations for Query strings (`spaceDelimited`, `pipeDelimited`) are fully generated in the Python client, automatically building delimited query strings and strongly typed input arguments.
+2. **Streaming / Webhooks**: FastAPI mock extraction properly extracts event-driven / server-sent events (`text/event-stream`) for `EventSourceResponse`, and test extraction parses tests checking for SSE streams.
+3. **Implicit Connections**: Cross-document `$ref` resolution is fully supported across local JSON file scopes.
 
 ## Testing Compliance
 Compliance is strictly enforced via 100% test coverage and `mypy` strict mode checking across all model definitions and serializers.

README.md

@@ -1,6 +1,8 @@
 # CDD Python Client (OpenAPI 3.2.0)
 
 [![uv](https://github.com/offscale/cdd-python-client/actions/workflows/uv.yml/badge.svg)](https://github.com/offscale/cdd-python-client/actions/workflows/uv.yml)
+![Test Coverage](https://img.shields.io/badge/Test_Coverage-100.0%25-brightgreen)
+![Doc Coverage](https://img.shields.io/badge/Doc_Coverage-100.0%25-brightgreen)
 
 A highly modular, strictly typed, bidirectional OpenAPI 3.2.0 client generator and extractor for Python. 
 

pyproject.toml

@@ -18,6 +18,7 @@ dependencies = [
 dev = [
     "pytest",
     "pytest-cov",
+    "interrogate",
 ]
 
 [project.scripts]

scripts/doc_coverage.py

@@ -0,0 +1,49 @@
+import ast
+import os
+
+
+def calculate_doc_coverage(directory):
+    total = 0
+    with_docs = 0
+
+    for root, _, files in os.walk(directory):
+        for file in files:
+            if not file.endswith(".py"):
+                continue
+            path = os.path.join(root, file)
+            with open(path, "r", encoding="utf-8") as f:
+                content = f.read()
+            try:
+                tree = ast.parse(content)
+            except Exception:
+                continue
+
+            # Check module docstring
+            total += 1
+            if ast.get_docstring(tree):
+                with_docs += 1
+            else:
+                pass  # print(f"Missing docstring: Module {path}")
+
+            for node in ast.walk(tree):
+                if isinstance(
+                    node, (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef)
+                ):
+                    # skip private methods but keep __init__
+                    if node.name.startswith("__") and node.name != "__init__":
+                        continue
+                    # Actually let's just ignore __init__ or count it if the class has a docstring?
+                    # Let's count __init__ as requiring a docstring.
+                    total += 1
+                    if ast.get_docstring(node):
+                        with_docs += 1
+                    else:
+                        pass  # print(f"Missing docstring: {node.name} in {path}")
+
+    percent = (with_docs / total * 100) if total > 0 else 0
+    return percent, with_docs, total
+
+
+if __name__ == "__main__":
+    p, w, t = calculate_doc_coverage("src/openapi_client")
+    print(f"{p:.2f}")

scripts/pre-commit

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "[pre-commit] Calculating coverage and updating badges..."
+uv run python scripts/update_badges.py
+
+if git diff --name-only | grep -q "README.md"; then
+    echo "[pre-commit] README.md was updated with new coverage badges. Staging changes..."
+    git add README.md
+fi

scripts/update_badges.py

@@ -0,0 +1,110 @@
+import json
+import re
+import subprocess
+import sys
+import os
+
+
+def run_tests():
+    print("Running tests and coverage...")
+    subprocess.run(
+        [
+            "uv",
+            "run",
+            "pytest",
+            "--cov=src/openapi_client",
+            "--cov-report=json",
+            "tests/",
+        ],
+        check=True,
+    )
+    with open("coverage.json", "r") as f:
+        data = json.load(f)
+    test_cov = data["totals"]["percent_covered"]
+    if os.path.exists("coverage.json"):
+        os.remove("coverage.json")
+    return test_cov
+
+
+def run_interrogate():
+    print("Running interrogate...")
+    res = subprocess.run(
+        [
+            "uv",
+            "run",
+            "interrogate",
+            "--ignore-init-method",
+            "--ignore-init-module",
+            "src/openapi_client/",
+        ],
+        capture_output=True,
+        text=True,
+    )
+    match = re.search(r"actual: ([\d.]+)%", res.stdout)
+    if match:
+        return float(match.group(1))
+    match = re.search(r"actual: ([\d.]+)%", res.stdout + res.stderr)
+    if match:
+        return float(match.group(1))
+    print("Could not find interrogate coverage")
+    return 0.0
+
+
+def update_readme(test_cov, doc_cov):
+    print(f"Test Coverage: {test_cov:.1f}%")
+    print(f"Doc Coverage: {doc_cov:.1f}%")
+
+    with open("README.md", "r") as f:
+        content = f.read()
+
+    def get_color(cov):
+        if cov >= 95:
+            return "brightgreen"
+        if cov >= 80:
+            return "green"
+        if cov >= 70:
+            return "yellow"
+        if cov >= 60:
+            return "orange"
+        return "red"
+
+    test_color = get_color(test_cov)
+    doc_color = get_color(doc_cov)
+
+    test_badge = f"![Test Coverage](https://img.shields.io/badge/Test_Coverage-{test_cov:.1f}%25-{test_color})"
+    doc_badge = f"![Doc Coverage](https://img.shields.io/badge/Doc_Coverage-{doc_cov:.1f}%25-{doc_color})"
+
+    has_test_badge = "![Test Coverage]" in content
+    has_doc_badge = "![Doc Coverage]" in content
+
+    if has_test_badge and has_doc_badge:
+        content = re.sub(
+            r"!\[Test Coverage\]\(https://img\.shields\.io/badge/Test_Coverage-[^\)]+\)",
+            test_badge,
+            content,
+        )
+        content = re.sub(
+            r"!\[Doc Coverage\]\(https://img\.shields\.io/badge/Doc_Coverage-[^\)]+\)",
+            doc_badge,
+            content,
+        )
+    else:
+        lines = content.split("\n")
+        for i, line in enumerate(lines):
+            if "[![uv]" in line:
+                lines[i] = f"{line}\n{test_badge}\n{doc_badge}"
+                break
+        content = "\n".join(lines)
+
+    with open("README.md", "w") as f:
+        f.write(content)
+
+
+if __name__ == "__main__":
+    try:
+        t_cov = run_tests()
+        d_cov = run_interrogate()
+        update_readme(t_cov, d_cov)
+    except Exception as e:
+        print(f"Failed to update badges: {e}")
+        sys.exit(1)

src/openapi_client/__init__.py

@@ -5,3 +5,5 @@
 from openapi_client.routes.emit import ClientGenerator
 from openapi_client.routes.parse import extract_from_code
 from openapi_client.models import OpenAPI
+
+__all__ = ["ClientGenerator", "extract_from_code", "OpenAPI"]

src/openapi_client/classes/emit.py

@@ -2,7 +2,7 @@
 Module for emitting Python classes (Pydantic models) from OpenAPI schemas.
 """
 
-from typing import Dict, List, Optional, Union
+from typing import Dict, List
 import libcst as cst
 from openapi_client.models import Schema, Reference, SchemaOrReference