opsmith-cli 0.4.4b0__tar.gz → 0.4.6b0__tar.gz

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opsmith-cli
-Version: 0.4.4b0
+Version: 0.4.6b0
 Summary: Opsmith is an AI devops engineer in your terminal
 License-Expression: GPL-3.0-only
 License-File: LICENSE.txt
@@ -14,25 +14,27 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development
-Requires-Python: >=3.11
-Requires-Dist: ansible==12.3.0
-Requires-Dist: gitpython==3.1.45
-Requires-Dist: google-api-python-client==2.187.0
-Requires-Dist: google-cloud-compute==1.40.0
-Requires-Dist: google-cloud-resource-manager==1.15.0
-Requires-Dist: google-cloud-storage==3.7.0
+Requires-Python: >=3.12
+Requires-Dist: ansible==14.1.0
+Requires-Dist: gitpython==3.1.50
+Requires-Dist: google-api-python-client==2.197.0
+Requires-Dist: google-cloud-compute==1.48.0
+Requires-Dist: google-cloud-resource-manager==1.17.0
+Requires-Dist: google-cloud-storage==3.12.0
 Requires-Dist: grep-ast==0.9.0
 Requires-Dist: inquirer==3.4.1
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: networkx==3.6.1
-Requires-Dist: pick==2.4.0
-Requires-Dist: pydantic-ai==1.37.0
-Requires-Dist: pydantic==2.12.5
-Requires-Dist: python-dotenv==1.2.1
+Requires-Dist: pick==2.6.0
+Requires-Dist: pydantic-ai==1.107.0
+Requires-Dist: pydantic==2.13.4
+Requires-Dist: python-dotenv==1.2.2
 Requires-Dist: pyyaml==6.0.3
-Requires-Dist: tqdm==4.67.1
-Requires-Dist: tree-sitter-language-pack==0.13.0
-Requires-Dist: typer==0.20.1
+Requires-Dist: rich==15.0.0
+Requires-Dist: tqdm==4.68.3
+Requires-Dist: tree-sitter-language-pack==1.9.1
+Requires-Dist: tree-sitter==0.25.2
+Requires-Dist: typer==0.26.7
 Description-Content-Type: text/markdown
 
 # Opsmith: An AI devops engineer in your terminal

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/opsmith/deployment_strategies/monolithic.py

@@ -105,13 +105,16 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
         # Parse env_file_content from LLM
         env_file_vars = dotenv_values(stream=StringIO(env_file_content))
 
-        env_defaults = deployment_config.get_env_var_defaults()
+        configured_env = deployment_config.get_configured_env_vars()
 
         # Prepare questions for inquirer
         questions = []
         for key, value in sorted(env_file_vars.items()):
+            # Exclude any custom env that is not configured
+            if key not in configured_env:
+                continue
             # Precedence: llm > code default
