ivoryos 1.3.9__py3-none-any.whl → 1.4.1__py3-none-any.whl

ivoryos/static/js/action_handlers.js

@@ -1,118 +1,169 @@
+// ============================================================================
+// STATE MANAGEMENT
+// ============================================================================
 
+let previousHtmlState = null;  // Store previous instrument panel state
+let lastFocusedElement = null; // Track focus for modal management
 
+// ============================================================================
+// MODE & BATCH MANAGEMENT
+// ============================================================================
 
+function getMode() {
+    return sessionStorage.getItem("mode") || "single";
+}
 
-function saveWorkflow(link) {
-    const url = link.dataset.postUrl;
+function setMode(mode, triggerUpdate = true) {
+    sessionStorage.setItem("mode", mode);
 
-    fetch(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        }
-    })
-    .then(res => res.json())
-    .then(data => {
-        if (data.success) {
-            // flash a success message
-            // flash("Workflow saved successfully", "success");
-            window.location.reload();  // or update the UI dynamically
-        } else {
-            alert("Failed to save workflow: " + data.error);
-        }
-    })
-    .catch(err => {
-        console.error("Save error:", err);
-        alert("Something went wrong.");
-    });
+    const modeButtons = document.querySelectorAll(".mode-toggle");
+    const batchOptions = document.getElementById("batch-options");
+
+    modeButtons.forEach(b => b.classList.toggle("active", b.dataset.mode === mode));
+
+    if (batchOptions) {
+        batchOptions.style.display = (mode === "batch") ? "inline-flex" : "none";
+    }
+
+    if (triggerUpdate) updateCode();
+}
+
+function getBatch() {
+    return sessionStorage.getItem("batch") || "sample";
 }
 
