ivoryos 1.1.0__tar.gz → 1.2.0__tar.gz

{ivoryos-1.1.0/ivoryos.egg-info → ivoryos-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 1.1.0
+Version: 1.2.0
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/__init__.py

@@ -19,6 +19,7 @@ from ivoryos.routes.main.main import main
 from ivoryos.utils import utils
 from ivoryos.utils.db_models import db, User
 from ivoryos.utils.global_config import GlobalConfig
+from ivoryos.optimizer.registry import OPTIMIZER_REGISTRY
 from ivoryos.utils.script_runner import ScriptRunner
 from ivoryos.version import __version__ as ivoryos_version
 from importlib.metadata import entry_points
@@ -42,10 +43,10 @@ app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='sta
 app.register_blueprint(main, url_prefix=url_prefix)
 app.register_blueprint(auth, url_prefix=f'{url_prefix}/{auth.name}')
 app.register_blueprint(library, url_prefix=f'{url_prefix}/{library.name}')
-app.register_blueprint(control, url_prefix=f'{url_prefix}/{control.name}')
-app.register_blueprint(design, url_prefix=f'{url_prefix}/{design.name}')
-app.register_blueprint(execute, url_prefix=f'{url_prefix}/{execute.name}')
-app.register_blueprint(data, url_prefix=f'{url_prefix}/{data.name}')
+app.register_blueprint(control, url_prefix=f'{url_prefix}/instruments')
+app.register_blueprint(design, url_prefix=f'{url_prefix}')
+app.register_blueprint(execute, url_prefix=f'{url_prefix}')
+app.register_blueprint(data, url_prefix=f'{url_prefix}')
 app.register_blueprint(api, url_prefix=f'{url_prefix}/{api.name}')
 
 @login_manager.user_loader
@@ -94,6 +95,12 @@ def create_app(config_class=None):
     def redirect_to_prefix():
         return redirect(url_for('main.index', version=ivoryos_version))  # Assuming 'index' is a route in your blueprint
 
+    @app.template_filter('format_name')
+    def format_name(name):
+        name = name.split(".")[-1]
+        text = ' '.join(word for word in name.split('_'))
+        return text.capitalize()
+
     return app
 
 
@@ -144,7 +151,7 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
     app.config["LOGGERS_PATH"] = logger_output_name or app.config["LOGGERS_PATH"]  # default.log
     logger_path = os.path.join(app.config["OUTPUT_FOLDER"], app.config["LOGGERS_PATH"])
     dummy_deck_path = os.path.join(app.config["OUTPUT_FOLDER"], app.config["DUMMY_DECK"])
-
+    global_config.optimizers = OPTIMIZER_REGISTRY
     if module:
         app.config["MODULE"] = module
         app.config["OFF_LINE"] = False

ivoryos-1.2.0/ivoryos/routes/api/api.py

@@ -0,0 +1,56 @@
+import os
+from flask import Blueprint, jsonify, request, current_app
+
+from ivoryos.routes.control.control import find_instrument_by_name
+from ivoryos.utils.form import create_form_from_module
+from ivoryos.utils.global_config import GlobalConfig
+from ivoryos.utils.db_models import Script, WorkflowRun, SingleStep, WorkflowStep
+
+from ivoryos.socket_handlers import abort_pending, abort_current, pause, retry, runner
+from ivoryos.utils.task_runner import TaskRunner
+
+api = Blueprint('api', __name__)
+global_config = GlobalConfig()
+task_runner = TaskRunner()
+
+#TODO: add authentication and authorization to the API endpoints
+
+
+@api.route("/control/", strict_slashes=False, methods=['GET'])
+@api.route("/control/<string:instrument>", methods=['POST'])
+def backend_control(instrument: str=None):
+    """
+    .. :quickref: Backend Control; backend control
+
+    backend control through http requests
+
+    .. http:get:: /api/control/
+
+    :param instrument: instrument name
+    :type instrument: str
+
+    .. http:post:: /api/control/
+
+    """
+    if instrument:
+        inst_object = find_instrument_by_name(instrument)
+        forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
+
+    if request.method == 'POST':
+        method_name = request.form.get("hidden_name", None)
+        form = forms.get(method_name, None)
+        if form:
+            kwargs = {field.name: field.data for field in form if field.name not in ['csrf_token', 'hidden_name']}
+            wait = request.form.get("hidden_wait", "true") == "true"
+            output = task_runner.run_single_step(component=instrument, method=method_name, kwargs=kwargs, wait=wait,
+                                            current_app=current_app._get_current_object())
+            return jsonify(output), 200
+
+    snapshot = global_config.deck_snapshot.copy()
+    # Iterate through each instrument in the snapshot
+    for instrument_key, instrument_data in snapshot.items():
+        # Iterate through each function associated with the current instrument
+        for function_key, function_data in instrument_data.items():
+            # Convert the function signature to a string representation
+            function_data['signature'] = str(function_data['signature'])
+    return jsonify(snapshot), 200

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/routes/control/control.py

@@ -1,11 +1,11 @@
-from flask import Blueprint, redirect, flash, request, render_template, session, current_app
+from flask import Blueprint, redirect, flash, request, render_template, session, current_app, jsonify
 from flask_login import login_required
 
 from ivoryos.routes.control.control_file import control_file
 from ivoryos.routes.control.control_new_device import control_temp
 from ivoryos.routes.control.utils import post_session_by_instrument, get_session_by_instrument, find_instrument_by_name
 from ivoryos.utils.global_config import GlobalConfig
-from ivoryos.utils.form import create_form_from_module, format_name
+from ivoryos.utils.form import create_form_from_module
 from ivoryos.utils.task_runner import TaskRunner
 
 global_config = GlobalConfig()
@@ -18,17 +18,36 @@ control.register_blueprint(control_temp)
 
 
 
-@control.route("/home", strict_slashes=False, methods=["GET", "POST"])
+@control.route("/", strict_slashes=False, methods=["GET", "POST"])
+@control.route("/<string:instrument>", strict_slashes=False, methods=["GET", "POST"])
 @login_required
 def deck_controllers():
     """
-    Combined controllers page: sidebar with all instruments, main area with method cards for selected instrument.
+    .. :quickref: Direct Control; device (instruments) and methods
+
+    device home interface for listing all instruments and methods, selecting an instrument to run its methods
+
+    .. http:get:: /instruments
+
+        get all instruments for home page
+
+    .. http:get:: /instruments/<string:instrument>
+
+        get all methods of the given <instrument>
+
+    .. http:post:: /instruments/<string:instrument>
+
+        send POST request to run a method of the given <instrument>
+
+    :param instrument: instrument name, if not provided, list all instruments
+    :type instrument: str
+    :status 200: render template with instruments and methods
+
     """
     deck_variables = global_config.deck_snapshot.keys()
     temp_variables = global_config.defined_variables.keys()
     instrument = request.args.get('instrument')
     forms = None
-    # format_name_fn = format_name
     if instrument:
         inst_object = find_instrument_by_name(instrument)
         _forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
@@ -47,12 +66,12 @@ def deck_controllers():
             form = forms.get(method_name)
             kwargs = {field.name: field.data for field in form if field.name != 'csrf_token'} if form else {}
             if form and form.validate_on_submit():
-                try:
-                    kwargs.pop("hidden_name", None)
-                    output = runner.run_single_step(instrument, method_name, kwargs, wait=True, current_app=current_app._get_current_object())
-                    flash(f"\nRun Success! Output value: {output}.")
-                except Exception as e:
-                    flash(str(e))
+                kwargs.pop("hidden_name", None)
+                output = runner.run_single_step(instrument, method_name, kwargs, wait=True, current_app=current_app._get_current_object())
+                if output["success"]:
+                    flash(f"\nRun Success! Output value: {output.get('output', 'None')}.")
+                else:
+                    flash(f"\nRun Error! {output.get('output', 'Unknown error occurred.')}", "error")
             else:
                 if form:
                     flash(form.errors)
@@ -64,16 +83,15 @@ def deck_controllers():
         temp_variables=temp_variables,
         instrument=instrument,
         forms=forms,
-        format_name=format_name,
         session=session
     )
 
-@control.route('/<instrument>/save-order', methods=['POST'])
+@control.route('/<string:instrument>/actions/order', methods=['POST'])
 def save_order(instrument: str):
     """
     .. :quickref: Control Customization; Save functions' order
 
-    .. http:post:: /control/save-order
+    .. http:post:: instruments/<string:instrument>/actions/order
 
     save function drag and drop order for the given <instrument>
 
@@ -83,47 +101,32 @@ def save_order(instrument: str):
     post_session_by_instrument('card_order', instrument, data['order'])
     return '', 204
 
-
-@control.route('/<instrument>/<function>/hide')
-def hide_function(instrument, function):
+@control.route('/<string:instrument>/actions/<string:function>', methods=["PATCH"])
+def hide_function(instrument: str, function: str):
     """
-    .. :quickref: Control Customization; Hide function
+    .. :quickref: Control Customization; Toggle function visibility
 
-    .. http:get:: //control/<instrument>/<function>/hide
+    .. http:patch:: /instruments/<instrument>/actions/<function>
 
-    Hide the given <instrument> and <function>
+    Toggle visibility for the given <instrument> and <function>
 
     """
     back = request.referrer
+    data = request.get_json()
+    hidden = data.get('hidden', True)
     functions = get_session_by_instrument("hidden_functions", instrument)
     order = get_session_by_instrument("card_order", instrument)
-    if function not in functions:
+    if hidden and function not in functions:
         functions.append(function)
-        order.remove(function)
-    post_session_by_instrument('hidden_functions', instrument, functions)
-    post_session_by_instrument('card_order', instrument, order)
-    return redirect(back)
-
-
-@control.route('/<instrument>/<function>/unhide')
-def remove_hidden(instrument: str, function: str):
-    """
-    .. :quickref: Control Customization; Remove a hidden function
-
-    .. http:get:: /control/<instrument>/<function>/unhide
-
-    Un-hide the given <instrument> and <function>
-
-    """
-    back = request.referrer
-    functions = get_session_by_instrument("hidden_functions", instrument)
-    order = get_session_by_instrument("card_order", instrument)
-    if function in functions:
+        if function in order:
+            order.remove(function)
+    elif not hidden and function in functions:
         functions.remove(function)
-        order.append(function)
+        if function not in order:
+            order.append(function)
     post_session_by_instrument('hidden_functions', instrument, functions)
     post_session_by_instrument('card_order', instrument, order)
-    return redirect(back)
+    return jsonify(success=True, message="Visibility updated")
 
 
 

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/routes/control/control_file.py

@@ -10,15 +10,15 @@ global_config = GlobalConfig()
 control_file = Blueprint('file', __name__)
 
 
-@control_file.route("/download/proxy", strict_slashes=False)
+@control_file.route("/files/proxy", strict_slashes=False)
 @login_required
 def download_proxy():
     """
