Merge pull request #46 from shivenmian/u/shivenmian/teachimprove

nit: add "task complete" btn to Teach UI

01OS/01OS/server/teach.py

@@ -1,9 +1,7 @@
 from datetime import datetime
 from .utils.logs import setup_logging, logger
-import tkinter as tk
-import tkinter.simpledialog
 from interpreter import interpreter
-from tkinter import messagebox
+from tkinter import messagebox, Button, simpledialog, Tk, Label, Frame, LEFT, ACTIVE
 from ..utils.accumulator import Accumulator
 import time
 import os
@@ -17,6 +15,39 @@ class Skill:
         self.steps = []
         self.code = ""
 
+class StepCheckDialog(simpledialog.Dialog):
+    def body(self, master):
+        self.title("Step Check")  # Set the title of the dialog window
+        description = "Did I do this step correctly?"  # Add window description
+        Label(master, text=description).pack()  # Display window description
+
+    def buttonbox(self):
+        box = Frame(self)
+        Button(box, text="Yes", width=10, command=self.yes_action, default=ACTIVE).pack(side=LEFT, padx=5, pady=5)
+        Button(box, text="No", width=10, command=self.no_action).pack(side=LEFT, padx=5, pady=5)
+        Button(box, text="Task Complete", width=10, command=self.task_complete_action).pack(side=LEFT, padx=5, pady=5)
+
+        self.bind("<Return>", self.yes_action)
+        self.bind("<Escape>", self.no_action)
+
+        box.pack()
+
+    def yes_action(self, event=None):
+        self.result = "Yes"
+        self.destroy()
+
+    def no_action(self, event=None):
+        self.result = "No"
+        self.destroy()
+
+    def task_complete_action(self, event=None):
+        self.result = "Task Complete"
+        self.destroy()
+
+    def done(self, result):
+        self.result = result
+        self.destroy()
+
 def to_camel_case(text):
     words = text.split()
     camel_case_string = words[0].lower() + ''.join(word.title() for word in words[1:])
@@ -36,34 +67,38 @@ def generate_python_steps(function_name, steps):
     return code_string
 
 def teach():
-    root = tk.Tk()
+    root = Tk()
     root.withdraw()
+    skill_name = simpledialog.askstring("Skill Name", "Please enter the name for the skill:", parent=root)
+    if skill_name:
+        skill = Skill(skill_name)
+        while True:
+            step = simpledialog.askstring("Next Step", "Enter the next step (or 'end' to finish): ", parent=root)
+            if step is None or step == "end":
+                break
+            elif step.strip() == "":
+                continue
+            logger.info(f"Performing step: {step}")
+            chunk_code = ""
+            interpreter.computer.languages = [l for l in interpreter.computer.languages if l.name.lower() == "python"]
+            interpreter.force_task_completion = True
+            for chunk in interpreter.chat(step, stream=True, display=False):
+                if "format" in chunk and chunk["format"] == "execution":
+                    content = chunk["content"]
+                    language = content["format"]
+                    code = content["content"]
+                    chunk_code += code
+                    interpreter.computer.run(code, language)
+                time.sleep(0.05)
+                accumulator.accumulate(chunk)
             
-    skill_name = tkinter.simpledialog.askstring("Skill Name", "Please enter the name for the skill:")
+            stepCheckDialog = StepCheckDialog(root)
-    skill = Skill(skill_name)
+            stepCheckResult = stepCheckDialog.result
-    while True:
+            if stepCheckResult == "Yes" or stepCheckResult == "Task Complete":
-        step = tkinter.simpledialog.askstring("Next Step", "Enter the next step (or 'end' to finish): ")
+                skill.steps.append(step)
-        logger.info(f"Performing step: {step}")
+                skill.code += chunk_code
-        if step == "end":
+                if stepCheckResult == "Task Complete":
-            break
+                    break
-
-        chunk_code = ""
-        interpreter.computer.languages = [l for l in interpreter.computer.languages if l.name.lower() == "python"]
-        interpreter.force_task_completion = True
-        for chunk in interpreter.chat(step, stream=True, display=False):
-            if "format" in chunk and chunk["format"] == "execution":
-                content = chunk["content"]
-                language = content["format"]
-                code = content["content"]
-                chunk_code += code
-                interpreter.computer.run(code, language)
-            time.sleep(0.05)
-            accumulator.accumulate(chunk)
-
-        isCorrect = messagebox.askyesno("To Proceed?", "Did I do this step right?")
-        if isCorrect:
-            skill.steps.append(step)
-            skill.code += chunk_code
 
     # Uncomment this incase you want steps instead of code
     #python_code = generate_python_steps(skill.skill_name, skill.steps)
@@ -71,5 +106,6 @@ def teach():
     python_code = generate_python_code(skill.skill_name, skill.code)
     SKILLS_DIR = os.path.dirname(__file__) + "/skills"
     filename = os.path.join(SKILLS_DIR, f"{skill.skill_name.replace(' ', '_')}.py")
+    logger.info(f"Saving skill to: {filename}")
     with open(filename, "w") as file:
         file.write(python_code)