diagram-to-iac 1.9.0__tar.gz → 1.12.0__tar.gz

{diagram_to_iac-1.9.0/src/diagram_to_iac.egg-info → diagram_to_iac-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diagram-to-iac
-Version: 1.9.0
+Version: 1.12.0
 Summary: Convert architecture diagrams into IaC modules
 Author-email: vindpro <admin@vindpro.com>
 Description-Content-Type: text/markdown

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "diagram-to-iac"
-version     = "1.9.0"
+version     = "1.12.0"
 description = "Convert architecture diagrams into IaC modules"
 readme      = "README.md"
 authors     = [{ name="vindpro", email="admin@vindpro.com" }]
@@ -22,12 +22,8 @@ git-agent = "diagram_to_iac.actions.git_entry:main"
 terraform-agent = "diagram_to_iac.actions.terraform_agent_entry:main"
 supervisor-agent = "diagram_to_iac.actions.supervisor_entry:main"
 
-[tool.setuptools]
-include-package-data = true
+[tool.setuptools]                    # (intentionally left empty)
 
 [tool.setuptools.packages.find]      # find‑options live here
 where   = ["src"]
 exclude = ["tests*", "scripts*"]
-
-[tool.setuptools.package-data]
-"diagram_to_iac" = ["config.yaml", "*.yaml"]

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/core/enhanced_memory.py

@@ -101,12 +101,12 @@ class PersistentFileMemory(MemoryInterface):
     
     def __init__(self, file_path: Optional[str] = None):
         if file_path is None:
-            # Get workspace base from config with fallback
-            workspace_base = get_config_value("system.workspace_base", "/workspace")
+            # Get workspace base from environment variable first, then config with fallback
+            workspace_base = os.environ.get("WORKSPACE_BASE") or get_config_value("system.workspace_base", "/workspace")
             
             # Default to workspace or /tmp directory for container safety
             try:
-                # Try workspace first (from config)
+                # Try workspace first (from environment or config)
                 base_dir = Path(workspace_base) if Path(workspace_base).exists() else Path.cwd()
                 data_dir = base_dir / "data" / "db"
                 data_dir.mkdir(parents=True, exist_ok=True)

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/core/issue_tracker.py

@@ -1,5 +1,4 @@
 import json
-import os
 from pathlib import Path
 from typing import Dict, Optional
 
@@ -8,18 +7,8 @@ class IssueTracker:
 
     def __init__(self, file_path: Optional[str] = None):
         if file_path is None:
-            # Check environment variable first
-            if os.environ.get('ISSUE_TRACKER_FILE'):
-                file_path = os.environ['ISSUE_TRACKER_FILE']
-            else:
-                # Check for workspace-based path first (for containers)
-                workspace_base = os.environ.get('WORKSPACE_BASE', '/workspace')
-                if os.path.exists(workspace_base):
-                    base_dir = Path(workspace_base)
-                else:
-                    # Fallback to package-relative path
-                    base_dir = Path(__file__).resolve().parents[3]
-                file_path = base_dir / "data" / "db" / "issue_tracker.json"
+            base_dir = Path(__file__).resolve().parents[3]
+            file_path = base_dir / "data" / "db" / "issue_tracker.json"
         self.file_path = Path(file_path)
         self._table: Dict[str, Dict[str, int]] = {}
         self._load()

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/core/memory.py

@@ -87,15 +87,12 @@ class EnhancedMemory(Memory):
 
 # Default path for the persistent agent state JSON file. Allows override via
 # `AGENT_STATE_FILE` environment variable for testing.
-def _get_default_agent_state_path():
-    """Get the default agent state path, checking workspace first."""
-    workspace_base = os.environ.get('WORKSPACE_BASE', '/workspace')
-    if os.path.exists(workspace_base):
-        return Path(workspace_base) / "data" / "state" / "agent_state.json"
-    else:
-        return Path(__file__).resolve().parents[3] / "state" / ".agent_state" / "agent_state.json"
-
-_DEFAULT_AGENT_STATE_PATH = _get_default_agent_state_path()
+_DEFAULT_AGENT_STATE_PATH = (
+    Path(__file__).resolve().parents[3]
+    / "state"
+    / ".agent_state"
+    / "agent_state.json"
+)
 AGENT_STATE_PATH = Path(os.environ.get("AGENT_STATE_FILE", _DEFAULT_AGENT_STATE_PATH))
 
 

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/services/observability.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import json
-import os
 from datetime import datetime, timezone
 from pathlib import Path
 import threading
@@ -12,17 +11,7 @@ class LogBus:
     """Simple JSONL logging service."""
 
     def __init__(self, log_dir: str | Path | None = None) -> None:
-        if log_dir:
-            self.log_dir = Path(log_dir)
-        else:
-            # Check for workspace-based path first (for containers)
-            workspace_base = os.environ.get('WORKSPACE_BASE', '/workspace')
-            if os.path.exists(workspace_base):
-                self.log_dir = Path(workspace_base) / "logs"
-            else:
-                # Fallback to package-relative path
-                self.log_dir = Path(__file__).resolve().parents[3] / "logs"
-        
+        self.log_dir = Path(log_dir) if log_dir else Path(__file__).resolve().parents[3] / "logs"
         self.log_dir.mkdir(parents=True, exist_ok=True)
         timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
         self.log_path = self.log_dir / f"run-{timestamp}.jsonl"

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/tools/api_utils.py

@@ -3,14 +3,8 @@ import os
 from openai import OpenAI
 from anthropic import Anthropic
 import requests
-try:
-    import google.generativeai as genai
-except ImportError:
-    genai = None
-try:
-    import googleapiclient.discovery
-except ImportError:
-    googleapiclient = None
+import google.generativeai as genai
+import googleapiclient.discovery
 from concurrent.futures import ThreadPoolExecutor, TimeoutError
 
 # Import centralized configuration
@@ -51,10 +45,6 @@ def test_openai_api():
 
 def test_gemini_api():
     try:
-        if genai is None:
-            print("❌ Gemini API error: google-generativeai package not installed.")
-            return False
-            
         google_api_key = os.environ.get("GOOGLE_API_KEY")
         if not google_api_key:
             print("❌ Gemini API error: GOOGLE_API_KEY environment variable not set.")

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/tools/git/git.py

@@ -767,86 +767,27 @@ class GitExecutor:
                     labels_str = ",".join(gh_input.labels)
                     gh_command += f" --label \"{labels_str}\""
 
-                # Load GitHub assignee configuration from config
-                github_config = self.config.get('github', {})
-                issue_assignment_config = github_config.get('issue_assignment', {})
-                copilot_assignee = github_config.get('copilot_assignee', 'Copilot')
-                prefer_copilot = issue_assignment_config.get('prefer_copilot', True)
-                auto_assign_when_empty = issue_assignment_config.get('auto_assign_when_empty', True)
-                smart_prioritization = issue_assignment_config.get('smart_prioritization', True)
-                fallback_strategy = github_config.get('fallback_assignee_strategy', 'owner')
-
-                # Smart assignee prioritization logic
+                # Handle assignees - auto-assign to repository owner or github-copilot if none provided
                 assignees_to_use = gh_input.assignees or []
-                
-                if assignees_to_use:
-                    # If assignees are provided, apply smart prioritization (if enabled)
-                    if smart_prioritization:
-                        if copilot_assignee in assignees_to_use:
-                            # Multiple assignees with Copilot -> assign to Copilot only
-                            assignees_to_use = [copilot_assignee]
-                            self.logger.info(f"Multiple assignees detected with @{copilot_assignee} - assigning to @{copilot_assignee} only")
-                        elif len(assignees_to_use) == 1 and assignees_to_use[0] == owner:
-                            # Only owner as assignee -> keep as owner
-                            self.logger.info(f"Single assignee is repository owner - assigning to @{owner}")
-                        elif len(assignees_to_use) > 1 and copilot_assignee not in assignees_to_use:
-                            # Multiple assignees without Copilot -> assign to owner only
-                            assignees_to_use = [owner]
-                            self.logger.info(f"Multiple assignees without @{copilot_assignee} - assigning to repository owner @{owner} only")
-                        # Single non-owner assignee -> keep as provided
-                    else:
-                        self.logger.info("Smart prioritization disabled - using assignees as provided")
-                else:
-                    # No assignees provided - auto-assign based on configuration
-                    if auto_assign_when_empty and prefer_copilot:
-                        try:
-                            # Check if configured Copilot user exists
-                            check_copilot_cmd = f"gh api /users/{copilot_assignee}"
-                            check_shell_input = ShellExecInput(command=check_copilot_cmd, timeout=10)
-                            check_result = self.shell_executor.shell_exec(check_shell_input)
-                            
-                            if check_result.exit_code == 0:
-                                assignees_to_use = [copilot_assignee]
-                                self.logger.info(f"No assignees provided - auto-assigning to @{copilot_assignee}")
-                            else:
-                                # Fallback based on strategy
-                                if fallback_strategy == "owner":
-                                    assignees_to_use = [owner]
-                                    self.logger.info(f"No assignees provided, @{copilot_assignee} not available - auto-assigning to repository owner @{owner}")
-                                elif fallback_strategy == "default_assignees":
-                                    default_assignees = github_config.get('default_assignees', [])
-                                    assignees_to_use = default_assignees if default_assignees else [owner]
-                                    self.logger.info(f"No assignees provided, @{copilot_assignee} not available - using default assignees: {assignees_to_use}")
-                                else:  # fallback_strategy == "none"
-                                    assignees_to_use = []
-                                    self.logger.info(f"No assignees provided, @{copilot_assignee} not available - no assignee set")
-                        except Exception as e:
-                            # Fallback to configured strategy if check fails
-                            if fallback_strategy == "owner":
-                                assignees_to_use = [owner]
-                                self.logger.info(f"Failed to check @{copilot_assignee}, assigning to repository owner @{owner}. Error: {e}")
-                            elif fallback_strategy == "default_assignees":
-                                default_assignees = github_config.get('default_assignees', [])
-                                assignees_to_use = default_assignees if default_assignees else [owner]
-                                self.logger.info(f"Failed to check @{copilot_assignee}, using default assignees: {assignees_to_use}. Error: {e}")
-                            else:  # fallback_strategy == "none"
-                                assignees_to_use = []
-                                self.logger.info(f"Failed to check @{copilot_assignee}, no assignee set. Error: {e}")
-                    elif auto_assign_when_empty:
-                        # Auto-assign but don't prefer Copilot
-                        if fallback_strategy == "owner":
+                if not assignees_to_use:
+                    # Try to assign to @github-copilot first, fallback to repository owner
+                    try:
+                        # Check if github-copilot exists as a user
+                        check_copilot_cmd = "gh api /users/github-copilot"
+                        check_shell_input = ShellExecInput(command=check_copilot_cmd, timeout=10)
+                        check_result = self.shell_executor.shell_exec(check_shell_input)
+                        
+                        if check_result.exit_code == 0:
+                            assignees_to_use = ["github-copilot"]
+                            self.logger.info("Auto-assigning issue to @github-copilot")
+                        else:
+                            # Fallback to repository owner
                             assignees_to_use = [owner]
-                            self.logger.info(f"No assignees provided - auto-assigning to repository owner @{owner}")
-                        elif fallback_strategy == "default_assignees":
-                            default_assignees = github_config.get('default_assignees', [])
-                            assignees_to_use = default_assignees if default_assignees else [owner]
-                            self.logger.info(f"No assignees provided - using default assignees: {assignees_to_use}")
-                        else:  # fallback_strategy == "none"
-                            assignees_to_use = []
-                            self.logger.info("No assignees provided - no auto-assignment configured")
-                    else:
-                        assignees_to_use = []
-                        self.logger.info("No assignees provided - auto-assignment disabled")
+                            self.logger.info(f"Auto-assigning issue to repository owner: @{owner}")
+                    except Exception as e:
+                        # Fallback to repository owner if check fails
+                        assignees_to_use = [owner]
+                        self.logger.info(f"Failed to check @github-copilot, assigning to repository owner: @{owner}. Error: {e}")
                 
                 if assignees_to_use:
                     assignees_str = ",".join(assignees_to_use)

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac/tools/sec_utils.py

@@ -37,77 +37,44 @@ except ImportError:
 # Path inside container where the encoded YAML is mounted (dev only)
 _YAML_PATH = pathlib.Path("/run/secrets.yaml")
 
-def _load_config_secrets():
-    """Load secret configuration from config.yaml."""
-    try:
-        # Try to load from config.yaml
-        config_path = pathlib.Path(__file__).parent.parent / "config.yaml"
-        if config_path.exists() and yaml:
-            config_data = yaml.safe_load(config_path.read_text())
-            security_config = config_data.get("security", {})
-            
-            required_secrets = security_config.get("required_secrets", ["REPO_API_KEY"])
-            optional_secrets = security_config.get("optional_secrets", [])
-            secret_mappings = security_config.get("secret_mappings", {})
-            
-            # Combine required and optional secrets
-            expected_secrets = required_secrets + optional_secrets
-            
-            # Create full mapping (defaults to same name if not mapped)
-            full_mapping = {}
-            for secret in expected_secrets:
-                full_mapping[secret] = secret_mappings.get(secret, secret)
-            
-            # AI API secrets (hardcoded as they're specific to AI functionality)
-            ai_secrets = [
-                "OPENAI_API_KEY",
-                "GOOGLE_API_KEY", 
-                "ANTHROPIC_API_KEY",
-                "GROK_API_KEY"
-            ]
-            
-            return expected_secrets, required_secrets, ai_secrets, full_mapping
-    except Exception as e:
-        print(f"⚠️ Warning: Could not load secret config from config.yaml: {e}")
-    
-    # Fallback to hardcoded values
-    expected_secrets = [
-        "DOCKERHUB_API_KEY",
-        "DOCKERHUB_USERNAME", 
-        "TF_API_KEY",
-        "PYPI_API_KEY",
-        "OPENAI_API_KEY",
-        "GOOGLE_API_KEY",
-        "ANTHROPIC_API_KEY", 
-        "GROK_API_KEY",
-        "REPO_API_KEY"
-    ]
-    
-    required_secrets = ["REPO_API_KEY"]
-    
-    ai_secrets = [
-        "OPENAI_API_KEY",
-        "GOOGLE_API_KEY", 
-        "ANTHROPIC_API_KEY",
-        "GROK_API_KEY"
-    ]
-    
-    secret_mapping = {
-        "REPO_API_KEY": "GITHUB_TOKEN",
-        "TF_API_KEY": "TFE_TOKEN",
-        "DOCKERHUB_API_KEY": "DOCKERHUB_API_KEY",
-        "DOCKERHUB_USERNAME": "DOCKERHUB_USERNAME",
-        "PYPI_API_KEY": "PYPI_API_KEY", 
-        "OPENAI_API_KEY": "OPENAI_API_KEY",
-        "GOOGLE_API_KEY": "GOOGLE_API_KEY",
-        "ANTHROPIC_API_KEY": "ANTHROPIC_API_KEY",
-        "GROK_API_KEY": "GROK_API_KEY"
-    }
-    
-    return expected_secrets, required_secrets, ai_secrets, secret_mapping
+# Expected secrets based on secrets_example.yaml
+EXPECTED_SECRETS = [
+    "DOCKERHUB_API_KEY",
+    "DOCKERHUB_USERNAME", 
+    "TF_API_KEY",
+    "PYPI_API_KEY",
+    "OPENAI_API_KEY",
+    "GOOGLE_API_KEY",
+    "ANTHROPIC_API_KEY", 
+    "GROK_API_KEY",
+    "REPO_API_KEY"
+]
+
+# Required secrets that must be present (others are optional)
+REQUIRED_SECRETS = [
+    "REPO_API_KEY"  # GITHUB_TOKEN is required for repo operations
+]
+
+# Optional AI API secrets (at least one should be present for AI functionality)
+AI_API_SECRETS = [
+    "OPENAI_API_KEY",
+    "GOOGLE_API_KEY", 
+    "ANTHROPIC_API_KEY",
+    "GROK_API_KEY"
+]
 
-# Load configuration at module level
-EXPECTED_SECRETS, REQUIRED_SECRETS, AI_API_SECRETS, SECRET_ENV_MAPPING = _load_config_secrets()
+# Map internal secret names to environment variable names
+SECRET_ENV_MAPPING = {
+    "REPO_API_KEY": "GITHUB_TOKEN",
+    "TF_API_KEY": "TFE_TOKEN",
+    "DOCKERHUB_API_KEY": "DOCKERHUB_API_KEY",
+    "DOCKERHUB_USERNAME": "DOCKERHUB_USERNAME",
+    "PYPI_API_KEY": "PYPI_API_KEY", 
+    "OPENAI_API_KEY": "OPENAI_API_KEY",
+    "GOOGLE_API_KEY": "GOOGLE_API_KEY",
+    "ANTHROPIC_API_KEY": "ANTHROPIC_API_KEY",
+    "GROK_API_KEY": "GROK_API_KEY"
+}
 
 
 def _decode_b64(enc: str) -> str:
@@ -140,35 +107,12 @@ def _is_dev_environment() -> bool:
     )
 
 
