thothctl 0.29.0__tar.gz → 0.30.0__tar.gz

{thothctl-0.29.0 → thothctl-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thothctl
-Version: 0.29.0
+Version: 0.30.0
 Summary: A CLI for Developer Control Plane. Accelerate your cloud IaC deployments.
 Project-URL: SourceCode, https://github.com/thothforge/thothctl
 Project-URL: HomePage, https://github.com/thothforge/thothctl

{thothctl-0.29.0 → thothctl-0.30.0}/src/thothctl/commands/generate/commands/iac.py

@@ -1,5 +1,6 @@
 """CLI command: thothctl generate iac — Generate IaC from natural language intent."""
 
+import logging
 from typing import Optional
 
 import click
@@ -7,6 +8,8 @@ import click
 from ....core.cli_ui import CliUI
 from ....core.commands import ClickCommand
 
+logger = logging.getLogger(__name__)
+
 
 class GenerateIaCCommand(ClickCommand):
     """Generate governed Infrastructure as Code from natural language intent."""
@@ -65,6 +68,7 @@ class GenerateIaCCommand(ClickCommand):
             plan_iam_role=plan_iam_role,
             plan_profile=plan_profile,
             project_type=project_type,
+            plan_filter=plan_filter,
         )
 
         # Show intent
@@ -149,11 +153,21 @@ class GenerateIaCCommand(ClickCommand):
         # Display results
         if not result.success:
             self.ui.print_error(f"Generation failed: {result.error}")
+            if result.raw_response:
+                self.ui.print_info(
+                    "The raw AI response was saved to generation history for "
+                    "debugging (view via the dashboard Generation tab or "
+                    "generation_history.db)."
+                )
             # Still record failed runs to history
             try:
                 import time as _time
 
-                _elapsed = _time.time() - self._start_time if hasattr(self, "_start_time") else 0
+                _elapsed = (
+                    _time.time() - self._start_time
+                    if hasattr(self, "_start_time")
+                    else 0
+                )
                 from ....services.generate.intent.generation_history import (
                     save_generation_run,
                 )
@@ -308,6 +322,7 @@ class GenerateIaCCommand(ClickCommand):
         plan_iam_role: Optional[str],
         plan_profile: Optional[str],
         project_type: str,
+        plan_filter: Optional[str] = None,
     ) -> Optional[dict]:
         """Build plan validation config from CLI flags + .thothcf.toml.
 
@@ -346,6 +361,12 @@ class GenerateIaCCommand(ClickCommand):
         elif os.environ.get("THOTH_PLAN_AWS_PROFILE"):
             config["aws_profile"] = os.environ["THOTH_PLAN_AWS_PROFILE"]
 
+        # Stack filter for targeted plan validation
+        if plan_filter:
+            config["stack_filter"] = plan_filter
+        elif os.environ.get("THOTH_PLAN_FILTER"):
+            config["stack_filter"] = os.environ["THOTH_PLAN_FILTER"]
+
         # Always pass project type for routing
         config["project_type"] = project_type
 
@@ -492,6 +513,8 @@ cli = GenerateIaCCommand.as_click_command(
     click.option(
         "--plan-filter",
         default=None,
-        help="Terragrunt filter pattern for targeted plan validation",
+        help="Terragrunt filter pattern for targeted plan validation "
+        "(scopes 'full-project' plan validation to matching stacks). "
+        "Also settable via THOTH_PLAN_FILTER or [generation.plan].stack_filter.",
     ),
 )

{thothctl-0.29.0 → thothctl-0.30.0}/src/thothctl/services/generate/intent/generation_history.py

@@ -6,8 +6,6 @@ and generated file listings. Powers the dashboard Generation tab.
 Database: ~/.thothcf/generation_history.db
 """
 
-import json
-import os
 import sqlite3
 import uuid
 from datetime import datetime
