ivoryos 1.1.0__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

ivoryos/routes/design/templates/components/modals/drop_modal.html

@@ -1,6 +1,5 @@
-{# Drop modal component #}
-<div class="modal fade" id="dropModal" tabindex="-1" aria-labelledby="dropModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal fade" id="dropModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="dropModalLabel">Configure Action</h5>
@@ -8,7 +7,6 @@
             </div>
             <div class="modal-body">
                 <p>Drop Position ID: <strong id="modalDropTarget"></strong></p>
-                <!-- Form will be dynamically inserted here -->
                 <div id="modalFormFields"></div>
             </div>
             <div class="modal-footer">
@@ -16,4 +14,4 @@
             </div>
         </div>
     </div>
-</div> 
+</div>

ivoryos/routes/design/templates/components/modals/new_script_modal.html

@@ -11,8 +11,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"> Continue editing </button>
-                <a role="button" class="btn btn-primary" href="{{url_for('design.clear')}}"> Already saved, clear all </a>
-            </div>
+                <button class="btn btn-danger" onclick="clearDraft()">Already saved, clear all</button>            </div>
         </div>
     </div>
 </div> 

ivoryos/routes/design/templates/components/modals/rename_modal.html

@@ -6,16 +6,16 @@
                 <h1 class="modal-title fs-5" id="renameModal">Rename your script</h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
-            <form method="POST" name="run_name" action="{{ url_for('library.edit_run_name') }}">
-                <div class="modal-body">
+            <form name="run_name" onsubmit="editScriptName(event)">
+            <div class="modal-body">
                     <div class="input-group mb-3">
-                        <label class="input-group-text" for="run_name">Run Name</label>
-                        <input class="form-control" type="text" name="run_name" id="run_name" placeholder="{{script['name']}}" required="required">
+                        <label class="input-group-text" for="new-name">Run Name</label>
+                        <input class="form-control" type="text" name="new-name" id="new-name" value="{{ script['name'] }}" required="required">
                     </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"> Close </button>
-                    <button type="submit"  class="btn btn-primary"> Save </button>
+                    <button type="submit" class="btn btn-primary"> Save</button>
                 </div>
             </form>
         </div>

ivoryos/routes/design/templates/components/modals/saveas_modal.html

@@ -6,7 +6,7 @@
                 <h1 class="modal-title fs-5" id="saveasModal">Save your script as </h1>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
-            <form method="POST" name="run_name" action="{{ url_for('library.save_as') }}">
+            <form method="POST" name="save-as" action="{{ url_for('library.save_as') }}">
                 <div class="modal-body">
                     <div class="input-group mb-3">
                         <label class="input-group-text" for="run_name">Run Name</label>
@@ -19,7 +19,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"> Close </button>
-                    <button type="submit"  class="btn btn-primary"> Save </button>
+                    <button type="submit"  class="btn btn-primary" > Save </button>
                 </div>
             </form>
         </div>

ivoryos/routes/design/templates/components/python_code_overlay.html

@@ -1,17 +1,39 @@
 {# Python code overlay component #}
+{#{% if session.get('show_code') %}#}
+<style>
+.code-overlay {
+    position: fixed;
+    right: 0;
+    top: 180px;
+    height: 100vh;
+    width: 400px;
+    z-index: 1000;
+    transition: transform 0.3s ease;
+    transform: translateX(100%);
+}
+
+.code-overlay.show {
+    transform: translateX(0);
+}
+</style>
+<script>hljs.highlightAll();</script>
 {% if session.get('show_code') %}
 <div id="pythonCodeOverlay" class="code-overlay bg-light border-start show">
+{% else %}
+<div id="pythonCodeOverlay" class="code-overlay bg-light border-start">
+{% endif %}
     <div class="overlay-header d-flex justify-content-between align-items-center px-3 py-2 border-bottom">
         <strong>Python Code</strong>
-        <button class="btn btn-sm btn-outline-secondary" onclick="toggleCodeOverlay(false)">
+        <button class="btn btn-sm btn-outline-secondary" onclick="toggleCodeOverlay()">
             <i class="bi bi-x-lg"></i>
         </button>
     </div>
     <div class="overlay-content p-3">
-        {% for stype, script in session['python_code'].items() %}
+        {% for stype, script in session.get('python_code', {}).items() %}
             <pre><code class="language-python">{{ script }}</code></pre>
         {% endfor %}
-        <a href="{{ url_for('design.design_files.download', filetype='python') }}">Download <i class="bi bi-download"></i></a>
+        <a href="{{ url_for('design.design_files.download_python', filetype='python') }}">
+            Download <i class="bi bi-download"></i>
+        </a>
     </div>
 </div>
-{% endif %} 

ivoryos/routes/design/templates/components/sidebar.html

@@ -1,16 +1,15 @@
 {# Sidebar component for experiment builder #}
-<div class="col-md-3 scroll-column">
-    {# select deck if this is online#}
-    {% if off_line %}
-        {% include 'components/deck_selector.html' %}
-    {% endif %}
-
-    {# edit action #}
-    {% if session["edit_action"] %}
-        {% include 'components/edit_action_form.html' %}
-    {% elif instrument %}
-        {% include 'components/instrument_panel.html' %}
+<div class="instrument-panel" id="instrument-panel">
+    {% if instrument %}
+        <div class="instrument-methods" id="instrument-methods">
+        {% include 'components/actions_panel.html' %}
+        </div>
     {% else %}
-        {% include 'components/operations_panel.html' %}
+        {# select deck if this is online#}
+        {% if off_line %}
+            {% include 'components/deck_selector.html' %}
+        {% endif %}
+
+        {% include 'components/instruments_panel.html' %}
     {% endif %}
-</div> 
+</div>

ivoryos/routes/design/templates/experiment_builder.html

@@ -3,23 +3,7 @@
 
 {% block body %}
     {# overlay block for text-to-code gen #}
-    <style>
-    .code-overlay {
-        position: absolute;
-        top: 0;
-        right: -50%;
-        height: 100%;
-        width: 50%;
-        z-index: 100;
-        background: #f8f9fa;
-        box-shadow: -2px 0 6px rgba(0, 0, 0, 0.1);
-        transition: right 0.3s ease;
-        overflow-y: auto;
-    }
-    .code-overlay.show {
-        right: 0;
-    }
-</style>
+
     <div id="overlay" class="overlay">
         <div>
             <h3 id="overlay-text">Generating design, please wait...</h3>
@@ -28,14 +12,30 @@
     </div>
 
     <div class="row">
-        {% include 'components/sidebar.html' %}
-        {% include 'components/canvas.html' %}
+        <div class="col-md-3 scroll-column" id="sidebar-wrapper">
+            {% include 'components/sidebar.html' %}
+        </div>
+        <div class="col-md-9 scroll-column" id="canvas-wrapper">
+            {% include 'components/canvas.html' %}
+        </div>
+
     </div>
 
     {# Include all modals #}
     {% include 'components/modals.html' %}
 
     {# Include all scripts #}
-    {% include 'components/scripts.html' %}
+    <script>
+        const updateListUrl = "{{ url_for('design.design_steps.update_list') }}";
+        const scriptUIStateUrl = "{{ url_for('design.update_ui_state') }}";
+        const scriptMetaUrl = "{{ url_for('design.update_script_meta') }}";
+        const scriptStepUrl = `{{ url_for('design.design_steps.get_step', uuid=0) }}`;
+        const scriptStepDupUrl = `{{ url_for('design.design_steps.duplicate_action', uuid=0) }}`;
+        const scriptDeleteUrl = "{{ url_for('design.clear_draft') }}";
+    </script>
+    <script src="{{ url_for('static', filename='js/sortable_design.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/action_handlers.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/script_metadata.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/ui_state.js') }}"></script>
 
 {% endblock %}

ivoryos/routes/execute/execute.py

@@ -8,13 +8,14 @@ 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.global_config import GlobalConfig
-from ivoryos.utils.form import create_action_button, format_name, create_form_from_pseudo, \
-    create_form_from_action, create_all_builtin_forms
+from ivoryos.utils.form import create_action_button
 
 from werkzeug.utils import secure_filename
 
-from ivoryos.socket_handlers import runner
+from ivoryos.socket_handlers import runner, retry, pause, abort_pending, abort_current
 
 execute = Blueprint('execute', __name__, template_folder='templates')
 
@@ -23,19 +24,19 @@ execute.register_blueprint(files)
 global_config = GlobalConfig()
 
 
-@execute.route("/campaign", methods=['GET', 'POST'])
+@execute.route("/executions/config", methods=['GET', 'POST'])
 @login_required
 def experiment_run():
     """
-    .. :quickref: Workflow Execution; Execute/iterate the workflow
+    .. :quickref: Workflow Execution Config; Execute/iterate the workflow
 
-    .. http:get:: /design/campaign
+    .. http:get:: /executions/config
 
-    Compile the workflow and load the experiment execution interface.
+    Load the experiment execution interface.
 
-    .. http:post:: /design/campaign
+    .. http:post:: /executions/config
 
-    Start workflow execution
+    Start workflow execution with experiment configuration.
 
     """
     deck = global_config.deck
@@ -45,7 +46,7 @@ def experiment_run():
     # script.sort_actions() # handled in update list
     off_line = current_app.config["OFF_LINE"]
     deck_list = utils.import_history(os.path.join(current_app.config["OUTPUT_FOLDER"], 'deck_history.txt'))
-
+    optimizers_schema = {k: v.get_schema() for k, v in global_config.optimizers.items()}
     design_buttons = {stype: create_action_button(script, stype) for stype in script.stypes}
     config_preview = []
     config_file_list = [i for i in os.listdir(current_app.config["CSV_FOLDER"]) if not i == ".gitkeep"]
@@ -149,13 +150,156 @@ def experiment_run():
                                return_list=return_list, config_list=config_list, config_file_list=config_file_list,
                                config_preview=config_preview, data_list=data_list, config_type_list=config_type_list,
                                no_deck_warning=no_deck_warning, dismiss=dismiss, design_buttons=design_buttons,
-                               history=deck_list, pause_status=runner.pause_status())
+                               history=deck_list, pause_status=runner.pause_status(), optimizer_schema=optimizers_schema)
+
+@execute.route("/executions/campaign", methods=["POST"])
+@login_required
+def run_bo():
+    """
+    .. :quickref: Workflow Execution; run Bayesian Optimization
+    Run Bayesian Optimization with the given parameters and objectives.
+
+    .. http:post:: /executions/campaign
+
+    :form repeat: number of iterations to run
+    :form optimizer_type: type of optimizer to use
+    :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)
+    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,
+                          logger=g.logger, socketio=g.socketio, repeat_count=repeat,
+                          output_path=datapath, compiled=False, history=existing_data,
+                          current_app=current_app._get_current_object()
+                          )
+
+    except Exception as e:
+        if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+            return jsonify({"error": e.__str__()})
+        else:
+            flash(e.__str__())
+    return redirect(url_for("execute.experiment_run"))
+
+
+
+@execute.route("/executions/status", methods=["GET"])
+def runner_status():
+    """
+    .. :quickref: Workflow Execution Control; backend runner status
+
+    get is system is busy and current task
+
+    .. http:get:: /executions/status
+
+
+    """
+    # runner = global_config.runner
+    runner_busy = global_config.runner_lock.locked()
+    status = {"busy": runner_busy}
+    task_status = global_config.runner_status
+    current_step = {}
+
+    if task_status is not None:
+        task_type = task_status["type"]
+        task_id = task_status["id"]
+        if task_type == "task":
+            # todo
+            step = SingleStep.query.get(task_id)
+            current_step = step.as_dict()
+        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(
+                    WorkflowStep.start_time.desc()).first()
+                if latest_step is not None:
+                    current_step = latest_step.as_dict()
+                status["workflow_status"] = {"workflow_info": workflow.as_dict(), "runner_status": runner.get_status()}
+    status["current_task"] = current_step
+    return jsonify(status), 200
+
+
+@execute.route("/executions/abort/next-iteration", methods=["POST"])
+def api_abort_pending():
+    """
+    .. :quickref: Workflow Execution control; abort pending workflow
 
+    finish the current iteration and stop pending workflow iterations
 
-@execute.route('/data_preview/<filename>')
+    .. http:get:: /executions/abort/next-iteration
+
+    """
+    abort_pending()
+    return jsonify({"status": "ok"}), 200
+
+
+@execute.route("/executions/abort/next-task", methods=["POST"])
+def api_abort_current():
+    """
+    .. :quickref: Workflow Execution Control; abort all pending tasks starting from the next task
+
+    finish the current task and stop all pending tasks or iterations
+
+    .. http:get:: /executions/abort/next-task
+
+    """
+    abort_current()
+    return jsonify({"status": "ok"}), 200
+
+
+@execute.route("/executions/pause-resume", methods=["POST"])
+def api_pause():
+    """
+    .. :quickref: Workflow Execution Control; pause and resume
+
+    pause workflow iterations or resume workflow iterations
+
+    .. http:get:: /executions/pause-resume
+
+    """
+    msg = pause()
+    return jsonify({"status": "ok", "pause_status": msg}), 200
+
+
+@execute.route("/executions/retry", methods=["POST"])
+def api_retry():
+    """
+    .. :quickref: Workflow Execution Control; retry the failed workflow execution step.
+
+    retry the failed workflow execution step.
+
+    .. http:get:: /executions/retry
+
+    """
+    retry()
+    return jsonify({"status": "ok, retrying failed step"}), 200
+
+
+@execute.route('/files/preview/<string:filename>')
 @login_required
 def data_preview(filename):
-    """Serve a preview of the selected data file (CSV) as JSON."""
+    """
+    .. :quickref: Workflow Execution Files; preview a workflow history file (.CSV)
+
+    Preview the contents of a workflow history file in CSV format.
+
+    .. http:get:: /files/preview/<str:filename>
+    """
     import csv
     import os
     from flask import abort

ivoryos/routes/execute/execute_file.py

@@ -8,10 +8,37 @@ from ivoryos.utils import utils
 files = Blueprint('execute_files', __name__)
 
 
+@files.route('/files/execution-configs')
+def download_empty_config():
+    """
+    .. :quickref: Workflow Files; download an empty workflow config file (.CSV)
 
-@files.route('/upload/config', methods=['POST'])
+    .. http:get:: /files/execution-configs
+
+    :form file: workflow design CSV file
+    :status 302: load pseudo deck and then redirects to :http:get:`/ivoryos/executions/config`
+    """
+    script = utils.get_script_file()
+    run_name = script.name if script.name else "untitled"
+
+    filepath = os.path.join(current_app.config['SCRIPT_FOLDER'], f"{run_name}_config.csv")
+    with open(filepath, 'w', newline='') as f:
+        writer = csv.writer(f)
+        cfg, cfg_types = script.config("script")
+        writer.writerow(cfg)
+        writer.writerow(list(cfg_types.values()))
+    return send_file(os.path.abspath(filepath), as_attachment=True)
+
+@files.route('/files/batch-configs', methods=['POST'])
 def upload():
-    """Upload a workflow config file (.CSV)"""
+    """
+    .. :quickref: Workflow Files; upload a workflow config file (.CSV)
+
+    .. http:post:: /files/execution-configs
+
+    :form file: workflow CSV config file
+    :status 302: save csv file and then redirects to :http:get:`/ivoryos/executions/config`
+    """
     if request.method == "POST":
         f = request.files['file']
         if 'file' not in request.files:
@@ -26,9 +53,16 @@ def upload():
             return redirect(url_for("execute.experiment_run"))
 
 
-@files.route('/upload/history', methods=['POST'])
+@files.route('/files/execution-data', methods=['POST'])
 def upload_history():
-    """Upload a workflow history file (.CSV)"""
+    """
+    .. :quickref: Workflow Files; upload a workflow history file (.CSV)
+
+    .. http:post:: /files/execution-data
+
+    :form file: workflow history CSV file
+    :status 302: save csv file and then redirects to :http:get:`/ivoryos/executions/config`
+    """
     if request.method == "POST":
         f = request.files['historyfile']
         if 'historyfile' not in request.files: