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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opsmith-cli
-Version: 0.4.3b0
+Version: 0.4.4b0
 Summary: Opsmith is an AI devops engineer in your terminal
 License-Expression: GPL-3.0-only
 License-File: LICENSE.txt

{opsmith_cli-0.4.3b0 → opsmith_cli-0.4.4b0}/opsmith/deployment_strategies/base.py

@@ -14,6 +14,7 @@ from rich import print
 
 from opsmith.agent import AgentDeps
 from opsmith.cloud_providers.base import BaseCloudProvider, MachineType
+from opsmith.git_repo import GitRepo
 from opsmith.infra_provisioners.ansible_provisioner import AnsibleProvisioner
 from opsmith.infra_provisioners.terraform_provisioner import TerraformProvisioner
 from opsmith.settings import settings
@@ -105,6 +106,7 @@ class BaseDeploymentStrategy(abc.ABC):
         self.src_dir = src_dir
         self.deployments_path = src_dir.joinpath(settings.deployments_dir)
         self.templates_dir = Path(__file__).parent.parent / "templates"
+        self.git_repo = GitRepo(self.src_dir)
 
     def _get_env_state_path(self, environment_name: str) -> Path:
         return self.deployments_path / "environments" / environment_name / "state.yml"
@@ -176,54 +178,59 @@ class BaseDeploymentStrategy(abc.ABC):
             ServiceTypeEnum.BACKEND_WORKER,
         ]
 
-        for service in deployment_config.services:
-            if service.service_type not in buildable_service_types:
-                continue
-
-            # This logic is from generate_dockerfiles
-            service_dir_slug = service.name_slug
-            dockerfile_path_abs = self.deployments_path / "docker" / service_dir_slug / "Dockerfile"
+        with self.git_repo.git_archive_context() as clean_context_path:
+            for service in deployment_config.services:
+                if service.service_type not in buildable_service_types:
+                    continue
 
