diagram-to-iac 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

diagram_to_iac/tools/llm_utils/router.py

@@ -9,6 +9,10 @@ from .base_driver import BaseLLMDriver
 from .openai_driver import OpenAIDriver
 from .anthropic_driver import AnthropicDriver
 from .gemini_driver import GoogleDriver
+from .grok_driver import GrokDriver
+
+# Import ConfigLoader for centralized configuration
+from ...core.config_loader import ConfigLoader
 
 try:
     from langchain_core.messages import HumanMessage
@@ -28,11 +32,15 @@ class LLMRouter:
         self.config = self._load_model_policy(config_path)
         self._provider_cache = {}
         
-        # Initialize drivers
+        # Initialize ConfigLoader for accessing centralized configuration
+        self._config_loader = ConfigLoader()
+        
+        # Initialize drivers (including new Grok driver)
         self._drivers = {
             "openai": OpenAIDriver(),
             "anthropic": AnthropicDriver(),
-            "google": GoogleDriver()
+            "google": GoogleDriver(),
+            "grok": GrokDriver()
         }
     
     def _load_model_policy(self, config_path: Optional[str] = None) -> Dict[str, Any]:
@@ -77,6 +85,8 @@ class LLMRouter:
             return 'anthropic'
         elif any(pattern in model_lower for pattern in ['gemini', 'google']):
             return 'google'
+        elif any(pattern in model_lower for pattern in ['grok', 'x.ai']):
+            return 'grok'
         else:
             return 'openai'  # Default fallback
     
@@ -85,7 +95,8 @@ class LLMRouter:
         key_mapping = {
             'openai': 'OPENAI_API_KEY',
             'anthropic': 'ANTHROPIC_API_KEY', 
-            'google': 'GOOGLE_API_KEY'
+            'google': 'GOOGLE_API_KEY',
+            'grok': 'GROK_API_KEY'
         }
         
         required_key = key_mapping.get(provider)
@@ -93,23 +104,154 @@ class LLMRouter:
             return False
         return True
     
+    def _get_available_providers(self) -> List[str]:
+        """Get list of providers with available API keys."""
+        available = []
+        for provider in self._drivers.keys():
+            if self._check_api_key(provider):
+                available.append(provider)
+        return available
+    
+    def _get_provider_selection_config(self) -> Dict[str, Any]:
+        """Get provider selection configuration from centralized config."""
+        try:
+            app_config = self._config_loader.get_config()
+            return app_config.get('ai', {}).get('provider_selection', {})
+        except Exception:
+            # Fallback to default behavior if config loading fails
+            return {
+                'strategy': 'auto',
+                'preferred_order': ['openai', 'anthropic', 'google', 'grok'],
+                'fallback': {'enabled': True, 'retry_attempts': 2}
+            }
+    
+    def _select_best_provider(self, requested_provider: Optional[str] = None, 
+                            requested_model: Optional[str] = None) -> tuple[str, str]:
+        """
+        Intelligently select the best available provider and model.
+        
+        Args:
+            requested_provider: Explicitly requested provider (takes precedence)
+            requested_model: Explicitly requested model (used for provider detection)
+            
+        Returns:
+            tuple: (selected_provider, selected_model)
+        """
+        config = self._get_provider_selection_config()
+        strategy = config.get('strategy', 'auto')
+        
+        # If provider explicitly requested, try that first
+        if requested_provider and self._check_api_key(requested_provider):
+            fallback_model = self._get_fallback_model_for_provider(requested_provider)
+            return requested_provider, requested_model or fallback_model
+        
+        # If model specified, detect its provider and check availability
+        if requested_model:
+            detected_provider = self._detect_provider(requested_model)
+            if self._check_api_key(detected_provider):
+                return detected_provider, requested_model
+        
+        # Get available providers
+        available_providers = self._get_available_providers()
+        if not available_providers:
+            raise ValueError(
+                "No AI providers available. Please set at least one API key: "
+                "OPENAI_API_KEY, ANTHROPIC_API_KEY, GOOGLE_API_KEY, or GROK_API_KEY"
+            )
+        
+        # Apply selection strategy
+        if strategy == 'auto' or strategy == 'prefer_cost' or strategy == 'prefer_performance':
+            preferred_order = config.get('preferred_order', ['openai', 'anthropic', 'google', 'grok'])
+            
+            # Filter to only available providers, maintaining preference order
+            for provider in preferred_order:
+                if provider in available_providers:
+                    model = self._get_optimal_model_for_provider(provider, strategy, config)
+                    return provider, model
+        
+        # Fallback to first available provider if strategy selection fails
+        first_provider = available_providers[0]
+        model = self._get_fallback_model_for_provider(first_provider)
+        return first_provider, model
+    
+    def _get_optimal_model_for_provider(self, provider: str, strategy: str, config: Dict[str, Any]) -> str:
+        """Get the optimal model for a provider based on selection strategy."""
+        if strategy == 'prefer_cost':
+            cost_models = config.get('cost_optimization', {}).get('prefer_models', [])
+            for model in cost_models:
+                if self._detect_provider(model) == provider:
+                    return model
+        elif strategy == 'prefer_performance':
+            perf_models = config.get('performance_optimization', {}).get('prefer_models', [])
+            for model in perf_models:
+                if self._detect_provider(model) == provider:
+                    return model
+        
+        # Fallback to provider's default model
+        return self._get_fallback_model_for_provider(provider)
+    
+    def _get_fallback_model_for_provider(self, provider: str) -> str:
+        """Get default/fallback model for a specific provider."""
+        fallback_models = {
+            'openai': 'gpt-4o-mini',
+            'anthropic': 'claude-3-haiku',
+            'google': 'gemini-pro',
+            'grok': 'grok-1.5'
+        }
+        return fallback_models.get(provider, 'gpt-4o-mini')
+    
     def get_llm_for_agent(self, agent_name: str) -> BaseChatModel:
         """
-        Get an LLM instance configured for a specific agent.
-        Uses agent-specific configuration from model_policy.yaml.
+        Get an LLM instance configured for a specific agent with intelligent provider selection.
+        Uses agent-specific configuration from model_policy.yaml and falls back to available providers.
         """
         config = self._resolve_model_config(agent_name)
         