-    .. :quickref: Direct Control; download proxy interface
+    .. :quickref: Direct Control Files; download proxy interface
 
-    download proxy interface
+    download proxy Python interface
 
-    .. http:get:: /control/download
+    .. http:get:: /files/proxy
     """
     snapshot = global_config.deck_snapshot.copy()
     class_definitions = {}

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/routes/control/control_new_device.py

@@ -10,18 +10,18 @@ global_config = GlobalConfig()
 
 control_temp = Blueprint('temp', __name__)
 
-@control_temp.route("/import/module", methods=['POST'])
+@control_temp.route("/new/module", methods=['POST'])
 def import_api():
     """
     .. :quickref: Advanced Features; Manually import API module(s)
 
     importing other Python modules
 
-    .. http:post:: /control/import/module
+    .. http:post:: /instruments/new/module
 
     :form filepath: API (Python class) module filepath
 
-    import the module and redirect to :http:get:`/ivoryos/control/new/`
+    import the module and redirect to :http:get:`/ivoryos/instruments/new/`
 
     """
     filepath = request.form.get('filepath')
@@ -45,12 +45,12 @@ def import_api():
 
 
 
-@control_temp.route("/import/deck", methods=['POST'])
+@control_temp.route("/new/deck-python", methods=['POST'])
 def import_deck():
     """
     .. :quickref: Advanced Features; Manually import a deck
 
