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

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

@@ -0,0 +1,14 @@
+{# Repeat tab component #}
+<div class="tab-pane fade {{ 'show active' if not config_list else '' }}" id="tab1" role="tabpanel" aria-labelledby="tab1-tab">
+    <p><h5>Control panel:</h5></p>
+    <form role="form" method='POST' name="run" action="{{url_for('execute.experiment_run')}}">
+        <div class="input-group mb-3">
+            <label class="input-group-text" for="repeat">Repeat for </label>
+            <input class="form-control" type="number" id="repeat" name="repeat" min="1" max="1000" value="1">
+            <label class="input-group-text" for="repeat"> times</label>
+        </div>
+        <div class="input-group mb-3">
+            <button class="form-control" type="submit" class="btn btn-dark">Run</button>
+        </div>
+    </form>
+</div> 

ivoryos/routes/execute/templates/experiment_run.html

@@ -0,0 +1,294 @@
+{% extends 'base.html' %}
+{% block title %}IvoryOS | Design execution{% endblock %}
+
+{% block body %}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.4.1/socket.io.js"></script>
+
+    {% if no_deck_warning and not dismiss %}
+        {# auto pop import when there is no deck#}
+        <script type="text/javascript">
+            function OpenBootstrapPopup() {
+                $("#importModal").modal('show');
+            }
+            window.onload = function () {
+                OpenBootstrapPopup();
+            };
+        </script>
+    {% endif %}
+
+    <div class="row">
+        {% include 'components/run_panel.html' %}
+        {% include 'components/progress_panel.html' %}
+        {% include 'components/logging_panel.html' %}
+    </div>
+
+    {# Include error modal #}
+    {% include 'components/error_modal.html' %}
+
+    <script src="{{ url_for('static', filename='js/socket_handler.js') }}"></script>
+    <script>
+        var rowCount = 0;
+        var configColumns = [
+            {% for column in config_list %}
+                '{{ column }}'{{ ',' if not loop.last else '' }}
+            {% endfor %}
+        ];
+        var configTypes = {
+            {% for column, type in config_type_list.items() %}
+                '{{ column }}': '{{ type }}'{{ ',' if not loop.last else '' }}
+            {% endfor %}
+        };
+
+        // State management
+        var originalFileData = null;
+        var isModifiedFromFile = false;
+        var saveTimeout = null;
+        var lastSavedData = null;
+
+        function addRow(data = null, skipSave = false) {
+            rowCount++;
+            var tableBody = document.getElementById("tableBody");
+            var newRow = tableBody.insertRow(-1);
+
+            // Row number cell
+            var rowNumCell = newRow.insertCell(-1);
+            rowNumCell.innerHTML = '<span class="badge bg-secondary">' + rowCount + '</span>';
+
+            // Data cells
+            configColumns.forEach(function(column, index) {
+                var cell = newRow.insertCell(-1);
+                var value = data && data[column] ? data[column] : '';
+                var placeholder = configTypes[column] || 'value';
+                cell.innerHTML = '<input type="text" class="form-control form-control-sm" name="' +
+                    column + '[' + rowCount + ']" value="' + value + '" placeholder="' + placeholder +
+                    '" oninput="onInputChange()" onchange="onInputChange()">';
+            });
+
+            // Action cell
+            var actionCell = newRow.insertCell(-1);
+            actionCell.innerHTML = '<button type="button" class="btn btn-sm btn-outline-danger" onclick="removeRow(this)" title="Remove row">' +
+                '<i class="bi bi-trash"></i></button>';
+
+            if (!skipSave) {
+                markAsModified();
+                debouncedSave();
+            }
+        }
+
+        function removeRow(button) {
+            var row = button.closest('tr');
+            row.remove();
+            updateRowNumbers();
+            markAsModified();
+            debouncedSave();
+        }
+
+        function updateRowNumbers() {
+            var tableBody = document.getElementById("tableBody");
+            var rows = tableBody.getElementsByTagName('tr');
+            for (var i = 0; i < rows.length; i++) {
+                var badge = rows[i].querySelector('.badge');
+                if (badge) {
+                    badge.textContent = i + 1;
+                }
+            }
+        }
+
+        function clearAllRows() {
+            if (confirm('Are you sure you want to clear all rows?')) {
+                var tableBody = document.getElementById("tableBody");
+                tableBody.innerHTML = '';
+                rowCount = 0;
+                markAsModified();
+                clearSavedData();
+                // Add 5 empty rows by default
+                for (let i = 0; i < 5; i++) {
+                    addRow(null, true);
+                }
+                debouncedSave();
+            }
+        }
+
+        function resetToFile() {
+            if (originalFileData && confirm('Reset to original file data? This will lose all manual changes.')) {
+                loadDataFromSource(originalFileData, false);
+                isModifiedFromFile = false;
+                updateStatusIndicators();
+                debouncedSave();
+            }
+        }
+
+        function onInputChange() {
+            markAsModified();
+            debouncedSave();
+        }
+
+        function markAsModified() {
+            if (originalFileData) {
+                isModifiedFromFile = true;
+                updateStatusIndicators();
+            }
+        }
+
+        function updateStatusIndicators() {
+            var modifiedStatus = document.getElementById('modifiedStatus');
+            var resetBtn = document.getElementById('resetToFileBtn');
+
+            if (isModifiedFromFile && originalFileData) {
+                modifiedStatus.style.display = 'inline-block';
+                resetBtn.style.display = 'inline-block';
+            } else {
+                modifiedStatus.style.display = 'none';
+                resetBtn.style.display = 'none';
+            }
+        }
+
+        function showSaveStatus() {
+            var saveStatus = document.getElementById('saveStatus');
+            saveStatus.style.display = 'inline-block';
+            setTimeout(function() {
+                saveStatus.style.display = 'none';
+            }, 2000);
+        }
+
+        function debouncedSave() {
+            clearTimeout(saveTimeout);
+            saveTimeout = setTimeout(function() {
+                saveFormData();
+                showSaveStatus();
+            }, 1000); // Save 1 second after user stops typing
+        }
+
+        function saveFormData() {
+            var formData = getCurrentFormData();
+            try {
+                sessionStorage.setItem('configFormData', JSON.stringify(formData));
+                sessionStorage.setItem('configModified', isModifiedFromFile.toString());
+                lastSavedData = formData;
+            } catch (e) {
+                console.warn('Could not save form data to sessionStorage:', e);
+            }
+        }
+
+        function getCurrentFormData() {
+            var tableBody = document.getElementById("tableBody");
+            var rows = tableBody.getElementsByTagName('tr');
+            var data = [];
+
+            for (var i = 0; i < rows.length; i++) {
+                var inputs = rows[i].getElementsByTagName('input');
+                var rowData = {};
+                var hasData = false;
+
+                for (var j = 0; j < inputs.length; j++) {
+                    var input = inputs[j];
+                    var name = input.name;
+                    if (name) {
+                        var columnName = name.substring(0, name.indexOf('['));
+                        rowData[columnName] = input.value;
+                        if (input.value.trim() !== '') {
+                            hasData = true;
+                        }
+                    }
+                }
+
+                if (hasData) {
+                    data.push(rowData);
+                }
+            }
+
+            return data;
+        }
+
+        function loadSavedData() {
+            try {
+                var savedData = sessionStorage.getItem('configFormData');
+                var savedModified = sessionStorage.getItem('configModified');
+
+                if (savedData) {
+                    var parsedData = JSON.parse(savedData);
+                    isModifiedFromFile = savedModified === 'true';
+                    return parsedData;
+                }
+            } catch (e) {
+                console.warn('Could not load saved form data:', e);
+            }
+            return null;
+        }
+
+        function clearSavedData() {
+            try {
+                sessionStorage.removeItem('configFormData');
+                sessionStorage.removeItem('configModified');
+            } catch (e) {
+                console.warn('Could not clear saved data:', e);
+            }
+        }
+
+        function loadDataFromSource(data, isFromFile = false) {
+            // Clear existing rows
+            var tableBody = document.getElementById("tableBody");
+            tableBody.innerHTML = '';
+            rowCount = 0;
+
+            // Add rows with data
+            data.forEach(function(rowData) {
+                addRow(rowData, true);
+            });
+
+            // Add a few empty rows for additional input
+            for (let i = 0; i < 3; i++) {
+                addRow(null, true);
+            }
+
+            if (isFromFile) {
+                originalFileData = JSON.parse(JSON.stringify(data)); // Deep copy
+                isModifiedFromFile = false;
+                clearSavedData(); // Clear saved data when loading from file
+            }
+
+            updateStatusIndicators();
+        }
+
+        function loadConfigData() {
+            // Check for saved form data first
+            var savedData = loadSavedData();
+
+            {% if config_preview %}
+                var fileData = {{ config_preview | tojson | safe }};
+                originalFileData = JSON.parse(JSON.stringify(fileData)); // Deep copy
+
+                if (savedData && savedData.length > 0) {
+                    // Load saved data if available
+                    loadDataFromSource(savedData, false);
+                    console.log('Loaded saved form data');
+                } else {
+                    // Load from file
+                    loadDataFromSource(fileData, true);
+                    console.log('Loaded file data');
+                }
+            {% else %}
+                if (savedData && savedData.length > 0) {
+                    // Load saved data
+                    loadDataFromSource(savedData, false);
+                    console.log('Loaded saved form data');
+                } else {
+                    // Add default empty rows
+                    for (let i = 0; i < 5; i++) {
+                        addRow(null, true);
+                    }
+                }
+            {% endif %}
+        }
+
+        // Handle page unload
+        window.addEventListener('beforeunload', function() {
+            saveFormData();
+        });
+
+        // Initialize table when page loads
+        document.addEventListener("DOMContentLoaded", function() {
+            loadConfigData();
+        });
+    </script>
+{% endblock %}

ivoryos/routes/{database/database.py → library/library.py}

@@ -4,11 +4,11 @@ from flask_login import login_required
 from ivoryos.utils.db_models import Script, db, WorkflowRun, WorkflowStep
 from ivoryos.utils.utils import get_script_file, post_script_file
 
-database = Blueprint('database', __name__, template_folder='templates/database')
+library = Blueprint('library', __name__, template_folder='templates')
 
 
 
-@database.route("/database/scripts/edit/<script_name>")
+@library.route("/edit/<script_name>")
 @login_required
 def edit_workflow(script_name:str):
     """
@@ -37,7 +37,7 @@ def edit_workflow(script_name:str):
     return redirect(url_for('design.experiment_builder'))
 
 
-@database.route("/database/scripts/delete/<script_name>")
+@library.route("/delete/<script_name>")
 @login_required
 def delete_workflow(script_name: str):
     """
@@ -57,7 +57,7 @@ def delete_workflow(script_name: str):
     return redirect(url_for('database.load_from_database'))
 
 
-@database.route("/database/scripts/save")
+@library.route("/save")
 @login_required
 def publish():
     """
@@ -84,7 +84,7 @@ def publish():
     return redirect(url_for('design.experiment_builder'))
 
 
-@database.route("/database/scripts/finalize")
+@library.route("/finalize")
 @login_required
 def finalize():
     """
@@ -106,8 +106,8 @@ def finalize():
     return redirect(url_for('design.experiment_builder'))
 
 
-@database.route("/database/scripts/", strict_slashes=False)
-@database.route("/database/scripts/<deck_name>")
+@library.route("/get/", strict_slashes=False)
+@library.route("/get/<deck_name>")
 @login_required
 def load_from_database(deck_name=None):
     """
@@ -144,10 +144,10 @@ def load_from_database(deck_name=None):
         })
     else:
         # return HTML
-        return render_template("scripts_database.html", scripts=scripts, deck_list=deck_list, deck_name=deck_name)
+        return render_template("library.html", scripts=scripts, deck_list=deck_list, deck_name=deck_name)
 
 
-@database.route("/database/scripts/rename", methods=['POST'])
+@library.route("/rename", methods=['POST'])
 @login_required
 def edit_run_name():
     """
@@ -173,7 +173,7 @@ def edit_run_name():
         return redirect(url_for("design.experiment_builder"))
 
 
-@database.route("/database/scripts/save_as", methods=['POST'])
+@library.route("/save_as", methods=['POST'])
 @login_required
 def save_as():
     """
@@ -202,105 +202,3 @@ def save_as():
             flash("Script name is already exist in database")
         return redirect(url_for("design.experiment_builder"))
 
-
-# -----------------------------------------------------------
-# ------------------  Workflow logs   -----------------------
-# -----------------------------------------------------------
-@database.route('/database/workflows/')
-def list_workflows():
-    """
-    .. :quickref: Database; list all workflow logs
-
-    list all workflow logs
-
-    .. http:get:: /database/workflows/
-
-    """
-    query = WorkflowRun.query.order_by(WorkflowRun.id.desc())
-    search_term = request.args.get("keyword", None)
-    if search_term:
-        query = query.filter(WorkflowRun.name.like(f'%{search_term}%'))
-    page = request.args.get('page', default=1, type=int)
-    per_page = 10
-
-    workflows = query.paginate(page=page, per_page=per_page, error_out=False)
-    if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
-        workflows = query.all()
-        workflow_data = {w.id:{"workflow_name":w.name, "start_time":w.start_time} for w in workflows}
-        return jsonify({
-            "workflow_data": workflow_data,
-        })
-    else:
-        return render_template('workflow_database.html', workflows=workflows)
-
-
-@database.route("/database/workflows/<int:workflow_id>")
-def get_workflow_steps(workflow_id:int):
-    """
-    .. :quickref: Database; list all workflow logs
-
-    list all workflow logs
-
-    .. http:get:: /database/workflows/<int:workflow_id>
-
-    """
-    workflow = db.session.get(WorkflowRun, workflow_id)
-    steps = WorkflowStep.query.filter_by(workflow_id=workflow_id).order_by(WorkflowStep.start_time).all()
-
-    # Use full objects for template rendering
-    grouped = {
-        "prep": [],
-        "script": {},
-        "cleanup": [],
-    }
-
-    # Use dicts for JSON response
-    grouped_json = {
-        "prep": [],
-        "script": {},
-        "cleanup": [],
-    }
-
-    for step in steps:
-        step_dict = step.as_dict()
-
-        if step.phase == "prep":
-            grouped["prep"].append(step)
-            grouped_json["prep"].append(step_dict)
-
-        elif step.phase == "script":
-            grouped["script"].setdefault(step.repeat_index, []).append(step)
-            grouped_json["script"].setdefault(step.repeat_index, []).append(step_dict)
-
-        elif step.phase == "cleanup" or step.method_name == "stop":
-            grouped["cleanup"].append(step)
-            grouped_json["cleanup"].append(step_dict)
-
-    if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
-        return jsonify({
-            "workflow_info": workflow.as_dict(),
-            "steps": grouped_json,
-        })
-    else:
-        return render_template("workflow_view.html", workflow=workflow, grouped=grouped)
-
-
-@database.route("/database/workflows/delete/<int:workflow_id>")
-@login_required
-def delete_workflow_data(workflow_id: int):
-    """
-    .. :quickref: Database; delete experiment data from database
-
-    delete workflow data from database
-
-    .. http:get:: /database/workflows/delete/<int:workflow_id>
-
-    :param workflow_id: workflow id
-    :type workflow_id: int
-    :status 302: redirect to :http:get:`/ivoryos/database/workflows/`
-
-    """
-    run = WorkflowRun.query.get(workflow_id)
-    db.session.delete(run)
-    db.session.commit()
-    return redirect(url_for('database.list_workflows'))

ivoryos/routes/{database/templates/database/scripts_database.html → library/templates/library.html}

@@ -4,12 +4,12 @@
 {% block body %}
     <div class="database-filter">
         {% for deck_name in deck_list %}
-            {% if deck_name == "ALL" %}<a class="btn btn-secondary" href="{{url_for('database.load_from_database')}}">Back</a>
-            {% else %}<a class="btn btn-secondary" href="{{url_for('database.load_from_database',deck_name=deck_name)}}">{{deck_name}}</a>
+            {% if deck_name == "ALL" %}<a class="btn btn-secondary" href="{{url_for('library.load_from_database')}}">Back</a>
+            {% else %}<a class="btn btn-secondary" href="{{url_for('library.load_from_database',deck_name=deck_name)}}">{{deck_name}}</a>
             {% endif %}
         {% endfor %}
 
-        <form id="search" style="display: inline-block;float: right;" action="{{url_for('database.load_from_database',deck_name=deck_name)}}" method="GET">
+        <form id="search" style="display: inline-block;float: right;" action="{{url_for('library.load_from_database',deck_name=deck_name)}}" method="GET">
             <div class="input-group">
                 <div class="form-outline">
                     <input type="search" name="keyword" id="keyword" class="form-control" placeholder="Search workflows...">
@@ -37,7 +37,7 @@
         <tbody>
             {% for script in scripts %}
                 <tr>
-                    <td><a href="{{ url_for('database.edit_workflow', script_name=script.name) }}">{{ script.name }}</a></td>
+                    <td><a href="{{ url_for('library.edit_workflow', script_name=script.name) }}">{{ script.name }}</a></td>
                     <td>{{ script.deck }}</td>
                     <td>{{ script.status }}</td>
                     <td>{{ script.time_created }}</td>
@@ -47,7 +47,7 @@
                     <td>
                         {#not workflow.status == "finalized" or#}
                         {% if session['user'] == 'admin' or session['user'] == script.author %}
-                            <a href="{{ url_for('database.delete_workflow', script_name=script.name) }}">delete</a>
+                            <a href="{{ url_for('library.delete_workflow', script_name=script.name) }}">delete</a>
                         {% else %}
                             <a class="disabled-link">delete</a>
                         {% endif %}
@@ -60,13 +60,13 @@
     {#    paging#}
     <div class="pagination justify-content-center">
         <div class="page-item {{ 'disabled' if not scripts.has_prev else '' }}">
-            <a class="page-link" href="{{ url_for('database.load_from_database', page=scripts.prev_num) }}">Previous</a>
+            <a class="page-link" href="{{ url_for('library.load_from_database', page=scripts.prev_num) }}">Previous</a>
         </div>
 
         {% for num in scripts.iter_pages() %}
             {% if num %}
                 <div class="page-item {{ 'active' if num == scripts.page else '' }}">
-                    <a class="page-link" href="{{ url_for('database.load_from_database', page=num) }}">{{ num }}</a>
+                    <a class="page-link" href="{{ url_for('library.load_from_database', page=num) }}">{{ num }}</a>
                 </div>
             {% else %}
                 <div class="page-item disabled">
@@ -76,7 +76,7 @@
         {% endfor %}
 
         <div class="page-item {{ 'disabled' if not scripts.has_next else '' }}">
-            <a class="page-link" href="{{ url_for('database.load_from_database', page=scripts.next_num) }}">Next</a>
+            <a class="page-link" href="{{ url_for('library.load_from_database', page=scripts.next_num) }}">Next</a>
         </div>
     </div>
 

ivoryos/routes/main/main.py

@@ -2,7 +2,7 @@ from flask import Blueprint, render_template, current_app
 from flask_login import login_required
 from ivoryos.version import __version__ as ivoryos_version
 
-main = Blueprint('main', __name__, template_folder='templates/main')
+main = Blueprint('main', __name__, template_folder='templates')
 
 @main.route("/")
 @login_required

ivoryos/routes/main/templates/{main/home.html → home.html}

@@ -19,7 +19,7 @@
                             <i class="bi bi-folder2-open me-2"></i>Browse designs
                         </h5>
                         <p class="card-text">View all saved workflows from the database.</p>
-                        <a href="{{ url_for('database.load_from_database') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('library.load_from_database') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>
@@ -48,7 +48,7 @@
                             <i class="bi bi-graph-up-arrow me-2"></i>Experiment data
                         </h5>
                         <p class="card-text">Browse workflow logs and output data.</p>
-                        <a href="{{ url_for('database.list_workflows') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('data.list_workflows') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>
@@ -62,7 +62,7 @@
                             <i class="bi bi-play-circle me-2"></i>Run current workflow
                         </h5>
                         <p class="card-text">Execute workflows with configurable parameters.</p>
-                        <a href="{{ url_for('design.experiment_run') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('execute.experiment_run') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>
@@ -93,7 +93,7 @@
                             <i class="bi bi-usb-plug me-2"></i>Connect a new device
                         </h5>
                         <p class="card-text">Add new hardware temporarily or for testing purposes.</p>
-                        <a href="{{ url_for('control.controllers_home') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('control.temp.new_controller') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>

ivoryos/socket_handlers.py

@@ -0,0 +1,52 @@
+import os
+from flask import current_app
+from flask_socketio import SocketIO
+from ivoryos.utils.script_runner import ScriptRunner
+
+socketio = SocketIO()
+runner = ScriptRunner()
+
+def abort_pending():
+    runner.abort_pending()
+    socketio.emit('log', {'message': "aborted pending iterations"})
+
+def abort_current():
+    runner.stop_execution()
+    socketio.emit('log', {'message': "stopped next task"})
+
+def pause():
+    runner.retry = False
+    msg = runner.toggle_pause()
+    socketio.emit('log', {'message': msg})
+    return msg
+
+def retry():
+    runner.retry = True
+    msg = runner.toggle_pause()
+    socketio.emit('log', {'message': msg})
+
+# Socket.IO Event Handlers
+@socketio.on('abort_pending')
+def handle_abort_pending():
+    abort_pending()
+
+@socketio.on('abort_current')
+def handle_abort_current():
+    abort_current()
+
+@socketio.on('pause')
+def handle_pause():
+    pause()
+
+@socketio.on('retry')
+def handle_retry():
+    retry()
+
+@socketio.on('connect')
+def handle_connect():
+    # Fetch log messages from local file
+    filename = os.path.join(current_app.config["OUTPUT_FOLDER"], current_app.config["LOGGERS_PATH"])
+    with open(filename, 'r') as log_file:
+        log_history = log_file.readlines()
+    for message in log_history[-10:]:
+        socketio.emit('log', {'message': message}) 

ivoryos/templates/base.html

@@ -38,16 +38,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 %}
 
@@ -116,7 +116,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">