ivoryos 1.2.5__py3-none-any.whl → 1.4.4__py3-none-any.whl

ivoryos/routes/control/control_new_device.py

@@ -1,9 +1,10 @@
+import importlib
 import os
 from flask import Blueprint, request, current_app, send_file, flash, redirect, url_for, session, render_template
 from flask_login import login_required
 
 from ivoryos.utils import utils
-from ivoryos.routes.control.utils import find_instrument_by_name
+# from ivoryos.routes.control.utils import find_instrument_by_name
 from ivoryos.utils.global_config import GlobalConfig
 
 global_config = GlobalConfig()
@@ -28,16 +29,25 @@ def import_api():
     # filepath.replace('\\', '/')
     name = os.path.split(filepath)[-1].split('.')[0]
     try:
-        spec = utils.importlib.util.spec_from_file_location(name, filepath)
-        module = utils.importlib.util.module_from_spec(spec)
+        spec = importlib.util.spec_from_file_location(name, filepath)
+        module = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(module)
-        classes = utils.inspect.getmembers(module, utils.inspect.isclass)
-        if len(classes) == 0:
-            flash("Invalid import: no class found in the path")
-            return redirect(url_for("control.controllers_home"))
-        for i in classes:
-            globals()[i[0]] = i[1]
-            global_config.api_variables.add(i[0])
+        cls_dict = utils.create_module_snapshot(module=module)
+
+        def merge_to_global(old: dict, new: dict):
+            overwritten = []
+
+            for key, value in new.items():
+                if key in old:
+                    overwritten.append(key)  # record duplicates
+                old[key] = value  # overwrite or insert
+
+            return overwritten
+
+        duplicates = merge_to_global(global_config.api_variables, cls_dict)
+        if duplicates:
+            # optionally, you can log duplicates
+            flash(f"Overwritten classes: {', '.join(duplicates)}")
     # should handle path error and file type error
     except Exception as e:
         flash(e.__str__())
@@ -107,7 +117,7 @@ def new_controller(instrument:str=None):
     args = None
     if instrument:
 
-        device = globals()[instrument]
+        device = global_config.api_variables[instrument]
         args = utils.inspect.signature(device.__init__)
 
         if request.method == 'POST':

ivoryos/routes/control/templates/controllers.html

@@ -49,6 +49,24 @@
             </div>
           </div>
         {% endif %}
+
+          {% if block_variables %}
+            <div class="mb-4">
+            <h6 class="fw-bold text-secondary mb-2" style="letter-spacing: 1px;">Methods</h6>
+            <div class="list-group">
+              {% for inst in block_variables %}
+                <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">{{ inst | format_name }}</span>
+                  {% if instrument == inst %}
+                    <span class="ms-auto">&gt;</span>
+                  {% endif %}
+                </a>
+              {% endfor %}
+            </div>
+          </div>
+          {% endif %}
         <!-- Action Buttons -->
         <div class="mb-4">
           <a href="{{ url_for('control.file.download_proxy', filetype='proxy') }}" class="btn btn-outline-primary w-100 mb-2">
@@ -89,6 +107,15 @@
                                 {{ field(class="btn btn-dark") }}
                               {% elif field.type == "BooleanField" %}
                                 {{ field(class="form-check-input") }}
+                              {% elif field.type == "FlexibleEnumField" %}
+                                 <input type="text" id="{{ field.id }}" name="{{ field.name }}" value="{{ field.data }}"
+                                    list="{{ field.id }}_options" placeholder="{{ field.render_kw.placeholder if field.render_kw and field.render_kw.placeholder }}"
+                                    class="form-control">
+                                 <datalist id="{{ field.id }}_options">
+                                    {% for key in field.choices %}
+                                       <option value="{{ key }}">{{ key }}</option>
+                                    {% endfor %}
+                                 </datalist>
                               {% else %}
                                 {{ field(class="form-control") }}
                               {% endif %}

ivoryos/routes/control/utils.py

@@ -13,6 +13,8 @@ def find_instrument_by_name(name: str):
     if name.startswith("deck"):
         name = name.replace("deck.", "")
         return getattr(global_config.deck, name)
+    elif name.startswith("blocks"):
+        return global_config.building_blocks[name]
     elif name in global_config.defined_variables:
         return global_config.defined_variables[name]
     elif name in globals():

