thothctl 0.18.3__tar.gz → 0.18.5__tar.gz

{thothctl-0.18.3 → thothctl-0.18.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thothctl
-Version: 0.18.3
+Version: 0.18.5
 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.18.3 → thothctl-0.18.5}/docs/framework/commands/ai-review/README.md

@@ -541,6 +541,71 @@ The `improve` command includes 13 built-in fix patterns that work without AI:
 | `CKV_AWS_116` | Add Lambda dead letter config |
 | `CKV_AWS_272` | Enable Lambda code signing |
 
+## Token Usage & Cost Tracking
+
+Every AI interaction reports token consumption (input/output) and estimated cost in the command output:
+
+```
+💰 Today's AI cost: $0.0234 (3 requests, ↑12,450 in / ↓3,210 out tokens)
+```
+
+### Per-Command Output
+
+| Command | Token Info Shown |
+|---------|-----------------|
+| `analyze` | Daily totals: cost, requests, input/output tokens |
+| `orchestrate` | Per-run: cost, input/output tokens, model used |
+| `report` | Full breakdown by period, provider, and model |
+
+### Cost Report
+
+```bash
+# Daily summary
+thothctl ai-review report --period daily
+
+# Monthly breakdown
+thothctl ai-review report --period monthly
+
+# Export to JSON
+thothctl ai-review report --period monthly --export costs.json
+```
+
+Output:
+```
+┌────────────────────┬──────────────┐
+│ Metric             │ Value        │
+├────────────────────┼──────────────┤
+│ Total Cost         │ $0.1240      │
+│ Total Requests     │ 12           │
+│ Input Tokens       │ 45,200       │
+│ Output Tokens      │ 8,340        │
+└────────────────────┴──────────────┘
+```
+
+### Budget Controls
+
+```bash
+# Set daily and monthly limits
+thothctl ai-review configure --daily-limit 50 --monthly-budget 200
+```
+
+| Control | Default | Description |
+|---------|---------|-------------|
+| Daily limit | $100 | Max spend per day |
+| Monthly budget | $200 | Max spend per month |
+| Auto fallback | true | Falls back to pattern-based fixes when budget exceeded |
+
+Cost logs are stored at `.thothctl/ai_costs/<date>.jsonl` (one JSON record per API call).
+
+### Supported Pricing
+
+| Provider | Tracked | Notes |
+|----------|---------|-------|
+| OpenAI | ✅ | GPT-3.5, GPT-4, GPT-4 Turbo |
+| Bedrock | ✅ | Claude 3 Sonnet, Haiku |
+| Azure OpenAI | ✅ | Same as OpenAI pricing |
+| Ollama | ✅ (zero cost) | Local models — no API charges |
+
 ## MCP Integration
 
 The AI review is exposed as an MCP tool (`thothctl_ai_review`) for AI assistant interoperability:

{thothctl-0.18.3 → thothctl-0.18.5}/docs/framework/commands/check/check_project_iac.md

@@ -19,6 +19,7 @@ Options:
                                   Project type: stack or module [default: stack]
   --org-policy TEXT               Organization policy source (Git URL or local path)
   --enforcement [soft|hard]       Enforcement mode: soft (report) or hard (fail pipeline)