-    .. http:post:: /control/import_deck
+    .. http:post:: /instruments/new/deck-python
 
     :form filepath: deck module filepath
 
@@ -84,20 +84,20 @@ def import_deck():
 
 
 @control_temp.route("/new/", strict_slashes=False)
-@control_temp.route("/new/<instrument>", methods=['GET', 'POST'])
+@control_temp.route("/new/<string:instrument>", methods=['GET', 'POST'])
 @login_required
-def new_controller(instrument=None):
+def new_controller(instrument:str=None):
     """
-    .. :quickref: Direct Control; connect to a new device
+    .. :quickref: Advanced Features; connect to a new device
 
     interface for connecting a new <instrument>
 
-    .. http:get:: /control/new/
+    .. http:get:: /instruments/new/
 
     :param instrument: instrument name
     :type instrument: str
 
-    .. http:post:: /control/new/
+    .. http:post:: /instruments/new/
 
     :form device_name: module instance name (e.g. my_instance = MyClass())
     :form kwargs: dynamic module initialization kwargs fields

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/routes/control/templates/controllers.html

@@ -20,7 +20,7 @@
               <a class="list-group-item list-group-item-action d-flex align-items-center {% if instrument == inst %}active bg-primary text-white border-0{% else %}bg-light{% endif %}"
                  href="{{ url_for('control.deck_controllers') }}?instrument={{ inst }}"
                  style="border-radius: 0.5rem; margin-bottom: 0.5rem; transition: background 0.2s;">
-                <span class="flex-grow-1">{{ format_name(inst) }}</span>
+                <span class="flex-grow-1">{{ inst | format_name }}</span>
                 {% if instrument == inst %}
                   <span class="ms-auto">&gt;</span>
                 {% endif %}
@@ -40,7 +40,7 @@
                 <a class="list-group-item list-group-item-action d-flex align-items-center {% if instrument == inst %}active bg-warning text-dark border-0{% else %}bg-light{% endif %}"
                    href="{{ url_for('control.deck_controllers') }}?instrument={{ inst }}"
                    style="border-radius: 0.5rem; margin-bottom: 0.5rem; transition: background 0.2s;">
-                  <span class="flex-grow-1">{{ format_name(inst) }}</span>
+                  <span class="flex-grow-1">{{ inst | format_name }}</span>
                   {% if instrument == inst %}
                     <span class="ms-auto">&gt;</span>
                   {% endif %}
@@ -63,7 +63,7 @@
 
     <!-- Main: Method Cards -->
     <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4" style="height: 100vh; overflow-y: auto;">
-      {% if instrument and forms %}
+      {% if instrument%}
 {#        <h2 class="text-secondary">{{ instrument }} controller</h2>#}
         <div class="grid-container" id="sortable-grid" style="display: grid; grid-template-columns: repeat(auto-fit, minmax(350px, 1fr)); gap: 1rem; width: 100%;">
           {% set hidden = session.get('hidden_functions', {}) %}
@@ -73,15 +73,18 @@
               <div class="card" id="{{function}}" style="margin: 0;">
                 <div class="bg-white rounded shadow-sm h-100">
                   <i class="bi bi-info-circle ms-2" data-bs-toggle="tooltip" data-bs-placement="top" title='{{ form.hidden_name.description or "Docstring is not available" }}' ></i>
-                  <a style="float: right" aria-label="Close" href="{{ url_for('control.hide_function', instrument=instrument, function=function) }}"><i class="bi bi-eye-slash-fill"></i></a>
-                  <div class="form-control" style="border: none">
-                    <form role="form" method='POST' name="{{function}}" id="{{function}}" action="{{ url_for('control.deck_controllers') }}?instrument={{ instrument }}">
+                    <a href="{{ url_for('control.hide_function', instrument=instrument, function=function) }}"
+                       data-method="patch" data-payload='{"hidden":true}' class="toggle-visibility">
+                       <i style="float: right;" class="bi bi-eye-slash-fill text-muted" title="Hide function"></i>
+                    </a>
+                    <div class="form-control" style="border: none">
+                        <form role="form" method='POST' name="{{function}}" id="{{function}}" action="{{ url_for('control.deck_controllers') }}?instrument={{ instrument }}">
                       <div class="form-group">
                         {{ form.hidden_tag() }}
                         {% for field in form %}
                           {% if field.type not in ['CSRFTokenField', 'HiddenField'] %}
                             <div class="input-group mb-3">
-                              <label class="input-group-text">{{ field.label.text }}</label>
+                              <label class="input-group-text">{{ field.label.text | format_name }}</label>
                               {% if field.type == "SubmitField" %}
                                 {{ field(class="btn btn-dark") }}
                               {% elif field.type == "BooleanField" %}
@@ -94,7 +97,9 @@
                         {% endfor %}
                       </div>
                       <div class="input-group mb-3">
-                        <button type="submit" name="{{ function }}" id="{{ function }}" class="form-control" style="background-color: #a5cece;">{{format_name(function)}} </button>
+                        <button type="submit" name="{{ function }}" id="{{ function }}" class="form-control" style="background-color: #a5cece;">
+                            {{ function | format_name }}
+                        </button>
                       </div>
                     </form>
                   </div>
@@ -116,13 +121,37 @@
             <div class="accordion-body">
               {% for function in hidden_instrument %}
                 <div>
-                  {{ function }} <a href="{{ url_for('control.remove_hidden', instrument=instrument, function=function) }}"><i class="bi bi-eye-fill"></i></a>
+                  {{ function }}
+                    <a href="{{ url_for('control.hide_function', instrument=instrument, function=function) }}"
+                       data-method="patch" data-payload='{"hidden":false}' class="toggle-visibility">
+                       <i class="bi bi-eye-fill text-success" title="Show function"></i>
+                    </a>
                 </div>
               {% endfor %}
             </div>
           </div>
         </div>
         <script>
+
+            document.querySelectorAll('.toggle-visibility').forEach(el => {
+              el.addEventListener('click', e => {
+                e.preventDefault();
+                const url = el.getAttribute('href');
+                const payload = JSON.parse(el.getAttribute('data-payload') || '{}');
+                fetch(url, {
+                  method: 'PATCH',
+                  headers: {
+                    'Content-Type': 'application/json'
+                  },
+                  body: JSON.stringify(payload)
+                }).then(response => {
+                  if (response.ok) {
+                    location.reload(); // or update the DOM directly
+                  }
+                });
+              });
+            });
+
           const saveOrderUrl = `{{ url_for('control.save_order', instrument=instrument) }}`;
           const buttonIds = {{ session['card_order'][instrument] | tojson }};
         </script>

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/routes/control/templates/controllers_new.html

@@ -31,7 +31,7 @@
          <!-- Connecting Device -->
          <div class="col-xl-5 col-lg-5 col-md-6 mb-4">
              {% if device %}
-                 {{ device }}
+{#                 {{ device }}#}
              <div class="card shadow-sm mb-4">
                  <div class="card-header">
                      <h5 class="mb-0">Connecting</h5>

ivoryos-1.2.0/ivoryos/routes/data/data.py

@@ -0,0 +1,129 @@
+import os
+
+from flask import Blueprint, redirect, url_for, request, render_template, current_app, jsonify, send_file
+from flask_login import login_required
+
+from ivoryos.utils.db_models import db, WorkflowRun, WorkflowStep
+
+data = Blueprint('data', __name__, template_folder='templates')
+
+
+
+@data.route('/executions/records')
+def list_workflows():
+    """
+    .. :quickref: Workflow Execution Database; list all workflow execution records
+
+    list all workflow execution records
+
+    .. http:get:: /executions/records
+
+    """
+    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)
+
+
+@data.get("/executions/records/<int:workflow_id>")
+def workflow_logs(workflow_id:int):
+    """
+    .. :quickref: Workflow Data Database; get workflow data, steps, and logs
+
+    get workflow data logs by workflow id
+
+    .. http:get:: /executions/<int:workflow_id>
+
+    :param workflow_id: workflow id
+    :type workflow_id: int
+    """
+
+    if request.method == 'GET':
+        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)
+
+
+@data.delete("/executions/records/<int:workflow_id>")
+@login_required
+def delete_workflow_record(workflow_id: int):
+    """
+    .. :quickref: Workflow Data Database; delete a workflow execution record
+
+    delete a workflow execution record by workflow id
+
+    .. http:delete:: /executions/records/<int:workflow_id>
+
+    :param workflow_id: workflow id
+    :type workflow_id: int
+    :status 200: return success message
+    """
+    run = WorkflowRun.query.get(workflow_id)
+    db.session.delete(run)
+    db.session.commit()
+    return jsonify(success=True)
+
+
+@data.route('/files/execution-data/<string:filename>')
+def download_results(filename:str):
+    """
+    .. :quickref: Workflow data; download a workflow data file (.CSV)
+
+    .. http:get:: /files/execution-data/<string:filename>
+
+    :param filename: workflow data filename
+    :type filename: str
+
+    # :status 302: load pseudo deck and then redirects to :http:get:`/ivoryos/executions`
+    """
+
+    filepath = os.path.join(current_app.config["DATA_FOLDER"], filename)
+    return send_file(os.path.abspath(filepath), as_attachment=True)

ivoryos-1.2.0/ivoryos/routes/data/templates/components/step_card.html

@@ -0,0 +1,13 @@
+<div class="card mb-2 {{ 'border-danger text-danger bg-light' if step.run_error else 'border-secondary' }}">
+  <div class="card-body p-2">
+    <strong>{{ step.method_name | format_name }}</strong>
+    <small class="text-muted">
+      <i class="fas fa-play-circle me-1"></i> Start: {{ step.start_time.strftime('%H:%M:%S') if step.start_time else 'N/A' }}
+      <i class="fas fa-stop-circle ms-2 me-1"></i> End: {{ step.end_time.strftime('%H:%M:%S') if step.end_time else 'N/A' }}
+      <!-- {% if step.run_error %}
+        <i class="fas fa-stop-circle ms-2 me-1"></i> Error: {{ step.run_error if step.run_error else 'N/A' }}
+      {% endif %} -->
+    </small>
+    <!-- <small>Error: {{ step.run_error }}</small> -->
+  </div>
+</div>

{ivoryos-1.1.0 → ivoryos-1.2.0}/ivoryos/routes/data/templates/workflow_database.html

@@ -28,19 +28,25 @@
         <tbody>
             {% for workflow in workflows %}
                 <tr>
-                    <td><a href="{{ url_for('data.get_workflow_steps', workflow_id=workflow.id) }}">{{ workflow.name }}</a></td>
+                    <td><a href="{{ url_for('data.workflow_logs', workflow_id=workflow.id) }}">{{ workflow.name }}</a></td>
                     <td>{{ workflow.id }}</td>
                     <td>{{ workflow.start_time.strftime("%Y-%m-%d %H:%M:%S") if workflow.start_time else '' }}</td>
                     <td>{{ workflow.end_time.strftime("%Y-%m-%d %H:%M:%S") if workflow.end_time else '' }}</td>
 
                     <td>
                         {% if workflow.data_path %}
-                          <a href="{{ url_for('design.design_files.download_results', filename=workflow.data_path) }}">{{ workflow.data_path }}</a>
+                          <a href="{{ url_for('data.download_results', filename=workflow.data_path) }}">{{ workflow.data_path }}</a>
                         {% endif %}
                     </td>
                     <td>
                         {% if session['user'] == 'admin' or session['user'] == workflow.author %}
-                            <a href="{{ url_for('data.delete_workflow_data', workflow_id=workflow.id) }}">delete</a>
+{#                            <a href="{{ url_for('data.delete_workflow_data', workflow_id=workflow.id) }}">delete</a>#}
+                            <a href="#"
+                               class="text-danger"
+                               data-delete-url="{{ url_for('data.delete_workflow_record', workflow_id=workflow.id) }}"
+                               onclick="deleteWorkflow(this); return false;">
+                               Delete
+                            </a>
                         {% else %}
                             <a class="disabled-link">delete</a>
                         {% endif %}
@@ -99,5 +105,5 @@
                 });
         }
     </script>
-
+    <script src="{{ url_for('static', filename='js/db_delete.js') }}"></script>
 {% endblock %}