-            default_value = value or env_defaults.get(key)
+            default_value = value or configured_env[key]
             questions.append(
                 inquirer.Text(
                     name=key,
@@ -238,6 +241,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
         images: Dict[str, str],
         environment_state: MonolithicDeploymentState,
         existing_env_content: Optional[str] = None,
+        initial_messages: Optional[list[ModelMessage]] = None,
     ):
         base_compose_template = self.docker_compose_snippets_env.get_template("base.yml")
         base_compose = base_compose_template.render(app_name=deployment_config.app_name_slug)
@@ -293,7 +297,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
         confirmed_env_content = existing_env_content or "N/A"
         is_successful = False
         docker_compose_content = None
-        messages = []
+        messages = initial_messages or []
         for attempt in range(settings.max_docker_compose_gen_attempts):
             print(
                 "\n[bold blue]Generating docker-compose file, Attempt"
@@ -927,7 +931,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
                     env_file_content=existing_env_content,
                 )
 
-                is_successful, reason, _, confirmed_env_content = (
+                is_successful, reason, validation_messages, confirmed_env_content = (
                     self._deploy_validate_docker_compose(
                         deployment_config,
                         environment,
@@ -947,6 +951,7 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
                         images,
                         env_state,
                         existing_env_content=confirmed_env_content,
+                        initial_messages=validation_messages,
                     )
             else:
                 # This can happen if only frontend was deployed

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/opsmith/models.py

@@ -3,10 +3,13 @@ import os
 from importlib.metadata import entry_points
 from typing import Dict, List, Optional, Tuple, Type
 
-from google.genai.types import ThinkingConfigDict
+from google.genai.types import ThinkingConfigDict, ThinkingLevel
 from pydantic_ai.models.anthropic import AnthropicModelSettings
 from pydantic_ai.models.google import GoogleModelSettings
-from pydantic_ai.models.openai import OpenAIModelSettings
+from pydantic_ai.models.openai import (
+    OpenAIChatModelSettings,
+    OpenAIResponsesModelSettings,
+)
 from pydantic_ai.settings import ModelSettings
 from rich import print
 
@@ -100,13 +103,10 @@ class ModelRegistry:
     def _load_builtin_models(self):
         """Load built-in models"""
         for model_cls in [
-            OpenAIGPT41,
-            OpenAIGPTO3,
-            OpenAIGPT5,
-            AnthropicClaudeSonnet37,
-            AnthropicClaudeSonnet4,
-            AnthropicClaudeSonnet45,
-            GoogleGlaGemini25Pro,
+            OpenAIGPT55,
+            OpenAIGPT55Pro,
+            AnthropicClaudeSonnet46,
+            AnthropicClaudeOpus48,
             GoogleGlaGemini3Pro,
         ]:
             self.register(model_cls)
@@ -127,10 +127,10 @@ class ModelRegistry:
                 )
 
 
-class OpenAIGPT41(BaseAiModel):
+class OpenAIGPT55(BaseAiModel):
     @classmethod
     def name(cls) -> str:
-        return "gpt-4.1"
+        return "gpt-5.5"
 
     @classmethod
     def provider(cls) -> str:
@@ -143,17 +143,18 @@ class OpenAIGPT41(BaseAiModel):
     @classmethod
     def get_model_settings(cls) -> ModelSettings:
         """Returns model-specific settings."""
-        return OpenAIModelSettings()
+        return OpenAIChatModelSettings(openai_reasoning_effort="high")
 
 
-class OpenAIGPTO3(BaseAiModel):
+class OpenAIGPT55Pro(BaseAiModel):
     @classmethod
     def name(cls) -> str:
-        return "o3"
+        return "gpt-5.5-pro"
 
     @classmethod
     def provider(cls) -> str:
-        return "openai"
+        # Pro reasoning models are only served via the OpenAI Responses API.
+        return "openai-responses"
 
     @classmethod
     def api_key_prefix(cls) -> str:
@@ -162,32 +163,13 @@ class OpenAIGPTO3(BaseAiModel):
     @classmethod
     def get_model_settings(cls) -> ModelSettings:
         """Returns model-specific settings."""
-        return OpenAIModelSettings(openai_reasoning_effort="high")
+        return OpenAIResponsesModelSettings(openai_reasoning_effort="medium")
 
 
-class OpenAIGPT5(BaseAiModel):
+class AnthropicClaudeSonnet46(BaseAiModel):
     @classmethod
     def name(cls) -> str:
-        return "gpt-5"
-
-    @classmethod
-    def provider(cls) -> str:
-        return "openai"
-
-    @classmethod
-    def api_key_prefix(cls) -> str:
-        return "OPENAI"
-
-    @classmethod
-    def get_model_settings(cls) -> ModelSettings:
-        """Returns model-specific settings."""
-        return OpenAIModelSettings()
-
-
-class AnthropicClaudeSonnet37(BaseAiModel):
-    @classmethod
-    def name(cls) -> str:
-        return "claude-3-7-sonnet-20250219"
+        return "claude-sonnet-4-6"
 
     @classmethod
     def provider(cls) -> str:
@@ -200,13 +182,13 @@ class AnthropicClaudeSonnet37(BaseAiModel):
     @classmethod
     def get_model_settings(cls) -> ModelSettings:
         """Returns model-specific settings."""
-        return AnthropicModelSettings()
+        return AnthropicModelSettings(anthropic_effort="high")
 
 
-class AnthropicClaudeSonnet4(BaseAiModel):
+class AnthropicClaudeOpus48(BaseAiModel):
     @classmethod
     def name(cls) -> str:
-        return "claude-sonnet-4-20250514"
+        return "claude-opus-4-8"
 
     @classmethod
     def provider(cls) -> str:
@@ -219,51 +201,13 @@ class AnthropicClaudeSonnet4(BaseAiModel):
     @classmethod
     def get_model_settings(cls) -> ModelSettings:
         """Returns model-specific settings."""
-        return AnthropicModelSettings()
-
-
-class AnthropicClaudeSonnet45(BaseAiModel):
-    @classmethod
-    def name(cls) -> str:
-        return "claude-sonnet-4-5-20250929"
-
-    @classmethod
-    def provider(cls) -> str:
-        return "anthropic"
-
-    @classmethod
-    def api_key_prefix(cls) -> str:
-        return "ANTHROPIC"
-
-    @classmethod
-    def get_model_settings(cls) -> ModelSettings:
-        """Returns model-specific settings."""
-        return AnthropicModelSettings()
-
-
-class GoogleGlaGemini25Pro(BaseAiModel):
-    @classmethod
-    def name(cls) -> str:
-        return "gemini-2.5-pro"
-
-    @classmethod
-    def provider(cls) -> str:
-        return "google-gla"
-
-    @classmethod
-    def api_key_prefix(cls) -> str:
-        return "GEMINI"
-
-    @classmethod
-    def get_model_settings(cls) -> ModelSettings:
-        """Returns model-specific settings."""
-        return GoogleModelSettings(google_thinking_config=ThinkingConfigDict(thinking_budget=-1))
+        return AnthropicModelSettings(anthropic_effort="medium")
 
 
 class GoogleGlaGemini3Pro(BaseAiModel):
     @classmethod
     def name(cls) -> str:
-        return "gemini-3-pro-preview"
+        return "gemini-3.1-pro-preview"
 
     @classmethod
     def provider(cls) -> str:
@@ -276,7 +220,9 @@ class GoogleGlaGemini3Pro(BaseAiModel):
     @classmethod
     def get_model_settings(cls) -> ModelSettings:
         """Returns model-specific settings."""
-        return GoogleModelSettings(google_thinking_config=ThinkingConfigDict(thinking_level="HIGH"))
+        return GoogleModelSettings(
+            google_thinking_config=ThinkingConfigDict(thinking_level=ThinkingLevel.HIGH)
+        )
 
 
 MODEL_REGISTRY = ModelRegistry()

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/opsmith/repo_map.py

@@ -8,6 +8,7 @@ import typer
 from grep_ast import TreeContext, filename_to_lang
 from grep_ast.tsl import get_language, get_parser
 from tqdm import tqdm
+from tree_sitter import Query, QueryCursor
 
 from opsmith.constants import ROOT_IMPORTANT_FILES
 from opsmith.git_repo import GitRepo
@@ -272,8 +273,8 @@ class RepoMap:
             return tags
 
         tree = parser_module.parse(bytes(code, "utf-8"))
-        query = language_module.query(query_scm_content)
-        captures = query.captures(tree.root_node)
+        query = Query(language_module, query_scm_content)
+        captures = QueryCursor(query).captures(tree.root_node)
 
         processed_tags = set()  # To avoid duplicate tags from different patterns
 

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/opsmith/templates/virtual_machine_setup/aws/main.yml

@@ -150,6 +150,12 @@
         groups: systemd-journal
         append: yes
 
+    - name: Start Vector service
+      ansible.builtin.service:
+        name: vector
+        state: started
+        enabled: yes
+
     - name: Create CloudWatch agent configuration
       ansible.builtin.copy:
         content: |

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/opsmith/types.py

@@ -225,14 +225,13 @@ class DeploymentConfig(ServiceList):
                 return env
         raise ValueError(f"Environment '{name}' not found in the deployment configuration.")
 
-    def get_env_var_defaults(self) -> dict:
-        """Retrieves a dictionary of environment variable defaults."""
-        env_var_defaults = {}
+    def get_configured_env_vars(self) -> dict:
+        """Retrieves a dictionary of configured environment variable with defaults."""
+        env_vars = {}
         for service in self.services:
             for env_var in service.env_vars:
-                if env_var.default_value:
-                    env_var_defaults[env_var.key] = env_var.default_value
-        return env_var_defaults
+                env_vars[env_var.key] = env_var.default_value
+        return env_vars
 
     @classmethod
     def load(cls: Type["DeploymentConfig"], deployments_path: Path) -> Optional["DeploymentConfig"]:

{opsmith_cli-0.4.4b0 → opsmith_cli-0.4.6b0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opsmith-cli"
-version = "0.4.4b"
+version = "0.4.6b"
 description = "Opsmith is an AI devops engineer in your terminal"
 readme = {file = "README.md", content-type = "text/markdown"}
 classifiers = [
@@ -16,26 +16,28 @@ classifiers = [
     "Topic :: Software Development",
 ]
 license = "GPL-3.0-only"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 dependencies = [
-    "ansible==12.3.0",
-    "gitpython==3.1.45",
-    "google-api-python-client==2.187.0",
-    "google-cloud-compute==1.40.0",
-    "google-cloud-resource-manager==1.15.0",
-    "google-cloud-storage==3.7.0",
+    "ansible==14.1.0",
+    "gitpython==3.1.50",
+    "google-api-python-client==2.197.0",
+    "google-cloud-compute==1.48.0",
+    "google-cloud-resource-manager==1.17.0",
+    "google-cloud-storage==3.12.0",
     "grep-ast==0.9.0",
     "inquirer==3.4.1",
     "jinja2==3.1.6",
     "networkx==3.6.1",
-    "pick==2.4.0",
-    "pydantic==2.12.5",
-    "pydantic-ai==1.37.0",
-    "python-dotenv==1.2.1",
+    "pick==2.6.0",
+    "pydantic==2.13.4",
+    "pydantic-ai==1.107.0",
+    "python-dotenv==1.2.2",
     "pyyaml==6.0.3",
-    "tqdm==4.67.1",
-    "tree-sitter-language-pack==0.13.0",
-    "typer==0.20.1",
+    "rich==15.0.0",
+    "tqdm==4.68.3",
+    "tree-sitter==0.25.2",
+    "tree-sitter-language-pack==1.9.1",
+    "typer==0.26.7",
 ]
 
 [project.scripts]