+  --skip-org-policy               Skip organizational policy check (project exceptions)
   --help                          Show this message and exit.
 ```
 
@@ -26,9 +27,52 @@ Options:
 
 ThothCTL can enforce organizational standards that projects **cannot override**. This ensures all projects in your organization follow the same structure, naming, and tagging rules — regardless of what individual `.thothcf.toml` files contain.
 
+### Policy Resolution Order
+
+ThothCTL resolves the org policy source in this order:
+
+| Priority | Source | Example |
+|----------|--------|---------|
+| 1 | `--org-policy` flag | `--org-policy https://github.com/myorg/policies.git` |
+| 2 | `THOTH_ORG_POLICY` env var | `export THOTH_ORG_POLICY=https://github.com/myorg/policies.git` |
+| 3 | **Active space's `governance.policy_repo`** | Set via `thothctl space update <name> --policy-repo <url>` |
+| 4 | None (skip org policy) | No org rules applied |
+
+### Space Integration
+
+When a space is active and has a `policy_repo` configured, organizational rules are loaded **automatically** — no flags or env vars needed:
+
+```bash
+# 1. Configure your space with the org policy repo
+thothctl space update platform-team --policy-repo https://github.com/myorg/org-policies.git
+
+# 2. Activate the space
+thothctl space activate platform-team
+
+# 3. Run check — org rules load automatically
+thothctl check project iac -p stack
+
+# Output:
+# 📜 Loading org policy from: /home/user/.thothcf/.policy_cache/abc123
+# ✅ Organization policy check passed
+```
+
+### Skipping Org Policy (Project Exceptions)
+
+Projects that have explicit exceptions from organizational rules can skip the check:
+
+```bash
+thothctl check project iac -p stack --skip-org-policy
+```
+
+This is useful for:
+- Experimental/prototype projects not yet conforming to standards
+- Legacy projects with approved exceptions
+- Third-party imported projects
+
 ### How It Works
 
-1. Set `THOTH_ORG_POLICY` to your org policy Git repo (or pass `--org-policy`)
+1. ThothCTL resolves the policy source (see resolution order above)
 2. The repo contains `rules/base.toml` + `rules/<project_type>.toml`
 3. ThothCTL merges org rules with project rules — **mandatory org rules cannot be weakened**
 4. Violations are reported with enforcement level (mandatory = fail, recommended = warn)
@@ -36,7 +80,11 @@ ThothCTL can enforce organizational standards that projects **cannot override**.
 ### Usage
 
 ```bash
-# Via env var (CI/CD recommended)
+# Automatic via active space (preferred)
+thothctl space activate platform-team
+thothctl check project iac --enforcement hard
+
+# Via env var (CI/CD)
 export THOTH_ORG_POLICY=https://github.com/myorg/org-policies.git
 thothctl check project iac --enforcement hard
 
@@ -44,11 +92,8 @@ thothctl check project iac --enforcement hard
 export THOTH_ORG_POLICY=https://github.com/myorg/org-policies.git@v1.0
 thothctl check project iac --enforcement hard
 
-# Via flag
+# Via flag (explicit override)
 thothctl check project iac --org-policy /path/to/org-policies --enforcement hard
-
-# Local path (development)
-thothctl check project iac --org-policy ../org-iac-policies
 ```
 
 ### Enforcement Levels

{thothctl-0.18.3 → thothctl-0.18.5}/docs/framework/commands/inventory/inventory_iac.md

@@ -6,10 +6,9 @@ The `thothctl inventory iac` command creates, updates, and manages an inventory
 
 ## Recent Improvements ✨
 
-- **🎯 Unified Version Checking**: Single `--check-versions` flag handles both module and provider version checking
+- **🎯 Independent Version Checking**: Separate flags for module versions (`-cv`) and provider versions (`-cpv`) — check what you need
 - **🎨 Modern HTML Reports**: Professional styling with Inter font, gradients, and responsive design
 - **📊 Enhanced Provider Analysis**: Comprehensive provider version tracking with status indicators
-- **🚀 Intelligent Automation**: Automatic provider checking when version checking is enabled
 - **📱 Responsive Design**: Reports work perfectly on desktop, tablet, and mobile devices
 
 ## Command Options
@@ -20,33 +19,21 @@ Usage: thothctl inventory iac [OPTIONS]
   Create a inventory about IaC modules composition for terraform/tofu/terragrunt projects
 
 Options:
