nit: clean up results parser logic

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

Author: vsoch

fractale/agent/kubernetes/job/agent.py

@@ -254,7 +254,9 @@ def finish_deploy(self, context, obj, deploy_dir):
 
                         # If the pod was OOMKIlled, this shouldn't cycle around as failure during optimization
                         if reason == "OOMKilled" and context.get("is_optimizing"):
-                            return self.optimize(context, obj, context.result, "The last attempt was OOMKilled.")
+                            return self.optimize(
+                                context, obj, context.result, "The last attempt was OOMKilled."
+                            )
 
                         diagnostics = self.get_diagnostics(obj, pod)
                         obj.delete()
@@ -305,6 +307,7 @@ def finish_deploy(self, context, obj, deploy_dir):
 
         # Save logs regardless of success or not (so we see change)
         self.save_log(full_logs)
+        context.was_unsatisfiable = "unsatisfiable" in full_logs
 
         # But did it succeed?
         print(final_status)
@@ -321,6 +324,11 @@ def finish_deploy(self, context, obj, deploy_dir):
         # If we were optimizing and it was too long, return to optimization agent
         elif context.get("is_optimizing") is True and context.was_timeout:
             return self.optimize(context, obj, context.result, full_logs)
+
+        # We were optimizing and the resource was unsatisfiable
+        elif context.get("is_optimizing") is True and context.was_unsatisfiable:
+            return self.optimize(context, obj, context.result, full_logs)
+
         else:
             print("\n[red]❌ Job final status is Failed.[/red]")
             diagnostics = self.get_diagnostics(obj, pod)

fractale/agent/kubernetes/job/prompts.py

@@ -77,6 +77,7 @@ def get_update_prompt(manifest, updates):
     Here is the Dockerfile that helped to generate the application.
     {{dockerfile}}{% endif %}
 {% if was_timeout %}Your last attempt timed out, which means you MUST reduce problem size OR increase resources (if possible){% endif %}
+{% if was_unsatisfiable %}Your last attempt was unsatisfiable. The topology or other parameters might be wrong.{% endif %}
 """
 
 optimize_function_task = """Your task is to use a function to optimize the running of a Kubernetes abstraction: {{optimize}} in {{environment}}. You MUST use this function that returns RETRY or STOP.