-        # Check if API key is available for the provider
-        if not self._check_api_key(config['provider']):
-            raise ValueError(f"API key not found for provider: {config['provider']}")
-        
-        return self._create_llm_instance(config)
+        # Try intelligent provider selection with fallback
+        try:
+            # Check if configured provider is available
+            if self._check_api_key(config['provider']):
+                return self._create_llm_instance(config)
+            else:
+                # Provider not available, use intelligent selection
+                print(f"Warning: Configured provider '{config['provider']}' not available for agent '{agent_name}'. Using intelligent fallback.")
+                
+                selected_provider, selected_model = self._select_best_provider(
+                    requested_model=config.get('model')
+                )
+                
+                # Update config with selected provider and model
+                fallback_config = config.copy()
+                fallback_config['provider'] = selected_provider
+                fallback_config['model'] = selected_model
+                
+                return self._create_llm_instance(fallback_config)
+                
+        except Exception as e:
+            # Last resort fallback
+            available_providers = self._get_available_providers()
+            if not available_providers:
+                raise ValueError(
+                    f"No AI providers available for agent '{agent_name}'. "
+                    f"Please set at least one API key: OPENAI_API_KEY, ANTHROPIC_API_KEY, GOOGLE_API_KEY, or GROK_API_KEY"
+                ) from e
+            
+            # Use first available provider with its default model
+            fallback_provider = available_providers[0]
+            fallback_model = self._get_fallback_model_for_provider(fallback_provider)
+            
+            fallback_config = config.copy()
+            fallback_config['provider'] = fallback_provider
+            fallback_config['model'] = fallback_model
+            
+            print(f"Warning: Fallback to {fallback_provider}/{fallback_model} for agent '{agent_name}' due to error: {e}")
+            return self._create_llm_instance(fallback_config)
     
     def get_llm(self, model_name: str = None, temperature: float = None, agent_name: str = None) -> BaseChatModel:
         """
-        Initializes and returns an LLM instance using model_policy.yaml configuration.
+        Initializes and returns an LLM instance with intelligent provider selection.
         Uses provided parameters or falls back to agent-specific or global defaults.
+        Automatically selects best available provider if configured provider is unavailable.
         """
         # If agent_name is provided but other params are None, use agent-specific config
         if agent_name and model_name is None and temperature is None:
@@ -120,26 +262,53 @@ class LLMRouter:
             model_name, temperature, agent_name
         )
         