-  -pj, --project-name TEXT        Specify a custom project name for the
-                                  inventory report
-  --provider-tool [tofu|terraform]
-                                  Tool to use for checking providers (default:
-                                  tofu)
-  --check-providers               Check and report provider information for
-                                  each stack (automatically enabled with
-                                  --check-versions)
-  --complete                      Include .terraform and .terragrunt-cache
-                                  folders in analysis (complete analysis)
-  -ft, --framework-type [auto|terraform|terragrunt|terraform-terragrunt]
-                                  Framework type to analyze (auto for
-                                  automatic detection)
+  -cv, --check-versions           Check latest versions for modules
+  -cpv, --check-provider-versions Check latest versions for providers
+  --check-providers               Check and report provider information for each stack
+  -ft, --framework-type [auto|terraform|terragrunt|terraform-terragrunt|module|cdkv2]
+                                  Framework type to analyze (auto for automatic detection)
   -r, --report-type [html|json|cyclonedx|all]
-                                  Type of report to generate (cyclonedx
-                                  generates OWASP CycloneDX SBOM format)
+                                  Type of report to generate
   -iact, --inventory-action [create|update|restore]
                                   Action for inventory tasks
-  -auto, --auto-approve           Use with --update_dependencies option for
-                                  auto approve updating dependencies.
-  -updep, --update-dependencies-path
-                                  Pass the inventory json file path for
-                                  updating dependencies.
-  -cv, --check-versions           Check latest versions for modules and
-                                  providers (includes provider version
-                                  checking)
   -iph, --inventory-path PATH     Path for saving inventory reports
+  -pj, --project-name TEXT        Custom project name for the report
+  --provider-tool [tofu|terraform]
+                                  Tool to use for checking providers (default: tofu)
+  --complete                      Include .terraform and .terragrunt-cache in analysis
+  -auto, --auto-approve           Auto approve updating dependencies
   --post-to-pr                    Post inventory summary as a PR comment
                                   (Azure DevOps or GitHub)
   --vcs-provider [auto|azure_repos|github]
@@ -67,18 +54,21 @@ thothctl inventory iac
 
 This creates an inventory of all IaC components in the current directory and generates a **modern HTML report** in the default location (`./Reports/Inventory`).
 
-### Create an Inventory with Version Checking (Recommended) 🚀
+### Create an Inventory with Version Checking
 
 ```bash
-thothctl inventory iac --check-versions
-```
+# Check module versions only
+thothctl inventory iac -cv
 
-This creates a comprehensive inventory that:
-- ✅ Checks latest versions for all modules
-- ✅ Automatically enables provider checking
-- ✅ Analyzes provider versions against registries
-- ✅ Shows "Latest Version" and "Status" columns
-- ✅ Generates modern, professional HTML reports
+# Check provider versions only
+thothctl inventory iac -cpv
+
+# Check both module and provider versions
+thothctl inventory iac -cv -cpv
+
+# Provider info without version lookup
+thothctl inventory iac --check-providers
+```
 
 ### Generate Different Report Types
 
@@ -100,7 +90,7 @@ thothctl inventory iac --report-type all
 
 ```bash
 thothctl inventory iac \
-  --check-versions \
+  -cv -cpv \
   --inventory-path ./docs/infrastructure \
   --project-name "Production Infrastructure"
 ```
@@ -129,10 +119,10 @@ ThothCTL now supports generating **CycloneDX Software Bill of Materials (SBOM)**
 ### Example:
 ```bash
 # Generate CycloneDX SBOM for security audit
-thothctl inventory iac --check-versions --report-type cyclonedx
+thothctl inventory iac -cv -cpv --report-type cyclonedx
 
 # Complete analysis with all formats including SBOM
