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

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/library/library.py

@@ -0,0 +1,159 @@
+from flask import Blueprint, redirect, url_for, flash, request, render_template, session, current_app, jsonify
+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
+
+library = Blueprint('library', __name__, template_folder='templates')
+
+
+
+@library.route("/<string:script_name>", methods=["GET", "POST", "DELETE"])
+@login_required
+def workflow_script(script_name:str):
+    # todo: split this into two routes, one for GET and POST, another for DELETE
+    """
+    .. :quickref: Workflow Script Database; get, post, delete workflow script
+
+    .. http:get:: /<string:script_name>
+
+    :param script_name: script name
+    :type script_name: str
+    :status 302: redirect to :http:get:`/ivoryos/design/script/`
+
+    .. http:post:: /<string:script_name>
+
+    :param script_name: script name
+    :type script_name: str
+    :status 200: json response with success status
+
+    .. http:delete:: /<string:script_name>
+
+    :param script_name: script name
+    :type script_name: str
+    :status 302: redirect to :http:get:`/ivoryos/design/script/`
+
+    """
+    row = Script.query.get(script_name)
+    if request.method == "DELETE":
+        if not row:
+            return jsonify(success=False)
+        db.session.delete(row)
+        db.session.commit()
+        return jsonify(success=True)
+    if request.method == "GET":
+        if not row:
+            return jsonify(success=False)
+        script = Script(**row.as_dict())
+        post_script_file(script)
+        pseudo_name = session.get("pseudo_deck", "")
+        off_line = current_app.config["OFF_LINE"]
+        if off_line and pseudo_name and not script.deck == pseudo_name:
+            flash(f"Choose the deck with name {script.deck}")
+        if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+            return jsonify({
+                "script": script.as_dict(),
+                "python_script": script.compile(),
+            })
+        return redirect(url_for('design.experiment_builder'))
+    if request.method == "POST":
+        status = publish()
+        return jsonify(status)
+    return None
+
+
+def publish():
+    script = get_script_file()
+
+    if script.author is None:
+        script.author = session.get('user')
+    if not script.name or not script.deck:
+        return {"success": False, "error": "Deck cannot be empty, try to re-submit deck configuration on the left panel"}
+    row = Script.query.get(script.name)
+    if row and row.status == "finalized":
+        return {"success": False, "error": "This is a protected script, use save as to rename."}
+
+    elif row and session.get('user') != row.author:
+        return {"success": False, "error": "You are not the author, use save as to rename."}
+    else:
+        db.session.merge(script)
+        db.session.commit()
+        return {"success": True, "message": "Script published successfully"}
+
+
+@library.get("/", strict_slashes=False)
+@login_required
+def load_from_database():
+    """
+    .. :quickref: Script Database; database page
+
+    backend control through http requests
+
+    .. http:get:: /designs/get/<deck_name>
+
+    :param deck_name: filter for deck name
+    :type deck_name: str
+
+    """
+    session.pop('edit_action', None)  # reset cache
+    query = Script.query
+    search_term = request.args.get("keyword", None)
+    deck_name = request.args.get("deck", None)
+    if search_term:
+        query = query.filter(Script.name.like(f'%{search_term}%'))
+    if deck_name is None:
+        temp = Script.query.with_entities(Script.deck).distinct().all()
+        deck_list = [i[0] for i in temp]
+    else:
+        query = query.filter(Script.deck == deck_name)
+        deck_list = ["ALL"]
+    page = request.args.get('page', default=1, type=int)
+    per_page = 10
+
+    scripts = query.paginate(page=page, per_page=per_page, error_out=False)
+    if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+        scripts = query.all()
+        script_names = [script.name for script in scripts]
+        return jsonify({
+            "workflows": script_names,
+        })
+    else:
+        # return HTML
+        return render_template("library.html", scripts=scripts, deck_list=deck_list, deck_name=deck_name)
+
+
+
+
+@library.post("/", strict_slashes=False)
+@login_required
+def save_as():
+    """
+    .. :quickref: Script Database; save the script as
+
+    save the current workflow script as
+
+    .. http:post:: /library/save_as
+
+    : form run_name: new workflow name
+    :status 302: redirect to :http:get:`/ivoryos/design/script/`
+
+    """
+    if request.method == "POST":
+        run_name = request.form.get("run_name")
+        ## TODO: check if run_name is valid
+        register_workflow = request.form.get("register_workflow")
+        script = get_script_file()
+        script.save_as(run_name)
+        script.registered = register_workflow == "on"
+        script.author = session.get('user')
+        post_script_file(script)
+        status = publish()
+        if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+            return jsonify(status)
+        else:
+            if status["success"]:
+                flash("Script saved successfully")
+            else:
+                flash(status["error"], "error")
+            return redirect(url_for('design.experiment_builder'))
+

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

@@ -2,25 +2,28 @@
 
 {% block title %}IvoryOS | Design Database{% endblock %}
 {% 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>
-            {% endif %}
+    <!-- Deck Filter Buttons -->
+    <div class="btn-group" role="group">
+        {% for deck in deck_list %}
+            <a class="btn {% if deck == current_deck_name %}btn-primary{% else %}btn-secondary{% endif %}"
+               href="{{ url_for('library.load_from_database', deck_name=deck) }}">
+                {{ deck }}
+            </a>
         {% endfor %}
-
-        <form id="search" style="display: inline-block;float: right;" action="{{url_for('database.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...">
-                </div>
-                <button type="submit" class="btn btn-primary">
-                    <i class="bi bi-search"></i>
-                </button>
-            </div>
-        </form>
     </div>
 
+    <!-- Search Form -->
+    <form id="search" class="d-flex " method="GET" style="display: inline-block;float: right;"
+          action="{{ url_for('library.load_from_database', deck_name=current_deck_name or 'ALL') }}">
+        <div class="input-group">
+            <input type="search" name="keyword" id="keyword" class="form-control"
+                   placeholder="Search workflows..." value="{{ request.args.get('keyword', '') }}">
+            <button type="submit" class="btn btn-primary">
+                <i class="bi bi-search"></i>
+            </button>
+        </div>
+    </form>
+
     <table class="table table-hover" id="workflowLibrary">
         <thead>
             <tr>
@@ -37,7 +40,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.workflow_script', script_name=script.name) }}">{{ script.name }}</a></td>
                     <td>{{ script.deck }}</td>
                     <td>{{ script.status }}</td>
                     <td>{{ script.time_created }}</td>
@@ -47,7 +50,12 @@
                     <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="#"
+                               class="text-danger"
+                               data-delete-url="{{ url_for('library.workflow_script', script_name=script.name) }}"
+                               onclick="deleteWorkflow(this); return false;">
+                               Delete
+                            </a>
                         {% else %}
                             <a class="disabled-link">delete</a>
                         {% endif %}
@@ -60,13 +68,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,8 +84,8 @@
         {% 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>
-
+    <script src="{{ url_for('static', filename='js/db_delete.js') }}"></script>
 {% endblock %}

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})