ivoryos 1.0.8__tar.gz → 1.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 1.0.8
+Version: 1.1.0
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang
@@ -39,7 +39,7 @@ With the least modification of the current workflow, user can design, manage and
 This software is developed and tested using Windows. This software and its dependencies are compatible across major platforms: Linux, macOS, and Windows. Some dependencies (Flask-SQLAlchemy) may require additional setup.
 
 ### Python Version
-Python >=3.7 for best compatibility.
+Python >=3.10 for best compatibility. Python >=3.7 without Ax.
 ### Python dependencies
 This software is compatible with the latest versions of all dependencies. 
 - bcrypt~=4.0
@@ -50,8 +50,7 @@ This software is compatible with the latest versions of all dependencies.
 - SQLAlchemy-Utils~=0.41
 - Flask-WTF~=1.2
 - python-dotenv==1.0.1
-- openai (optional ~=1.53)
-- ax-platform (optional ~=0.3 or ~=0.4 for Python>=3.9)
+- ax-platform (optional ~=0.4 for Python>=3.9)
 
 ## Installation
 ```bash
@@ -61,7 +60,7 @@ or
 ```bash
 git clone https://gitlab.com/heingroup/ivoryos.git
 cd ivoryos
-pip install -e .
+pip install .
 ```
 
 The installation may take 10 to 30 seconds to install. The installation time may vary and take up to several minutes, depending on the network speed, computer performance, and virtual environment settings.
@@ -89,7 +88,7 @@ Create an account and login (local database)
 [//]: # (![PyPI - Downloads](https://img.shields.io/pypi/dm/ivoryos))
 
 
-### Additional settings
+### Additional settings (not actively maintained)
 #### AI assistant
 To streamline the experimental design on SDLs, we also integrate Large Language Models (LLMs) to interpret the inspected functions and generate code according to task descriptions.
 
@@ -141,8 +140,6 @@ ivoryos.run(__name__)
 ### Deck function and web form 
 ![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/source/_static/demo.gif)
 
-### Text-to-code demo
-![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/source/_static/text-to-code.gif)
 
 ### Directory structure
 

{ivoryos-1.0.8 → ivoryos-1.1.0}/README.md

@@ -28,7 +28,7 @@ With the least modification of the current workflow, user can design, manage and
 This software is developed and tested using Windows. This software and its dependencies are compatible across major platforms: Linux, macOS, and Windows. Some dependencies (Flask-SQLAlchemy) may require additional setup.
 
 ### Python Version
-Python >=3.7 for best compatibility.
+Python >=3.10 for best compatibility. Python >=3.7 without Ax.
 ### Python dependencies
 This software is compatible with the latest versions of all dependencies. 
 - bcrypt~=4.0
@@ -39,8 +39,7 @@ This software is compatible with the latest versions of all dependencies.
 - SQLAlchemy-Utils~=0.41
 - Flask-WTF~=1.2
 - python-dotenv==1.0.1
-- openai (optional ~=1.53)
-- ax-platform (optional ~=0.3 or ~=0.4 for Python>=3.9)
+- ax-platform (optional ~=0.4 for Python>=3.9)
 
 ## Installation
 ```bash
@@ -50,7 +49,7 @@ or
 ```bash
 git clone https://gitlab.com/heingroup/ivoryos.git
 cd ivoryos
-pip install -e .
+pip install .
 ```
 
 The installation may take 10 to 30 seconds to install. The installation time may vary and take up to several minutes, depending on the network speed, computer performance, and virtual environment settings.
@@ -78,7 +77,7 @@ Create an account and login (local database)
 [//]: # (![PyPI - Downloads](https://img.shields.io/pypi/dm/ivoryos))
 
 
-### Additional settings
+### Additional settings (not actively maintained)
 #### AI assistant
 To streamline the experimental design on SDLs, we also integrate Large Language Models (LLMs) to interpret the inspected functions and generate code according to task descriptions.
 
@@ -130,8 +129,6 @@ ivoryos.run(__name__)
 ### Deck function and web form 
 ![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/source/_static/demo.gif)
 
-### Text-to-code demo
-![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/source/_static/text-to-code.gif)
 
 ### Directory structure
 

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

@@ -3,12 +3,17 @@ import sys
 from typing import Union
 
 from flask import Flask, redirect, url_for, g, Blueprint
+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.database.database import database
-from ivoryos.routes.design.design import design, socketio
+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
@@ -35,10 +40,13 @@ def enforce_sqlite_foreign_keys(dbapi_connection, connection_record):
 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=url_prefix)
