ivoryos 1.0.9__py3-none-any.whl → 1.4.4__py3-none-any.whl

ivoryos/static/js/sortable_design.js

@@ -1,16 +1,56 @@
-$(document).ready(function () {
-    let dropTargetId = ""; // Store the ID of the drop target
+// Move triggerModal to global scope
+function triggerModal(formHtml, actionName, actionId, dropTargetId) {
+    if (formHtml && formHtml.trim() !== "") {
+        var $form = $("<div>").html(formHtml);
+
+        var $hiddenInput = $("<input>")
+            .attr("type", "hidden")
+            .attr("name", "drop_target_id")
+            .attr("id", "dropTargetInput")
+            .val(dropTargetId);
+
+        $form.find("button[type='submit']").before($hiddenInput);
+
+        $("#modalFormFields").empty().append($form.children());
+
+        const $modal = $("#dropModal");
+
+        setTimeout(() => {
+            showModal($modal);
+        }, 0);
+
+        $("#modalDropTarget").text(dropTargetId || "N/A");
+        $("#modalFormFields")
+            .data("action-id", actionId)
+            .data("action-name", actionName)
+            .data("drop-target-id", dropTargetId);
+    } else {
+        console.error("Form HTML is undefined or empty!");
+    }
+}
+
+function showModal($modal) {
+    $modal.modal({
+        backdrop: 'static',
+        keyboard: true,
+        focus: true
+    }).modal('show');
+}
 
+const state = {
+    dropTargetId: ""
+};
+
+function initializeCanvas() {
     $("#list ul").sortable({
         cancel: ".unsortable",
         opacity: 0.8,
         cursor: "move",
         placeholder: "drop-placeholder",
         update: function () {
-            var item_order = [];
-            $("ul.reorder li").each(function () {
-                item_order.push($(this).attr("id"));
-            });
+            const item_order = $("ul.reorder li").map(function () {
+                return this.id;
+            }).get();
             var order_string = "order=" + item_order.join(",");
 
             $.ajax({
@@ -19,87 +59,98 @@ $(document).ready(function () {
                 data: order_string,
                 cache: false,
                 success: function (data) {
-                    $("#response").html(data);
-                    $("#response").slideDown("slow");
-                    window.location.href = window.location.href;
+                    // Update the canvas content with the new HTML
+                    updateActionCanvas(data)
                 }
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                console.error("Failed to update order:", textStatus, errorThrown);
             });
         }
     });
 
     // Make Entire Accordion Item Draggable
-    $(".accordion-item").on("dragstart", function (event) {
-        let formHtml = $(this).find(".accordion-body").html(); // Get the correct form
-        event.originalEvent.dataTransfer.setData("form", formHtml || ""); // Store form HTML
+    $(".accordion-item").off("dragstart").on("dragstart", function (event) {
+        let formHtml = $(this).find(".accordion-body").html();
+        event.originalEvent.dataTransfer.setData("form", formHtml || "");
         event.originalEvent.dataTransfer.setData("action", $(this).find(".draggable-action").data("action"));
         event.originalEvent.dataTransfer.setData("id", $(this).find(".draggable-action").attr("id"));
-
         $(this).addClass("dragging");
     });
 
-
-    $("#list ul, .canvas").on("dragover", function (event) {
+    $("#list ul, .canvas").off("dragover").on("dragover", function (event) {
         event.preventDefault();
         let $target = $(event.target).closest("li");
 
-        // If we're over a valid <li> element in the list
         if ($target.length) {
-            dropTargetId = $target.attr("id") || ""; // Store the drop target ID
-
-            $(".drop-placeholder").remove(); // Remove existing placeholders
-            $("<li class='drop-placeholder'></li>").insertBefore($target); // Insert before the target element
+            state.dropTargetId = $target.attr("id") || "";
+            insertDropPlaceholder($target);
         } else if (!$("#list ul").children().length && $(this).hasClass("canvas")) {
-            $(".drop-placeholder").remove();  // Remove any placeholder
-            // $("#list ul").append("<li class='drop-placeholder'></li>"); // Append placeholder to canvas
+            $(".drop-placeholder").remove();
         } else {
-            dropTargetId = "";  // Append placeholder to canvas
+            state.dropTargetId = "";
         }
     });
 
-    $("#list ul, .canvas").on("dragleave", function () {
-        $(".drop-placeholder").remove(); // Remove placeholder on leave
+    $("#list ul, .canvas").off("dragleave").on("dragleave", function () {
+        $(".drop-placeholder").remove();
     });
 
-    $("#list ul, .canvas").on("drop", function (event) {
+    $("#list ul, .canvas").off("drop").on("drop", function (event) {
         event.preventDefault();
-
         var actionName = event.originalEvent.dataTransfer.getData("action");
         var actionId = event.originalEvent.dataTransfer.getData("id");
-        var formHtml = event.originalEvent.dataTransfer.getData("form"); // Retrieve form HTML
+        var formHtml = event.originalEvent.dataTransfer.getData("form");
         let listLength = $("ul.reorder li").length;
-        dropTargetId = dropTargetId || listLength + 1;  // Assign a "last" ID or unique identifier
+        state.dropTargetId = state.dropTargetId || listLength + 1;
         $(".drop-placeholder").remove();
-            // Trigger the modal with the appropriate action
-        triggerModal(formHtml, actionName, actionId, dropTargetId);
-
+        document.activeElement?.blur();
+        triggerModal(formHtml, actionName, actionId, state.dropTargetId);
     });
+    initializeCodeOverlay();
+}
 
-    // Function to trigger the modal (same for both buttons and accordion items)
-    function triggerModal(formHtml, actionName, actionId, dropTargetId) {
-        if (formHtml && formHtml.trim() !== "") {
-            var $form = $("<div>").html(formHtml); // Convert HTML string to jQuery object
+function insertDropPlaceholder($target) {
+    $(".drop-placeholder").remove();
+    $("<li class='drop-placeholder'></li>").insertBefore($target);
+}
 
-            // Create a hidden input for the drop target ID
-            var $hiddenInput = $("<input>")
-                .attr("type", "hidden")
-                .attr("name", "drop_target_id")
-                .attr("id", "dropTargetInput")
-                .val(dropTargetId);
+// Add this function to sortable_design.js
+function initializeDragHandlers() {
+    const $cards = $(".accordion-item.design-control");
 
-            // Insert before the submit button
-            $form.find("button[type='submit']").before($hiddenInput);
+    // Toggle draggable based on mouse/touch position
+    $cards.off("mousedown touchstart").on("mousedown touchstart", function (event) {
+        this.setAttribute("draggable", $(event.target).closest(".input-group").length ? "false" : "true");
+    });
 
-            $("#modalFormFields").empty().append($form.children());
-            $("#dropModal").modal("show"); // Show modal
+    // Handle the actual drag
+    $cards.off("dragstart dragend").on({
+        dragstart: function (event) {
+            if (this.getAttribute("draggable") !== "true") {
+                event.preventDefault();
+                return false;
+            }
+
+            const formHtml = $(this).find(".accordion-body form").prop("outerHTML");
+            if (!formHtml) return false;
+
+            event.originalEvent.dataTransfer.setData("form", formHtml);
+            event.originalEvent.dataTransfer.setData("action", $(this).find(".draggable-action").data("action"));
+            event.originalEvent.dataTransfer.setData("id", $(this).find(".draggable-action").attr("id"));
+
+            $(this).addClass("dragging");
+        },
+        dragend: function () {
+            $(this).removeClass("dragging").attr("draggable", "false");
+        }
+    });
 
-            // Store and display drop target ID in the modal
-            $("#modalDropTarget").text(dropTargetId || "N/A");
+    // Prevent form inputs from being draggable
+    $(".accordion-item input, .accordion-item select").attr("draggable", "false");
+}
 
-            $("#modalFormFields").data("action-id", actionId);
-            $("#modalFormFields").data("action-name", actionName);
-            $("#modalFormFields").data("drop-target-id", dropTargetId);
-        } else {
-            console.error("Form HTML is undefined or empty!");
-        }
-    }
-});
+// Make sure it's called in the document ready function
+$(document).ready(function () {
+    initializeCanvas();
+    initializeDragHandlers(); // Add this line
+});

ivoryos/static/js/ui_state.js

@@ -0,0 +1,114 @@
+// Toggle visibility of line numbers
+function toggleLineNumbers(save = true) {
+    const show = document.getElementById('toggleLineNumbers').checked;
+    document.querySelectorAll('.line-number').forEach(el => {
+        el.classList.toggle('d-none', !show);
+    });
+
+    if (save) {
+        localStorage.setItem('showLineNumbers', show ? 'true' : 'false');
+    }
+}
+
+// Toggle visibility of Python code overlay
+function toggleCodeOverlay(state = null) {
+    const overlay = document.getElementById("pythonCodeOverlay");
+    const checkbox = document.getElementById("showPythonCodeSwitch");
+
+    const isVisible = overlay.classList.contains("show");
+    const newState = state !== null ? state : !isVisible;
+
+    if (newState) {
+        overlay.classList.add("show");
+        checkbox.checked = true;
+    } else {
+        overlay.classList.remove("show");
+        checkbox.checked = false;
+    }
+
+    // Save state to session via PATCH
+    fetch(scriptUIStateUrl, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ show_code: newState })
+    });
+}
+
+
+function setScriptPhase(stype) {
+    fetch(scriptUIStateUrl, {
+        method: "PATCH",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ editing_type: stype })
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.html) {
+            document.getElementById("canvas-wrapper").innerHTML = data.html;
+            initializeCanvas(); // Reinitialize the canvas functionality
+            document.querySelectorAll('#pythonCodeOverlay pre code').forEach((block) => {
+                hljs.highlightElement(block);
+            });
+        }
+    })
+    .catch(error => console.error("Failed to update editing type", error));
+}
+
+
+
+function changeDeck(deck) {
+    fetch(scriptUIStateUrl, {
+        method: "PATCH",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ deck_name: deck })
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.html) {
+            document.getElementById("sidebar-wrapper").innerHTML = data.html;
+        }
+    })
+    .catch(error => console.error("Failed to change deck", error));
+}
+
+
+
+function toggleAutoFill() {
+    const instrumentValue = document.querySelector('.form-check.form-switch').dataset.instrument;
+
+    fetch(scriptUIStateUrl, {
+        method: "PATCH",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+            autofill: document.getElementById("autoFillCheck").checked,
+            instrument: instrumentValue
+        })
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.html) {
+            document.getElementById("instrument-panel").innerHTML = data.html;
+            initializeDragHandlers()
+        }
+    })
+}
+// Restore state on page load
+document.addEventListener('DOMContentLoaded', () => {
+    const savedState = localStorage.getItem('showLineNumbers');
+    const checkbox = document.getElementById('toggleLineNumbers');
+
+    if (savedState === 'true') {
+        checkbox.checked = true;
+    }
+    if (checkbox) {
+        toggleLineNumbers(false);  // don't overwrite localStorage on load
+        checkbox.addEventListener('change', () => toggleLineNumbers());
+    }
+
+});