-        # Detect provider for the model
-        provider = self._detect_provider(effective_model_name)
-        
-        # Check API key availability
-        if not self._check_api_key(provider):
-            # Fallback to default provider if API key is missing
+        # Use intelligent provider selection
+        try:
+            # Try to detect provider for the requested model
+            initial_provider = self._detect_provider(effective_model_name)
+            
+            # Use intelligent selection to find best available option
+            selected_provider, selected_model = self._select_best_provider(
+                requested_provider=initial_provider if self._check_api_key(initial_provider) else None,
+                requested_model=effective_model_name
+            )
+            
+            # Create configuration dict
+            config = {
+                'model': selected_model,
+                'temperature': effective_temperature,
+                'provider': selected_provider
+            }
+            
+            # Create and return the appropriate LLM instance
+            return self._create_llm_instance(config)
+            
+        except Exception as e:
+            # Last resort: use fallback configuration from policy
+            print(f"Warning: Intelligent provider selection failed: {e}. Using fallback configuration.")
+            
             fallback_config = self.config.get('default', {})
-            effective_model_name = fallback_config.get('model', 'gpt-4o-mini')
-            effective_temperature = fallback_config.get('temperature', 0.0)
-            provider = fallback_config.get('provider', 'openai')
-        
-        # Create configuration dict
-        config = {
-            'model': effective_model_name,
-            'temperature': effective_temperature,
-            'provider': provider
-        }
-        
-        # Create and return the appropriate LLM instance
-        return self._create_llm_instance(config)
+            fallback_provider = fallback_config.get('provider', 'openai')
+            
+            # If default provider is not available, try any available provider
+            if not self._check_api_key(fallback_provider):
+                available_providers = self._get_available_providers()
+                if available_providers:
+                    fallback_provider = available_providers[0]
+                    effective_model_name = self._get_fallback_model_for_provider(fallback_provider)
+                else:
+                    raise ValueError(
+                        "No AI providers available. Please set at least one API key: "
+                        "OPENAI_API_KEY, ANTHROPIC_API_KEY, GOOGLE_API_KEY, or GROK_API_KEY"
+                    ) from e
+            
+            config = {
+                'model': effective_model_name,
+                'temperature': effective_temperature,
+                'provider': fallback_provider
+            }
+            
+            return self._create_llm_instance(config)
     
     def _resolve_model_config(self, agent_name: str) -> Dict[str, Any]:
         """
@@ -230,6 +399,7 @@ class LLMRouter:
         info = {}
         for provider, driver in self._drivers.items():
             info[provider] = {
+                "available": self._check_api_key(provider),
                 "models": driver.get_supported_models(),
                 "capabilities": {
                     model: driver.get_model_capabilities(model)
@@ -237,6 +407,26 @@ class LLMRouter:
                 }
             }
         return info
+    
+    def get_provider_status(self) -> Dict[str, Any]:
+        """Get status information about all providers and intelligent selection."""
+        available_providers = self._get_available_providers()
+        config = self._get_provider_selection_config()
+        
+        return {
+            "available_providers": available_providers,
+            "total_providers": len(self._drivers),
+            "selection_strategy": config.get('strategy', 'auto'),
+            "preferred_order": config.get('preferred_order', []),
+            "provider_details": {
+                provider: {
+                    "available": self._check_api_key(provider),
+                    "api_key_env": f"{provider.upper()}_API_KEY",
+                    "default_model": self._get_fallback_model_for_provider(provider)
+                }
+                for provider in self._drivers.keys()
+            }
+        }
 
 
 # Create global router instance

{diagram_to_iac-1.0.2.dist-info → diagram_to_iac-1.0.4.dist-info}/METADATA

@@ -1,21 +1,22 @@
 Metadata-Version: 2.4
 Name: diagram-to-iac
-Version: 1.0.2
+Version: 1.0.4
 Summary: Convert architecture diagrams into IaC modules
 Author-email: vindpro <admin@vindpro.com>
 Description-Content-Type: text/markdown
-Requires-Dist: anthropic==0.54.0
+Requires-Dist: anthropic==0.55.0
 Requires-Dist: google_api_python_client==2.173.0
 Requires-Dist: langchain_anthropic==0.3.15
 Requires-Dist: langchain-core<1.0.0,>=0.3.62
 Requires-Dist: langchain_google_genai==2.1.5
-Requires-Dist: langchain_openai==0.3.24
+Requires-Dist: langchain_openai==0.3.25
 Requires-Dist: langgraph==0.4.8
-Requires-Dist: openai==1.88.0
+Requires-Dist: openai==1.91.0
 Requires-Dist: protobuf>=5.27.0
 Requires-Dist: pydantic==2.11.7
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: Requests==2.32.4
+Requires-Dist: typing_extensions==4.14.0
 Requires-Dist: GitPython<4.0,>=3.1
 
 # diagram-to-iac

{diagram_to_iac-1.0.2.dist-info → diagram_to_iac-1.0.4.dist-info}/RECORD

@@ -3,13 +3,13 @@ diagram_to_iac/cli.py,sha256=uumG1frF42eCkdLIZxyxQB1x6lDwtG-qKL4vcHnLLXY,400
 diagram_to_iac/r2d.py,sha256=I7XSuUtu8TdvAhK4tCMLc3U_3ZtP7DJGfq168aeI3Mk,13208
 diagram_to_iac/actions/__init__.py,sha256=P1CjjY4FYUA0Tcx8FQNLYYSI9fhv8yKd_TmRGtmhW50,229
 diagram_to_iac/actions/git_entry.py,sha256=mhY6gYquUPVvyvnTC2S90z_uXEe1asqWLoi1989aB_Q,5403
-diagram_to_iac/actions/supervisor_entry.py,sha256=vWhFn-4M0jQnrUQUSCb0I_YNxzGsKiBV0QNzkIkQfNE,3586
+diagram_to_iac/actions/supervisor_entry.py,sha256=Nm6YIBbEzpL1huza3a0ThA0hdimptRd5rndLUsOMSH4,9282
 diagram_to_iac/actions/terraform_agent_entry.py,sha256=gKkX4fIRdBDZpwPQO_v2t1SSO0SQuzaxQ0StKegGK8U,6852
 diagram_to_iac/agents/__init__.py,sha256=GHInKSPq56ZPYSKsyti6_wk82dhn2hOqfxNHkZZOj_0,735
 diagram_to_iac/agents/demonstrator_langgraph/__init__.py,sha256=nghMYMEEarfkR0V6AH1fDCV-mXBLnmFP2sO4OPxJ4cI,371
 diagram_to_iac/agents/demonstrator_langgraph/agent.py,sha256=9ZH2H5iAB2DfMhCr-OzImVZlwoeXIP8RKl6_VG47W2I,35349
 diagram_to_iac/agents/git_langgraph/__init__.py,sha256=x6nCnOu-Vcl-qVqW1swhdaE_sQqUSvEUUtWk4eePBUo,295
-diagram_to_iac/agents/git_langgraph/agent.py,sha256=bG3GHub62Rm8q9XrkLMN4kLBH6BTiLYrxQ9heNGsoCY,47640
+diagram_to_iac/agents/git_langgraph/agent.py,sha256=_lGwyTTgTsS4ZtaQLCceGJa5zeLvux_Hqda1-fqAgXg,49288
 diagram_to_iac/agents/git_langgraph/pr.py,sha256=qXopN5XAF1DIac5vbH-QasihkuAiWmC9JY8pLYlm-sQ,8601
 diagram_to_iac/agents/hello_langgraph/__init__.py,sha256=lviuDAPJezmpaXR-H7JxfIT9wvg1xO2t6JLyeKSSx0Y,266
 diagram_to_iac/agents/hello_langgraph/agent.py,sha256=R49yfFGxqMPBBu36ztDH9lBE_-s7VFyRB33gnNSXxek,33777
@@ -22,8 +22,9 @@ diagram_to_iac/agents/shell_langgraph/__init__.py,sha256=teAx1L87McCj9_24NUdET3O
 diagram_to_iac/agents/shell_langgraph/agent.py,sha256=dZWzjVQ9oX_BtNHQ1Zrzy2oQpuY1e5BS51-SGcWpoSw,4341
 diagram_to_iac/agents/shell_langgraph/detector.py,sha256=wLw0uDP_V2m1z6SRk7QNCzoUMYCfXwu3DNg8EWue9yk,1493
 diagram_to_iac/agents/supervisor_langgraph/__init__.py,sha256=iLN60d20cqoXOLyuLvJkiwrzapE84em222Tnyndq2dc,385
-diagram_to_iac/agents/supervisor_langgraph/agent.py,sha256=NdqYFyVw1bc4UK-IQOmcc1ZEIQVVakg1z5OC_uN_kqc,84790
+diagram_to_iac/agents/supervisor_langgraph/agent.py,sha256=1qfgYSQQx1JNgN9ORFCl35NrklRbN7ZcUdP5AbGBsGo,101342
 diagram_to_iac/agents/supervisor_langgraph/demonstrator.py,sha256=OT-bElEyLZBedzcc5DtZnp1yhjYVjx4jRzt52f5SoSU,803
+diagram_to_iac/agents/supervisor_langgraph/github_listener.py,sha256=Ko9dOnS9CUqbjTogEyhEmVhkiaW8OiwLzX6k18lSrac,16377
 diagram_to_iac/agents/supervisor_langgraph/guards.py,sha256=XzBgjXnwbOgLkGm7AqXX4tQdGBerq_6pKvduKPqIwF0,720
 diagram_to_iac/agents/supervisor_langgraph/pat_loop.py,sha256=feY8ZPGQxqkUuHOMSdpilGDUjOvaky8xImLuVe98hrw,1566
 diagram_to_iac/agents/supervisor_langgraph/router.py,sha256=7hZXXEmtvG__w7UAaOhoPaHdubUv-oMKbQdMTMXk-qY,276
@@ -37,7 +38,9 @@ diagram_to_iac/core/enhanced_memory.py,sha256=Ga5wtI45zEcbwL_F1YqJaXBRpWK0iJPa69
 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/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
 diagram_to_iac/services/step_summary.py,sha256=g3MuMZ51IDubI0oWcF7qMvseNgDS6D90AsKK_1s5xDQ,2808
 diagram_to_iac/tools/__init__.py,sha256=F2pcKhoPP5KDeQIGcqKXD1J30KFKc9qxMw1jxzrs9qY,434
@@ -49,17 +52,18 @@ diagram_to_iac/tools/git/git.py,sha256=0NYz9NqQWf-5YTX7R3nBPyLmzvih-jhd0gYY8KZDm
 diagram_to_iac/tools/hello/__init__.py,sha256=f6GpkiQxvuGaRMm34yQilGACxUI4c5edJQTDjZtskjQ,891
 diagram_to_iac/tools/hello/cal_utils.py,sha256=B-0iOJHNL1IgYPlWUdrAwEf1r9LUKBAnGyx1xQz05ZE,1507
 diagram_to_iac/tools/hello/text_utils.py,sha256=ZaVQYw6GVqaq9EDTQfG3gTAudeN8CuFUUb7IETZhUCA,3952
-diagram_to_iac/tools/llm_utils/__init__.py,sha256=IQ6cQprJtV4j5s_RVnt94rCGXfuvZ0PiTH6Y0gK242o,440
+diagram_to_iac/tools/llm_utils/__init__.py,sha256=xkSbnB3_eqFX7UDZPl9s4blh5IKPzRh52sHdwmJ4VMM,494
 diagram_to_iac/tools/llm_utils/anthropic_driver.py,sha256=tb8HVGB6Ng9ZwImRJtSy2X0965ZE3Vm5g8HbMfcLyBY,3674
 diagram_to_iac/tools/llm_utils/base_driver.py,sha256=sDUxk6_iNn3WU_HyRz2hW3YGTn8_7aucqEUnGTj2PeU,2503
 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=WHGanstQjUlo2SmDFKGAL6xtIb3xXWlgZ5CIzHWN8I8,12906
+diagram_to_iac/tools/llm_utils/router.py,sha256=hl-y1CCvRoBWSpKpkDI_SSyi9YIT2ZA6y6awn7_ErkM,22117
 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.0.2.dist-info/METADATA,sha256=t9VPmIiCYqB66upyuPB5hpx6h5zOxch96bdLClkndUw,9019
-diagram_to_iac-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-diagram_to_iac-1.0.2.dist-info/entry_points.txt,sha256=DfGCnmgWWGHtQpqU8VqcUWs5k_be-bfO67z1vOuTitA,277
-diagram_to_iac-1.0.2.dist-info/top_level.txt,sha256=k1cV0YODiCUU46qlmbQaquMcbMXhNm05NZLxsinDUBA,15
-diagram_to_iac-1.0.2.dist-info/RECORD,,
+diagram_to_iac-1.0.4.dist-info/METADATA,sha256=T5CbWJpZcJzrnRlEPH47EtIxumc12u0IBcrB4yLGCCc,9060
+diagram_to_iac-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+diagram_to_iac-1.0.4.dist-info/entry_points.txt,sha256=DfGCnmgWWGHtQpqU8VqcUWs5k_be-bfO67z1vOuTitA,277
+diagram_to_iac-1.0.4.dist-info/top_level.txt,sha256=k1cV0YODiCUU46qlmbQaquMcbMXhNm05NZLxsinDUBA,15
+diagram_to_iac-1.0.4.dist-info/RECORD,,