ivoryos 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

ivoryos/__init__.py

@@ -1,248 +1,13 @@
-import os
-import sys
-import uuid
-from typing import Union
-
-from flask import Flask, redirect, url_for, g, Blueprint, session
-from flask_login import AnonymousUserMixin
-
-# sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-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.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.server import run
 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
-
-
-@event.listens_for(Engine, "connect")
-def enforce_sqlite_foreign_keys(dbapi_connection, connection_record):
-    if isinstance(dbapi_connection, sqlite3.Connection):
-        cursor = dbapi_connection.cursor()
-        cursor.execute("PRAGMA foreign_keys=ON")
-        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):
-    """
-    This function is called by Flask-Login on every request to get the
-    current user object from the user ID stored in the session.
-    """
-    # The correct implementation is to fetch the user from the database.
-    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,
-        logger: Union[str, list] = None,
-        logger_output_name: str = None,
-        enable_design: bool = True,
-        blueprint_plugins: Union[list, Blueprint] = [],
-        exclude_names: list = [],
-        ):
-    """
-    Start ivoryOS app server.
-
-    :param module: module name, __name__ for current module
-    :param host: host address, defaults to 0.0.0.0
-    :param port: port, defaults to None, and will use 8000
-    :param debug: debug mode, defaults to None (True)
-    :param llm_server: llm server, defaults to None.
-    :param model: llm model, defaults to None. If None, app will run without text-to-code feature
-    :param config: config class, defaults to None
-    :param logger: logger name of list of logger names, defaults to None
-    :param logger_output_name: log file save name of logger, defaults to None, and will use "default.log"
-    :param enable_design: enable design canvas, database and workflow execution
-    :param blueprint_plugins: Union[list[Blueprint], Blueprint] custom Blueprint pages
-    :param exclude_names: list[str] module names to exclude from parsing
-    """
-    app = create_app(config_class=config or get_config())  # Create app instance using factory function
-
-    # plugins = load_installed_plugins(app, socketio)
-    plugins = []
-    if blueprint_plugins:
-        config_plugins = load_plugins(blueprint_plugins, app, socketio)
-        plugins.extend(config_plugins)
-
-    def inject_nav_config():
-        """Make NAV_CONFIG available globally to all templates."""
-        return dict(
-            enable_design=enable_design,
-            plugins=plugins,
-        )
-
-    app.context_processor(inject_nav_config)
-    port = port or int(os.environ.get("PORT", 8000))
-    debug = debug if debug is not None else app.config.get('DEBUG', True)
-
-    app.config["LOGGERS"] = logger
-    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
-        global_config.deck = sys.modules[module]
-        global_config.deck_snapshot = utils.create_deck_snapshot(global_config.deck,
-                                                                 output_path=dummy_deck_path,
-                                                                 save=True,
-                                                                 exclude_names=exclude_names
-                                                                 )
-    else:
-        app.config["OFF_LINE"] = True
-    if model:
-        app.config["ENABLE_LLM"] = True
-        app.config["LLM_MODEL"] = model
-        app.config["LLM_SERVER"] = llm_server
-        utils.install_and_import('openai')
-        from ivoryos.utils.llm_agent import LlmAgent
-        global_config.agent = LlmAgent(host=llm_server, model=model,
-                                       output_path=app.config["OUTPUT_FOLDER"] if module is not None else None)
-    else:
-        app.config["ENABLE_LLM"] = False
-    if logger and type(logger) is str:
-        utils.start_logger(socketio, log_filename=logger_path, logger_name=logger)
-    elif type(logger) is list:
-        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}")
-    socketio.run(app, host=host, port=port, debug=debug, use_reloader=False, allow_unsafe_werkzeug=True)
-    # return app
-
-
-# def load_installed_plugins(app, socketio):
-#     """
-#     Dynamically load installed plugins and attach Flask-SocketIO.
-#     """
-#     plugin_names = []
-#     for entry_point in entry_points().get("ivoryos.plugins", []):
-#         plugin = entry_point.load()
-#
-#         # If the plugin has an `init_socketio()` function, pass socketio
-#         if hasattr(plugin, 'init_socketio'):
-#             plugin.init_socketio(socketio)
-#
-#         plugin_names.append(entry_point.name)
-#         app.register_blueprint(getattr(plugin, entry_point.name), url_prefix=f"{url_prefix}/{entry_point.name}")
-#
-#     return plugin_names
+from ivoryos.utils.decorators import block, BUILDING_BLOCKS
 
 
-def load_plugins(blueprints: Union[list, Blueprint], app, socketio):
-    """
-    Dynamically load installed plugins and attach Flask-SocketIO.
-    :param blueprints: Union[list, Blueprint] list of Blueprint objects or a single Blueprint object
-    :param app: Flask application instance
-    :param socketio: Flask-SocketIO instance
-    :return: list of plugin names
-    """
-    plugin_names = []
-    if not isinstance(blueprints, list):
-        blueprints = [blueprints]
-    for blueprint in blueprints:
-        # If the plugin has an `init_socketio()` function, pass socketio
-        if hasattr(blueprint, 'init_socketio'):
-            blueprint.init_socketio(socketio)
-        plugin_names.append(blueprint.name)
-        app.register_blueprint(blueprint, url_prefix=f"{url_prefix}/{blueprint.name}")
-    return plugin_names
+__all__ = [
+    "block",
+    "BUILDING_BLOCKS",
+    "OPTIMIZER_REGISTRY",
+    "run",
+    "ivoryos_version",
+]

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/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()
@@ -48,7 +48,10 @@ def deck_controllers(instrument: str = None):
     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())