ivoryos/templates/base.html

@@ -24,9 +24,25 @@
     <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
         <div class= "container">
 {#            {{ module_config }}#}
+
             <a class="navbar-brand" href="{{ url_for('main.index') }}">
-                <img src="{{url_for('static', filename='logo.webp')}}" alt="Logo" height="60" class="d-inline-block align-text-bottom">
+                {% if current_user.is_authenticated %}
+                    {% if current_user.settings.logo_mode == 'replace' and current_user.settings.logo_filename %}
+                        <img src="{{ url_for('static', filename='user_logos/' ~ current_user.settings.logo_filename) }}" alt="User Logo" height="50">
+                    {% else %}
+
+                        {% if current_user.settings.logo_mode == 'add' and current_user.settings.logo_filename %}
+                            <img src="{{ url_for('static', filename='user_logos/' ~ current_user.settings.logo_filename) }}" alt="User Logo" height="50" class="ms-2">
+                        {% endif %}
+                        <img src="{{ url_for('static', filename='ivoryos_logo.png') }}" alt="IvoryOS" height="50">
+                    {% endif %}
+                {% else %}
+                    <img src="{{ url_for('static', filename='ivoryos_logo.png') }}" alt="IvoryOS" height="50">
+                {% endif %}
             </a>
+
+
+
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
@@ -38,16 +54,16 @@
                     </li>
                     {% if enable_design %}
                         <li class="nav-item">
-                            <a class="nav-link" href="{{ url_for('database.load_from_database') }}" aria-current="page">Library</a>
+                            <a class="nav-link" href="{{ url_for('library.load_from_database') }}" aria-current="page">Library</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="{{ url_for('design.experiment_builder') }}">Design</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="{{ url_for('design.experiment_run') }}">Compile/Run</a>
+                            <a class="nav-link" href="{{ url_for('execute.experiment_run') }}">Compile/Run</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="{{ url_for('database.list_workflows') }}">Data</a>
+                            <a class="nav-link" href="{{ url_for('data.list_workflows') }}">Data</a>
                         </li>
                     {% endif %}
 
@@ -69,11 +85,12 @@
                     {% endif %}
                 </ul>
                 <ul class="navbar-nav ms-auto">
-
-                    {% if session["user"] %}
+                    {% if current_user.is_authenticated %}
                         <div class="dropdown">
-                            <li class="nav-item " aria-expanded="false"><i class="bi bi-person-circle"></i> {{ session["user"] }}</li>
+                            <li class="nav-item " aria-expanded="false"><i class="bi bi-person-circle"></i> {{ current_user.get_id() }}</li>
                             <ul class="dropdown-menu">
+                                <li><a class="dropdown-item" href="{{ url_for("auth.change_password") }}" role="button" aria-expanded="false">Change Password</a></li>
+                                <li><a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#logoModal" role="button" aria-expanded="false">Customize Logo</a></li>
                                 <li><a class="dropdown-item" href="{{ url_for("auth.logout") }}" role="button" aria-expanded="false">Logout</a></li>
                             </ul>
 
@@ -116,7 +133,7 @@
                     <h1 class="modal-title fs-5" id="importModal">Import deck by file path</h1>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
-                <form method="POST" action="{{ url_for('control.import_deck') }}" enctype="multipart/form-data">
+                <form method="POST" action="{{ url_for('control.temp.import_deck') }}" enctype="multipart/form-data">
                     <div class="modal-body">
                         <h5>from connection history</h5>
                         <div class="form-group">
@@ -153,5 +170,47 @@
             </div>
         </div>
     </div>
+
+    <!-- Logo Customization Modal -->
+    <div class="modal fade" id="logoModal" tabindex="-1" aria-labelledby="logoModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-content shadow-lg">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="logoModalLabel">Customize Navbar Logo</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form method="POST"
+                    action="{{ url_for('main.customize_logo') }}"
+                    enctype="multipart/form-data">
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label class="form-label fw-semibold">Upload your logo</label>
+                            <input type="file" name="logo" accept="image/*" class="form-control" required>
+                        </div>
+                        <div class="mb-2">
+                            <label class="form-label fw-semibold">Display mode</label>
+                            <div class="form-check">
+                                <input class="form-check-input" type="radio" name="mode" id="add" value="add" checked>
+                                <label class="form-check-label" for="add">
+                                Add next to IvoryOS logo
+                                </label>
+                            </div>
+                            <div class="form-check">
+                                <input class="form-check-input" type="radio" name="mode" id="replace" value="replace">
+                                <label class="form-check-label" for="replace">
+                                Replace IvoryOS logo
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                        <button type="submit" class="btn btn-primary">Apply</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
 </body>
 </html>

ivoryos/utils/bo_campaign.py

@@ -1,7 +1,9 @@
+from typing import Dict, Any
+import re
 from ivoryos.utils.utils import install_and_import
 
 
-def ax_init_form(data, arg_types):
+def ax_init_form(data, arg_types, previous_data_len=0):
     """
     create Ax campaign from the web form input
     :param data:
@@ -9,7 +11,11 @@ def ax_init_form(data, arg_types):
     install_and_import("ax", "ax-platform")
     parameter, objectives = ax_wrapper(data, arg_types)
     from ax.service.ax_client import AxClient
-    ax_client = AxClient()
+    if previous_data_len > 0:
+        gs = exisitng_data_gs(previous_data_len)
+        ax_client = AxClient(generation_strategy=gs)
+    else:
+        ax_client = AxClient()
     ax_client.create_experiment(parameter, objectives=objectives)
     return ax_client
 
@@ -84,4 +90,175 @@ def ax_init_opc(bo_args):
     bo_args["objectives"] = objectives_formatted
     ax_client.create_experiment(**bo_args)
 
-    return ax_client
+    return ax_client
+
+
+def exisitng_data_gs(data_len):
+    """
+    temporal generation strategy for existing data
+    """
+    from ax.generation_strategy.generation_node import GenerationStep
+    from ax.generation_strategy.generation_strategy import GenerationStrategy
+    from ax.modelbridge.registry import Generators
+    if data_len > 4:
+        gs = GenerationStrategy(
+            steps=[
+                GenerationStep(
+                    model=Generators.BOTORCH_MODULAR,
+                    num_trials=-1,
+                    max_parallelism=3,
+                ),
+            ]
+        )
+    else:
+        gs = GenerationStrategy(
+            steps=[
+                GenerationStep(
+                    model=Generators.SOBOL,
+                    num_trials=5-data_len,  # how many sobol trials to perform (rule of thumb: 2 * number of params)
+                    max_parallelism=5,
+                    model_kwargs={"seed": 999},
+                ),
+                GenerationStep(
+                    model=Generators.BOTORCH_MODULAR,
+                    num_trials=-1,
+                    max_parallelism=3,
+                ),
+            ]
+        )
+    return gs
+
+
+def parse_optimization_form(form_data: Dict[str, str]):
+    """
+    Parse dynamic form data into structured optimization configuration.
+
+    Expected form field patterns:
+    - 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
+    """
+
+    objectives = []
+    parameters = []
+    config = {}
+
+    # Track processed field names to avoid duplicates
+    processed_objectives = set()
+    processed_parameters = set()
+
+    # Parse objectives
+    for field_name, value in form_data.items():
+        if field_name.endswith('_obj_min') and value:
+            # Extract objective name
+            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"
+            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
+    for field_name, value in form_data.items():
+        if field_name.endswith('_type') and value:
+            # Extract parameter name
+            param_name = field_name.replace('_type', '')
+            if param_name in processed_parameters:
+                continue
+
+            parameter = {
+                "name": param_name,
+                "type": value
+            }
+
+            # Get value type (default to float)
+            value_type_field = f"{param_name}_value_type"
+            value_type = form_data.get(value_type_field, "float")
+            parameter["value_type"] = value_type
+
+            # Handle different parameter types
+            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":
+                            bounds = [int(min_val), int(max_val)]
+                        elif value_type == "float":
+                            bounds = [float(min_val), float(max_val)]
+                        else:  # string
+                            bounds = [float(min_val), float(max_val)]
+                        if step_val:
+                            bounds.append(float(step_val))
+                        parameter["bounds"] = bounds
+
+            elif value == "choice":
+                choices_field = f"{param_name}_value"
+                if choices_field in form_data and form_data[choices_field]:
+                    # Split choices by comma and clean whitespace
+                    choices = [choice.strip() for choice in form_data[choices_field].split(',')]
+
+                    # Convert choices based on value_type
+                    if value_type == "int":
+                        choices = [int(choice) for choice in choices if choice.isdigit()]
+                    elif value_type == "float":
+                        choices = [float(choice) for choice in choices if
+                                   choice.replace('.', '').replace('-', '').isdigit()]
+                    # For string, keep as is
+
+                    parameter["bounds"] = choices
+
+            elif value == "fixed":
+                fixed_field = f"{param_name}_value"
+                if fixed_field in form_data and form_data[fixed_field]:
+                    fixed_val = form_data[fixed_field]
+
+                    # Convert based on value_type
+                    if value_type == "int":
+                        parameter["value"] = int(fixed_val)
+                    elif value_type == "float":
+                        parameter["value"] = float(fixed_val)
+                    else:
+                        parameter["value"] = str(fixed_val)
+
+            parameters.append(parameter)
+            processed_parameters.add(param_name)
+
+    # Parse configuration steps
+    step_pattern = re.compile(r'step(\d+)_(.+)')
+    steps = {}
+
+    for field_name, value in form_data.items():
+        match = step_pattern.match(field_name)
+        if match and value:
+            step_num = int(match.group(1))
+            step_attr = match.group(2)
+            step_key = f"step_{step_num}"
+
+            if step_key not in steps:
+                steps[step_key] = {}
+
+            # Convert num_samples to int if it's a number field
+            if step_attr == "num_samples":
+                steps[step_key][step_attr] = int(value)
+            else:
+                steps[step_key][step_attr] = value
+
+    return parameters, objectives, steps