ivoryos/routes/data/data.py

@@ -3,7 +3,7 @@ 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
+from ivoryos.utils.db_models import db, WorkflowRun, WorkflowStep, WorkflowPhase
 
 data = Blueprint('data', __name__, template_folder='templates')
 
@@ -37,7 +37,6 @@ def list_workflows():
     else:
         return render_template('workflow_database.html', workflows=workflows)
 
-
 @data.get("/executions/records/<int:workflow_id>")
 def workflow_logs(workflow_id:int):
     """
@@ -45,52 +44,119 @@ def workflow_logs(workflow_id:int):
 
     get workflow data logs by workflow id
 
-    .. http:get:: /executions/<int:workflow_id>
+    .. http:get:: /executions/records/<int:workflow_id>
 
     :param workflow_id: workflow id
     :type workflow_id: int
     """
+    workflow = db.session.get(WorkflowRun, workflow_id)
+    if not workflow:
+        return jsonify({"error": "Workflow not found"}), 404
+
+    # Query all phases for this run, ordered by start_time
+    phases = WorkflowPhase.query.filter_by(run_id=workflow_id).order_by(WorkflowPhase.start_time).all()
+
+    # Prepare grouped data for template (full objects)
+    grouped = {
+        "prep": [],
+        "script": {},
+        "cleanup": [],
+    }
+
+    # Prepare grouped data for JSON (dicts)
+    grouped_json = {
+        "prep": [],
+        "script": {},
+        "cleanup": [],
+    }
+
+    for phase in phases:
+        phase_dict = phase.as_dict()
+
+        # Steps sorted by step_index
+        steps = sorted(phase.steps, key=lambda s: s.step_index)
+        phase_steps_dicts = [s.as_dict() for s in steps]
+
+        if phase.name == "prep":
+            grouped["prep"].append(phase)
+            grouped_json["prep"].append({
+                **phase_dict,
+                "steps": phase_steps_dicts
+            })
 
-    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,
+        elif phase.name == "main":
+            grouped["script"].setdefault(phase.repeat_index, []).append(phase)
+            grouped_json["script"].setdefault(phase.repeat_index, []).append({
+                **phase_dict,
+                "steps": phase_steps_dicts
             })
-        else:
-            return render_template("workflow_view.html", workflow=workflow, grouped=grouped)
+
+        elif phase.name == "cleanup":
+            grouped["cleanup"].append(phase)
+            grouped_json["cleanup"].append({
+                **phase_dict,
+                "steps": phase_steps_dicts
+            })
+
+    if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+        return jsonify({
+            "workflow_info": workflow.as_dict(),
+            "phases": grouped_json,
+        })
+    else:
+        return render_template("workflow_view.html", workflow=workflow, grouped=grouped)
+
+
+@data.get("/executions/data/<int:workflow_id>")
+def workflow_phase_data(workflow_id: int):
+    """
+    .. :quickref: Workflow Data Database; get workflow data for plotting
+
+    get workflow data for plotting by workflow id
+
+    .. http:get:: /executions/data/<int: workflow_id>
+
+    :param workflow_id: workflow id
+    """
+
+    workflow = db.session.get(WorkflowRun, workflow_id)
+    if not workflow:
+        return jsonify({})
+
+    phase_data = {}
+    main_phases = WorkflowPhase.query.filter_by(run_id=workflow_id, name='main') \
+        .order_by(WorkflowPhase.repeat_index).all()
+
+    for phase in main_phases:
+        outputs = phase.outputs or {}
+        phase_index = phase.repeat_index
+        phase_data[phase_index] = {}
+
+        # Normalize everything to a list of dicts
+        if isinstance(outputs, dict):
+            outputs = [outputs]
+        elif isinstance(outputs, list):
+            # flatten if it’s nested like [[{...}, {...}]]
+            outputs = [
+                item for sublist in outputs
+                for item in (sublist if isinstance(sublist, list) else [sublist])
+            ]
+
+        # convert each output entry to plotting format
+        for out in outputs:
+            if not isinstance(out, dict):
+                continue
+            for k, v in out.items():
+                if isinstance(v, (int, float)):
+                    phase_data[phase_index].setdefault(k, []).append(
+                        {"x": phase_index, "y": v}
+                    )
+                elif isinstance(v, list) and all(isinstance(i, (int, float)) for i in v):
+                    phase_data[phase_index].setdefault(k, []).extend(
+                        {"x": phase_index, "y": val} for val in v
+                    )
+
+    return jsonify(phase_data)
 
 
 @data.delete("/executions/records/<int:workflow_id>")