@@ -99,12 +102,11 @@ def deck_controllers(instrument: str = None):
                 function_data["signature"] = str(function_data["signature"])
         return jsonify(snapshot)
 
-    deck_variables = global_config.deck_snapshot.keys()
-    temp_variables = global_config.defined_variables.keys()
     return render_template(
         "controllers.html",
-        defined_variables=deck_variables,
-        temp_variables=temp_variables,
+        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/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/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/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/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/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/server.py

@@ -0,0 +1,168 @@
+import os
+import sqlite3
+import sys
+from typing import Union
+
+from flask import Blueprint
+
+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.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.utils import utils
+from ivoryos.utils.db_models import db, User
+
+
+url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
+
+@event.listens_for(Engine, "connect")
+def enforce_sqlite_foreign_keys(dbapi_connection, connection_record):
+    if isinstance(dbapi_connection, sqlite3.Connection):
+        cursor = dbapi_connection.cursor()
+        cursor.execute("PRAGMA foreign_keys=ON")
+        cursor.close()
+
+
+
+@login_manager.user_loader
+def load_user(user_id):
+    """
+    This function is called by Flask-Login on every request to get the
+    current user object from the user ID stored in the session.
+    """
+    # The correct implementation is to fetch the user from the database.
+    return db.session.get(User, user_id)
+
+
+
+
+
+def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, model=None,
+        config: Config = None,
+        logger: Union[str, list] = None,
+        logger_output_name: str = None,
+        enable_design: bool = True,
+        blueprint_plugins: Union[list, Blueprint] = [],
+        exclude_names: list = [],
+        ):
+    """
+    Start ivoryOS app server.
+
+    :param module: module name, __name__ for current module
+    :param host: host address, defaults to 0.0.0.0
+    :param port: port, defaults to None, and will use 8000
+    :param debug: debug mode, defaults to None (True)
+    :param llm_server: llm server, defaults to None.
+    :param model: llm model, defaults to None. If None, app will run without text-to-code feature
+    :param config: config class, defaults to None
+    :param logger: logger name of list of logger names, defaults to None
+    :param logger_output_name: log file save name of logger, defaults to None, and will use "default.log"
+    :param enable_design: enable design canvas, database and workflow execution
+    :param blueprint_plugins: Union[list[Blueprint], Blueprint] custom Blueprint pages
+    :param exclude_names: list[str] module names to exclude from parsing
+    """
+    app = create_app(config_class=config or get_config())  # Create app instance using factory function
+
+    # plugins = load_installed_plugins(app, socketio)
+    plugins = []
+    if blueprint_plugins:
+        config_plugins = load_plugins(blueprint_plugins, app, socketio)
+        plugins.extend(config_plugins)
+
+    def inject_nav_config():
+        """Make NAV_CONFIG available globally to all templates."""
+        return dict(
+            enable_design=enable_design,
+            plugins=plugins,
+        )
+
+    app.context_processor(inject_nav_config)
+    port = port or int(os.environ.get("PORT", 8000))
+    debug = debug if debug is not None else app.config.get('DEBUG', True)
+
+    app.config["LOGGERS"] = logger
+    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
+        global_config.deck = sys.modules[module]
+        global_config.deck_snapshot = utils.create_deck_snapshot(global_config.deck,
+                                                                 output_path=dummy_deck_path,
+                                                                 save=True,
+                                                                 exclude_names=exclude_names
+                                                                 )
+        global_config.building_blocks = utils.create_block_snapshot()
+
+    else:
+        app.config["OFF_LINE"] = True
+    if model:
+        app.config["ENABLE_LLM"] = True
+        app.config["LLM_MODEL"] = model
+        app.config["LLM_SERVER"] = llm_server
+        utils.install_and_import('openai')
+        from ivoryos.utils.llm_agent import LlmAgent
+        global_config.agent = LlmAgent(host=llm_server, model=model,
+                                       output_path=app.config["OUTPUT_FOLDER"] if module is not None else None)
+    else:
+        app.config["ENABLE_LLM"] = False
+    if logger and type(logger) is str:
+        utils.start_logger(socketio, log_filename=logger_path, logger_name=logger)
+    elif type(logger) is list:
+        for log in logger:
+            utils.start_logger(socketio, log_filename=logger_path, logger_name=log)
+
+    # 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
+
+
+# def load_installed_plugins(app, socketio):
+#     """
+#     Dynamically load installed plugins and attach Flask-SocketIO.
+#     """
+#     plugin_names = []
+#     for entry_point in entry_points().get("ivoryos.plugins", []):
+#         plugin = entry_point.load()
+#
+#         # If the plugin has an `init_socketio()` function, pass socketio
+#         if hasattr(plugin, 'init_socketio'):
+#             plugin.init_socketio(socketio)
+#
+#         plugin_names.append(entry_point.name)
+#         app.register_blueprint(getattr(plugin, entry_point.name), url_prefix=f"{url_prefix}/{entry_point.name}")
+#
+#     return plugin_names
+
+
+def load_plugins(blueprints: Union[list, Blueprint], app, socketio):
+    """
+    Dynamically load installed plugins and attach Flask-SocketIO.
+    :param blueprints: Union[list, Blueprint] list of Blueprint objects or a single Blueprint object
+    :param app: Flask application instance
+    :param socketio: Flask-SocketIO instance
+    :return: list of plugin names
+    """
+    plugin_names = []
+    if not isinstance(blueprints, list):
+        blueprints = [blueprints]
+    for blueprint in blueprints:
+        # If the plugin has an `init_socketio()` function, pass socketio
+        if hasattr(blueprint, 'init_socketio'):
+            blueprint.init_socketio(socketio)
+        plugin_names.append(blueprint.name)
+        app.register_blueprint(blueprint, url_prefix=f"{url_prefix}/{blueprint.name}")
+    return plugin_names
+

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() {

ivoryos/static/js/sortable_design.js

@@ -115,20 +115,37 @@ function insertDropPlaceholder($target) {
 
 // Add this function to sortable_design.js
 function initializeDragHandlers() {
-    $(".accordion-item").off("dragstart").on("dragstart", function (event) {
-        let formHtml = $(this).find(".accordion-body form").prop('outerHTML');
-
-        if (!formHtml) {
-            console.error("Form not found in accordion-body");
-            return false;
-        }
+    const $cards = $(".accordion-item.design-control");
 
-        event.originalEvent.dataTransfer.setData("form", formHtml);
-        event.originalEvent.dataTransfer.setData("action", $(this).find(".draggable-action").data("action"));
-        event.originalEvent.dataTransfer.setData("id", $(this).find(".draggable-action").attr("id"));
+    // Toggle draggable based on mouse/touch position
+    $cards.off("mousedown touchstart").on("mousedown touchstart", function (event) {
+        this.setAttribute("draggable", $(event.target).closest(".input-group").length ? "false" : "true");
+    });
 
-        $(this).addClass("dragging");
+    // Handle the actual drag
+    $cards.off("dragstart dragend").on({
+        dragstart: function (event) {
+            if (this.getAttribute("draggable") !== "true") {
+                event.preventDefault();
+                return false;
+            }
+
+            const formHtml = $(this).find(".accordion-body form").prop("outerHTML");
+            if (!formHtml) return false;
+
+            event.originalEvent.dataTransfer.setData("form", formHtml);
+            event.originalEvent.dataTransfer.setData("action", $(this).find(".draggable-action").data("action"));
+            event.originalEvent.dataTransfer.setData("id", $(this).find(".draggable-action").attr("id"));
+
+            $(this).addClass("dragging");
+        },
+        dragend: function () {
+            $(this).removeClass("dragging").attr("draggable", "false");
+        }
     });
+
+    // Prevent form inputs from being draggable
+    $(".accordion-item input, .accordion-item select").attr("draggable", "false");
 }
 
 // Make sure it's called in the document ready function

ivoryos/utils/db_models.py

@@ -318,6 +318,12 @@ class Script(db.Model):
                     {"id": current_len + 2, "instrument": 'repeat', "action": 'endrepeat',
                      "args": {}, "return": '', "uuid": uid},
                 ],
+            "pause":
+                [
+                    {"id": current_len + 1, "instrument": 'pause', "action": "pause",
+                     "args": {"statement": 1 if statement == '' else statement}, "return": '', "uuid": uid,
+                     "arg_types": {"statement": "str"}}
+                ],
         }
         action_list = logic_dict[logic_type]
         self.currently_editing_script.extend(action_list)
@@ -443,6 +449,9 @@ class Script(db.Model):
         Compile the current script to a Python file.
         :return: String to write to a Python file.
         """
+        self.needs_call_human = False
+        self.blocks_included = False
+
         self.sort_actions()
         run_name = self.name if self.name else "untitled"
         run_name = self.validate_function_name(run_name)
@@ -524,6 +533,9 @@ class Script(db.Model):
             return f"{self.indent(indent_unit)}time.sleep({statement})", indent_unit
         elif instrument == 'repeat':
             return self._process_repeat(indent_unit, action_name, statement, next_action)
+        elif instrument == 'pause':
+            self.needs_call_human = True
+            return f"{self.indent(indent_unit)}pause('{statement}')", indent_unit
         #todo
         # elif instrument == 'registered_workflows':
         #     return inspect.getsource(my_function)
@@ -592,14 +604,18 @@ class Script(db.Model):
         """
         Process actions related to instruments.
         """
+        function_call = f"{instrument}.{action}"
+        if instrument.startswith("blocks"):
+            self.blocks_included = True
+            function_call = action
 
-        if isinstance(args, dict):
+        if isinstance(args, dict) and args != {}:
             args_str = self._process_dict_args(args)
-            single_line = f"{instrument}.{action}(**{args_str})"
+            single_line = f"{function_call}(**{args_str})"
         elif isinstance(args, str):
-            single_line = f"{instrument}.{action} = {args}"
+            single_line = f"{function_call} = {args}"
         else:
-            single_line = f"{instrument}.{action}()"
+            single_line = f"{function_call}()"
 
         if save_data:
             save_data += " = "
@@ -640,7 +656,7 @@ class Script(db.Model):
         """
         return arg in self.script_dict and self.script_dict[arg].get("arg_types") == "variable"
 
-    def _write_to_file(self, script_path, run_name, exec_string):
+    def _write_to_file(self, script_path, run_name, exec_string, call_human=False):
         """
         Write the compiled script to a file.
         """
@@ -650,9 +666,28 @@ class Script(db.Model):
             else:
                 s.write("deck = None")
             s.write("\nimport time")
+            if self.blocks_included:
+                s.write(f"\n{self._create_block_import()}")
+            if self.needs_call_human:
+                s.write("""\n\ndef pause(reason="Manual intervention required"):\n\tprint(f"\\nHUMAN INTERVENTION REQUIRED: {reason}")\n\tinput("Press Enter to continue...\\n")""")
+
             for i in exec_string.values():
                 s.write(f"\n\n\n{i}")
 
+    def _create_block_import(self):
+        imports = {}
+        from ivoryos.utils.decorators import BUILDING_BLOCKS
+        for category, methods in BUILDING_BLOCKS.items():
+            for method_name, meta in methods.items():
+                func = meta["func"]
+                module = meta["path"]
+                name = func.__name__
+                imports.setdefault(module, set()).add(name)
+        lines = []
+        for module, funcs in imports.items():
+            lines.append(f"from {module} import {', '.join(sorted(funcs))}")
+        return "\n".join(lines)
+
 class WorkflowRun(db.Model):
     __tablename__ = 'workflow_runs'
 

ivoryos/utils/decorators.py

@@ -0,0 +1,33 @@
+import inspect
+import os
+
+BUILDING_BLOCKS = {}
+
+def block(_func=None, *, category="general"):
+    def decorator(func):
+        if category not in BUILDING_BLOCKS:
+            BUILDING_BLOCKS[category] = {}
+        if func.__module__ == "__main__":
+            file_path = inspect.getfile(func)  # e.g. /path/to/math_blocks.py
+            module = os.path.splitext(os.path.basename(file_path))[0]
+        else:
+            module = func.__module__
+        BUILDING_BLOCKS[category][func.__name__] = {
+            "func": func,
+            "signature": inspect.signature(func),
+            "docstring": inspect.getdoc(func),
+            "path": module
+        }
+        return func
+    if _func is None:
+        return decorator
+    else:
+        return decorator(_func)
+
+
+class BlockNamespace:
+    """[not in use] Expose methods for one block category as attributes."""
+
+    def __init__(self, methods):
+        for name, meta in methods.items():
+            setattr(self, name, meta["func"])

ivoryos/utils/form.py

@@ -429,7 +429,7 @@ def create_form_from_action(action: dict, script=None, design=True):
 
 def create_all_builtin_forms(script):
     all_builtin_forms = {}
-    for logic_name in ['if', 'while', 'variable', 'wait', 'repeat']:
+    for logic_name in ['if', 'while', 'variable', 'wait', 'repeat', 'pause']:
         # signature = info.get('signature', {})
         form_class = create_builtin_form(logic_name, script)
         all_builtin_forms[logic_name] = form_class()
@@ -444,7 +444,8 @@ def create_builtin_form(logic_type, script):
 
     placeholder_text = {
         'wait': 'Enter second',
-        'repeat': 'Enter an integer'
+        'repeat': 'Enter an integer',
+        'pause': 'Human Intervention Message'
     }.get(logic_type, 'Enter statement')
     description_text = {
         'variable': 'Your variable can be numbers, boolean (True or False) or text ("text")',
@@ -536,6 +537,7 @@ def _action_button(action: dict, variables: dict):
         "repeat": "background-color: lightsteelblue",
         "if": "background-color: salmon",
         "while": "background-color: salmon",
+        "pause": "background-color: goldenrod",
     }.get(action['instrument'], "")
 
     if action['instrument'] in ['if', 'while', 'repeat']:

ivoryos/utils/global_config.py

@@ -8,6 +8,7 @@ class GlobalConfig:
         if cls._instance is None:
             cls._instance = super(GlobalConfig, cls).__new__(cls, *args, **kwargs)
             cls._instance._deck = None
+            cls._instance._building_blocks = None
             cls._instance._registered_workflows = None
             cls._instance._agent = None
             cls._instance._defined_variables = {}
@@ -27,6 +28,15 @@ class GlobalConfig:
         if self._deck is None:
             self._deck = value
 
+    @property
+    def building_blocks(self):
+        return self._building_blocks
+
+    @building_blocks.setter
+    def building_blocks(self, value):
+        if self._building_blocks is None:
+            self._building_blocks = value
+
     @property
     def registered_workflows(self):
         return self._registered_workflows

ivoryos/utils/script_runner.py

@@ -8,12 +8,18 @@ from datetime import datetime
 from ivoryos.utils import utils, bo_campaign
 from ivoryos.utils.db_models import Script, WorkflowRun, WorkflowStep, db, SingleStep
 from ivoryos.utils.global_config import GlobalConfig
+from ivoryos.utils.decorators import BUILDING_BLOCKS
 
 global_config = GlobalConfig()
 global deck
 deck = None
 # global deck, registered_workflows
 # deck, registered_workflows = None, None
+class HumanInterventionRequired(Exception):
+    pass
+
+def pause(reason="Human intervention required"):
+    raise HumanInterventionRequired(reason)
 
 class ScriptRunner:
     def __init__(self, globals_dict=None):
@@ -110,9 +116,15 @@ class ScriptRunner:
         # Parse function body from string
         temp_connections = global_config.defined_variables
         # Prepare execution environment
-        exec_globals = {"deck": deck, "time":time}  # Add required global objects
+        exec_globals = {"deck": deck, "time":time, "pause": pause}  # Add required global objects
         # exec_globals = {"deck": deck, "time": time, "registered_workflows":registered_workflows}  # Add required global objects
         exec_globals.update(temp_connections)
+
+        # Inject all block categories
+        for category, data in BUILDING_BLOCKS.items():
+            for method_name, method in data.items():
+                exec_globals[method_name] = method["func"]
+
         exec_locals = {}  # Local execution scope
 
         # Define function arguments manually in exec_locals
@@ -161,6 +173,13 @@ class ScriptRunner:
                 else:
                     exec(line, exec_globals, exec_locals)
                 step.run_error = False
+
+            except HumanInterventionRequired as e:
+                logger.warning(f"Human intervention required: {e}")
+                socketio.emit('human_intervention', {'message': str(e)})
+                # Instead of auto-resume, explicitly stay paused until user action
+                self.toggle_pause()
+
             except Exception as e:
                 logger.error(f"Error during script execution: {e}")
                 socketio.emit('error', {'message': str(e)})
@@ -230,7 +249,7 @@ class ScriptRunner:
             with current_app.app_context():
                 run = db.session.get(WorkflowRun, run_id)
                 run.end_time = datetime.now()
-                run.output_file = filename
+                run.data_path = filename
                 run.run_error = error_flag
                 db.session.commit()
 

ivoryos/utils/task_runner.py

@@ -2,6 +2,7 @@ import threading
 import time
 from datetime import datetime
 
+from ivoryos.utils.decorators import BUILDING_BLOCKS
 from ivoryos.utils.db_models import db, SingleStep
 from ivoryos.utils.global_config import GlobalConfig
 
@@ -48,16 +49,20 @@ class TaskRunner:
         if component.startswith("deck."):
             component = component.split(".")[1]
             instrument = getattr(deck, component)
+            function_executable = getattr(instrument, method)
+        elif component.startswith("blocks."):
+            component = component.split(".")[1]
+            function_executable = BUILDING_BLOCKS[component][method]["func"]
         else:
             temp_connections = global_config.defined_variables
             instrument = temp_connections.get(component)
-        function_executable = getattr(instrument, method)
+            function_executable = getattr(instrument, method)
         return function_executable
 
     def _run_single_step(self, component, method, kwargs, current_app=None):
         try:
             function_executable = self._get_executable(component, deck, method)
-            method_name = f"{function_executable.__self__.__class__.__name__}.{function_executable.__name__}"
+            method_name = f"{component}.{method}"
         except Exception as e:
             self.lock.release()
             return {"status": "error", "msg": e.__str__()}

ivoryos/utils/utils.py

@@ -15,7 +15,7 @@ from flask_login import current_user
 from flask_socketio import SocketIO
 
 from ivoryos.utils.db_models import Script
-
+from ivoryos.utils.decorators import BUILDING_BLOCKS
 
 def get_script_file():
     """Get script from Flask session and returns the script"""
@@ -151,6 +151,7 @@ def _convert_by_str(args, arg_types):
                 return args
             except Exception:
                 raise TypeError(f"Input type error: cannot convert '{args}' to {arg_type}.")
+    return args
 
 
 def _convert_by_class(args, arg_types):
@@ -364,6 +365,24 @@ def create_deck_snapshot(deck, save: bool = False, output_path: str = '', exclud
     return deck_snapshot
 
 
+def create_block_snapshot(save: bool = False, output_path: str = ''):
+    block_snapshot = {}
+    included = {}
+    failed = {}
+    for category, data in BUILDING_BLOCKS.items():
+        key = f"blocks.{category}"
+        block_snapshot[key] = {}
+
+        for func_name, meta in data.items():
+            func = meta["func"]
+            block_snapshot[key][func_name] = {
+                "signature": meta["signature"],
+                "docstring": meta["docstring"],
+                "path": f"{func.__module__}.{func.__qualname__}"
+            }
+    print(block_snapshot)
+    return block_snapshot
+
 def load_deck(pkl_name: str):
     """
     Loads a pickled deck snapshot from disk on offline mode

ivoryos/version.py

@@ -1 +1 @@
-__version__ = "1.2.7"
+__version__ = "1.2.8"

{ivoryos-1.2.7.dist-info → ivoryos-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ivoryos
-Version: 1.2.7
+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.7.dist-info → ivoryos-1.2.8.dist-info}/RECORD

@@ -1,7 +1,9 @@
-ivoryos/__init__.py,sha256=BAA7OPl3h_QdSc4na-7OWTKhaOq1LtHOrJHX3gGITrc,9863
+ivoryos/__init__.py,sha256=eUtNgSskl--l94VUTT1bgiBR8gdMMFQgjHEsHOxdHyI,320
+ivoryos/app.py,sha256=yU3f4mu2LL82NEPvQid5GWdfrIa4F_04Feb0bl-ICV4,3323
 ivoryos/config.py,sha256=y3RxNjiIola9tK7jg-mHM8EzLMwiLwOzoisXkDvj0gA,2174
+ivoryos/server.py,sha256=2ka-xqWpuY9HIqxtA24jU_dIX51DRx1ccejpJnBKgaE,6742
 ivoryos/socket_handlers.py,sha256=VWVWiIdm4jYAutwGu6R0t1nK5MuMyOCL0xAnFn06jWQ,1302
-ivoryos/version.py,sha256=49prCLbE3fFzLfxem5rd2dr1iV4_L-bN0N4J7jxU5yA,22
+ivoryos/version.py,sha256=CfVXm0wwlKPW0khOcwhWw61TpgtZiLijCePsAIOK3aU,22
 ivoryos/optimizer/ax_optimizer.py,sha256=PoSu8hrDFFpqyhRBnaSMswIUsDfEX6sPWt8NEZ_sobs,7112
 ivoryos/optimizer/base_optimizer.py,sha256=JTbUharZKn0t8_BDbAFuwZIbT1VOnX1Xuog1pJuU8hY,1992
 ivoryos/optimizer/baybe_optimizer.py,sha256=EdrrRiYO-IOx610cPXiQhH4qG8knUP0uiZ0YoyaGIU8,7954
@@ -13,11 +15,11 @@ ivoryos/routes/auth/auth.py,sha256=CqoP9cM8BuXVGHGujX7-0sNAOdWILU9amyBrObOD6Ss,3
 ivoryos/routes/auth/templates/login.html,sha256=WSRrKbdM_oobqSXFRTo-j9UlOgp6sYzS9tm7TqqPULI,1207
 ivoryos/routes/auth/templates/signup.html,sha256=b5LTXtpfTSkSS7X8u1ldwQbbgEFTk6UNMAediA5BwBY,1465
 ivoryos/routes/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/control/control.py,sha256=4wqY-68PCJkhdBXzj4sb3BceI0PKViPiTLGz8VP_rU8,6059
+ivoryos/routes/control/control.py,sha256=6LnVF4mGgfLQvzmrSFxaFz9lBtBe4WnXlIouDxtaR2E,6230
 ivoryos/routes/control/control_file.py,sha256=3fQ9R8EcdqKs_hABn2EqRAB1xC2DHAT_q_pwsMIDDQI,864
 ivoryos/routes/control/control_new_device.py,sha256=mfJKg5JAOagIpUKbp2b5nRwvd2V3bzT3M0zIhIsEaFM,5456
-ivoryos/routes/control/utils.py,sha256=at11wA5HPAZN4BfMaymj1GKEvRTrqi4Wg6cTqUZJDjU,1155
-ivoryos/routes/control/templates/controllers.html,sha256=tgtTuns8S2Pf6XKeojinQZ1bz112ieRGLPF5-1cElfE,8030
+ivoryos/routes/control/utils.py,sha256=XlhhqAtOj7n3XfHPDxJ8TvCV2K2I2IixB0CBkl1QeQc,1242
+ivoryos/routes/control/templates/controllers.html,sha256=XoV1HVjB6ho4Ah8HerqqmbiWK0N_HyFKhmqu4E2JXdM,8966
 ivoryos/routes/control/templates/controllers_new.html,sha256=eVeLABT39DWOIYrwWClw7sAD3lCoAGCznygPgFbQoRc,5945
 ivoryos/routes/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/data/data.py,sha256=AoqCaIAK0f9hstF1pxlJFeK_J-wKbMfXWGNDUbaBFFk,4218
@@ -25,11 +27,11 @@ ivoryos/routes/data/templates/workflow_database.html,sha256=ofvHcovpwmJXo1SFiSrL
 ivoryos/routes/data/templates/workflow_view.html,sha256=72xKreX9WhYx-0n0cFf-CL-fJIWXPCIaTi_Aa8Tq3xg,3651
 ivoryos/routes/data/templates/components/step_card.html,sha256=9lKR4NCgU2v5Nbdv2uaJ-9aKibtiB_2-Y_kyHX6Ka1k,730
 ivoryos/routes/design/__init__.py,sha256=zS3HXKaw0ALL5n6t_W1rUz5Uj5_tTQ-Y1VMXyzewvR0,113
-ivoryos/routes/design/design.py,sha256=BxCSyb9NHlm6SLi7iZITS-g4IyPyBK0ZVAeadPGG-Cw,17763
+ivoryos/routes/design/design.py,sha256=xYDwtCdTcCd282guaIeNvfUFc5UsiypkQVpRvFqRujQ,18246
 ivoryos/routes/design/design_file.py,sha256=m4yku8fkpLUs4XvLJBqR5V-kyaGKbGB6ZoRxGbjEU5Q,2140
 ivoryos/routes/design/design_step.py,sha256=l8U3-FuXmap__sYm51AueKdbTaLCFaKjAz-j02b4g-E,5200
 ivoryos/routes/design/templates/experiment_builder.html,sha256=hh-d2tOc_40gww5WfUYIf8sM3qBaALZnR8Sx7Ja4tpU,1623
-ivoryos/routes/design/templates/components/action_form.html,sha256=ktnmXVwe2WFLM6Sg_VbBfDrPXrnongSUxjpYhZGamPY,3058
+ivoryos/routes/design/templates/components/action_form.html,sha256=kXJOrJLbFsMHHWVSuMQHpt1xFrUMnwgzTG8e6Qfn0Cg,3042
 ivoryos/routes/design/templates/components/actions_panel.html,sha256=jHTR58saTUIZInBdC-vLc1ZTbStLiULeWbupjB4hQzo,977
 ivoryos/routes/design/templates/components/autofill_toggle.html,sha256=CRVQUHoQT7sOSO5-Vax54ImHdT4G_mEgqR5OQkeUwK8,617
 ivoryos/routes/design/templates/components/canvas.html,sha256=bKLCJaG1B36Yy9Vsnz4P5qiX4BPdfaGe9JeQQzu9rsI,268
@@ -38,7 +40,7 @@ ivoryos/routes/design/templates/components/canvas_header.html,sha256=7iIzLDGHX7M
 ivoryos/routes/design/templates/components/canvas_main.html,sha256=9inYO700zRa09lfQI2NY4FJGGeTh-9rvX4ltjj0LK3k,1432
 ivoryos/routes/design/templates/components/deck_selector.html,sha256=ryTRpljYezo0AzGLCJu_qOMokjjnft3GIxddmNGtBA0,657
 ivoryos/routes/design/templates/components/edit_action_form.html,sha256=Dz7FnnOK4PYptAHNy9_WFCU1RZTSV61-1lNHHOSRJNs,1876
-ivoryos/routes/design/templates/components/instruments_panel.html,sha256=r1jnScVRAknrRPRbAnIVApfnx9f4yavgf9ZlNhNpjW4,3135
+ivoryos/routes/design/templates/components/instruments_panel.html,sha256=tRKd-wOqKjaMJCLuGgRmHtxIgSjklhBkuX8arm5aTCU,4268
 ivoryos/routes/design/templates/components/modals.html,sha256=6Dl8I8oD4ln7kK8C5e92pFVVH5KDte-vVTL0U_6NSTg,306
 ivoryos/routes/design/templates/components/python_code_overlay.html,sha256=GUHgsmUWQf0P1Fbg5W0OJC34TXCUIMQVUkS7KDoauyI,1264
 ivoryos/routes/design/templates/components/sidebar.html,sha256=A6dRo53zIB6QJVrRLJcBZHUNJ3qpYPnR3kWxM8gTkjw,501
@@ -76,25 +78,26 @@ ivoryos/static/js/action_handlers.js,sha256=UJHKFhYRNQRBo0AHLCIxhWxt8OSgYeyLynzP
 ivoryos/static/js/db_delete.js,sha256=l67fqUaN_FVDaL7v91Hd7LyRbxnqXx9nyjF34-7aewY,561
 ivoryos/static/js/overlay.js,sha256=dPxop19es0E0ZUSY3d_4exIk7CJuQEnlW5uTt5fZfzI,483
 ivoryos/static/js/script_metadata.js,sha256=m8VYZ8OGT2oTx1kXMXq60bKQI9WCbJNkzcFDzLvRuGc,1188
-ivoryos/static/js/socket_handler.js,sha256=2Iyv_3METjhSlSavs_L9FE3PKY4xDEpfzJpd2FywY9o,5300
+ivoryos/static/js/socket_handler.js,sha256=vrpVyYMsFpHIJjqke5LwVttRI6IJMXSx_D0AMhWRg3k,6906
 ivoryos/static/js/sortable_card.js,sha256=ifmlGe3yy0U_KzMphV4ClRhK2DLOvkELYMlq1vECuac,807
-ivoryos/static/js/sortable_design.js,sha256=QqYyk385JNm6zCgZK_Oa-cJEP1uPtZ_tVz27x4hyx5A,4790
+ivoryos/static/js/sortable_design.js,sha256=ASc9P6_423Mczeg6QH6LVtyxLyWhpxWJP2nEEjR9K1M,5474
 ivoryos/static/js/ui_state.js,sha256=XYsOcfGlduqLlqHySvPrRrR50CiAsml51duqneigsRY,3368
 ivoryos/templates/base.html,sha256=cl5w6E8yskbUzdiJFal6fZjnPuFNKEzc7BrrbRd6bMI,8581
 ivoryos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/utils/bo_campaign.py,sha256=Fil-zT7JexL_p9XqyWByjAk42XB1R9XUKN8CdV5bi6c,9714
 ivoryos/utils/client_proxy.py,sha256=74G3HAuq50iEHkSvlMZFmQaukm613FbRgOdzO_T3dMg,10191
-ivoryos/utils/db_models.py,sha256=EN0gNzYgCxKLxgceKEixWi17EKMObz0hLdDnpZ-ur5o,27923
-ivoryos/utils/form.py,sha256=A6juCWGtSbaTClgVc8rqufniPRWT7LjeDQs4r0gQs50,22207
-ivoryos/utils/global_config.py,sha256=zNO9GYhGn7El3msWoxJIm3S4Mzb3VMh2i5ZEsVtvb2Q,2463
+ivoryos/utils/db_models.py,sha256=aJ9JOmKERXqGrhSTqIbdTGeq16aalDUaOmU3kvZvx0U,29542
+ivoryos/utils/decorators.py,sha256=p1Bdl3dCeaHNv6-cCCUOZMiFu9kRaqqQnkFJUkzPoJE,991
+ivoryos/utils/form.py,sha256=G9wkxCF3aozWBvm865DcCkA6G4dQfNQWKlPejYp5t-U,22311
+ivoryos/utils/global_config.py,sha256=D6oz5dttyaP24jbqnw1sR64moSb-7jJkSpRuufdA_TI,2747
 ivoryos/utils/llm_agent.py,sha256=-lVCkjPlpLues9sNTmaT7bT4sdhWvV2DiojNwzB2Lcw,6422
 ivoryos/utils/py_to_json.py,sha256=fyqjaxDHPh-sahgT6IHSn34ktwf6y51_x1qvhbNlH-U,7314
-ivoryos/utils/script_runner.py,sha256=MdLMSAeaVXxnbcQfzHJximeJ6W7uOCxqTQhFSpsEieg,17065
+ivoryos/utils/script_runner.py,sha256=gQp37yzlo04h6bxbHloOOim4cLn43S0web7-XN2TQjA,17799
 ivoryos/utils/serilize.py,sha256=lkBhkz8r2bLmz2_xOb0c4ptSSOqjIu6krj5YYK4Nvj8,6784
-ivoryos/utils/task_runner.py,sha256=qgHheE2rnhgRmWUeUQHgdS-Kl-yv-9uA-eM6lD9d0b4,3018
-ivoryos/utils/utils.py,sha256=-WiU0_brszB9yDsiQepf_7SzNgPTSpul2RSKDOY3pqo,13921
-ivoryos-1.2.7.dist-info/licenses/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
-ivoryos-1.2.7.dist-info/METADATA,sha256=EEA3X0SiKMnSGTiZ-Q5_4A6LsofsYSVdKE7L2o4eZhE,7351
-ivoryos-1.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ivoryos-1.2.7.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
-ivoryos-1.2.7.dist-info/RECORD,,
+ivoryos/utils/task_runner.py,sha256=bfG6GubdlzgD8rBwzD00aGB5LDFmb9hLFJIOMH8hVv4,3248
+ivoryos/utils/utils.py,sha256=JfDANbhjD6eBJTKeTtEn6B060jd9HACMLxrrQjJzaAI,14589
+ivoryos-1.2.8.dist-info/licenses/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
+ivoryos-1.2.8.dist-info/METADATA,sha256=lw0l8cYCIOBgPxYj3PxoOcAwyLDUL4T6Ij_DrRQsBXc,7351
+ivoryos-1.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ivoryos-1.2.8.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
+ivoryos-1.2.8.dist-info/RECORD,,