diagram-to-iac 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

diagram_to_iac/core/config_loader.py

@@ -16,113 +16,104 @@ logger = logging.getLogger(__name__)
 class ConfigLoader:
     """
     Central configuration management for the diagram-to-iac project.
-    Loads configuration from YAML files and provides environment variable override capability.
+    Loads configuration from central config.yaml file with environment variable override capability.
     """
     
-    def __init__(self, app_config_path: Optional[str] = None, system_config_path: Optional[str] = None):
+    def __init__(self, config_path: Optional[str] = None):
         """
-        Initialize ConfigLoader with optional custom config paths.
+        Initialize ConfigLoader with optional custom config path.
         
         Args:
-            app_config_path: Path to application config file (default: src/diagram_to_iac/config.yaml)
-            system_config_path: Path to system config file (default: config/system.yaml)
+            config_path: Path to central config file (default: src/diagram_to_iac/config.yaml)
         """
         self.logger = logging.getLogger(self.__class__.__name__)
         
-        # Set default paths
-        self.base_path = Path(__file__).parent.parent.parent.parent  # diagram-to-iac root
-        self.app_config_path = Path(app_config_path) if app_config_path else self.base_path / "src" / "diagram_to_iac" / "config.yaml"
-        self.system_config_path = Path(system_config_path) if system_config_path else self.base_path / "config" / "system.yaml"
+        # Set default paths (container-safe)
+        if config_path:
+            self.config_path = Path(config_path)
+        else:
+            # Try multiple locations for central config
+            possible_paths = [
+                Path.cwd() / "src" / "diagram_to_iac" / "config.yaml",  # Development
+                Path(__file__).parent.parent / "config.yaml",  # Package location
+                Path("/workspace/src/diagram_to_iac/config.yaml"),  # Container workspace
+                Path("/workspace/config.yaml"),  # Container root
+            ]
+            self.config_path = None
+            for path in possible_paths:
+                if path.exists():
+                    self.config_path = path
+                    break
+            # Default to package location if none found (will create defaults)
+            if not self.config_path:
+                self.config_path = Path(__file__).parent.parent / "config.yaml"
         
-        # Cache for loaded configs
-        self._app_config = None
-        self._system_config = None
-        self._merged_config = None
+        # Cache for loaded config
+        self._config = None
     
     @lru_cache(maxsize=1)
     def get_config(self) -> Dict[str, Any]:
         """
-        Get the complete merged configuration with environment variable overrides.
+        Get the complete configuration with environment variable overrides.
         
         Returns:
-            Merged configuration dictionary
+            Configuration dictionary
         """
-        if self._merged_config is None:
-            self._merged_config = self._load_and_merge_configs()
-        return self._merged_config
+        if self._config is None:
+            self._config = self._load_config()
+        return self._config
     
-    def _load_and_merge_configs(self) -> Dict[str, Any]:
+    def _load_config(self) -> Dict[str, Any]:
         """
-        Load and merge all configuration sources.
+        Load configuration from central config file.
         
         Returns:
-            Merged configuration dictionary
+            Configuration dictionary with environment overrides applied
         """
-        # Load base configs
-        app_config = self._load_app_config()
-        system_config = self._load_system_config()
-        
-        # Start with system config as base, overlay app config
-        merged = self._deep_merge(system_config, app_config)
+        # Load base config
+        config = self._load_config_file()
         
         # Apply environment variable overrides
-        merged = self._apply_env_overrides(merged)
+        config = self._apply_env_overrides(config)
         
-        self.logger.debug("Configuration loaded and merged successfully")
-        return merged
-    
-    def _load_app_config(self) -> Dict[str, Any]:
-        """Load application configuration from YAML file."""
-        if self._app_config is None:
-            try:
-                if self.app_config_path.exists():
-                    with open(self.app_config_path, 'r') as f:
-                        self._app_config = yaml.safe_load(f) or {}
-                    self.logger.debug(f"Loaded app config from {self.app_config_path}")
-                else:
-                    self.logger.warning(f"App config file not found: {self.app_config_path}")
-                    self._app_config = {}
-            except Exception as e:
-                self.logger.error(f"Failed to load app config: {e}")
-                self._app_config = {}
-        return self._app_config
+        self.logger.debug("Configuration loaded successfully")
+        return config
     
-    def _load_system_config(self) -> Dict[str, Any]:
-        """Load system configuration from YAML file."""
-        if self._system_config is None:
-            try:
-                if self.system_config_path.exists():
-                    with open(self.system_config_path, 'r') as f:
-                        self._system_config = yaml.safe_load(f) or {}
-                    self.logger.debug(f"Loaded system config from {self.system_config_path}")
-                else:
-                    self.logger.warning(f"System config file not found: {self.system_config_path}")
-                    self._system_config = {}
-            except Exception as e:
-                self.logger.error(f"Failed to load system config: {e}")
-                self._system_config = {}
-        return self._system_config
-    
-    def _deep_merge(self, base: Dict[str, Any], overlay: Dict[str, Any]) -> Dict[str, Any]:
-        """
-        Deep merge two dictionaries, with overlay taking precedence.
-        
-        Args:
-            base: Base dictionary
-            overlay: Dictionary to overlay on base
-            
-        Returns:
-            Merged dictionary
-        """
-        result = base.copy()
-        
-        for key, value in overlay.items():
-            if key in result and isinstance(result[key], dict) and isinstance(value, dict):
-                result[key] = self._deep_merge(result[key], value)
+    def _load_config_file(self) -> Dict[str, Any]:
+        """Load configuration from central YAML file."""
+        try:
+            if self.config_path.exists():
+                with open(self.config_path, 'r') as f:
+                    config = yaml.safe_load(f) or {}
+                self.logger.debug(f"Loaded config from {self.config_path}")
             else:
-                result[key] = value
-        
-        return result
+                self.logger.warning(f"Config file not found at {self.config_path}, using built-in defaults")
+                config = self._get_default_config()
+        except Exception as e:
+            self.logger.error(f"Failed to load config: {e}")
+            config = self._get_default_config()
+        return config
+    
+    def _get_default_config(self) -> Dict[str, Any]:
+        """Get default configuration when config file is not available."""
+        return {
+            'system': {
+                'workspace_base': '/workspace',
+                'log_level': 'INFO'
+            },
+            'network': {
+                'api_timeout': 10,
+                'shell_timeout': 30,
+                'terraform_timeout': 300,
+                'github_timeout': 15,
+                'git_timeout': 300
+            },
+            'ai': {
+                'default_model': 'gpt-4o-mini',
+                'default_temperature': 0.1,
+                'max_tokens': 1000
+            }
+        }
     
     def _apply_env_overrides(self, config: Dict[str, Any]) -> Dict[str, Any]:
         """
@@ -246,10 +237,8 @@ class ConfigLoader:
             return default
     
     def reload(self) -> None:
-        """Reload configuration from files (clears cache)."""
-        self._app_config = None
-        self._system_config = None
-        self._merged_config = None
+        """Reload configuration from file (clears cache)."""
+        self._config = None
         self.get_config.cache_clear()
         self.logger.debug("Configuration cache cleared, will reload on next access")
 

diagram_to_iac/core/enhanced_memory.py

@@ -4,6 +4,13 @@ import json
 import os
 from pathlib import Path
 
+try:
+    from .config_loader import get_config_value
+except ImportError:
+    # Fallback for tests or standalone usage
+    def get_config_value(path: str, default: Any = None) -> Any:
+        return default
+
 # Abstract base for memory implementations
 class MemoryInterface(ABC):
     """Abstract interface for agent memory systems."""
@@ -94,11 +101,21 @@ class PersistentFileMemory(MemoryInterface):
     
     def __init__(self, file_path: Optional[str] = None):
         if file_path is None:
-            # Default to data/db directory
-            base_dir = Path(__file__).parent.parent.parent.parent
-            data_dir = base_dir / "data" / "db"
-            data_dir.mkdir(parents=True, exist_ok=True)
-            file_path = data_dir / "agent_memory.json"
+            # Get workspace base from config with fallback
+            workspace_base = get_config_value("system.workspace_base", "/workspace")
+            
+            # Default to workspace or /tmp directory for container safety
+            try:
+                # Try workspace first (from 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)
+                file_path = data_dir / "agent_memory.json"
+            except (PermissionError, OSError):
+                # Fallback to /tmp for container environments
+                data_dir = Path("/tmp") / "diagram_to_iac" / "data" / "db"
+                data_dir.mkdir(parents=True, exist_ok=True)
+                file_path = data_dir / "agent_memory.json"
         
         self.file_path = Path(file_path)
         self._state: Dict[str, Any] = {}

diagram_to_iac/core/registry.py

@@ -33,6 +33,8 @@ from enum import Enum
 
 from pydantic import BaseModel, Field, field_validator
 
+from .config_loader import get_config_value
+
 
 class RunStatus(str, Enum):
     """Status values for deployment runs."""
@@ -126,9 +128,27 @@ class RunRegistry:
         if registry_path:
             self.registry_path = Path(registry_path)
         else:
-            # Default to data/state/issue_registry.json
-            base_path = Path(__file__).parent.parent.parent.parent
-            self.registry_path = base_path / "data" / "state" / "issue_registry.json"
+            # Get workspace base from config (with fallback)
+            workspace_base = get_config_value("system.workspace_base", "/workspace")
+            
+            # Try multiple locations for registry file
+            possible_paths = [
+                Path.cwd() / "data" / "state" / "issue_registry.json",  # Development
+                Path(workspace_base) / "data" / "state" / "issue_registry.json",  # Container workspace
+                Path("/tmp/diagram_to_iac/data/state/issue_registry.json"),  # Container fallback
+            ]
+            self.registry_path = None
+            for path in possible_paths:
+                try:
+                    path.parent.mkdir(parents=True, exist_ok=True)
+                    self.registry_path = path
+                    break
+                except (PermissionError, OSError):
+                    continue
+            
+            # Final fallback if all locations fail
+            if not self.registry_path:
+                self.registry_path = Path("/tmp/issue_registry.json")
         
         # Ensure the directory exists
         self.registry_path.parent.mkdir(parents=True, exist_ok=True)

diagram_to_iac/tools/llm_utils/router.py

@@ -46,9 +46,20 @@ class LLMRouter:
     def _load_model_policy(self, config_path: Optional[str] = None) -> Dict[str, Any]:
         """Load model policy from YAML configuration."""
         if config_path is None:
-            # Default to project's model_policy.yaml
-            base_dir = Path(__file__).parent.parent.parent.parent.parent
-            config_path = base_dir / "config" / "model_policy.yaml"
+            # Try multiple locations for model policy config
+            possible_paths = [
+                Path.cwd() / "config" / "model_policy.yaml",  # Development
+                Path("/workspace/config/model_policy.yaml"),  # Container workspace
+                Path(__file__).parent.parent.parent.parent.parent / "config" / "model_policy.yaml",  # Package fallback
+            ]
+            config_path = None
+            for path in possible_paths:
+                if path.exists():
+                    config_path = path
+                    break
+            # Default to workspace location if none found
+            if not config_path:
+                config_path = Path.cwd() / "config" / "model_policy.yaml"
         
         try:
             with open(config_path, 'r') as f:

{diagram_to_iac-1.3.0.dist-info → diagram_to_iac-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diagram-to-iac
-Version: 1.3.0
+Version: 1.4.0
 Summary: Convert architecture diagrams into IaC modules
 Author-email: vindpro <admin@vindpro.com>
 Description-Content-Type: text/markdown
@@ -10,7 +10,7 @@ Requires-Dist: langchain_anthropic==0.3.16
 Requires-Dist: langchain-core<1.0.0,>=0.3.62
 Requires-Dist: langchain_google_genai==2.1.5
 Requires-Dist: langchain_openai==0.3.26
-Requires-Dist: langgraph==0.4.10
+Requires-Dist: langgraph==0.5.0
 Requires-Dist: openai==1.92.2
 Requires-Dist: protobuf>=5.27.0
 Requires-Dist: pydantic==2.11.7

{diagram_to_iac-1.3.0.dist-info → diagram_to_iac-1.4.0.dist-info}/RECORD

@@ -33,12 +33,12 @@ diagram_to_iac/agents/terraform_langgraph/agent.py,sha256=lDaRCLcqShZiUGN25R-T94
 diagram_to_iac/agents/terraform_langgraph/parser.py,sha256=J56CPlpIEIPuDHeAOL3sz4TiIgqLi7raPlX7jwFrAms,2039
 diagram_to_iac/core/__init__.py,sha256=VjXPYLIS2SAPIDniBkeA2EDK0VHJvdaKIC8dzVneaTM,140
 diagram_to_iac/core/agent_base.py,sha256=DjZjcfzDpEhfIOki00XwQ-4lPli3OBcQ_7RNKsT7JSI,505
-diagram_to_iac/core/config_loader.py,sha256=5kkOJoOZVMJhlVQOUu_gWXd26lrblxXtcphKYLhx8WA,10131
-diagram_to_iac/core/enhanced_memory.py,sha256=Ga5wtI45zEcbwL_F1YqJaXBRpWK0iJPa69j4-V-ebvM,10951
+diagram_to_iac/core/config_loader.py,sha256=6WWOp6G7_xYUhm1x62sVa-7kFlCthcthbppmeGz1YsM,9276
+diagram_to_iac/core/enhanced_memory.py,sha256=fJ8r-MREZRnm6Rg01CDCicMEx-dDxDEjJgrk8rnVc5Y,11761
 diagram_to_iac/core/errors.py,sha256=gZwZocnIcBlS4YccIBdjG8XztRCtMe4Cu6KWxLzebDM,115
 diagram_to_iac/core/issue_tracker.py,sha256=0eo289hn94yCoFCkLaYiDOIJBjk33i2dk6eLeYe_9YE,1659
 diagram_to_iac/core/memory.py,sha256=P9URX8m2nab65ZPF36uf6Z9hEXQGXrjrXa8dPXG7pm8,4444
-diagram_to_iac/core/registry.py,sha256=AM2fv9lzrNvFfkyt7VMxQ5SWIOWhdBu4_3Aaspdokj8,25758
+diagram_to_iac/core/registry.py,sha256=ibdMz68W7qkwF0dprt4ni5pekgJfAPuRgL85uRU7wHY,26632
 diagram_to_iac/services/__init__.py,sha256=I5R8g7vYX4tCldRf1Jf9vEhm5mylc-MfFicqLnY6a3E,238
 diagram_to_iac/services/commenter.py,sha256=iXvHXOeih64FbE34PuGPk6fhI4RmC62ZSVtFwmMqiOA,22146
 diagram_to_iac/services/observability.py,sha256=yxbnjMc4TO1SM8RZZMHf2E8uVOLpxFhiTjsTkymDi6Y,1856
@@ -58,12 +58,12 @@ diagram_to_iac/tools/llm_utils/base_driver.py,sha256=sDUxk6_iNn3WU_HyRz2hW3YGTn8
 diagram_to_iac/tools/llm_utils/gemini_driver.py,sha256=VO1mJ3o10oSFo5hTBs6h8TJsXyAuah4FRr6Ua-9aNYc,3794
 diagram_to_iac/tools/llm_utils/grok_driver.py,sha256=hcq4m6ZEgjVsLXaaGlW5SWHEqyjY4KUDy88xSZFUa6Y,2955
 diagram_to_iac/tools/llm_utils/openai_driver.py,sha256=ZqzXEYEutwqRw3qWx-GH85Mj2afxK4NlhCOMq_MabqQ,3962
-diagram_to_iac/tools/llm_utils/router.py,sha256=hl-y1CCvRoBWSpKpkDI_SSyi9YIT2ZA6y6awn7_ErkM,22117
+diagram_to_iac/tools/llm_utils/router.py,sha256=ga8xfmPMl_SGINDwazeAAFYTAx9L_IQcVV5AdvqD0dQ,22643
 diagram_to_iac/tools/shell/__init__.py,sha256=6UZjBcnbPabA6Qy7t4j-dCi3S2sE6sB2bTE9PIL98bA,292
 diagram_to_iac/tools/shell/shell.py,sha256=ZOJ7Vo3l_R2Gm6Ml2FL0RX__-C_JOsUrLJVvBMwAy9E,21122
 diagram_to_iac/tools/tf/terraform.py,sha256=j1boWRo6JKpNGf1OwnWoWboO0gMYTizCOHDSxozoFZw,37343
-diagram_to_iac-1.3.0.dist-info/METADATA,sha256=h5UhAUbrllCL4GeK7kxjXiv578CWLUstdgN0HQoa2mI,10429
-diagram_to_iac-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-diagram_to_iac-1.3.0.dist-info/entry_points.txt,sha256=DfGCnmgWWGHtQpqU8VqcUWs5k_be-bfO67z1vOuTitA,277
-diagram_to_iac-1.3.0.dist-info/top_level.txt,sha256=k1cV0YODiCUU46qlmbQaquMcbMXhNm05NZLxsinDUBA,15
-diagram_to_iac-1.3.0.dist-info/RECORD,,
+diagram_to_iac-1.4.0.dist-info/METADATA,sha256=qdDVn1c4C91A_2FrJYoAOPUrAaqI841bMUd7eymUNsM,10428
+diagram_to_iac-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+diagram_to_iac-1.4.0.dist-info/entry_points.txt,sha256=DfGCnmgWWGHtQpqU8VqcUWs5k_be-bfO67z1vOuTitA,277
+diagram_to_iac-1.4.0.dist-info/top_level.txt,sha256=k1cV0YODiCUU46qlmbQaquMcbMXhNm05NZLxsinDUBA,15
+diagram_to_iac-1.4.0.dist-info/RECORD,,