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

ivoryos/routes/execute/execute.py

@@ -3,13 +3,13 @@ import os
 import time
 
 from flask import Blueprint, redirect, url_for, flash, jsonify, request, render_template, session, \
-    current_app, g
+    current_app, g, send_file
 from flask_login import login_required
 
 from ivoryos.routes.execute.execute_file import files
 from ivoryos.utils import utils
 from ivoryos.utils.bo_campaign import parse_optimization_form
-from ivoryos.utils.db_models import SingleStep, WorkflowRun, WorkflowStep
+from ivoryos.utils.db_models import SingleStep, WorkflowRun, WorkflowStep, WorkflowPhase
 from ivoryos.utils.global_config import GlobalConfig
 from ivoryos.utils.form import create_action_button
 
@@ -76,14 +76,17 @@ def experiment_run():
         if isinstance(exec_string, dict):
             for key, func_str in exec_string.items():
                 exec(func_str)
-            line_collection = script.convert_to_lines(exec_string)
+
         else:
             # Handle string case - you might need to adjust this based on your needs
-            line_collection = []
+            line_collection = {}
     except Exception:
         flash(f"Please check syntax!!")
         return redirect(url_for("design.experiment_builder"))
 
+
+    line_collection = script.render_script_lines(script.script_dict)
+
     run_name = script.name if script.name else "untitled"
 
     dismiss = session.get("dismiss", None)
@@ -92,8 +95,13 @@ def experiment_run():
 
     _, return_list = script.config_return()
     config_list, config_type_list = script.config("script")
-    data_list = os.listdir(current_app.config['DATA_FOLDER'])
-    data_list.remove(".gitkeep") if ".gitkeep" in data_list else data_list
+    data_list = [f for f in os.listdir(current_app.config['DATA_FOLDER']) if f.endswith('.csv')]
+    # Remove .gitkeep if present
+    if ".gitkeep" in data_list:
+        data_list.remove(".gitkeep")
+
+    # Sort by creation time, newest first
+    data_list.sort(key=lambda f: os.path.getctime(os.path.join(current_app.config['DATA_FOLDER'], f)), reverse=True)
 
     if deck is None:
         no_deck_warning = True
@@ -105,31 +113,36 @@ def experiment_run():
             flash(f"This script is not compatible with current deck, import {script.deck}")
 
     if request.method == "POST":
-        bo_args = None
+        # bo_args = None
         compiled = False
         if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
             payload_json = request.get_json()
             compiled = True
             if "kwargs" in payload_json:
                 config = payload_json["kwargs"]
-            elif "parameters" in payload_json:
-                bo_args = payload_json
+            # elif "parameters" in payload_json:
+            #     bo_args = payload_json
             repeat = payload_json.pop("repeat", None)
+            batch_size = payload_json.pop('batch_size', 1)
         else:
             if "bo" in request.form:
                 bo_args = request.form.to_dict()
                 existing_data = bo_args.pop("existing_data")
             if "online-config" in request.form:
-                config = utils.web_config_entry_wrapper(request.form.to_dict(), config_list)
+                config_args = request.form.to_dict()
+                config_args.pop("batch_size", None)
+                config = utils.web_config_entry_wrapper(config_args, config_list)
+            batch_size = int(request.form.get('batch_size', 1))
             repeat = request.form.get('repeat', None)
 
         try:
+        # if True:
             datapath = current_app.config["DATA_FOLDER"]
             run_name = script.validate_function_name(run_name)