-def _is_ci_environment() -> bool:
-    """Check if running in CI environment."""
-    return os.environ.get("CI") == "true" or os.environ.get("GITHUB_ACTIONS") == "true"
-
-
 def _get_env_secrets() -> Dict[str, Optional[str]]:
     """Get secrets from environment variables."""
     env_secrets = {}
-    is_ci = _is_ci_environment()
-    
     for secret_key in EXPECTED_SECRETS:
         env_name = SECRET_ENV_MAPPING.get(secret_key, secret_key)
-        raw_value = None
-        
-        if is_ci:
-            # In CI, check for _ENCODED variant first (since that's how they're provided)
-            encoded_env_name = f"{secret_key}_ENCODED"  # Use secret_key directly for CI
-            raw_value = os.environ.get(encoded_env_name)
-            
-            # If not found with secret_key, try with env_name
-            if raw_value is None:
-                encoded_env_name = f"{env_name}_ENCODED"
-                raw_value = os.environ.get(encoded_env_name)
-        
-        # If still not found, try the direct environment variable name
-        if raw_value is None:
-            raw_value = os.environ.get(env_name)
-        
-        # If we found a value, process it
+        raw_value = os.environ.get(env_name)
         if raw_value:
             # Check if value is already decoded, use as-is; otherwise decode it
             if (secret_key == "TF_API_KEY" and ".atlasv1." in raw_value) or \
