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

ivoryos/routes/library/library.py

@@ -8,114 +8,88 @@ library = Blueprint('library', __name__, template_folder='templates')
 
 
 
-@library.route("/edit/<script_name>")
+@library.route("/<string:script_name>", methods=["GET", "POST", "DELETE"])
 @login_required
-def edit_workflow(script_name:str):
+def workflow_script(script_name:str):
+    # todo: split this into two routes, one for GET and POST, another for DELETE
     """
-    .. :quickref: Database; load workflow script to canvas
+    .. :quickref: Workflow Script Database; get, post, delete workflow script
 
-    load the selected workflow to the design canvas
-
-    .. http:get:: /database/scripts/edit/<script_name>
+    .. http:get:: /<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)
-    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'))
 
+    .. http:post:: /<string:script_name>
 
-@library.route("/delete/<script_name>")
-@login_required
-def delete_workflow(script_name: str):
-    """
-    .. :quickref: Database; delete workflow
-
-    delete workflow from database
+    :param script_name: script name
+    :type script_name: str
+    :status 200: json response with success status
 
-    .. http:get:: /database/scripts/delete/<script_name>
+    .. http:delete:: /<string:script_name>
 
-    :param script_name: workflow name
+    :param script_name: script name
     :type script_name: str
-    :status 302: redirect to :http:get:`/ivoryos/database/scripts/`
+    :status 302: redirect to :http:get:`/ivoryos/design/script/`
 
     """
-    Script.query.filter(Script.name == script_name).delete()
-    db.session.commit()
-    return redirect(url_for('database.load_from_database'))
+    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
 
 
-@library.route("/save")
-@login_required
 def publish():
-    """
-    .. :quickref: Database; save workflow to database
-
-    save workflow to database
-
-    .. http:get:: /database/scripts/save
-
-    :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
-    """
     script = get_script_file()
+
+    if script.author is None:
+        script.author = session.get('user')
     if not script.name or not script.deck:
-        flash("Deck cannot be empty, try to re-submit deck configuration on the left panel")
+        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":
-        flash("This is a protected script, use save as to rename.")
-    elif row and not session['user'] == row.author:
-        flash("You are not the author, use save as to rename.")
-    else:
-        db.session.merge(script)
-        db.session.commit()
-        flash("Saved!")
-    return redirect(url_for('design.experiment_builder'))
-
-
-@library.route("/finalize")
-@login_required
-def finalize():
-    """
-    .. :quickref: Database; finalize the workflow
+        return {"success": False, "error": "This is a protected script, use save as to rename."}
 
-    [protected workflow] prevent saving edited workflow to the same workflow name
-
-    .. http:get:: /finalize
-
-    :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
-
-    """
-    script = get_script_file()
-    script.finalize()
-    if script.name:
+    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()
-    post_script_file(script)
-    return redirect(url_for('design.experiment_builder'))
+        return {"success": True, "message": "Script published successfully"}
 
 
-@library.route("/get/", strict_slashes=False)
-@library.route("/get/<deck_name>")
+@library.get("/", strict_slashes=False)
 @login_required
-def load_from_database(deck_name=None):
+def load_from_database():
     """
-    .. :quickref: Database; database page
+    .. :quickref: Script Database; database page
 
     backend control through http requests
 
-    .. http:get:: /database/scripts/<deck_name>
+    .. http:get:: /designs/get/<deck_name>
 
     :param deck_name: filter for deck name
     :type deck_name: str
@@ -124,6 +98,7 @@ def load_from_database(deck_name=None):
     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:
@@ -147,58 +122,38 @@ def load_from_database(deck_name=None):
         return render_template("library.html", scripts=scripts, deck_list=deck_list, deck_name=deck_name)
 
 