+function setBatch(batch, triggerUpdate = true) {
+    sessionStorage.setItem("batch", batch);
 
-function updateInstrumentPanel(link) {
-    const url = link.dataset.getUrl;
-    fetch(url)
-    .then(res => res.json())
-    .then(data => {
-        if (data.html) {
-            document.getElementById("sidebar-wrapper").innerHTML = data.html;
-            initializeDragHandlers()
-        }
-    })
+    const batchButtons = document.querySelectorAll(".batch-toggle");
+    batchButtons.forEach(b => b.classList.toggle("active", b.dataset.batch === batch));
+
+    if (triggerUpdate) updateCode();
 }
 
-function addMethodToDesign(event, form) {
-    event.preventDefault(); // Prevent default form submission
+// ============================================================================
+// CODE OVERLAY MANAGEMENT
+// ============================================================================
 
-    const formData = new FormData(form);
+async function updateCode() {
+    try {
+        const params = new URLSearchParams({ mode: getMode(), batch: getBatch() });
+        const res = await fetch(scriptCompileUrl + "?" + params.toString());
+        if (!res.ok) return;
 
-    fetch(form.action, {
-        method: 'POST',
-        body: formData
-    })
-    .then(response => response.json())
-    .then(data => {
-        if (data.success) {
-            updateActionCanvas(data.html);
-            hideModal();
-        } else {
-            alert("Failed to add method: " + data.error);
+        const data = await res.json();
+        const codeElem = document.getElementById("python-code");
+
+        codeElem.removeAttribute("data-highlighted"); // Reset highlight.js flag
+        codeElem.textContent = data.code['script'] || "# No code found";
+
+        if (window.hljs) {
+            hljs.highlightElement(codeElem);
         }
-    })
-    .catch(error => console.error('Error:', error));
+    } catch (err) {
+        console.error("Error updating code:", err);
+    }
 }
 
+function initializeCodeOverlay() {
+    const codeElem = document.getElementById("python-code");
+    const copyBtn = document.getElementById("copy-code");
+    const downloadBtn = document.getElementById("download-code");
+
+    if (!copyBtn || !downloadBtn) return; // Elements don't exist
+
+    // Remove old listeners by cloning (prevents duplicate bindings)
+    const newCopyBtn = copyBtn.cloneNode(true);
+    const newDownloadBtn = downloadBtn.cloneNode(true);
+    copyBtn.parentNode.replaceChild(newCopyBtn, copyBtn);
+    downloadBtn.parentNode.replaceChild(newDownloadBtn, downloadBtn);
+
+    // Copy to clipboard
+    newCopyBtn.addEventListener("click", () => {
+        navigator.clipboard.writeText(codeElem.textContent)
+            .then(() => alert("Code copied!"))
+            .catch(err => console.error("Failed to copy", err));
+    });
+
+    // Download current code
+    newDownloadBtn.addEventListener("click", () => {
+        const blob = new Blob([codeElem.textContent], { type: "text/plain" });
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = "script.py";
+        a.click();
+        URL.revokeObjectURL(url);
+    });
+    updateCode();
+}
+
+// ============================================================================
+// UI UPDATE FUNCTIONS
+// ============================================================================
 
 function updateActionCanvas(html) {
     document.getElementById("canvas-action-wrapper").innerHTML = html;
-    initializeCanvas(); // Reinitialize canvas functionality
-    document.querySelectorAll('#pythonCodeOverlay pre code').forEach((block) => {
-        hljs.highlightElement(block);
+    initializeCanvas();
+
+    const mode = getMode();
+    const batch = getBatch();
+
+    // Rebind event handlers for mode/batch toggles
+    document.querySelectorAll(".mode-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setMode(btn.dataset.mode));
+    });
+    document.querySelectorAll(".batch-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setBatch(btn.dataset.batch));
     });
-}
 
+    // Restore toggle UI state (without triggering updates)
+    setMode(mode, false);
+    setBatch(batch, false);
 
-let lastFocusedElement = null;
+    // Reinitialize code overlay buttons
+    initializeCodeOverlay();
 
+}
 
-function hideModal() {
-    if (document.activeElement) {
-        document.activeElement.blur();
-    }
-    $('#dropModal').modal('hide');
-    if (lastFocusedElement) {
-        lastFocusedElement.focus();  // Return focus to the triggering element
-    }
+function updateInstrumentPanel(link) {
+    const url = link.dataset.getUrl;
+
+    fetch(url)
+        .then(res => res.json())
+        .then(data => {
+            if (data.html) {
+                document.getElementById("sidebar-wrapper").innerHTML = data.html;
+                initializeDragHandlers();
+            }
+        })
+        .catch(err => console.error("Error updating instrument panel:", err));
 }
 
-function submitEditForm(event) {
-    event.preventDefault();
-    const form = event.target;
-    const formData = new FormData(form);
+// ============================================================================
+// WORKFLOW MANAGEMENT
+// ============================================================================
 
-    fetch(form.action, {
+function saveWorkflow(link) {
+    const url = link.dataset.postUrl;
+
+    fetch(url, {
         method: 'POST',
-        body: formData
+        headers: {
+            'Content-Type': 'application/json'
+        }
     })
-    .then(response => response.text())
-    .then(html => {
-        if (html) {
-            // Update only the action list
-            updateActionCanvas(html);
-
-            if (previousHtmlState) {
-                document.getElementById('instrument-panel').innerHTML = previousHtmlState;
-                previousHtmlState = null;  // Clear the stored state
-            }
-            const parser = new DOMParser();
-            const doc = parser.parseFromString(html, 'text/html');
-            const warningDiv = doc.querySelector('#warning');
-            if (warningDiv && warningDiv.textContent.trim()) {
-                alert(warningDiv.textContent.trim()); // or use a nicer toast
-            }
+    .then(res => res.json())
+    .then(data => {
+        if (data.success) {
+            window.location.reload();
+        } else {
+            alert("Failed to save workflow: " + data.error);
         }
     })
-    .catch(error => {
-        console.error('Error:', error);
+    .catch(err => {
+        console.error("Save error:", err);
+        alert("Something went wrong.");
     });
 }
 
@@ -134,33 +185,26 @@ function clearDraft() {
     .catch(error => console.error("Failed to clear draft", error));
 }
 
+// ============================================================================
+// ACTION MANAGEMENT (CRUD Operations)
+// ============================================================================
 
+function addMethodToDesign(event, form) {
+    event.preventDefault();
 
+    const formData = new FormData(form);
 
-let previousHtmlState = null;  // Store the previous state
-
-function duplicateAction(uuid) {
-    if (!uuid) {
-        console.error('Invalid UUID');
-        return;
-    }
-
-    fetch(scriptStepDupUrl.replace('0', uuid), {
+    fetch(form.action, {
         method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        }
+        body: formData
     })
-
-    .then(response => response.text())
-    .then(html => {
-        updateActionCanvas(html);
-
-        const parser = new DOMParser();
-        const doc = parser.parseFromString(html, 'text/html');
-        const warningDiv = doc.querySelector('#warning');
-        if (warningDiv && warningDiv.textContent.trim()) {
-            alert(warningDiv.textContent.trim()); // or use a nicer toast
+    .then(response => response.json())
+    .then(data => {
+        if (data.success) {
+            updateActionCanvas(data.html);
+            hideModal();
+        } else {
+            alert("Failed to add method: " + data.error);
         }
     })
     .catch(error => console.error('Error:', error));
@@ -172,10 +216,11 @@ function editAction(uuid) {
         return;
     }
 
+    // Store current state for rollback
     previousHtmlState = document.getElementById('instrument-panel').innerHTML;
 
     fetch(scriptStepUrl.replace('0', uuid), {
-        method: 'GET',  // no need for Content-Type on GET
+        method: 'GET',
         headers: {
             'Content-Type': 'application/json'
         }
@@ -184,9 +229,9 @@ function editAction(uuid) {
         if (!response.ok) {
             return response.json().then(err => {
                 if (err.warning) {
-                    alert(err.warning);  // <-- should fire now
+                    alert(err.warning);
                 }
-                // restore panel so user isn't stuck
+                // Restore panel so user isn't stuck
                 if (previousHtmlState) {
                     document.getElementById('instrument-panel').innerHTML = previousHtmlState;
                     previousHtmlState = null;
@@ -199,6 +244,7 @@ function editAction(uuid) {
     .then(html => {
         document.getElementById('instrument-panel').innerHTML = html;
 
+        // Set up back button
         const backButton = document.getElementById('back');
         if (backButton) {
             backButton.addEventListener('click', function(e) {
@@ -213,8 +259,53 @@ function editAction(uuid) {
     .catch(error => console.error('Error:', error));
 }
 
+function submitEditForm(event) {
+    event.preventDefault();
+
+    const form = event.target;
+    const formData = new FormData(form);
+
+    fetch(form.action, {
+        method: 'POST',
+        body: formData
+    })
+    .then(response => response.text())
+    .then(html => {
+        if (html) {
+            updateActionCanvas(html);
+
+            // Restore previous instrument panel state
+            if (previousHtmlState) {
+                document.getElementById('instrument-panel').innerHTML = previousHtmlState;
+                previousHtmlState = null;
+            }
 
+            // Check for warnings
+            showWarningIfExists(html);
+        }
+    })
+    .catch(error => console.error('Error:', error));
+}
 
+function duplicateAction(uuid) {
+    if (!uuid) {
+        console.error('Invalid UUID');
+        return;
+    }
+
+    fetch(scriptStepDupUrl.replace('0', uuid), {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+    .then(response => response.text())
+    .then(html => {
+        updateActionCanvas(html);
+        showWarningIfExists(html);
+    })
+    .catch(error => console.error('Error:', error));
+}
 
 function deleteAction(uuid) {
     if (!uuid) {
@@ -230,21 +321,64 @@ function deleteAction(uuid) {
     })
     .then(response => response.text())
     .then(html => {
-        // Find the first list element's content and replace it
         updateActionCanvas(html);
-        // Optionally, check if a warning element exists
-        const parser = new DOMParser();
-        const doc = parser.parseFromString(html, 'text/html');
-        const warningDiv = doc.querySelector('#warning');
-        if (warningDiv && warningDiv.textContent.trim()) {
-            alert(warningDiv.textContent.trim()); // or use a nicer toast
-        }
+        showWarningIfExists(html);
     })
     .catch(error => console.error('Error:', error));
 }
 
+// ============================================================================
+// MODAL MANAGEMENT
+// ============================================================================
+
+function hideModal() {
+    if (document.activeElement) {
+        document.activeElement.blur();
+    }
+
+    $('#dropModal').modal('hide');
+
+    if (lastFocusedElement) {
+        lastFocusedElement.focus();
+    }
+}
+
+// ============================================================================
+// UTILITY FUNCTIONS
+// ============================================================================
+
+function showWarningIfExists(html) {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(html, 'text/html');
+    const warningDiv = doc.querySelector('#warning');
+
+    if (warningDiv && warningDiv.textContent.trim()) {
+        alert(warningDiv.textContent.trim());
+    }
+}
+
+// ============================================================================
+// INITIALIZATION
+// ============================================================================
 
+document.addEventListener("DOMContentLoaded", function() {
+    const mode = getMode();
+    const batch = getBatch();
 
+    // Set up mode/batch toggle listeners
+    document.querySelectorAll(".mode-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setMode(btn.dataset.mode));
+    });
+
+    document.querySelectorAll(".batch-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setBatch(btn.dataset.batch));
+    });
 
+    // Restore UI state (without triggering updates)
+    setMode(mode, false);
+    setBatch(batch, false);
 
+    // Initialize code overlay
+    initializeCodeOverlay();
 
+});

ivoryos/static/js/sortable_design.js

@@ -106,6 +106,7 @@ function initializeCanvas() {
         document.activeElement?.blur();
         triggerModal(formHtml, actionName, actionId, state.dropTargetId);
     });
+    initializeCodeOverlay();
 }
 
 function insertDropPlaceholder($target) {

ivoryos/utils/bo_campaign.py

@@ -134,7 +134,7 @@ def parse_optimization_form(form_data: Dict[str, str]):
     Parse dynamic form data into structured optimization configuration.
 
     Expected form field patterns:
-    - Objectives: {name}_min, {name}_weight
+    - Objectives: {name}_obj_min, {name}_weight
     - Parameters: {name}_type, {name}_min, {name}_max, {name}_choices, {name}_value_type
     - Config: step{n}_model, step{n}_num_samples
     """
@@ -149,25 +149,25 @@ def parse_optimization_form(form_data: Dict[str, str]):
 
     # Parse objectives
     for field_name, value in form_data.items():
-        if field_name.endswith('_min') and value:
+        if field_name.endswith('_obj_min') and value:
             # Extract objective name
-            obj_name = field_name.replace('_min', '')
+            obj_name = field_name.replace('_obj_min', '')
             if obj_name in processed_objectives:
                 continue
 
             # Check if corresponding weight exists
             weight_field = f"{obj_name}_weight"
-            if weight_field in form_data and form_data[weight_field]:
-                objectives.append({
-                    "name": obj_name,
-                    "minimize": value == "minimize",
-                    "weight": float(form_data[weight_field])
-                })
-            else:
-                objectives.append({
+            early_stop_field = f"{obj_name}_obj_threshold"
+
+            config = {
                     "name": obj_name,
                     "minimize": value == "minimize",
-                })
+                }
+            if weight_field in form_data and form_data[weight_field]:
+                config["weight"] = float(form_data[weight_field])
+            if early_stop_field in form_data and form_data[early_stop_field]:
+                config["early_stop"] = float(form_data[early_stop_field])
+            objectives.append(config)
             processed_objectives.add(obj_name)
 
     # Parse parameters
@@ -192,11 +192,11 @@ def parse_optimization_form(form_data: Dict[str, str]):
             if value == "range":
                 min_field = f"{param_name}_min"
                 max_field = f"{param_name}_max"
-
+                step_field = f"{param_name}_step"
                 if min_field in form_data and max_field in form_data:
                     min_val = form_data[min_field]
                     max_val = form_data[max_field]
-
+                    step_val = form_data[step_field] if step_field in form_data else None
                     if min_val and max_val:
                         # Convert based on value_type
                         if value_type == "int":
@@ -204,8 +204,9 @@ def parse_optimization_form(form_data: Dict[str, str]):
                         elif value_type == "float":
                             bounds = [float(min_val), float(max_val)]
                         else:  # string
-                            bounds = [str(min_val), str(max_val)]
-
+                            bounds = [float(min_val), float(max_val)]
+                        if step_val:
+                            bounds.append(float(step_val))
                         parameter["bounds"] = bounds
 
             elif value == "choice":