Fix issues

.gitignore

@@ -1,2 +1,4 @@
 .env
-node_modules
+node_modules
+.github
+.gitignore

project/app.py

@@ -36,44 +36,52 @@ def execute_blockly_logic(user_inputs):
 
     result = ""
 
-    code_lines = latest_blockly_code.splitlines()
-
-    cleaned_lines = []
-    skip = False
-    for line in code_lines:
-        stripped = line.strip()
-
-        # When we reach the Interface block, start skipping until after demo.launch()
-        if stripped.startswith("demo = gr.Interface("):
-            skip = True
+    # More comprehensive filtering of Gradio-related code
+    lines = latest_blockly_code.split('\n')
+    filtered_lines = []
+    skip_mode = False
+    in_demo_block = False
+    
+    for line in lines:
+        # Skip import gradio line
+        if 'import gradio' in line:
             continue
-        if skip:
-            # Stop skipping after demo.launch(...) line
-            if stripped.startswith("demo.launch("):
-                skip = False
+            
+        # Skip Gradio interface creation and any demo-related lines
+        if 'demo = gr.Interface' in line:
+            in_demo_block = True
+            skip_mode = True
             continue
-
-        # Keep everything else
-        cleaned_lines.append(line)
-
-    # Remove trailing blank lines
-    while cleaned_lines and not cleaned_lines[-1].strip():
-        cleaned_lines.pop()
-
-    code_to_run = "\n".join(cleaned_lines)
-
-    if len(code_lines) > 7:
-        code_to_run = "\n".join(code_lines[:-7])
-    else:
-        code_to_run = "\n".join(code_lines)
+        elif 'demo.launch' in line:
+            skip_mode = False
+            in_demo_block = False
+            continue
+        elif in_demo_block:
+            # Skip everything in the demo block (multi-line Interface declaration)
+            continue
+            
+        # Skip any standalone gr. calls
+        if 'gr.' in line:
+            continue
+        
+        if not skip_mode:
+            filtered_lines.append(line)
+    
+    code_to_run = '\n'.join(filtered_lines)
 
     def capture_result(msg):
         nonlocal result
         result = msg
 
-    env = {"reply": capture_result}
+    # Set up the environment with necessary imports that might be needed
+    env = {
+        "reply": capture_result,
+        "__builtins__": __builtins__,
+    }
 
     try:
+        # Import any required modules in the execution environment
+        exec("import os", env)
         exec(code_to_run, env)
         if "create_mcp" in env:
             import inspect
@@ -141,7 +149,7 @@ def build_interface():
         
         with gr.Row():
             submit_btn = gr.Button("Submit")
-            refresh_btn = gr.Button("Refresh Inputs")
+            refresh_btn = gr.Button("Refresh")
 
         def refresh_inputs():
             global latest_blockly_code

project/src/blocks/text.js

@@ -452,8 +452,8 @@ const create_mcp = {
   extensions: ["test_cleanup_extension"]
 };
 
-const tool_def = {
-  type: "tool_def",
+const func_def = {
+  type: "func_def",
   message0: "function %1 %2 %3",
   args0: [
     { type: "field_input", name: "NAME", text: "newFunction" },
@@ -489,7 +489,7 @@ function generateUniqueToolName(workspace, excludeBlock) {
 
   // Collect all existing tool names, excluding the block being created
   for (const block of allBlocks) {
-    if (block.type === 'tool_def' && block !== excludeBlock && block.getFieldValue('NAME')) {
+    if (block.type === 'func_def' && block !== excludeBlock && block.getFieldValue('NAME')) {
       existingNames.add(block.getFieldValue('NAME'));
     }
   }
@@ -520,10 +520,10 @@ Blockly.Blocks['create_mcp'] = {
   }
 };
 
-// Register tool_def block separately to include custom init logic
-Blockly.Blocks['tool_def'] = {
+// Register func_def block separately to include custom init logic
+Blockly.Blocks['func_def'] = {
   init: function () {
-    this.jsonInit(tool_def);
+    this.jsonInit(func_def);
     // Apply extensions
     Blockly.Extensions.apply('test_cleanup_extension', this, false);
     // Initialize mutator state

project/src/generators/python.js

@@ -136,7 +136,7 @@ demo.launch(mcp_server=True)
   return code;
 };
 
-forBlock['tool_def'] = function (block, generator) {
+forBlock['func_def'] = function (block, generator) {
   const name = block.getFieldValue('NAME');
   const typedInputs = [];
   let i = 0;

project/src/index.js

@@ -49,6 +49,17 @@ const ws = Blockly.inject(blocklyDiv, {
     colour: '#ccc',
     snap: false
   },
+  disable: false,
+  collapse: false,
+  zoom: {
+    controls: true,
+    wheel: true,
+    startScale: 1.0,
+    maxScale: 3,
+    minScale: 0.3,
+    scaleSpeed: 1.2,
+    pinch: true
+  },
   renderer: 'zelos',
   theme: myTheme,
 });
@@ -58,7 +69,6 @@ const updateCode = () => {
   const codeEl = document.querySelector('#generatedCode code');
 
   const call = `def llm_call(prompt, model):
-  global history
   from openai import OpenAI
   import os
 
@@ -138,7 +148,7 @@ ws.addChangeListener((event) => {
       if (
         removedBlock &&
         oldParent &&
-        (removedBlock.type.startsWith('input_reference_') && (oldParent.type === 'create_mcp' || oldParent.type === 'tool_def'))
+        (removedBlock.type.startsWith('input_reference_') && (oldParent.type === 'create_mcp' || oldParent.type === 'func_def'))
       ) {
         // Only duplicate if removed from a mutator input (X0, X1, X2, etc.)
         // NOT from other inputs like RETURN, BODY, or title input

project/src/toolbox.js

@@ -11,16 +11,31 @@ export const toolbox = {
     },
     {
       kind: 'category',
-      name: 'Custom',
+      name: 'AI',
       categorystyle: 'logic_category',
       contents: [
+        {
+          "kind": "label",
+          "text": "Text"
+        },
         {
           kind: 'block',
           type: 'llm_call',
         },
+        {
+          "kind": "label",
+          "text": "Image"
+        },
+      ]
+    },
+    {
+      kind: 'category',
+      name: 'Functions',
+      categorystyle: 'logic_category',
+      contents: [
         {
           kind: 'block',
-          type: 'tool_def',
+          type: 'func_def',
         },
       ]
     },