@@ -95,6 +96,8 @@ def get_update_prompt(manifest, updates):
     ```{% if dockerfile %}
     Here is the Dockerfile that helped to generate the application.
     {{dockerfile}}{% endif %}
+{% if was_timeout %}Your last attempt timed out, which means you MUST reduce problem size OR increase resources (if possible){% endif %}
+{% if was_unsatisfiable %}Your last attempt was unsatisfiable. The topology or other parameters might be wrong.{% endif %}
 """
 
 optimize_function_instructions = [
@@ -150,6 +153,8 @@ def get_optimize_prompt(context, resources):
                 "function": context.function,
                 "environment": context.environment,
                 "resources": json.dumps(resources),
+                "was_timeout": context.was_timeout,
+                "was_unsatisfiable": context.was_unsatisfiable,
                 "manifest": context.result,
                 "dockerfile": context.get("dockerfile"),
             }
@@ -161,6 +166,7 @@ def get_optimize_prompt(context, resources):
             # This is a resource spec provided by user (e.g., autoscaling cluster)
             "resources": context.get("resources"),
             "was_timeout": context.was_timeout,
+            "was_unsatisfiable": context.was_unsatisfiable,
             "environment": context.environment,
             # These are cluster resources found
             "cluster": json.dumps(resources),

fractale/agent/kubernetes/minicluster/agent.py

@@ -38,17 +38,21 @@ def check_flux_view(self, minicluster):
         """
         If a view is defined, ensure it is in allowed set.
         """
-        if not minicluster:
-            return minicluster
         view = minicluster.get("spec", {}).get("flux", {}).get("container", {}).get("image")
         if not view:
-            return minicluster
+            return yaml.dump(minicluster)
+
+        # If the agent gets it wrong it needs to know what are valid options
+        comment = ""
         if view not in flux_views:
-            logger.warning(f"Flux view {view} is not valid and will not be used.")
+            comment = f"Flux view {view} is not valid and will not be used."
+            logger.warning(comment)
+            comment = "# " + comment + "\n# Choices include: " + ", ".join(flux_views) + "\n"
             del minicluster["spec"]["flux"]["container"]
             if not minicluster["spec"]["flux"]:
                 del minicluster["spec"]["flux"]
-        return minicluster
+
+        return yaml.dump(minicluster) + "\n" + comment
 
     @timed
     def deploy(self, context):
@@ -71,9 +75,6 @@ def deploy(self, context):
         if not name:
             return 1, "Generated YAML is missing required '.metadata.name' field."
 
-        # This is a common error the LLM makes
-        minicluster = self.check_flux_view(minicluster)
-
         # If it doesn't follow instructions...
         containers = self.get_containers(minicluster)
         if not containers:
@@ -92,7 +93,8 @@ def deploy(self, context):
         deploy_dir = tempfile.mkdtemp()
         print(f"[dim]Created temporary deploy context: {deploy_dir}[/dim]")
 
-        context.result = yaml.dump(minicluster)
+        # Write the final minicluster after checking the view
+        context.result = self.check_flux_view(minicluster)
         mc = objects.MiniCluster(name, namespace)
         logger.info(
             f"Attempt {self.attempts} to deploy Kubernetes {mc.kind}: [bold cyan]{mc.namespace}/{mc.name}"

fractale/agent/kubernetes/minicluster/prompts.py

@@ -8,13 +8,12 @@
 # This should explicitly state what the agent is capable of doing.
 requires = prompts.common_requires + [
     "You MUST NOT create or require abstractions beyond the MiniCluster (no ConfigMap or Volume or other types)",
-    "You MUST set spec.logging.strict to true",
+    "You MUST set spec.logging.strict to true. You MUST NOT use mpirun or mpiexec. Flux bootstraps MPI.",
     "You are only scoped to edit the MiniCluster manifest for Kubernetes.",
-    "If a library is missing or change needed to the container, use a containers[0].commands.pre block to ad it",
+    "If a library is missing or change needed to the container, use a containers[0].commands.pre block to add it",
     "DO NOT CREATE A KUBERNETES JOB. You are creating a Flux MiniCluster deployed by the Flux Operator.",
     "You MUST set cleanup to false and you MUST set launcher to false. launcher MUST NOT be true under ANY CIRCUMSTANCES.",
     "You MUST NOT put a flux run or flux submit in the command. It is added by the Flux Operator."
-    "You MUST use version v1alpha2 of the flux-framework.org minicluster.",
     "You MUST NOT add any sidecars. The list of containers should only have one entry.",
     "The command is a string and not an array. Do not edit the flux view container image.",
 ]

fractale/agent/results/agent.py

@@ -97,52 +97,50 @@ def run(self, requires, log):
 
         # If too many retries, ask for human input - we've hit some rare edge case.
         retries = 0
-        advice = 0
         with_history = True
         attempts = []
 
         # Keep trying until we at least get a match
         match = None
         while not match:
             regex = self.ask_gemini(prompt, with_history=with_history)
+
+            # The last appended will be the final (correct)
+            attempts.append(regex)
             print("Received result parser from Gemini...")
             logger.custom(regex, title="[green]Result Parser[/green]", border_style="green")
             match = self.find_match(regex, log)
             self.metadata["assets"]["tries"] += 1
 
+            # If we have a match, check and cut out earlier
+            if match:
+
+                # If we get a match, ask the user to verify
+                result = match[0]
+                if len(match) > 1:
+                    result = " ".join(match)
+
+                # yes / no / feedback
+                is_correct = confirm_correct(log, result)
+                if is_correct is True:
+                    self.metadata["assets"]["regex-attempts"] = attempts
+                    return regex
+                elif is_correct is None:
+                    prompt += "\n" + input("Please enter feedback for the LLM:\n")
+                else:
+                    prompt += f"\nHere is a previous attempt that produced a match but was incorrect content: {regex}"
+
             # Ensure it doesn't make the same mistake...
-            if not match:
-                prompt += f"\nHere is a previous unsuccessful attempt: {regex}"
-                continue
-
-            # If we get a match, ask the user to verify
-            result = match[0]
-            if len(match) > 1:
-                result = " ".join(match)
-            is_correct = confirm_correct(log, result)
-            if is_correct is True:
-                return regex
-
-            # Feedback case
-            elif is_correct is None:
-                prompt += "\n" + input("Please enter feedback for the LLM:\n")
             else:
-                prompt += f"\nHere is a previous unsuccessful attempt: {regex}"
-                attempts.append(regex)
-
-            # If more than 5 retries, ask for human help
-            # Unlike retries, this counter resets
-            if advice >= 3:
-                prompt += "\n" + input("The agent is having trouble. Please provide advice:\n")
-                advice += 1
+                prompt += f"\nHere is a previous unsuccessful attempt that did not match anything: {regex}"
 
             # Usually this indicates a problem.
             if retries >= 5:
                 prompt = prompts.parsing_prompt % (requires, log)
                 with_history = False
+                retries = 0
 
             retries += 1
-            advice += 1
 
             # If it's not correct, we need to try again
             match = None