ivoryos 1.0.9__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

ivoryos/__init__.py

@@ -3,17 +3,23 @@ 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
 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
@@ -35,10 +41,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}/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):
@@ -86,6 +95,12 @@ def create_app(config_class=None):
     def redirect_to_prefix():
         return redirect(url_for('main.index', version=ivoryos_version))  # Assuming 'index' is a route in your blueprint
 
+    @app.template_filter('format_name')
+    def format_name(name):
+        name = name.split(".")[-1]
+        text = ' '.join(word for word in name.split('_'))
+        return text.capitalize()
+
     return app
 
 
@@ -136,7 +151,7 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
     app.config["LOGGERS_PATH"] = logger_output_name or app.config["LOGGERS_PATH"]  # default.log
     logger_path = os.path.join(app.config["OUTPUT_FOLDER"], app.config["LOGGERS_PATH"])
     dummy_deck_path = os.path.join(app.config["OUTPUT_FOLDER"], app.config["DUMMY_DECK"])
-
+    global_config.optimizers = OPTIMIZER_REGISTRY
     if module:
         app.config["MODULE"] = module
         app.config["OFF_LINE"] = False
@@ -195,6 +210,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/routes/api/api.py

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

ivoryos/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():
     """