-app.register_blueprint(control, url_prefix=url_prefix)
-app.register_blueprint(design, url_prefix=url_prefix)
-app.register_blueprint(database, url_prefix=url_prefix)
+app.register_blueprint(auth, url_prefix=f'{url_prefix}/{auth.name}')
+app.register_blueprint(library, url_prefix=f'{url_prefix}/{library.name}')
+app.register_blueprint(control, url_prefix=f'{url_prefix}/{control.name}')
+app.register_blueprint(design, url_prefix=f'{url_prefix}/{design.name}')
+app.register_blueprint(execute, url_prefix=f'{url_prefix}/{execute.name}')
+app.register_blueprint(data, url_prefix=f'{url_prefix}/{data.name}')
+app.register_blueprint(api, url_prefix=f'{url_prefix}/{api.name}')
 
 @login_manager.user_loader
 def load_user(user_id):
@@ -166,7 +174,7 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
 
     # in case Python 3.12 or higher doesn't log URL
     if sys.version_info >= (3, 12):
-        ip = utils.get_ip_address()
+        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}")
@@ -195,6 +203,10 @@ def load_installed_plugins(app, socketio):
 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):

ivoryos-1.1.0/ivoryos/routes/api/api.py

@@ -0,0 +1,109 @@
+import os
+from flask import Blueprint, jsonify, request, current_app
+
+from ivoryos.routes.control.control import find_instrument_by_name
+from ivoryos.utils.form import create_form_from_module
+from ivoryos.utils.global_config import GlobalConfig
+from ivoryos.utils.db_models import Script, WorkflowRun, SingleStep, WorkflowStep
+
+from ivoryos.socket_handlers import abort_pending, abort_current, pause, retry, runner
+
+api = Blueprint('api', __name__)
+global_config = GlobalConfig()
+
+
+
+@api.route("/runner/status", methods=["GET"])
+def runner_status():
+    """Get the execution status"""
+    # runner = global_config.runner
+    runner_busy = global_config.runner_lock.locked()
+    status = {"busy": runner_busy}
+    task_status = global_config.runner_status
+    current_step = {}
+
+    if task_status is not None:
+        task_type = task_status["type"]
+        task_id = task_status["id"]
+        if task_type == "task":
+            step = SingleStep.query.get(task_id)
+            current_step = step.as_dict()
+        if task_type == "workflow":
+            workflow = WorkflowRun.query.get(task_id)
+            if workflow is not None:
+                latest_step = WorkflowStep.query.filter_by(workflow_id=workflow.id).order_by(
+                    WorkflowStep.start_time.desc()).first()
+                if latest_step is not None:
+                    current_step = latest_step.as_dict()
+                status["workflow_status"] = {"workflow_info": workflow.as_dict(), "runner_status": runner.get_status()}
+    status["current_task"] = current_step
+    return jsonify(status), 200
+
+
+@api.route("/runner/abort_pending", methods=["POST"])
+def api_abort_pending():
+    """Abort pending action(s) during execution"""
+    abort_pending()
+    return jsonify({"status": "ok"}), 200
+
+
+@api.route("/runner/abort_current", methods=["POST"])
+def api_abort_current():
+    """Abort right after current action during execution"""
+    abort_current()
+    return jsonify({"status": "ok"}), 200
+
+
+@api.route("/runner/pause", methods=["POST"])
+def api_pause():
+    """Pause during execution"""
+    msg = pause()
+    return jsonify({"status": "ok", "pause_status": msg}), 200
+
+
+@api.route("/runner/retry", methods=["POST"])
+def api_retry():
+    """Retry when error occur during execution"""
+    retry()
+    return jsonify({"status": "ok, retrying failed step"}), 200
+
+
+
+@api.route("/control/", strict_slashes=False, methods=['GET'])
+@api.route("/control/<instrument>", methods=['POST'])
+def backend_control(instrument: str=None):
+    """
+    .. :quickref: Backend Control; backend control
+
+    backend control through http requests
+
+    .. http:get:: /api/control/
+
+    :param instrument: instrument name
+    :type instrument: str
+
+    .. http:post:: /api/control/
+
+    """
+    if instrument:
+        inst_object = find_instrument_by_name(instrument)
+        forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
+
+    if request.method == 'POST':
+        method_name = request.form.get("hidden_name", None)
+        form = forms.get(method_name, None)
+        if form:
+            kwargs = {field.name: field.data for field in form if field.name not in ['csrf_token', 'hidden_name']}
+            wait = request.form.get("hidden_wait", "true") == "true"
+            output = runner.run_single_step(component=instrument, method=method_name, kwargs=kwargs, wait=wait,
+                                            current_app=current_app._get_current_object())
+            return jsonify(output), 200
+
+    snapshot = global_config.deck_snapshot.copy()
+    # Iterate through each instrument in the snapshot
+    for instrument_key, instrument_data in snapshot.items():
+        # Iterate through each function associated with the current instrument
+        for function_key, function_data in instrument_data.items():
+            # Convert the function signature to a string representation
+            function_data['signature'] = str(function_data['signature'])
+    return jsonify(snapshot), 200