-            runner.run_script(script=script, run_name=run_name, config=config, bo_args=bo_args,
+            runner.run_script(script=script, run_name=run_name, config=config,
                               logger=g.logger, socketio=g.socketio, repeat_count=repeat,
                               output_path=datapath, compiled=compiled, history=existing_data,
-                              current_app=current_app._get_current_object()
+                              current_app=current_app._get_current_object(), batch_size=batch_size
                               )
             if utils.check_config_duplicate(config):
                 flash(f"WARNING: Duplicate in config entries.")
@@ -157,6 +170,7 @@ def experiment_run():
 def run_bo():
     """
     .. :quickref: Workflow Execution; run Bayesian Optimization
+
     Run Bayesian Optimization with the given parameters and objectives.
 
     .. http:post:: /executions/campaign
@@ -166,27 +180,56 @@ def run_bo():
     :form existing_data: existing data to use for optimization
     :form parameters: parameters for optimization
     :form objectives: objectives for optimization
+
     TODO: merge to experiment_run or not, add more details about the form fields and their expected values.
     """
     script = utils.get_script_file()
     run_name = script.name if script.name else "untitled"
-    payload = request.form.to_dict()
-    repeat = payload.pop("repeat", None)
-    optimizer_type = payload.pop("optimizer_type", None)
-    existing_data = payload.pop("existing_data", None)
-    parameters, objectives, steps = parse_optimization_form(payload)
+
+    if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+        payload_json = request.get_json()
+        objectives = payload_json.pop("objectives", None)
+        parameters = payload_json.pop("parameters", None)
+        steps = payload_json.pop("steps", None)
+        constraints = payload_json.pop("parameter_constraints", None)
+        repeat = payload_json.pop("repeat", None)
+        batch_size = payload_json.pop("batch_size", None)
+        optimizer_type = payload_json.pop("optimizer_type", None)
+        existing_data = payload_json.pop("existing_data", None)
+
+    else:
+        payload = request.form.to_dict()
+        repeat = payload.pop("repeat", None)
+        optimizer_type = payload.pop("optimizer_type", None)
+        existing_data = payload.pop("existing_data", None)
+        batch_mode = payload.pop("batch_mode", None)
+        batch_size = payload.pop("batch_size", 1)
+
+        # Get constraint expressions (new single-line input)
+        constraint_exprs = request.form.getlist("constraint_expr")
+        constraints = [expr.strip() for expr in constraint_exprs if expr.strip()]
+
+        # Remove constraint_expr entries from payload before parsing parameters
+        for key in list(payload.keys()):
+            if key.startswith("constraint_expr"):
+                payload.pop(key, None)
+
+        parameters, objectives, steps = parse_optimization_form(payload)
+
+    # if True:
     try:
         datapath = current_app.config["DATA_FOLDER"]
         run_name = script.validate_function_name(run_name)
         Optimizer = global_config.optimizers.get(optimizer_type, None)
         if not Optimizer:
             raise ValueError(f"Optimizer {optimizer_type} is not supported or not found.")
-        optimizer = Optimizer(experiment_name=run_name, parameter_space=parameters, objective_config=objectives,
-                              optimizer_config=steps)
-        runner.run_script(script=script, run_name=run_name, optimizer=optimizer,
+
+        runner.run_script(script=script, run_name=run_name, optimizer=None,
                           logger=g.logger, socketio=g.socketio, repeat_count=repeat,
                           output_path=datapath, compiled=False, history=existing_data,
-                          current_app=current_app._get_current_object()
+                          current_app=current_app._get_current_object(), batch_size=int(batch_size),
+                          objectives=objectives, parameters=parameters, constraints=constraints, steps=steps,
+                          optimizer_cls=Optimizer
                           )
 
     except Exception as e:
@@ -196,6 +239,21 @@ def run_bo():
             flash(e.__str__())
     return redirect(url_for("execute.experiment_run"))
 
+@execute.route("/executions/latest_plot")
+@login_required
+def get_optimizer_plot():
+
+    optimizer = current_app.config.get("LAST_OPTIMIZER")
+    if optimizer is not None:
+        # the placeholder is for showing different plots
+        latest_file = optimizer.get_plots('placeholder')
+        # print(latest_file)
+        if files:
+            return send_file(latest_file, mimetype="image/png")
+    # print("No plots found")
+    return jsonify({"error": "No plots found"}), 404
+
+
 
 
 @execute.route("/executions/status", methods=["GET"])
@@ -225,7 +283,9 @@ def runner_status():
         if task_type == "workflow":
             workflow = WorkflowRun.query.get(task_id)
             if workflow is not None:
-                latest_step = WorkflowStep.query.filter_by(workflow_id=workflow.id).order_by(
+                phases = WorkflowPhase.query.filter_by(run_id=workflow.id).order_by(WorkflowPhase.start_time).all()
+                current_phase = phases[-1]
+                latest_step = WorkflowStep.query.filter_by(phase_id=current_phase.id).order_by(
                     WorkflowStep.start_time.desc()).first()
                 if latest_step is not None:
                     current_step = latest_step.as_dict()

ivoryos/routes/execute/templates/components/logging_panel.html

@@ -1,31 +1,56 @@
 {# Logging panel component for experiment run #}
 <div class="col-lg-6 col-sm-12 logging-panel">
-    <p>
-        <div class="p d-flex justify-content-between align-items-center">
-            <h5>Progress：</h5>
-            <div class="d-flex gap-2 ms-auto">
-                <button id="pause-resume" class="btn btn-info text-white" data-bs-toggle="tooltip" title="Pause execution">
-                    {% if pause_status %}
-                        <i class="bi bi-play-circle"></i>
-                    {% else %}
-                        <i class="bi bi-pause-circle"></i>
-                    {% endif %}
-                </button>
-                <button id="abort-current" class="btn btn-danger text-white" data-bs-toggle="tooltip" title="Stop execution after current step">
-                    <i class="bi bi-stop-circle"></i>
-                </button>
-                <button id="abort-pending" class="btn btn-warning text-white" data-bs-toggle="tooltip" title="Stop execution after current iteration">
-                    <i class="bi bi-hourglass-split"></i>
-                </button>
-            </div>
+    <div class="d-flex justify-content-between align-items-center">
+        <h5>Progress：</h5>
+        <div class="d-flex gap-2 ms-auto">
+            <button id="pause-resume" class="btn btn-info text-white">
+            {% if pause_status %}
+            <i class="bi bi-play-circle"></i>
+            {% else %}
+            <i class="bi bi-pause-circle"></i>
+            {% endif %}
+            </button>
+            <button id="abort-current" class="btn btn-danger text-white">
+            <i class="bi bi-stop-circle"></i>
+            </button>
+            <button id="abort-pending" class="btn btn-warning text-white">
+            <i class="bi bi-hourglass-split"></i>
+            </button>
         </div>
-        <div class="text-muted mt-2">
-            <small><strong>Note:</strong> The current step cannot be paused or stopped until it completes. </small>
+    </div>
+    <small class="text-muted mt-2">
+    <strong>Note:</strong> The current step cannot be paused or stopped until it completes.
+    </small>
+    <div class="progress my-3">
+        <div id="progress-bar-inner" class="progress-bar progress-bar-striped progress-bar-animated"></div>
+    </div>
+    <!-- Tabs -->
+    <ul class="nav nav-tabs" id="logPlotTabs" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" id="log-tab" data-bs-toggle="tab" data-bs-target="#log" type="button" role="tab">Log</button>
+        </li>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" id="plot-tab" data-bs-toggle="tab" data-bs-target="#plot" type="button" role="tab">Optimizer Plot</button>
+        </li>
+    </ul>
+    <div class="tab-content mt-3" id="logPlotTabsContent">
+        <div class="tab-pane fade show active" id="log" role="tabpanel">
+            <div id="logging-panel" class="border p-2 bg-light" style="max-height: 400px; overflow-y: auto;"></div>
+        </div>
+        <div class="tab-pane fade" id="plot" role="tabpanel">
+            <button class="btn btn-success mb-2" onclick="showPlot()">Refresh Plot</button>
+            <small class="text-muted d-block mt-1" id="plot-info">This function is only available for NIMO optimizers.</small>
+            <br>
+            <img id="optimizerPlot" src="" class="img-fluid rounded shadow-sm d-block mx-auto" style="max-width:100%; display:none;">
         </div>
 
-    <div class="progress" role="progressbar" aria-label="Animated striped example" aria-valuenow="10" aria-valuemin="0" aria-valuemax="100">
-        <div id="progress-bar-inner" class="progress-bar progress-bar-striped progress-bar-animated"></div>
     </div>
-    <p><h5>Log：</h5></p>
-    <div id="logging-panel"></div>
-</div> 
+
+</div>
+<script>
+    function showPlot() {
+        const img = document.getElementById('optimizerPlot');
+        img.src = "{{ url_for('execute.get_optimizer_plot') }}";
+        img.style.display = 'block';
+    }
+</script>

ivoryos/routes/execute/templates/components/run_tabs.html

@@ -1,4 +1,4 @@
-{# Run tabs component for experiment run #}
+<!-- Main template structure -->
 <ul class="nav nav-tabs" id="myTabs" role="tablist">
     <li class="nav-item" role="presentation">
         <a class="nav-link {{ 'disabled' if config_list else '' }} {{ 'active' if not config_list else '' }}" id="tab1-tab" data-bs-toggle="tab" href="#tab1" role="tab" aria-controls="tab1" aria-selected="false">Repeat</a>
@@ -14,4 +14,47 @@
     {% include 'components/tab_repeat.html' %}
     {% include 'components/tab_configuration.html' %}
     {% include 'components/tab_bayesian.html' %}
-</div> 
+</div>
+
+<!-- ============================================ -->
+<!-- SWITCH TO THE LAST ACTIVE TAB ON PAGE LOAD   -->
+<!-- ============================================ -->
+<script>
+(function() {
+   'use strict';
+
+   // Store active tab when changed
+   document.addEventListener('shown.bs.tab', function(e) {
+       const tabId = e.target.id.replace('-tab', '');
+       if (tabId === 'tab2' || tabId === 'tab3') {
+            localStorage.setItem('ivoryosLastTab', tabId);
+            console.log('Saved last active tab:', tabId);
+        }
+
+       // Optional: run specific load logic per tab
+       if (tabId === 'tab2' && typeof window.loadConfigData === 'function') {
+           window.loadConfigData();
+       } else if (tabId === 'tab3' && typeof window.saveBO === 'function') {
+           window.saveBO();
+       }
+   });
+
+   // Restore tab from last session
+   document.addEventListener('DOMContentLoaded', function() {
+       const lastTab = localStorage.getItem('ivoryosLastTab');
+       const tabElement = lastTab ? document.getElementById(lastTab + '-tab') : null;
+
+       if (tabElement && !tabElement.classList.contains('disabled')) {
+           new bootstrap.Tab(tabElement).show();
+           console.log('Restored last active tab:', lastTab);
+       } else {
+           // Default to first non-disabled tab
+           const firstTab = document.querySelector('#myTabs .nav-link:not(.disabled)');
+           if (firstTab) {
+               new bootstrap.Tab(firstTab).show();
+               console.log('Defaulted to first available tab.');
+           }
+       }
+   });
+})();
+</script>