Merge pull request #360 from XpressAI/fahreza/recursive-compile

✨ Add Recursive Compile

src/XircuitsFactory.ts

@@ -10,7 +10,6 @@ import {
 import { Signal } from '@lumino/signaling';
 import { XircuitsPanel } from './XircuitsWidget';
 import {
-  checkIcon,
   copyIcon,
   cutIcon,
   listIcon,
@@ -26,7 +25,14 @@ import { ToolbarButton } from '@jupyterlab/apputils';
 import { LoggerCommandIDs } from './log/LogPlugin';
 import { ServiceManager } from '@jupyterlab/services';
 import { RunSwitcher } from './components/runner/RunSwitcher';
-import { lockIcon, reloadAllIcon, xircuitsIcon, toggleAnimationIcon } from './ui-components/icons';
+import { 
+  lockIcon, 
+  compileIcon,
+  reloadAllIcon, 
+  xircuitsIcon, 
+  toggleAnimationIcon, 
+  compileRunIcon
+} from './ui-components/icons';
 import { commandIDs } from "./commands/CommandIDs";
 const XIRCUITS_CLASS = 'xircuits-editor';
 
@@ -115,8 +121,8 @@ export class XircuitsFactory extends ABCWidgetFactory<DocumentWidget> {
     let logButton = CommandButton(LoggerCommandIDs.openLog, listIcon, 'Open log');
     let reloadAllNodesButton = CommandButton(commandIDs.reloadAllNodes, reloadAllIcon, 'Reload all nodes');
     let toggleAllLinkAnimationButton = CommandButton(commandIDs.toggleAllLinkAnimation, toggleAnimationIcon, 'Toggle low power mode by disabling link animation');
-    let compileButton = CommandButton(commandIDs.compileXircuit, checkIcon, 'Compile Xircuits');
-    let compileAndRunButton = CommandButton(commandIDs.runXircuit, runIcon,'Compile and Run Xircuits');
+    let compileButton = CommandButton(commandIDs.compileXircuit, compileIcon, 'Compile Xircuits');
+    let compileAndRunButton = CommandButton(commandIDs.runXircuit, compileRunIcon,'Compile and Run Xircuits');
 
     widget.toolbar.insertItem(0, 'xircuits-add-undo', undoButton);
     widget.toolbar.insertItem(1, 'xircuits-add-redo', redoButton);

src/components/XircuitsBodyWidget.tsx

@@ -536,7 +536,7 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
 		await commands.execute(commandIDs.saveDocManager);
 	}
 
-	const handleCompileClick = () => {
+	const handleCompileClick = async() => {
 		// Only compile xircuit if it is currently in focus
 		// This must be first to avoid unnecessary complication
 		if (shell.currentWidget?.id !== widgetId) {
@@ -545,16 +545,15 @@ export const BodyWidget: FC<BodyWidgetProps> = ({
 
 		let allNodesConnected = checkAllNodesConnected();
 
-		if (!saved) {
-			alert("Please save before compiling.");
-			return;
-		}
+		// if (!saved) {
+		// 	alert("Please save before compiling.");
+		// 	return;
+		// }
 
 		if (!allNodesConnected) {
 			alert("Please connect all the nodes before compiling.");
 			return;
 		}
-
 		let showOutput = true;
 		setCompiled(true);
 		commands.execute(commandIDs.compileFile, { showOutput, componentList });

src/index.tsx

@@ -236,14 +236,14 @@ const xircuits: JupyterFrontEndPlugin<void> = {
       };
 
       try {
-        return await requestAPI<any>('file/compile', {
+        return await requestAPI<any>('file/compile-recursive', {
           body: JSON.stringify(data),
           method: 'POST',
         });
 
       } catch (reason) {
         console.error(
-          'Error on POST /xircuits/file/compile', data, reason
+          'Error on POST /xircuits/file/compile-recursive', data, reason
         );
       }
     }
@@ -371,6 +371,7 @@ const xircuits: JupyterFrontEndPlugin<void> = {
             await compileXircuitsFile(xircuitsFile.path);
           }
         }
+        browserFactory.tracker.currentWidget.model.refresh();
       }
     });
 
@@ -474,4 +475,4 @@ const plugins: JupyterFrontEndPlugin<any>[] = [
   logPlugin
 ];
 
-export default plugins;
+export default plugins;

src/ui-components/icons.tsx

@@ -5,6 +5,8 @@ import lockSvg from '../../style/icons/lock.svg';
 import breakpointSvg from '../../style/icons/breakpoint.svg';
 import nextSvg from '../../style/icons/next.svg';
 import revertSvg from '../../style/icons/revert.svg';
+import compileSvg from '../../style/icons/compile.svg';
+import compileRunSvg from '../../style/icons/compile-run.svg';
 import componentLibSvg from '../../style/icons/component-library.svg';
 import reloadAllSvg from '../../style/icons/reload-all.svg';
 import toggleAnimationSvg from '../../style/icons/low-power.svg';
@@ -25,6 +27,8 @@ export const lockIcon = new LabIcon({ name: 'xircuits:lockIcon', svgstr: lockSvg
 export const breakpointIcon = new LabIcon({ name: 'xircuits:breakpointIcon', svgstr: breakpointSvg });
 export const nextIcon = new LabIcon({ name: 'xircuits:nextIcon', svgstr: nextSvg });
 export const revertIcon = new LabIcon({ name: 'xircuits:revertIcon', svgstr: revertSvg });
+export const compileIcon = new LabIcon({ name: 'xircuits:compileIcon', svgstr: compileSvg });
+export const compileRunIcon = new LabIcon({ name: 'xircuits:compileRunIcon', svgstr: compileRunSvg });
 export const reloadAllIcon = new LabIcon({ name: 'xircuits:reloadAllIcon', svgstr: reloadAllSvg });
 export const toggleAnimationIcon = new LabIcon({ name: 'xircuits:toggleAnimationIcon', svgstr: toggleAnimationSvg });
 export const componentLibIcon = new LabIcon({ name: 'xircuits:componentLibIcon', svgstr: componentLibSvg });

xircuits/compiler/__init__.py

@@ -1 +1 @@
-from .compiler import compile
+from .compiler import compile, recursive_compile

xircuits/compiler/compiler.py

@@ -1,14 +1,62 @@
 import json
-
+import os
 from xircuits.compiler.parser import XircuitsFileParser
 from xircuits.compiler.generator import CodeGenerator
 
-
-def compile(input_file, output_file, component_python_paths=None):
+def compile(input_file_path, output_file_path, component_python_paths=None):
     if component_python_paths is None:
         component_python_paths = {}
-
     parser = XircuitsFileParser()
-    graph = parser.parse(input_file)
+    with open(input_file_path, 'r', encoding='utf-8') as in_f:
+        graph = parser.parse(in_f)
     generator = CodeGenerator(graph, component_python_paths)
-    generator.generate(output_file)
+    with open(output_file_path, 'w', encoding='utf-8') as out_f:
+        generator.generate(out_f)
+
+def recursive_compile(input_file_path, component_python_paths=None, visited_files=None):
+    if component_python_paths is None:
+        component_python_paths = {}
+    if visited_files is None:
+        visited_files = set()
+
+    # Normalize file path
+    input_file_path = os.path.abspath(input_file_path)
+
+    if input_file_path in visited_files:
+        return
+
+    visited_files.add(input_file_path)
+
+    # Read the Xircuits workflow file
+    try:
+        with open(input_file_path, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+    except Exception as e:
+        print(f"Error reading {input_file_path}: {e}")
+        return
+
+    # Traverse layers to find nested workflows
+    if 'layers' in data:
+        for layer in data['layers']:
+            if 'models' in layer and isinstance(layer['models'], dict):
+                for model in layer['models'].values():
+                    extras = model.get('extras', {})
+                    if extras.get('type') == "xircuits_workflow":
+                        # Extract and transform the path from .py to .xircuits
+                        py_path = extras.get('path')
+                        if py_path:
+                            nested_xircuits_path = py_path.replace('.py', '.xircuits')
+                            # Resolve relative paths
+                            nested_xircuits_path = os.path.join(os.path.dirname(input_file_path), nested_xircuits_path)
+                            # Recursively compile the nested workflow
+                            recursive_compile(nested_xircuits_path, component_python_paths, visited_files)
+
+    # Compile the current workflow
+    py_output_path = input_file_path.replace('.xircuits', '.py')
+    # print(f"Compiling {input_file_path} to {py_output_path}")
+
+    try:
+        compile(input_file_path, py_output_path, component_python_paths=component_python_paths)
+        print(f"Compiled {input_file_path} to {py_output_path}")
+    except Exception as e:
+        print(f"Failed to compile {input_file_path}: {e}")

xircuits/handlers/__init__.py

@@ -1,6 +1,6 @@
 from jupyter_server.utils import url_path_join
 
-from .compile_xircuits import CompileXircuitsFileRouteHandler
+from .compile_xircuits import CompileXircuitsFileRouteHandler, CompileRecursiveXircuitsFileRouteHandler
 from .components import ComponentsRouteHandler
 from .config import RunConfigRouteHandler, SplitModeConfigHandler
 from .debugger import DebuggerRouteHandler
@@ -38,6 +38,10 @@ def setup_handlers(web_app, url_path):
             url_path_join(base_url, url_path, "file/compile"),
             CompileXircuitsFileRouteHandler
         ),
+        (
+            url_path_join(base_url, url_path, "file/compile-recursive"),
+            CompileRecursiveXircuitsFileRouteHandler
+        ),
         (
             url_path_join(base_url, url_path, "library/reload_config"),
             ReloadComponentLibraryConfigHandler

xircuits/handlers/compile_xircuits.py

@@ -5,7 +5,7 @@
 
 from pathlib import Path
 
-from xircuits.compiler import compile
+from xircuits.compiler import compile, recursive_compile
 import traceback
 
 
@@ -21,18 +21,45 @@ def get(self):
     def post(self):
         input_data = self.get_json_body()
 
-        input_file_path = input_data["filePath"]
-        output_file_path = input_data["outPath"]
+        input_file_path = self.__get_notebook_absolute_path__(input_data["filePath"])
+        output_file_path = self.__get_notebook_absolute_path__(input_data["outPath"])
 
         component_python_paths = input_data["pythonPaths"]
 
         msg = ""
 
         try:
-            with open(self.__get_notebook_absolute_path__(input_file_path), 'r', encoding='utf-8') as infile:
-                with open(self.__get_notebook_absolute_path__(output_file_path), 'w') as outfile:
-                    compile(infile, outfile, component_python_paths)
+            compile(str(input_file_path), str(output_file_path), component_python_paths)
+            msg = "completed"
+
+        except Exception:
+            msg = traceback.format_exc()
+            print(msg)
+            pass
+
+        finally:
+            data = {"message": msg}
+            self.finish(json.dumps(data))
+
+class CompileRecursiveXircuitsFileRouteHandler(APIHandler):
+    def __get_notebook_absolute_path__(self, path):
+        return (Path(self.application.settings['server_root_dir']) / path).expanduser().resolve()
 
+    @tornado.web.authenticated
+    def get(self):
+        self.finish(json.dumps({"data": "This is file/compile-recursive endpoint!"}))
+
+    @tornado.web.authenticated
+    def post(self):
+        input_data = self.get_json_body()
+
+        input_file_path = self.__get_notebook_absolute_path__(input_data["filePath"])
+        component_python_paths = input_data["pythonPaths"]
+
+        msg = ""
+
+        try:
+            recursive_compile(str(input_file_path), component_python_paths=component_python_paths)
             msg = "completed"
 
         except Exception:
@@ -41,6 +68,5 @@ def post(self):
             pass
 
         finally:
-
             data = {"message": msg}
             self.finish(json.dumps(data))