test kubernetes job

Signed-off-by: vsoch <[email protected]>

Author: vsoch

fractale/agent/build/agent.py

@@ -1,6 +1,7 @@
 from fractale.agent.base import Agent
 import fractale.agent.build.prompts as prompts
 from fractale.agent.context import get_context
+import fractale.agent.defaults as defaults
 
 import fractale.utils as utils
 import argparse
@@ -64,11 +65,6 @@ def add_arguments(self, subparser):
     def run(self, context):
         """
         Run the agent.      
-
-        TODO: get working here
-        Then think about how to move between steps. We will want to be able to
-        get initial variables from a plan for redoing steps.  OR keep the last
-        state of running it.
         """
         import google.generativeai as genai
 
@@ -79,7 +75,7 @@ def run(self, context):
         self.attempts = self.attempts or 0
 
         # Map context into needed arguments and validate
-        environment = context.get('environment', "generic cloud environment")        
+        environment = context.get('environment', defaults.environment)  
         application = context.get('application', required=True)
 
         # These are optional if we are doing a follow up build
@@ -94,7 +90,7 @@ def run(self, context):
         # This will either generate fresh or rebuild erroneous Dockerfile
         # We don't return the dockerfile because it is updated in the context
         context.dockerfile = self.generate_dockerfile(
-            context.application, context.environment, error_message=error_message, dockerfile=dockerfile
+            context.application, environment, error_message=error_message, dockerfile=dockerfile
         )
         print(Panel(context.dockerfile, title="[green]Dockerfile[/green]", border_style="green"))
 
@@ -183,7 +179,7 @@ def build(self, dockerfile, image_name):
         utils.write_file(dockerfile, os.path.join(build_dir, "Dockerfile"))
         print(
             Panel(
-                f"Attempt {self.attempts} to build image: [bold cyan]{image_name}[/bold cyan]",
+                f"Attempt {self.attempts+1} to build image: [bold cyan]{image_name}[/bold cyan]",
                 title="[blue]Docker Build[/blue]",
                 border_style="blue",
             )

fractale/agent/defaults.py

@@ -0,0 +1 @@
+environment = "generic cloud environment"

fractale/agent/kubernetes_job/agent.py

@@ -14,6 +14,8 @@
 from rich.panel import Panel
 from rich.syntax import Syntax
 
+from fractale.agent.context import get_context
+import fractale.agent.defaults as defaults
 import fractale.agent.kubernetes_job.prompts as prompts
 import fractale.utils as utils
 from fractale.agent.base import Agent
@@ -66,7 +68,7 @@ def add_arguments(self, subparser):
             dest="agent_name",
         )
 
-    def run(self, args, extra, error_message=None, template=None, context=None, attempts=0):
+    def run(self, context, template=None):
         """
         Run the agent.
         """
@@ -77,28 +79,44 @@ def run(self, args, extra, error_message=None, template=None, context=None, atte
         except KeyError:
             sys.exit("ERROR: GEMINI_API_KEY environment variable not set.")
 
+        # Init attempts. Each agent has an internal counter for total attempts
+        self.attempts = self.attempts or 0
+
+        # Create or get global context
+        context = get_context(context)
+        error_message = context.get('error_message')
+
         # If we have a context file, add to template
-        context = None
-        if args.context_file is not None:
-            context = utils.read_file(args.context_file)
+        context_file = context.get('context_file')
+        build_context = context.get('build_context')
+        if context_file is not None and build_context is None:
+            build_context = utils.read_file(context_file)
+        context.build_context = build_context        
+
+        # These are required
+        container = context.get('container', required=True)
+
+        # Assume most containers are built and loaded
+        environment = context.get('environment', defaults.environment)
+        no_pull = context.get('no_pull', True)
 
         # This will either generate fresh or rebuild erroneous Job
         job_crd = self.generate_crd(
-            container=args.container,
-            environment=args.environment,
+            container=container,
+            environment=environment,
             error_message=error_message,
             template=template,
-            context=context,
-            no_pull=args.no_pull,
+            context=context.build_context,
+            no_pull=no_pull,
         )
         print(Panel(job_crd, title="[green]job.yaml[/green]", border_style="green"))
 
         # Make and deploy it! Success is exit code 0.
-        return_code, output = self.deploy(job_crd, image_name=args.container, attempt=attempts)
+        return_code, output = self.deploy(job_crd, image_name=container)
         if return_code == 0:
             print(
                 Panel(
-                    f"[bold green]✅ Deploy complete in {attempts} attempts[/bold green]",
+                    f"[bold green]✅ Deploy complete in {self.attempts} attempts[/bold green]",
                     title="Success",
                     border_style="green",
                 )
@@ -111,24 +129,21 @@ def run(self, args, extra, error_message=None, template=None, context=None, atte
                     border_style="red",
                 )
             )
-            attempts += 1
             print("\n[bold cyan] Requesting Correction from Kubernetes Job Agent[/bold cyan]")
+            self.attempts += 1
 
             # Trigger again, provide initial context and error message
+            context.error_message = output
             return self.run(
-                args,
-                extra,
-                error_message=output,
                 template=job_crd,
                 context=context,
-                attempts=attempts,
             )
 
         # Add generation line
         job_crd += "\n# Generated by fractale build agent"
         self.print_crd(job_crd)
-        if args.outfile:
-            utils.write_file(job_crd, args.outfile)
+        if context.outfile:
+            utils.write_file(job_crd, context.outfile)
         return job_crd
 
     def print_crd(self, job_crd):
@@ -274,7 +289,7 @@ def cleanup_job(self, job_name, namespace):
             check=False,
         )
 
-    def deploy(self, job_crd, image_name, attempt):
+    def deploy(self, job_crd, image_name):
         """
         Deploy the Kubernetes Job.
         """
@@ -320,7 +335,7 @@ def deploy(self, job_crd, image_name, attempt):
         utils.write_file(job_crd, job_manifest_path)
         print(
             Panel(
-                f"Attempt {attempt} to deploy Kubernetes Job: [bold cyan]{image_name}[/bold cyan]",
+                f"Attempt {self.attempts+1} to deploy Kubernetes Job: [bold cyan]{image_name}[/bold cyan]",
                 title="[blue]Kubernetes Job[/blue]",
                 border_style="blue",
             )