@@ -182,7 +126,6 @@ def _get_env_secrets() -> Dict[str, Optional[str]]:
                 env_secrets[secret_key] = _decode_b64(raw_value)
         else:
             env_secrets[secret_key] = None
-    
     return env_secrets
 
 

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0/src/diagram_to_iac.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diagram-to-iac
-Version: 1.9.0
+Version: 1.12.0
 Summary: Convert architecture diagrams into IaC modules
 Author-email: vindpro <admin@vindpro.com>
 Description-Content-Type: text/markdown

{diagram_to_iac-1.9.0 → diagram_to_iac-1.12.0}/src/diagram_to_iac.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 src/diagram_to_iac/__init__.py
 src/diagram_to_iac/cli.py
-src/diagram_to_iac/config.yaml
 src/diagram_to_iac/r2d.py
 src/diagram_to_iac.egg-info/PKG-INFO
 src/diagram_to_iac.egg-info/SOURCES.txt
@@ -18,17 +17,13 @@ src/diagram_to_iac/actions/terraform_agent_entry.py
 src/diagram_to_iac/agents/__init__.py
 src/diagram_to_iac/agents/demonstrator_langgraph/__init__.py
 src/diagram_to_iac/agents/demonstrator_langgraph/agent.py
-src/diagram_to_iac/agents/demonstrator_langgraph/config.yaml
 src/diagram_to_iac/agents/git_langgraph/__init__.py
 src/diagram_to_iac/agents/git_langgraph/agent.py
-src/diagram_to_iac/agents/git_langgraph/config.yaml
 src/diagram_to_iac/agents/git_langgraph/pr.py
 src/diagram_to_iac/agents/hello_langgraph/__init__.py
 src/diagram_to_iac/agents/hello_langgraph/agent.py
-src/diagram_to_iac/agents/hello_langgraph/config.yaml
 src/diagram_to_iac/agents/policy_agent/__init__.py
 src/diagram_to_iac/agents/policy_agent/agent.py
-src/diagram_to_iac/agents/policy_agent/config.yaml
 src/diagram_to_iac/agents/policy_agent/integration_example.py
 src/diagram_to_iac/agents/policy_agent/tools/__init__.py
 src/diagram_to_iac/agents/policy_agent/tools/tfsec_tool.py
@@ -37,7 +32,6 @@ src/diagram_to_iac/agents/shell_langgraph/agent.py
 src/diagram_to_iac/agents/shell_langgraph/detector.py
 src/diagram_to_iac/agents/supervisor_langgraph/__init__.py
 src/diagram_to_iac/agents/supervisor_langgraph/agent.py
-src/diagram_to_iac/agents/supervisor_langgraph/config.yaml
 src/diagram_to_iac/agents/supervisor_langgraph/demonstrator.py
 src/diagram_to_iac/agents/supervisor_langgraph/github_listener.py
 src/diagram_to_iac/agents/supervisor_langgraph/guards.py