-@library.route("/rename", methods=['POST'])
-@login_required
-def edit_run_name():
-    """
-    .. :quickref: Database; edit workflow name
-
-    edit the name of the current workflow, won't save to the database
-
-    .. http:post:: database/scripts/rename
-
-    : form run_name: new workflow name
-    :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
-
-    """
-    if request.method == "POST":
-        run_name = request.form.get("run_name")
-        exist_script = Script.query.get(run_name)
-        if not exist_script:
-            script = get_script_file()
-            script.save_as(run_name)
-            post_script_file(script)
-        else:
-            flash("Script name is already exist in database")
-        return redirect(url_for("design.experiment_builder"))
 
 
-@library.route("/save_as", methods=['POST'])
+@library.post("/", strict_slashes=False)
 @login_required
 def save_as():
     """
-    .. :quickref: Database; save the run name as
+    .. :quickref: Script Database; save the script as
 
     save the current workflow script as
 
-    .. http:post:: /database/scripts/save_as
+    .. http:post:: /library/save_as
 
     : form run_name: new workflow name
-    :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
+    :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")
-        exist_script = Script.query.get(run_name)
-        if not exist_script:
-            script = get_script_file()
-            script.save_as(run_name)
-            script.registered = register_workflow == "on"
-            script.author = session.get('user')
-            post_script_file(script)
-            publish()
+        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:
-            flash("Script name is already exist in database")
-        return redirect(url_for("design.experiment_builder"))
+            if status["success"]:
+                flash("Script saved successfully")
+            else:
+                flash(status["error"], "error")
+            return redirect(url_for('design.experiment_builder'))
 

ivoryos/routes/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('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 %}
+    <!-- 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('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...">
-                </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('library.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('library.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 %}
@@ -79,5 +87,5 @@
             <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/static/js/action_handlers.js

@@ -0,0 +1,213 @@
+
+
+
+
+function saveWorkflow(link) {
+    const url = link.dataset.postUrl;
+
+    fetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.success) {
+            // flash a success message
+            flash("Workflow saved successfully", "success");
+            window.location.reload();  // or update the UI dynamically
+        } else {
+            alert("Failed to save workflow: " + data.error);
+        }
+    })
+    .catch(err => {
+        console.error("Save error:", err);
+        alert("Something went wrong.");
+    });
+}
+
+
+function updateInstrumentPanel(link) {
+    const url = link.dataset.getUrl;
+    fetch(url)
+    .then(res => res.json())
+    .then(data => {
+        if (data.html) {
+            document.getElementById("sidebar-wrapper").innerHTML = data.html;
+            initializeDragHandlers()
+        }
+    })
+}
+
+function addMethodToDesign(event, form) {
+    event.preventDefault(); // Prevent default form submission
+
+    const formData = new FormData(form);
+
+    fetch(form.action, {
+        method: 'POST',
+        body: formData
+    })
+    .then(response => response.json())
+    .then(data => {
+        if (data.success) {
+            updateActionCanvas(data.html);
+            hideModal();
+        } else {
+            alert("Failed to add method: " + data.error);
+        }
+    })
+    .catch(error => console.error('Error:', error));
+}
+
+
+function updateActionCanvas(html) {
+    document.getElementById("canvas-action-wrapper").innerHTML = html;
+    initializeCanvas(); // Reinitialize canvas functionality
+    document.querySelectorAll('#pythonCodeOverlay pre code').forEach((block) => {
+        hljs.highlightElement(block);
+    });
+}
+
+
+let lastFocusedElement = null;
+
+
+function hideModal() {
+    if (document.activeElement) {
+        document.activeElement.blur();
+    }
+    $('#dropModal').modal('hide');
+    if (lastFocusedElement) {
+        lastFocusedElement.focus();  // Return focus to the triggering element
+    }
+}
+
+function submitEditForm(event) {
+    event.preventDefault();
+    const form = event.target;
+    const formData = new FormData(form);
+
+    fetch(form.action, {
+        method: 'POST',
+        body: formData
+    })
+    .then(response => response.text())
+    .then(html => {
+        if (html) {
+            // Update only the action list
+            updateActionCanvas(html);
+
+            if (previousHtmlState) {
+                document.getElementById('instrument-panel').innerHTML = previousHtmlState;
+                previousHtmlState = null;  // Clear the stored state
+            }
+        }
+    })
+    .catch(error => {
+        console.error('Error:', error);
+    });
+}
+
+function clearDraft() {
+    fetch(scriptDeleteUrl, {
+        method: "DELETE",
+        headers: {
+            "Content-Type": "application/json",
+        },
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.success) {
+            window.location.reload();
+        } else {
+            alert("Failed to clear draft");
+        }
+    })
+    .catch(error => console.error("Failed to clear draft", error));
+}
+
+
+
+
+let previousHtmlState = null;  // Store the previous state
+
+function duplicateAction(uuid) {
+    if (!uuid) {
+        console.error('Invalid UUID');
+        return;
+    }
+
+    fetch(scriptStepDupUrl.replace('0', uuid), {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+
+    .then(response => response.text())
+    .then(html => {
+        updateActionCanvas(html);
+    })
+    .catch(error => console.error('Error:', error));
+}
+
+function editAction(uuid) {
+    if (!uuid) {
+        console.error('Invalid UUID');
+        return;
+    }
+
+    // Save current state before fetching new content
+    previousHtmlState = document.getElementById('instrument-panel').innerHTML;
+
+    fetch(scriptStepUrl.replace('0', uuid), {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+    .then(response => response.text())
+    .then(html => {
+        document.getElementById('instrument-panel').innerHTML = html;
+
+        // Add click handler for back button
+        document.getElementById('back').addEventListener('click', function(e) {
+            e.preventDefault();
+            if (previousHtmlState) {
+                document.getElementById('instrument-panel').innerHTML = previousHtmlState;
+                previousHtmlState = null;  // Clear the stored state
+            }
+        });
+    })
+    .catch(error => console.error('Error:', error));
+}
+
+
+
+function deleteAction(uuid) {
+    if (!uuid) {
+        console.error('Invalid UUID');
+        return;
+    }
+
+    fetch(scriptStepUrl.replace('0', uuid), {
+        method: 'DELETE',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+    .then(response => response.text())
+    .then(html => {
+        // Find the first list element's content and replace it
+        updateActionCanvas(html);
+    })
+    .catch(error => console.error('Error:', error));
+}
+
+
+
+
+
+

ivoryos/static/js/db_delete.js

@@ -0,0 +1,23 @@
+
+function deleteWorkflow(link) {
+    const url = link.dataset.deleteUrl;
+
+    fetch(url, {
+        method: 'DELETE',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.success) {
+            window.location.reload();  // or remove the row dynamically
+        } else {
+            alert("Failed to delete workflow: " + data.error);
+        }
+    })
+    .catch(err => {
+        console.error("Delete error:", err);
+        alert("Something went wrong.");
+    });
+}

ivoryos/static/js/script_metadata.js

@@ -0,0 +1,39 @@
+function editScriptName(event) {
+    event.preventDefault();  // Prevent full form submission
+    const newName = document.getElementById("new-name").value;
+    fetch(scriptMetaUrl, {
+        method: "PATCH",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({name: newName})
+    })
+        .then(res => res.json())
+        .then(data => {
+            if (data.success) {
+                window.location.reload();  // or update the title on page directly
+            } else {
+                alert("Failed to rename script");
+            }
+        })
+        .catch(error => console.error("Failed to rename script", error));
+}
+
+function lockScriptEditing() {
+    fetch(scriptMetaUrl, {
+        method: "PATCH",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ status: "finalized" })
+    })
+    .then(res => res.json())
+    .then(data => {
+        if (data.success) {
+            window.location.reload();
+        } else {
+            alert("Failed to update script status");
+        }
+    })
+    .catch(error => console.error("Failed to update script status", error));
+}