@@ -101,7 +167,7 @@ def delete_workflow_record(workflow_id: int):
 
     delete a workflow execution record by workflow id
 
-    .. http:delete:: /executions/records/<int:workflow_id>
+    .. http:delete:: /executions/records/<int: workflow_id>
 
     :param workflow_id: workflow id
     :type workflow_id: int
@@ -124,7 +190,7 @@ def download_results(filename:str):
     :param filename: workflow data filename
     :type filename: str
 
-    # :status 302: load pseudo deck and then redirects to :http:get:`/ivoryos/executions`
+    # :status 302: load pseudo deck and then redirects to :http:get:`/ivoryos/executions/records`
     """
 
     filepath = os.path.join(current_app.config["DATA_FOLDER"], filename)

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

@@ -1,13 +1,78 @@
-<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>
+<div class="card mb-2 {{ 'border-danger text-danger bg-light' if phase.run_error else 'border-secondary' }}">
+    <div class="card-body p-2">
+        <small class="text-muted">
+            <i class="fas fa-play-circle me-1"></i> Start: {{ phase.start_time.strftime('%H:%M:%S') if phase.start_time else 'N/A' }}
+            <i class="fas fa-stop-circle ms-2 me-1"></i> End: {{ phase.end_time.strftime('%H:%M:%S') if phase.end_time else 'N/A' }}
+        </small>
+        {% if phase.parameters %}
+        <div class="mt-2">
+            <strong>Parameters: </strong>
+            {% if phase.parameters is mapping %}
+                {% if phase.parameters %}
+                    <div class="mt-2">
+                        <strong>Parameters: </strong>
+                            {% for key, value in phase.parameters.items() %}
+                            <span class="badge bg-secondary me-1">{{ key }}: {{ value }}</span>
+                            {% endfor %}
+                    </div>
+                {% endif %}
+            {% else %}
+                {% for batch in phase.parameters %}
+                    <div class="mt-1">
+                        <span class="badge bg-info text-dark me-1">Batch {{ loop.index }}</span>
+                        {% for key, value in batch.items() %}
+                            <span class="badge bg-secondary me-1">{{ key }}: {{ value }}</span>
+                        {% endfor %}
+                    </div>
+                {% endfor %}
+            {% endif %}
+        </div>
+        {% endif %}
+
+        {% if phase.steps %}
+            <div class="mt-2">
+                <strong>Steps:</strong>
+                <ul class="mb-0">
+                    {% for step in phase.steps %}
+                        <li class="{{ 'text-danger' if step.run_error else '' }}">
+                            {{ step.method_name }}
+                            <small class="text-muted">
+                              ({{ step.start_time.strftime('%H:%M:%S') if step.start_time else 'N/A' }} –
+                              {{ step.end_time.strftime('%H:%M:%S') if step.end_time else 'N/A' }})
+                            </small>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        {% endif %}
+        {% if phase.outputs %}
+            <div class="mt-2">
+                <strong>Outputs:</strong>
+
+                {% if phase.outputs is mapping %}
+                    {% for key, value in phase.outputs.items() %}
+                        <span class="badge bg-success me-1">{{ key }}: {{ value }}</span>
+                    {% endfor %}
+
+                {% elif phase.outputs is sequence %}
+                    {% for batch in phase.outputs %}
+                        <div class="mt-1">
+                            <span class="badge bg-info text-dark me-1">Batch {{ loop.index }}</span>
+                            {% if batch is mapping %}
+                                {% for key, value in batch.items() %}
+                                    <span class="badge bg-success me-1">{{ key }}: {{ value }}</span>
+                                {% endfor %}
+                            {% elif batch is sequence %}
+                                {% for kwargs in batch %}
+                                    {% for key, value in kwargs.items() %}
+                                        <span class="badge bg-success me-1">{{ key }}: {{ value }}</span>
+                                    {% endfor %}
+                                {% endfor %}
+                            {% endif %}
+                        </div>
+                    {% endfor %}
+                {% endif %}
+            </div>
+        {% endif %}
+    </div>
+</div>