testgenie-py 0.1.8__py3-none-any.whl → 0.2.0__py3-none-any.whl

testgen/controller/docker_controller.py

@@ -5,6 +5,9 @@ import docker
 from docker import DockerClient, client
 from docker import errors
 from docker.models.containers import Container
+import importlib.resources as pkg_resources
+import tempfile
+import shutil
 
 from testgen.service.logging_service import get_logger
 from testgen.service.service import Service
@@ -99,8 +102,7 @@ class DockerController:
             print(f"Building {image_name} Docker image...")
 
             # Look for Dockerfile in the project root
-            docker_dir = os.path.join(project_root, "testgen", "docker")
-            dockerfile_path = os.path.join(docker_dir, "Dockerfile")
+            dockerfile_path = self.get_dockerfile_path()
             if not os.path.exists(dockerfile_path):
                 print(f"Dockerfile not found at {dockerfile_path}")
                 sys.exit(1)
@@ -134,7 +136,7 @@ class DockerController:
         
         return docker_client.containers.run(
                 image=image_name,
-                command=["poetry", "run", "python", "-m", "testgen.main"] + docker_args,
+                command=["python", "-m", "testgen.main"] + docker_args,
                 volumes={project_root: {"bind": "/controller", "mode": "rw"}},
                 environment=docker_env,
                 detach=True,
@@ -146,13 +148,17 @@ class DockerController:
     def build_docker_image(self, docker_client, image_name, dockerfile_path, project_root):
         try:
             print(f"Starting Docker build for image: {image_name}")
+            dockerfile_rel_path = os.path.relpath(dockerfile_path, project_root)
+            docker_dir = os.path.dirname(dockerfile_path)
+
             dockerfile_rel_path = os.path.relpath(dockerfile_path, project_root)
             self.debug(f"Project root {project_root}")
-            self.debug(f"Docker directory: {os.path.dirname(dockerfile_path)}")
+            self.debug(f"Docker directory: {docker_dir}")
             self.debug(f"Docker rel path: {dockerfile_rel_path}")
+
             build_progress = docker_client.api.build(
-                path=os.path.join(project_root, "testgen", "docker"),
-                dockerfile=os.path.join(project_root, "testgen", "docker", "Dockerfile"),
+                path=docker_dir,          # now it knows what docker_dir is
+                dockerfile=dockerfile_path,
                 tag=image_name,
                 rm=True,
                 decode=True
@@ -178,6 +184,25 @@ class DockerController:
             print(f"Unexpected error during Docker build: {str(e)}")
             return False
 
+    def get_dockerfile_path(self) -> str:
+        # First, try local development path
+        local_dockerfile = os.path.join(os.path.dirname(__file__), "docker", "Dockerfile")
+        if os.path.exists(local_dockerfile):
+            self.debug(f"Found local Dockerfile at: {local_dockerfile}")
+            return local_dockerfile
+
+        # If not found locally, try inside installed package
+        try:
+            dockerfile_resource = pkg_resources.files('testgen').joinpath('docker/Dockerfile')
+            if dockerfile_resource.is_file():
+                self.debug(f"Found package-installed Dockerfile at: {dockerfile_resource}")
+                return str(dockerfile_resource)
+        except Exception as e:
+            print(f"Error locating Dockerfile in package resources: {e}")
+
+        print("Dockerfile not found in local project or package.")
+        sys.exit(1)
+
     def debug(self, message: str):
         """Log debug message"""
         if self.debug_mode: