ivoryos 1.2.6a0__tar.gz → 1.2.8__tar.gz

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ivoryos
-Version: 1.2.6a0
+Version: 1.2.8
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Author-email: Ivory Zhang <ivoryzhang@chem.ubc.ca>
 License: MIT

ivoryos-1.2.8/ivoryos/__init__.py

@@ -0,0 +1,13 @@
+from ivoryos.server import run
+from ivoryos.optimizer.registry import OPTIMIZER_REGISTRY
+from ivoryos.version import __version__ as ivoryos_version
+from ivoryos.utils.decorators import block, BUILDING_BLOCKS
+
+
+__all__ = [
+    "block",
+    "BUILDING_BLOCKS",
+    "OPTIMIZER_REGISTRY",
+    "run",
+    "ivoryos_version",
+]

ivoryos-1.2.8/ivoryos/app.py

@@ -0,0 +1,94 @@
+import os
+import uuid
+
+from flask import Flask, session, g, redirect, url_for
+from flask_login import AnonymousUserMixin
+
+from ivoryos.utils import utils
+from ivoryos.utils.db_models import db
+from ivoryos.config import Config, get_config
+from ivoryos.routes.auth.auth import auth, login_manager
+from ivoryos.routes.control.control import control
+from ivoryos.routes.data.data import data
+from ivoryos.routes.library.library import library
+from ivoryos.routes.design.design import design
+from ivoryos.routes.execute.execute import execute
+from ivoryos.routes.api.api import api
+from ivoryos.socket_handlers import socketio
+from ivoryos.routes.main.main import main
+from ivoryos.version import __version__ as ivoryos_version
+
+def create_app(config_class=None):
+    """
+    create app, init database
+    """
+
+    url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
+    app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='static')
+    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}/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}')
+
+
+    app.config.from_object(config_class or 'config.get_config()')
+    os.makedirs(app.config["OUTPUT_FOLDER"], exist_ok=True)
+    # Initialize extensions
+    socketio.init_app(app, cors_allowed_origins="*", cookie=None)
+    login_manager.init_app(app)
+    login_manager.login_view = "auth.login"
+    db.init_app(app)
+
+    # Create database tables
+    with app.app_context():
+        db.create_all()
+
+    # Additional setup
+    utils.create_gui_dir(app.config['OUTPUT_FOLDER'])
+
+    # logger_list = app.config["LOGGERS"]
+    logger_path = os.path.join(app.config["OUTPUT_FOLDER"], app.config["LOGGERS_PATH"])
+    logger = utils.start_logger(socketio, 'gui_logger', logger_path)
+
+    @app.before_request
+    def before_request():
+        """
+        Called before
+
+        """
+        g.logger = logger
+        g.socketio = socketio
+        session.permanent = False
+        # DEMO_MODE: Simulate logged-in user per session
+        if app.config.get("DEMO_MODE", False):
+            if "demo_user_id" not in session:
+                session["demo_user_id"] = f"demo_{str(uuid.uuid4())[:8]}"
+
+            class SessionDemoUser(AnonymousUserMixin):
+                @property
+                def is_authenticated(self):
+                    return True
+
+                def get_id(self):
+                    return session.get("demo_user_id")
+
+            login_manager.anonymous_user = SessionDemoUser
+
+
+
+    @app.route('/')
+    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()
+
+    # app.config.setdefault("DEMO_MODE", False)
+    return app

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/routes/api/api.py

@@ -37,7 +37,7 @@ def backend_control(instrument: str=None):
         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)
+        method_name = request.json.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']}

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/routes/control/control.py

@@ -5,7 +5,7 @@ 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
+from ivoryos.utils.form import create_form_from_module, create_form_from_pseudo
 from ivoryos.utils.task_runner import TaskRunner
 
 global_config = GlobalConfig()
@@ -21,7 +21,7 @@ control.register_blueprint(control_temp)
 @control.route("/", strict_slashes=False, methods=["GET", "POST"])
 @control.route("/<string:instrument>", strict_slashes=False, methods=["GET", "POST"])
 @login_required
-def deck_controllers():
+def deck_controllers(instrument: str = None):
     """
     .. :quickref: Direct Control; device (instruments) and methods
 
@@ -44,43 +44,69 @@ def deck_controllers():
     :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')
+    instrument = instrument or request.args.get("instrument")
     forms = None
     if instrument:
         inst_object = find_instrument_by_name(instrument)
-        _forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
+        if instrument.startswith("blocks"):
+            forms = create_form_from_pseudo(pseudo=inst_object, autofill=False, design=False)
+        else:
+            forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
         order = get_session_by_instrument('card_order', instrument)
         hidden_functions = get_session_by_instrument('hidden_functions', instrument)
-        functions = list(_forms.keys())
+        functions = list(forms.keys())
         for function in functions:
             if function not in hidden_functions and function not in order:
                 order.append(function)
         post_session_by_instrument('card_order', instrument, order)
-        forms = {name: _forms[name] for name in order if name in _forms}
-        # Handle POST for method execution
-        if request.method == 'POST':
-            all_kwargs = request.form.copy()
-            method_name = all_kwargs.pop("hidden_name", None)
-            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():
-                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")
+        forms = {name: forms[name] for name in order if name in forms}
+
+    if request.method == "POST":
+        if not forms:
+            return jsonify({"success": False, "error": "Instrument not found"}), 404
+
+        payload = request.get_json() if request.is_json else request.form.to_dict()
+        method_name = payload.pop("hidden_name", None)
+        form = forms.get(method_name)
+
+        if not form:
+            return jsonify({"success": False, "error": f"Method {method_name} not found"}), 404
+
+        # Extract kwargs
+        if request.is_json:
+            kwargs = {k: v for k, v in payload.items() if k not in ["csrf_token", "hidden_wait"]}
+        else:
+            kwargs = {field.name: field.data for field in form if field.name not in ["csrf_token", "hidden_name"]}
+
+        wait = str(payload.get("hidden_wait", "true")).lower() == "true"
+
+        output = runner.run_single_step(
+            component=instrument, method=method_name, kwargs=kwargs, wait=wait,
+            current_app=current_app._get_current_object()
+        )
+
+        if request.is_json:
+            return jsonify(output)
+        else:
+            if output.get("success"):
+                flash(f"Run Success! Output: {output.get('output', 'None')}")
             else:
-                if form:
-                    flash(form.errors)
-                else:
-                    flash("Invalid method selected.")
+                flash(f"Run Error! {output.get('output', 'Unknown error occurred.')}", "error")
+
+    # GET request → render web form or return snapshot for API
+    if request.is_json or request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+
+        snapshot = global_config.deck_snapshot.copy()
+        for instrument_key, instrument_data in snapshot.items():
+            for function_key, function_data in instrument_data.items():
+                function_data["signature"] = str(function_data["signature"])
+        return jsonify(snapshot)
+
     return render_template(
-        'controllers.html',
-        defined_variables=deck_variables,
-        temp_variables=temp_variables,
+        "controllers.html",
+        defined_variables=global_config.deck_snapshot.keys(),
+        block_variables=global_config.building_blocks.keys(),
+        temp_variables=global_config.defined_variables.keys(),
         instrument=instrument,
         forms=forms,
         session=session

ivoryos-1.2.8/ivoryos/routes/control/control_file.py

@@ -0,0 +1,33 @@
+import os
+from flask import Blueprint,  request,current_app, send_file
+from flask_login import login_required
+
+from ivoryos.utils.client_proxy import ProxyGenerator
+from ivoryos.utils.global_config import GlobalConfig
+
+global_config = GlobalConfig()
+
+control_file = Blueprint('file', __name__)
+
+
+
+@control_file.route("/files/proxy", strict_slashes=False)
+@login_required
+def download_proxy():
+    """
+    .. :quickref: Direct Control Files; Download proxy Python interface
+
+    download proxy Python interface
+
+    .. http:get:: /files/proxy
+    """
+    generator = ProxyGenerator(request.url_root)
+    snapshot = global_config.deck_snapshot.copy()
+
+    filepath = generator.generate_from_flask_route(
+        snapshot,
+        request.url_root,
+        current_app.config["OUTPUT_FOLDER"]
+    )
+
+    return send_file(os.path.abspath(filepath), as_attachment=True)

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/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">

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/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-1.2.6a0 → ivoryos-1.2.8}/ivoryos/routes/design/design.py

@@ -35,6 +35,9 @@ def _create_forms(instrument, script, autofill, pseudo_deck = None):
         _object = global_config.defined_variables.get(instrument)
         functions = utils._inspect_class(_object)
         forms = create_form_from_pseudo(pseudo=functions, autofill=autofill, script=script)
+    elif instrument.startswith("blocks"):
+        forms = create_form_from_pseudo(pseudo=global_config.building_blocks[instrument], autofill=autofill, script=script)
+        functions = global_config.building_blocks[instrument]
     else:
         if deck:
             functions = global_config.deck_snapshot.get(instrument, {})
@@ -92,7 +95,7 @@ def experiment_builder():
 
     return render_template('experiment_builder.html', off_line=off_line, history=deck_list,
                            script=script, defined_variables=deck_variables, buttons_dict=design_buttons,
-                           local_variables=global_config.defined_variables)
+                           local_variables=global_config.defined_variables, block_variables=global_config.building_blocks)
 
 
 @design.route("/draft/meta", methods=["PATCH"])
@@ -192,7 +195,8 @@ def update_ui_state():
         deck_variables = list(pseudo_deck.keys()) if pseudo_deck else []
         deck_variables.remove("deck_name") if len(deck_variables) > 0 else deck_variables
         html = render_template("components/sidebar.html", history=deck_list,
-                               defined_variables=deck_variables, local_variables = global_config.defined_variables)
+                               defined_variables=deck_variables, local_variables = global_config.defined_variables,
+                               block_variables=global_config.building_blocks)
         return jsonify({"html": html})
     return jsonify({"error": "Invalid request"}), 400
 
@@ -310,6 +314,7 @@ def methods_handler(instrument: str = ''):
 
     success = True
     msg = ""
+    request.form
     if "hidden_name" in request.form:
         method_name = request.form.get("hidden_name", None)
         form = forms.get(method_name) if forms else None
@@ -322,7 +327,7 @@ def methods_handler(instrument: str = ''):
                 primitive_arg_types = utils.get_arg_type(kwargs, functions[function_name])
 
                 # todo
-                print(primitive_arg_types)
+                # print(primitive_arg_types)
 
                 script.eval_list(kwargs, primitive_arg_types)
                 kwargs = script.validate_variables(kwargs)
@@ -422,7 +427,9 @@ def get_operation_sidebar(instrument: str = ''):
         # edit_action_info = session.get("edit_action")
         html = render_template("components/sidebar.html", off_line=off_line, history=deck_list,
                                defined_variables=deck_variables,
-                               local_variables=global_config.defined_variables)
+                               local_variables=global_config.defined_variables,
+                               block_variables=global_config.building_blocks,
+                               )
     return jsonify({"html": html})
 
 

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/routes/design/templates/components/action_form.html

@@ -1,6 +1,6 @@
 {# Action form component #}
-<div class="accordion-item design-control" draggable="true">
-    <h2 class="accordion-header">
+<div class="accordion-item design-control">
+    <h2 class="accordion-header" >
         <button class="accordion-button collapsed draggable-action"
                 type="button" data-bs-toggle="collapse"
                 data-bs-target="#{{name}}" aria-expanded="false"

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/routes/design/templates/components/instruments_panel.html

@@ -39,7 +39,29 @@
             </ul>
         </div>
     </div>
-
+    {% if block_variables %}
+        <div class="accordion-item  design-control">
+            <h5 class="accordion-header">
+                <button class="accordion-button" data-bs-toggle="collapse" data-bs-target="#block" role="button" aria-expanded="false" aria-controls="collapseExample">
+                    Methods
+                </button>
+            </h5>
+            <div class="accordion-collapse collapse show" id="block">
+                <ul class="list-group">
+                    {% for category in block_variables %}
+                        <button class="list-group-item list-group-item-action"
+                                type="button"
+                                name="device"
+                                value="{{category}}"
+                                data-get-url="{{ url_for('design.get_operation_sidebar', instrument=category) }}"
+                                onclick="updateInstrumentPanel(this)">
+                            {{ category|format_name }}
+                        </button>
+                    {% endfor%}
+                </ul>
+            </div>
+        </div>
+    {% endif %}
     {% if local_variables %}
         <div class="accordion-item  design-control">
             <h5 class="accordion-header">

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/routes/execute/templates/experiment_run.html

@@ -15,12 +15,7 @@
             };
         </script>
     {% endif %}
-        <div id="progress-warning" style="border: 1px solid #f5c2c7; background-color: #f8d7da; color: #842029; padding: 1rem; border-radius: 0.5rem; margin: 1rem 0; font-size: 0.95rem;">
-            ⚠️ <strong>Note:</strong> Real-time progress tracking in this demo is currently <strong>not working</strong>. The system may report busy if multiple runs are initiated.
-            <br>
-            Workflow will still work, results can be tracked via the <strong>Data</strong> tab.
-            <br>
-        </div>
+
     <div class="row">
         {% include 'components/run_panel.html' %}
         {% include 'components/progress_panel.html' %}

ivoryos-1.2.6a0/ivoryos/__init__.py → ivoryos-1.2.8/ivoryos/server.py

@@ -1,37 +1,24 @@
 import os
+import sqlite3
 import sys
-import uuid
 from typing import Union
 
-from flask import Flask, redirect, url_for, g, Blueprint, session
-from flask_login import AnonymousUserMixin
+from flask import Blueprint
 
-# sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+from sqlalchemy import Engine, event
 
+# from ivoryos import BUILDING_BLOCKS
+from ivoryos.app import create_app
 from ivoryos.config import Config, get_config
-from ivoryos.routes.auth.auth import auth, login_manager
-from ivoryos.routes.control.control import control
-from ivoryos.routes.data.data import data
-from ivoryos.routes.library.library import library
-from ivoryos.routes.design.design import design
-from ivoryos.routes.execute.execute import execute
-from ivoryos.routes.api.api import api
+from ivoryos.optimizer.registry import OPTIMIZER_REGISTRY
+from ivoryos.routes.auth.auth import login_manager
+from ivoryos.routes.control.control import global_config
 from ivoryos.socket_handlers import socketio
-from ivoryos.routes.main.main import main
-# from ivoryos.routes.monitor.monitor import monitor
 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
 
-global_config = GlobalConfig()
-from sqlalchemy import event
-from sqlalchemy.engine import Engine
-import sqlite3
 
+url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
 
 @event.listens_for(Engine, "connect")
 def enforce_sqlite_foreign_keys(dbapi_connection, connection_record):
@@ -41,16 +28,6 @@ def enforce_sqlite_foreign_keys(dbapi_connection, connection_record):
         cursor.close()
 
 
-url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
-app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='static')
-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}/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
 def load_user(user_id):
@@ -62,68 +39,8 @@ def load_user(user_id):
     return db.session.get(User, user_id)
 
 
-def create_app(config_class=None):
-    """
-    create app, init database
-    """
-    app.config.from_object(config_class or 'config.get_config()')
-    os.makedirs(app.config["OUTPUT_FOLDER"], exist_ok=True)
-    # Initialize extensions
-    socketio.init_app(app, cors_allowed_origins="*", cookie=None)
-    login_manager.init_app(app)
-    login_manager.login_view = "auth.login"
-    db.init_app(app)
-
-    # Create database tables
-    with app.app_context():
-        db.create_all()
-
-    # Additional setup
-    utils.create_gui_dir(app.config['OUTPUT_FOLDER'])
-
-    # logger_list = app.config["LOGGERS"]
-    logger_path = os.path.join(app.config["OUTPUT_FOLDER"], app.config["LOGGERS_PATH"])
-    logger = utils.start_logger(socketio, 'gui_logger', logger_path)
-
-    @app.before_request
-    def before_request():
-        """
-        Called before
-
-        """
-        g.logger = logger
-        g.socketio = socketio
-        session.permanent = False
-        # DEMO_MODE: Simulate logged-in user per session
-        if app.config.get("DEMO_MODE", False):
-            if "demo_user_id" not in session:
-                session["demo_user_id"] = f"demo_{str(uuid.uuid4())[:8]}"
-
-            class SessionDemoUser(AnonymousUserMixin):
-                @property
-                def is_authenticated(self):
-                    return True
-
-                def get_id(self):
-                    return session.get("demo_user_id")
-
-            login_manager.anonymous_user = SessionDemoUser
-
 
 
-    @app.route('/')
-    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()
-
-    # app.config.setdefault("DEMO_MODE", False)
-    return app
-
 
 def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, model=None,
         config: Config = None,
@@ -182,6 +99,8 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
                                                                  save=True,
                                                                  exclude_names=exclude_names
                                                                  )
+        global_config.building_blocks = utils.create_block_snapshot()
+
     else:
         app.config["OFF_LINE"] = True
     if model:
@@ -200,12 +119,12 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
         for log in logger:
             utils.start_logger(socketio, log_filename=logger_path, logger_name=log)
 
-    # in case Python 3.12 or higher doesn't log URL
-    if sys.version_info >= (3, 12):
-        ip = utils.get_local_ip()
-        print(f"Server running at http://localhost:{port}")
-        if not ip == "127.0.0.1":
-            print(f"Server running at http://{ip}:{port}")
+    # TODO in case Python 3.12 or higher doesn't log URL
+    # if sys.version_info >= (3, 12):
+    #     ip = utils.get_local_ip()
+    #     print(f"Server running at http://localhost:{port}")
+    #     if not ip == "127.0.0.1":
+    #         print(f"Server running at http://{ip}:{port}")
     socketio.run(app, host=host, port=port, debug=debug, use_reloader=False, allow_unsafe_werkzeug=True)
     # return app
 
@@ -246,3 +165,4 @@ def load_plugins(blueprints: Union[list, Blueprint], app, socketio):
         plugin_names.append(blueprint.name)
         app.register_blueprint(blueprint, url_prefix=f"{url_prefix}/{blueprint.name}")
     return plugin_names
+

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/static/js/action_handlers.js

@@ -15,7 +15,7 @@ function saveWorkflow(link) {
     .then(data => {
         if (data.success) {
             // flash a success message
-            flash("Workflow saved successfully", "success");
+            // flash("Workflow saved successfully", "success");
             window.location.reload();  // or update the UI dynamically
         } else {
             alert("Failed to save workflow: " + data.error);

{ivoryos-1.2.6a0 → ivoryos-1.2.8}/ivoryos/static/js/socket_handler.js

@@ -37,13 +37,43 @@ document.addEventListener("DOMContentLoaded", function() {
         console.error("Error received:", errorData);
         var progressBar = document.getElementById('progress-bar-inner');
 
-        progressBar.classList.remove('bg-success');
-        progressBar.classList.add('bg-danger'); // Red color for error
-                // Show error modal
+        progressBar.classList.remove('bg-success', 'bg-warning');
+        progressBar.classList.add('bg-danger');
+
         var errorModal = new bootstrap.Modal(document.getElementById('error-modal'));
-        document.getElementById('error-message').innerText = "An error occurred: " + errorData.message;
+        document.getElementById('errorModalLabel').innerText = "Error Detected";
+        document.getElementById('error-message').innerText =
+            "An error occurred: " + errorData.message;
+
+        // Show all buttons again
+        document.getElementById('retry-btn').style.display = "inline-block";
+        document.getElementById('continue-btn').style.display = "inline-block";
+        document.getElementById('stop-btn').style.display = "inline-block";
+
         errorModal.show();
+    });
+
+
+    socket.on('human_intervention', function(data) {
+        console.warn("Human intervention required:", data);
+        var progressBar = document.getElementById('progress-bar-inner');
 
+        // Set progress bar to yellow
+        progressBar.classList.remove('bg-success', 'bg-danger');
+        progressBar.classList.add('bg-warning');
+
+        // Reuse error modal but update content
+        var errorModal = new bootstrap.Modal(document.getElementById('error-modal'));
+        document.getElementById('errorModalLabel').innerText = "Human Intervention Required";
+        document.getElementById('error-message').innerText =
+            "Workflow paused: " + (data.message || "Please check and manually resume.");
+
+        // Optionally: hide retry button, since it may not apply
+        document.getElementById('retry-btn').style.display = "none";
+        document.getElementById('continue-btn').style.display = "inline-block";
+        document.getElementById('stop-btn').style.display = "inline-block";
+
+        errorModal.show();
     });
 
     // Handle Pause/Resume Button
@@ -71,6 +101,11 @@ document.addEventListener("DOMContentLoaded", function() {
     document.getElementById('continue-btn').addEventListener('click', function() {
         socket.emit('pause');  // Resume execution
         console.log("Execution resumed.");
+
+        // Reset progress bar color to running (blue)
+        var progressBar = document.getElementById('progress-bar-inner');
+        progressBar.classList.remove('bg-danger', 'bg-warning');
+        progressBar.classList.add('bg-primary');
     });
 
     document.getElementById('retry-btn').addEventListener('click', function() {