{ivoryos-1.0.8 → ivoryos-1.1.0}/ivoryos/routes/auth/auth.py

@@ -6,10 +6,10 @@ from ivoryos.utils.db_models import Script, User, db
 from ivoryos.utils.utils import post_script_file
 login_manager = LoginManager()
 
-auth = Blueprint('auth', __name__, template_folder='templates/auth')
+auth = Blueprint('auth', __name__, template_folder='templates')
 
 
-@auth.route('/auth/login', methods=['GET', 'POST'])
+@auth.route('/login', methods=['GET', 'POST'])
 def login():
     """
     .. :quickref: User; login user
@@ -46,11 +46,11 @@ def login():
             return redirect(url_for('main.index'))
         else:
             flash("Incorrect username or password")
-            return redirect(url_for('auth.login')), 401
+            return redirect(url_for('auth.login'))
     return render_template('login.html')
 
 
-@auth.route('/auth/signup', methods=['GET', 'POST'])
+@auth.route('/signup', methods=['GET', 'POST'])
 def signup():
     """
     .. :quickref: User; signup for a new account
@@ -84,7 +84,7 @@ def signup():
     return render_template('signup.html')
 
 
-@auth.route("/auth/logout")
+@auth.route("/logout")
 @login_required
 def logout():
     """

ivoryos-1.1.0/ivoryos/routes/control/control.py

@@ -0,0 +1,131 @@
+from flask import Blueprint, redirect, flash, request, render_template, session, current_app
+from flask_login import login_required
+
+from ivoryos.routes.control.control_file import control_file
+from ivoryos.routes.control.control_new_device import control_temp
+from ivoryos.routes.control.utils import post_session_by_instrument, get_session_by_instrument, find_instrument_by_name
+from ivoryos.utils.global_config import GlobalConfig
+from ivoryos.utils.form import create_form_from_module, format_name
+from ivoryos.utils.task_runner import TaskRunner
+
+global_config = GlobalConfig()
+runner = TaskRunner()
+
+control = Blueprint('control', __name__, template_folder='templates')
+
+control.register_blueprint(control_file)
+control.register_blueprint(control_temp)
+
+
+
+@control.route("/home", strict_slashes=False, methods=["GET", "POST"])
+@login_required
+def deck_controllers():
+    """
+    Combined controllers page: sidebar with all instruments, main area with method cards for selected instrument.
+    """
+    deck_variables = global_config.deck_snapshot.keys()
+    temp_variables = global_config.defined_variables.keys()
+    instrument = request.args.get('instrument')
+    forms = None
+    # format_name_fn = format_name
+    if instrument:
+        inst_object = find_instrument_by_name(instrument)
+        _forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
+        order = get_session_by_instrument('card_order', instrument)
+        hidden_functions = get_session_by_instrument('hidden_functions', instrument)
+        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():
+                try:
+                    kwargs.pop("hidden_name", None)
+                    output = runner.run_single_step(instrument, method_name, kwargs, wait=True, current_app=current_app._get_current_object())
+                    flash(f"\nRun Success! Output value: {output}.")
+                except Exception as e:
+                    flash(str(e))
+            else:
+                if form:
+                    flash(form.errors)
+                else:
+                    flash("Invalid method selected.")
+    return render_template(
+        'controllers.html',
+        defined_variables=deck_variables,
+        temp_variables=temp_variables,
+        instrument=instrument,
+        forms=forms,
+        format_name=format_name,
+        session=session
+    )
+
+@control.route('/<instrument>/save-order', methods=['POST'])
+def save_order(instrument: str):
+    """
+    .. :quickref: Control Customization; Save functions' order
+
+    .. http:post:: /control/save-order
+
+    save function drag and drop order for the given <instrument>
+
+    """
+    # Save the new order for the specified group to session
+    data = request.json
+    post_session_by_instrument('card_order', instrument, data['order'])
+    return '', 204
+
+
+@control.route('/<instrument>/<function>/hide')
+def hide_function(instrument, function):
+    """
+    .. :quickref: Control Customization; Hide function
+
+    .. http:get:: //control/<instrument>/<function>/hide
+
+    Hide the given <instrument> and <function>
+
+    """
+    back = request.referrer
+    functions = get_session_by_instrument("hidden_functions", instrument)
+    order = get_session_by_instrument("card_order", instrument)
+    if function not in functions:
+        functions.append(function)
+        order.remove(function)
+    post_session_by_instrument('hidden_functions', instrument, functions)
+    post_session_by_instrument('card_order', instrument, order)
+    return redirect(back)
+
+
+@control.route('/<instrument>/<function>/unhide')
+def remove_hidden(instrument: str, function: str):
+    """
+    .. :quickref: Control Customization; Remove a hidden function
+
+    .. http:get:: /control/<instrument>/<function>/unhide
+
+    Un-hide the given <instrument> and <function>
+
+    """
+    back = request.referrer
+    functions = get_session_by_instrument("hidden_functions", instrument)
+    order = get_session_by_instrument("card_order", instrument)
+    if function in functions:
+        functions.remove(function)
+        order.append(function)
+    post_session_by_instrument('hidden_functions', instrument, functions)
+    post_session_by_instrument('card_order', instrument, order)
+    return redirect(back)
+
+
+
+
+

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

@@ -0,0 +1,36 @@
+import os
+from flask import Blueprint,  request,current_app, send_file
+from flask_login import login_required
+
+from ivoryos.utils.client_proxy import export_to_python, create_function
+from ivoryos.utils.global_config import GlobalConfig
+
+global_config = GlobalConfig()
+
+control_file = Blueprint('file', __name__)
+
+
+@control_file.route("/download/proxy", strict_slashes=False)
+@login_required
+def download_proxy():
+    """
+    .. :quickref: Direct Control; download proxy interface
+
+    download proxy interface
+
+    .. http:get:: /control/download
+    """
+    snapshot = global_config.deck_snapshot.copy()
+    class_definitions = {}
+    # Iterate through each instrument in the snapshot
+    for instrument_key, instrument_data in snapshot.items():
+        # Iterate through each function associated with the current instrument
+        for function_key, function_data in instrument_data.items():
+            # Convert the function signature to a string representation
+            function_data['signature'] = str(function_data['signature'])
+        class_name = instrument_key.split('.')[-1]  # Extracting the class name from the path
+        class_definitions[class_name.capitalize()] = create_function(request.url_root, class_name, instrument_data)
+    # Export the generated class definitions to a .py script
+    export_to_python(class_definitions, current_app.config["OUTPUT_FOLDER"])
+    filepath = os.path.join(current_app.config["OUTPUT_FOLDER"], "generated_proxy.py")
+    return send_file(os.path.abspath(filepath), as_attachment=True)

ivoryos-1.1.0/ivoryos/routes/control/control_new_device.py

@@ -0,0 +1,142 @@
+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.utils.global_config import GlobalConfig
+
+global_config = GlobalConfig()
+
+control_temp = Blueprint('temp', __name__)
+
+@control_temp.route("/import/module", methods=['POST'])
+def import_api():
+    """
+    .. :quickref: Advanced Features; Manually import API module(s)
+
+    importing other Python modules
+
+    .. http:post:: /control/import/module
+
+    :form filepath: API (Python class) module filepath
+
+    import the module and redirect to :http:get:`/ivoryos/control/new/`
+
+    """
+    filepath = request.form.get('filepath')
+    # 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.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])
+    # should handle path error and file type error
+    except Exception as e:
+        flash(e.__str__())
+    return redirect(url_for("control.temp.new_controller"))
+
+
+
+@control_temp.route("/import/deck", methods=['POST'])
+def import_deck():
+    """
+    .. :quickref: Advanced Features; Manually import a deck
+
+    .. http:post:: /control/import_deck
+
+    :form filepath: deck module filepath
+
+    import the module and redirect to the previous page
+
+    """
+    script = utils.get_script_file()
+    filepath = request.form.get('filepath')
+    session['dismiss'] = request.form.get('dismiss')
+    update = request.form.get('update')
+    back = request.referrer
+    if session['dismiss']:
+        return redirect(back)
+    name = os.path.split(filepath)[-1].split('.')[0]
+    try:
+        module = utils.import_module_by_filepath(filepath=filepath, name=name)
+        utils.save_to_history(filepath, current_app.config["DECK_HISTORY"])
+        module_sigs = utils.create_deck_snapshot(module, save=update, output_path=current_app.config["DUMMY_DECK"])
+        if not len(module_sigs) > 0:
+            flash("Invalid hardware deck, connect instruments in deck script", "error")
+            return redirect(url_for("control.deck_controllers"))
+        global_config.deck = module
+        global_config.deck_snapshot = module_sigs
+
+        if script.deck is None:
+            script.deck = module.__name__
+    # file path error exception
+    except Exception as e:
+        flash(e.__str__())
+    return redirect(back)
+
+
+@control_temp.route("/new/", strict_slashes=False)
+@control_temp.route("/new/<instrument>", methods=['GET', 'POST'])
+@login_required
+def new_controller(instrument=None):
+    """
+    .. :quickref: Direct Control; connect to a new device
+
+    interface for connecting a new <instrument>
+
+    .. http:get:: /control/new/
+
+    :param instrument: instrument name
+    :type instrument: str
+
+    .. http:post:: /control/new/
+
+    :form device_name: module instance name (e.g. my_instance = MyClass())
+    :form kwargs: dynamic module initialization kwargs fields
+
+    """
+    device = None
+    args = None
+    if instrument:
+
+        device = globals()[instrument]
+        args = utils.inspect.signature(device.__init__)
+
+        if request.method == 'POST':
+            device_name = request.form.get("device_name", "")
+            if device_name and device_name in globals():
+                flash("Device name is defined. Try another name, or leave it as blank to auto-configure")
+                # return render_template('controllers_new.html', instrument=instrument,
+                #                        api_variables=global_config.api_variables,
+                #                        device=device, args=args, defined_variables=global_config.defined_variables)
+            if device_name == "":
+                device_name = device.__name__.lower() + "_"
+                num = 1
+                while device_name + str(num) in global_config.defined_variables:
+                    num += 1
+                device_name = device_name + str(num)
+            kwargs = request.form.to_dict()
+            kwargs.pop("device_name")
+            for i in kwargs:
+                if kwargs[i] in global_config.defined_variables:
+                    kwargs[i] = global_config.defined_variables[kwargs[i]]
+            try:
+                utils.convert_config_type(kwargs, device.__init__.__annotations__, is_class=True)
+            except Exception as e:
+                flash(e)
+            try:
+                global_config.defined_variables[device_name] = device(**kwargs)
+                # global_config.defined_variables.add(device_name)
+                return redirect(url_for('control.deck_controllers'))
+            except Exception as e:
+                flash(e)
+    return render_template('controllers_new.html', instrument=instrument, api_variables=global_config.api_variables,
+                           device=device, args=args, defined_variables=global_config.defined_variables)