feat(ai): llm structured output retry and json schema repair engine (#123) - #230
Merged
dan-petty merged 3 commits intoSep 17, 2026
Merged
Conversation
There was a problem hiding this comment.
🟡 Changes recommended
A critical configuration cleanup causes production import failures, alongside unresolved structured-output safety and validation issues.
Get a fresh assessment by requesting another Copilot review.
Pull request overview
Adds structured LLM output parsing, JSON repair, schema validation, and reflection retries to LLMClient.
Changes:
- Adds
StructuredOutputMixinand structured-output tests. - Integrates repair, validation, retries, and telemetry.
- Updates configuration constants, defaults, exports, and task metadata.
File summaries
| File | Summary |
|---|---|
tests/test_ai_client_structured.py |
Structured-output tests |
src/devops_cli/config/settings.py |
Configuration reference updates |
src/devops_cli/config/defaults.py |
Retry defaults and legacy cleanup |
src/devops_cli/config/constants.py |
Structured-output constants |
src/devops_cli/config/__init__.py |
Configuration exports |
src/devops_cli/ai/client/unified.py |
Structured-output mixin integration |
src/devops_cli/ai/client/structured.py |
Parsing, repair, validation, and retry engine |
src/devops_cli/ai/client/__init__.py |
Public client exports |
docs/agent/tasks/task-123-llm-structured-output-retry-json-repair.md |
Task scope and status metadata |
Review details
Suppressed comments (4)
src/devops_cli/ai/client/structured.py:90
- Pydantic models ignore unknown fields by default, so payloads containing unexpected schema keys are accepted and silently discarded here. That means the engine does not detect one of the malformed-output cases described by issue #123; enforce the schema's extra-field policy (or explicitly reject extras) before returning the model.
try:
if hasattr(schema, "model_validate"):
return schema.model_validate(json_data), None
return TypeAdapter(schema).validate_python(json_data), None
src/devops_cli/ai/client/structured.py:73
- This sends the entire unbounded model response through json_repair and then appends the entire raw response to the next retry prompt. A large provider response can therefore cause excessive CPU, memory, and prompt-token usage across retries; apply the existing bounded JSON-repair limit (or an equivalent structured-output cap) before repair and reflection.
try:
repaired = json_repair.loads(candidate)
if repaired != "" and repaired is not None and isinstance(repaired, (dict, list)):
return repaired, True, None
repaired_full = json_repair.loads(cleaned)
if (
repaired_full != ""
and repaired_full is not None
and isinstance(repaired_full, (dict, list))
):
return repaired_full, True, None
src/devops_cli/ai/client/structured.py:225
max_retriesis accepted without an upper bound, so callers can request arbitrarily many model calls even though issue #123's contract caps structured retries at two. Clamp the effective retry count toDEFAULT_STRUCTURED_OUTPUT_MAX_RETRIES(while still handling negative values) before calculatingmax_attempts, so the public API cannot violate the stated safety limit.
max_attempts = max(1, max_retries + 1)
src/devops_cli/ai/client/structured.py:140
- This new domain API raises a bare
ValueError, contrary to the repository's exception convention: domain logic must raise aDevOpsCLIError-derived type (the existingLLMInferenceErrorhierarchy also preserves ValueError compatibility). Use the appropriate typed validation/domain exception here rather than exposing a built-in exception.
raise ValueError("Either prompt or user text must be provided.")
- Files reviewed: 9/9 changed files
- Comments generated: 4
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
dan-petty
force-pushed
the
feat/123-llm-structured-output-retry-json-repair
branch
from
September 17, 2026 15:16
7734056 to
b88415a
Compare
dan-petty
deleted the
feat/123-llm-structured-output-retry-json-repair
branch
September 17, 2026 16:04
dan-petty
added a commit
that referenced
this pull request
Sep 18, 2026
* feat(release): v0.2.19 * fix(release): draft PR description generator and milestone deliverable resolution (#218) (#219) * feat(release): fix draft PR description generator and milestone deliverable resolution * docs(agent): track task 218 for release draft pr description generator fix * fix(release): prevent duplicate text by formatting milestone issues as clean autolinks * fix(release): isolate milestone cache, dynamic draft checklist, and mock run_gh in tests * fix(ai): support main branch diffing and base resolution in review branch (#220) (#221) * fix(ai): support main branch diffing and base resolution in review branch (#220) * fix(review): propagate target_branch to target_ref and update task 220 status to In Review (#221) * fix(github): treat copilot review as completed when zero unresolved threads remain (#216) (#222) * fix(github): treat copilot review as completed when zero unresolved threads remain (#216) * docs(agent): update task 216 with PR #222 and status In Review * test(github): test monitor_pr across get_pr_monitoring_status boundary with mock threads (#222) * feat(ai): adaptive embedding batch sizing circuit breaker and timeout fallback (#117) (#223) * feat(ai): adaptive embedding batch sizing circuit breaker and timeout fallback (#117) * docs(agent): link PR #223 and transition task 117 to In Review * fix(ai): resolve review feedback on fallback cache poisoning and query key isolation (#117) * perf(ai): high-performance AST context packer with binary search truncation (#118) (#224) * perf(ai): high-performance AST context packer with binary search truncation (#118) * docs(agent): link PR #224 and transition task 118 to In Review * fix(ai): resolve review feedback on full-body binary search, empty AST isolation, and tokenizer prewarming (#118) * fix(ai): accurately evaluate truncation boolean and expand test coverage (#118) * fix(ai): polyglot tree-sitter file size boundary guard and resource containment (#119) (#225) * fix(ai): polyglot tree-sitter file size boundary guard and resource containment (#119) * fix(ai): harden repomap symlink resolution and syntax tuple * test(ci): isolate ci workspace root to tmp_path to prevent unlinking active coverage * perf(ai): parallel async branch and pr review worker pool with semaphore concurrency (#120) (#226) * perf(ai): parallel async branch and pr review worker pool with semaphore concurrency (#120) * docs(agent): link PR #226 to task-120 tracking * fix(ai): address Copilot review feedback on error isolation and sanitization * fix(security): sanitize CodeQL clear-text logging by recording exception type names * feat(ai): llm structured output retry and json schema repair engine (#123) (#230) * feat(ai): llm structured output retry and json schema repair engine (#123) * fix(ci): remove redundant pr merge readiness gate and remediate review findings (#123) (#230) * chore(ci): deduplicate pre-commit code checks and scope hooks to pre-commit stage * chore(ci): real-time quality gate streaming, re-entrant rate limit locking, and repos clone destination (#231) (#232) * chore(ci): real-time quality gate streaming, re-entrant rate limit locking, and project quota safety * feat(repos): parse organization destination from clone url instead of hardcoding standalone * docs(agent): add task-231 tracking for realtime CI, rate limiter locking, and repos clone * docs(agent): link PR #232 to task-231 tracking * fix(gh): isolate disk quota lock yield and add fallback pacing for unknown quotas * docs(agent): document task-231 CI failure remediation and merge readiness * fix(github): resolve paginated url query replacement loop and optimize dry-run reconciliation (#233) (#234) * docs(agent): record PR #232 merge and close task 231 * fix(github): resolve paginated url replacement loop, optimize dry-run project reconciliation, and add pr edit milestone (#233) * docs(agent): update task 233 status to in-review and link PR #234 * fix(github): resolve PR review comments for #234 with milestone resolution, off-board dry-run test, and tuple except syntax * fix: config * fix(github): eliminate bare gh invocations, harden rate limiter quota tracking, and optimize project reconciliation (#235) (#236) * fix(github): eliminate bare gh invocations, harden rate limiter quota tracking, and optimize project reconciliation (#235) * fix(github): replace hardcoded gh CLI strings with CONST_GH_CLI constant (#235) * fix(github): resolve review feedback on mutation budgeting, rate limiter caching, and milestone editing (#235) - Pass shared MutationBudget across issue sync, candidate provisioning, and custom field edits to enforce a strict aggregate cap of 25 mutations - Reject all HTTP mutation methods (POST, PUT, PATCH, DELETE) and field arguments in _is_cacheable_api_call - Retain --milestone option on devops pr edit with REST fallback - Raise GitHubRateLimitError instead of bare TypeError on non-dictionary data in QuotaState.from_dict - Enforce max_backoff in calculate_backoff_delay and quota_max_age in QuotaState.is_valid - Account effective_cost during limiter.acquire() and eliminate redundant second decrement in _post_process_run - Update Task 235 tracking to PR #236 and Status: In Review * fix(github): eliminate delay-bypassing caps and mock external calls in tests (#235) - Remove DEFAULT_GH_MAX_PACING_DELAY_SECONDS and DEFAULT_GH_MAX_BACKOFF_SECONDS to ensure mandatory pauses are never bypassed or truncated - Ensure _acquire_locked pauses for full calculated request delay and calculate_backoff_delay pauses for full duration until reset - Properly mock _resolve_project_owner_arg in project tests to eliminate unmocked rate limit network calls * fix(github): eliminate bare gh invocations, error masking, and inaccurate quota defaults (#237) (#238) * fix(github): eliminate bare gh invocations, error masking, and inaccurate quota defaults (#237) * docs(agent): link PR #238 in task-237 tracking * fix(github): resolve review feedback on error classification, syntax, and sync resiliency (#237) * feat(k8s): minikube gpu detection and dynamic service nodeport reachability fallback (#126) (#239) * feat(k8s): minikube gpu detection and dynamic service nodeport reachability fallback (#126) * docs(agent): update task-126 status to in review with pr #239 * fix(k8s): resolve PR #239 review feedback on valkey normalization, scheme fallback, and sanitization * feat(devcontainer): build from debian:sid with python3.14, uv 0.12.16, and CI caching optimizations * fix(devcontainer): normalize VERSION_CODENAME to trixie for devcontainer feature compatibility * feat(ai): proactive model prewarming and vram eviction governance (#127) (#240) * feat(ai): streaming reasoning think token parser and bounded stream sanitizer (#128) (#241) * feat(ai): streaming reasoning think token parser and bounded stream sanitizer (#128) * docs(task): update task-128 PR link to #241 * fix(ai): resolve review feedback on streaming reasoning and error bounds * feat(ai): high-throughput LLM gateway and distributed model router (#142) (#242) * feat(ai): high-throughput LLM gateway and distributed model router (#142) * docs(agent): update task-142 tracking with PR #242 * fix(ai): remediate review comments on llm gateway, vllm manifests, and router (#142) * fix: address PR #217 comments, remediate uv diagnostics, and add uv-check/lockfile quality gates (#243) * fix: address PR #217 comments, remediate uv diagnostics, upgrade dependencies, and add uv-check/lockfile quality gates * fix(devcontainer): support sys_bin path parameter and add edge-case coverage for shadowed binary reconciliation * fix: remove reconcile_shadowed_user_binaries and debian_sid test, honor table payload options, integrate outdated check into CI
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #123. Implements automated structured output and JSON schema repair pipeline with reflection retry loop in devops_cli.ai.client.