-            if not dockerfile_path_abs.exists():
-                print(
-                    f"[bold yellow]Dockerfile for {service_dir_slug} not found at"
-                    f" {dockerfile_path_abs}, skipping build.[/bold yellow]"
+                # This logic is from generate_dockerfiles
+                service_dir_slug = service.name_slug
+                dockerfile_path_abs = (
+                    self.deployments_path / "docker" / service_dir_slug / "Dockerfile"
                 )
-                continue
-
-            image_name_slug = service_dir_slug
 
-            print(f"\n[bold]Building and pushing image for {image_name_slug}...[/bold]")
+                if not dockerfile_path_abs.exists():
+                    print(
+                        f"[bold yellow]Dockerfile for {service_dir_slug} not found at"
+                        f" {dockerfile_path_abs}, skipping build.[/bold yellow]"
+                    )
+                    continue
 
-            build_infra_path = (
-                self.deployments_path
-                / "environments"
-                / environment.name
-                / "docker_build_push"
-                / image_name_slug
-            )
-
-            ansible_runner = AnsibleProvisioner(working_dir=build_infra_path)
-
-            provider_name = environment.cloud_provider_detail.name.lower()
+                image_name_slug = service_dir_slug
 
-            extra_vars = {
-                "docker_path": str(self.agent_deps.src_dir),
-                "dockerfile_path": str(dockerfile_path_abs),
-                "image_name_slug": image_name_slug,
-                "image_tag_name": "latest",
-                "registry_url": registry_url,
-            }
-            extra_vars.update(environment.cloud_provider_instance.provider_detail_dump)
-            ansible_runner.copy_template("docker_build_push", provider_name)
-            outputs = ansible_runner.run_playbook("main.yml", extra_vars)
+                print(f"\n[bold]Building and pushing image for {image_name_slug}...[/bold]")
 
-            print(f"[green]Successfully built and pushed image for {image_name_slug}[/green]")
+                build_infra_path = (
+                    self.deployments_path
+                    / "environments"
+                    / environment.name
+                    / "docker_build_push"
+                    / image_name_slug
+                )
 
-            if "image_url" in outputs:
-                images[image_name_slug] = outputs["image_url"]
-            else:
-                print(f"[bold red]Could not determine image URL for {image_name_slug}[/bold red]")
+                ansible_runner = AnsibleProvisioner(working_dir=build_infra_path)
+
+                provider_name = environment.cloud_provider_detail.name.lower()
+
+                extra_vars = {
+                    "docker_path": str(clean_context_path),
+                    "dockerfile_path": str(dockerfile_path_abs),
+                    "image_name_slug": image_name_slug,
+                    "image_tag_name": "latest",
+                    "registry_url": registry_url,
+                }
+                extra_vars.update(environment.cloud_provider_instance.provider_detail_dump)
+                ansible_runner.copy_template("docker_build_push", provider_name)
+                outputs = ansible_runner.run_playbook("main.yml", extra_vars)
+
+                print(f"[green]Successfully built and pushed image for {image_name_slug}[/green]")
+
+                if "image_url" in outputs:
+                    images[image_name_slug] = outputs["image_url"]
+                else:
+                    print(
+                        f"[bold red]Could not determine image URL for {image_name_slug}[/bold red]"
+                    )
 
         return images
 

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

@@ -906,22 +906,48 @@ class MonolithicDeploymentStrategy(BaseDeploymentStrategy):
 
         if other_services:
             if env_state.virtual_machine:
-                self._build_and_push_images(deployment_config, environment, env_state.registry_url)
+                images = self._build_and_push_images(
+                    deployment_config, environment, env_state.registry_url
+                )
 
-                env_file_path = f"/home/{env_state.virtual_machine.user}/app/.env"
+                ansible_user = env_state.virtual_machine.user
+                env_file_path = f"/home/{ansible_user}/app/.env"
+                docker_compose_file_path = f"/home/{ansible_user}/app/docker-compose.yml"
                 fetched_files = self._fetch_remote_deployment_files(
                     deployment_config,
                     environment,
                     env_state.virtual_machine,
-                    [env_file_path],
+                    [env_file_path, docker_compose_file_path],
                 )
+                existing_env_content = fetched_files[0]
+                existing_compose_content = fetched_files[1]
 
-                self._deploy_docker_compose(
-                    deployment_config,
-                    environment,
-                    env_state,
-                    fetched_files[0],
+                docker_compose_content = DockerComposeContent(
+                    content=existing_compose_content,
+                    env_file_content=existing_env_content,
                 )
+
+                is_successful, reason, _, confirmed_env_content = (
+                    self._deploy_validate_docker_compose(
+                        deployment_config,
+                        environment,
+                        env_state,
+                        docker_compose_content,
+                    )
+                )
+
+                if is_successful:
+                    print("[bold green]Release deployed successfully.[/bold green]")
+                else:
+                    print(f"[red]Deployment validation failed:[/red] {reason}")
+                    print("\n[bold blue]Regenerating docker-compose configuration...[/bold blue]")
+                    self._generate_docker_compose(
+                        deployment_config,
+                        environment,
+                        images,
+                        env_state,
+                        existing_env_content=confirmed_env_content,
+                    )
             else:
                 # This can happen if only frontend was deployed
                 print(

{opsmith_cli-0.4.3b0 → opsmith_cli-0.4.4b0}/opsmith/git_repo.py

@@ -1,3 +1,7 @@
+import io
+import tarfile
+import tempfile
+from contextlib import contextmanager
 from pathlib import Path
 from typing import List
 
@@ -65,6 +69,18 @@ class GitRepo:
         absolute_paths = [git_root / p for p in relative_paths if p]
         return absolute_paths
 
+    @contextmanager
+    def git_archive_context(self):
+        """Creates a clean build context from git-tracked files only."""
+        print("Creating build context from git-tracked files...")
+        with tempfile.TemporaryDirectory() as temp_dir:
+            buf = io.BytesIO()
+            self.repo.archive(buf, format="tar")
+            buf.seek(0)
+            with tarfile.open(fileobj=buf) as tar:
+                tar.extractall(path=temp_dir)
+            yield Path(temp_dir)
+
     def ensure_gitignore(self):
         """Ensures that Terraform state files are included in .gitignore."""
         gitignore_path = Path(self.repo.working_dir) / ".gitignore"

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

@@ -1,6 +1,6 @@
 [project]
 name = "opsmith-cli"
-version = "0.4.3b"
+version = "0.4.4b"
 description = "Opsmith is an AI devops engineer in your terminal"
 readme = {file = "README.md", content-type = "text/markdown"}
 classifiers = [