@@ -37,7 +35,8 @@ CREATE TABLE IF NOT EXISTS generation_runs (
     violations_initial INTEGER DEFAULT 0,
     violations_final INTEGER DEFAULT 0,
     output_dir TEXT DEFAULT '',
-    plan_validation TEXT DEFAULT 'disabled'
+    plan_validation TEXT DEFAULT 'disabled',
+    raw_response TEXT DEFAULT ''
 );
 
 CREATE TABLE IF NOT EXISTS generation_files (
@@ -82,9 +81,26 @@ def _get_conn() -> sqlite3.Connection:
     conn = sqlite3.connect(str(DB_PATH))
     conn.row_factory = sqlite3.Row
     conn.executescript(_SCHEMA)
+    _migrate(conn)
     return conn
 
 
+def _migrate(conn: sqlite3.Connection) -> None:
+    """Apply lightweight, idempotent migrations for pre-existing databases.
+
+    CREATE TABLE IF NOT EXISTS does not add columns to an already-existing
+    table, so newly introduced columns are added here via ALTER TABLE.
+    """
+    existing = {
+        row[1] for row in conn.execute("PRAGMA table_info(generation_runs)").fetchall()
+    }
+    if "raw_response" not in existing:
+        conn.execute(
+            "ALTER TABLE generation_runs ADD COLUMN raw_response TEXT DEFAULT ''"
+        )
+        conn.commit()
+
+
 def save_generation_run(
     intent: str,
     result: Any,
@@ -126,8 +142,9 @@ def save_generation_run(
             (id, timestamp, intent, project_type, composition, output_mode, 
              space, provider, model, success, error, files_count, iterations,
              context_tokens, generation_tokens, duration_seconds,
-             violations_initial, violations_final, output_dir, plan_validation)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+             violations_initial, violations_final, output_dir, plan_validation,
+             raw_response)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
             (
                 run_id,
                 datetime.now().isoformat(),
@@ -149,6 +166,8 @@ def save_generation_run(
                 result.validation.total_violations if result.validation else 0,
                 output_dir or "",
                 plan_validation,
+                # Only persisted on failed parses; truncate defensively.
+                (getattr(result, "raw_response", None) or "")[:10000],
             ),
         )
 
@@ -188,7 +207,7 @@ def save_generation_run(
         conn.commit()
         return run_id
 
-    except Exception as e:
+    except Exception:
         conn.rollback()
         raise
     finally:
@@ -335,33 +354,43 @@ def _compute_metrics(
         }
 
     # Add success condition to existing WHERE
-    success_where = (
-        f"{where} AND success = 1" if where else "WHERE success = 1"
-    )
+    success_where = f"{where} AND success = 1" if where else "WHERE success = 1"
 
     success = conn.execute(
         f"SELECT COUNT(*) FROM generation_runs {success_where}", params
     ).fetchone()[0]
 
-    avg_duration = conn.execute(
-        f"SELECT AVG(duration_seconds) FROM generation_runs {success_where}",
-        params,
-    ).fetchone()[0] or 0
+    avg_duration = (
+        conn.execute(
+            f"SELECT AVG(duration_seconds) FROM generation_runs {success_where}",
+            params,
+        ).fetchone()[0]
+        or 0
+    )
 
-    avg_iterations = conn.execute(
-        f"SELECT AVG(iterations) FROM generation_runs {success_where}",
-        params,
-    ).fetchone()[0] or 0
+    avg_iterations = (
+        conn.execute(
+            f"SELECT AVG(iterations) FROM generation_runs {success_where}",
+            params,
+        ).fetchone()[0]
+        or 0
+    )
 
-    total_tokens = conn.execute(
-        f"SELECT SUM(context_tokens + generation_tokens) FROM generation_runs {where}",
-        params,
-    ).fetchone()[0] or 0
+    total_tokens = (
+        conn.execute(
+            f"SELECT SUM(context_tokens + generation_tokens) FROM generation_runs {where}",
+            params,
+        ).fetchone()[0]
+        or 0
+    )
 
-    avg_files = conn.execute(
-        f"SELECT AVG(files_count) FROM generation_runs {success_where}",
-        params,
-    ).fetchone()[0] or 0
+    avg_files = (
+        conn.execute(
+            f"SELECT AVG(files_count) FROM generation_runs {success_where}",
+            params,
+        ).fetchone()[0]
+        or 0
+    )
 
     # Composition breakdown
     compositions = conn.execute(