-thothctl inventory iac --check-versions --report-type all
+thothctl inventory iac -cv -cpv --report-type all
 ```
 
 The CycloneDX report includes:

{thothctl-0.18.3 → thothctl-0.18.5}/src/thothctl/commands/ai_review/commands/analyze.py

@@ -61,7 +61,9 @@ class AnalyzeCommand(ClickCommand):
             if cost_report["total_cost"] > 0:
                 self.ui.print_info(
                     f"💰 Today's AI cost: ${cost_report['total_cost']:.4f} "
-                    f"({cost_report['total_requests']} requests)"
+                    f"({cost_report['total_requests']} requests, "
+                    f"↑{cost_report['total_input_tokens']:,} in / "
+                    f"↓{cost_report['total_output_tokens']:,} out tokens)"
                 )
 
         except ImportError as e:

{thothctl-0.18.3 → thothctl-0.18.5}/src/thothctl/commands/ai_review/commands/orchestrate.py

@@ -91,6 +91,16 @@ class OrchestrateCommand(ClickCommand):
                 json.dump(data, f, indent=2, default=str)
             self.ui.print_success(f"Full results saved to {output}")
 
+        # Show token usage
+        if hasattr(result, 'cost') and result.cost:
+            cost = result.cost
+            self.ui.print_info(
+                f"💰 Usage: ${cost.get('total_cost', 0):.4f} | "
+                f"↑{cost.get('input_tokens', 0):,} in / "
+                f"↓{cost.get('output_tokens', 0):,} out tokens | "
+                f"Model: {cost.get('model', 'unknown')}"
+            )
+
     def _display_security(self, data):
         summary = data.get("summary", {})
         table = Table(title="🔒 Security Agent")

{thothctl-0.18.3 → thothctl-0.18.5}/src/thothctl/commands/inventory/commands/iac.py

@@ -52,6 +52,7 @@ class IaCInvCommand(ClickCommand):
         framework_type: str = "auto",
         complete: bool = False,
         check_providers: bool = False,
+        check_provider_versions: bool = False,
         check_schema_compatibility: bool = False,
         provider_tool: str = "tofu",
         project_name: Optional[str] = None,
@@ -101,7 +102,7 @@ class IaCInvCommand(ClickCommand):
                         framework_type=framework_type,
                         complete=complete,
                         check_providers=check_providers,
-                        check_provider_versions=check_versions,  # Use unified flag for provider versions too
+                        check_provider_versions=check_provider_versions,
                         check_schema_compatibility=check_schema_compatibility,
                         provider_tool=provider_tool,
                         project_name=project_name,
@@ -181,8 +182,8 @@ class IaCInvCommand(ClickCommand):
                 self.ui.print_info("🔍 Schema compatibility analysis enabled - this may take additional time")
             
             with self.ui.status_spinner("Creating infrastructure inventory..."):
-                # When check_versions is enabled, automatically enable provider checking
-                effective_check_providers = check_providers or check_versions
+                # Enable provider checking if provider versions are requested
+                effective_check_providers = check_providers or check_provider_versions
                 
                 inventory = await self.inventory_service.create_inventory(
                     source_directory=source_dir,
@@ -192,7 +193,7 @@ class IaCInvCommand(ClickCommand):
                     framework_type=framework_type,
                     complete=complete,
                     check_providers=effective_check_providers,
-                    check_provider_versions=check_versions,
+                    check_provider_versions=check_provider_versions,
                     check_schema_compatibility=check_schema_compatibility,
                     provider_tool=provider_tool,
                     project_name=project_name,
@@ -510,7 +511,7 @@ cli = IaCInvCommand.as_click_command(
         "--check-versions",
         is_flag=True,
         default=False,
-        help="Check latest versions for modules and providers (includes provider version checking)",
+        help="Check latest versions for modules",
     ),
     click.option(
         "-updep",
@@ -557,7 +558,14 @@ cli = IaCInvCommand.as_click_command(
         "--check-providers",
         is_flag=True,
         default=False,
-        help="Check and report provider information for each stack (automatically enabled with --check-versions)",
+        help="Check and report provider information for each stack",
+    ),
+    click.option(
+        "--check-provider-versions",
+        "-cpv",
+        is_flag=True,
+        default=False,
+        help="Check latest versions for providers (can be used independently or with --check-versions)",
     ),
     click.option(
         "--check-schema-compatibility",

thothctl-0.18.5/src/thothctl/version.py

@@ -0,0 +1,2 @@
+"""Version module."""
+__version__ = "0.18.5"

thothctl-0.18.3/src/thothctl/version.py

@@ -1,2 +0,0 @@
-"""Version module."""
-__version__ = "0.18.3"