@@ -45,7 +39,6 @@ src/diagram_to_iac/agents/supervisor_langgraph/pat_loop.py
 src/diagram_to_iac/agents/supervisor_langgraph/router.py
 src/diagram_to_iac/agents/terraform_langgraph/__init__.py
 src/diagram_to_iac/agents/terraform_langgraph/agent.py
-src/diagram_to_iac/agents/terraform_langgraph/config.yaml
 src/diagram_to_iac/agents/terraform_langgraph/parser.py
 src/diagram_to_iac/core/__init__.py
 src/diagram_to_iac/core/agent_base.py
@@ -60,14 +53,12 @@ src/diagram_to_iac/services/__init__.py
 src/diagram_to_iac/services/commenter.py
 src/diagram_to_iac/services/observability.py
 src/diagram_to_iac/services/step_summary.py
-src/diagram_to_iac/templates/issue_frontmatter.yml
 src/diagram_to_iac/tools/__init__.py
 src/diagram_to_iac/tools/api_utils.py
 src/diagram_to_iac/tools/sec_utils.py
 src/diagram_to_iac/tools/text_utils.py
 src/diagram_to_iac/tools/git/__init__.py
 src/diagram_to_iac/tools/git/git.py
-src/diagram_to_iac/tools/git/git_config.yaml
 src/diagram_to_iac/tools/hello/__init__.py
 src/diagram_to_iac/tools/hello/cal_utils.py
 src/diagram_to_iac/tools/hello/text_utils.py
@@ -80,7 +71,5 @@ src/diagram_to_iac/tools/llm_utils/openai_driver.py
 src/diagram_to_iac/tools/llm_utils/router.py
 src/diagram_to_iac/tools/shell/__init__.py
 src/diagram_to_iac/tools/shell/shell.py
-src/diagram_to_iac/tools/shell/shell_config.yaml
 src/diagram_to_iac/tools/tf/terraform.py
-src/diagram_to_iac/tools/tf/terraform_config.yaml
 tests/test_devops_in_a_box.py