ivoryos 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

ivoryos/routes/auth/auth.py

@@ -9,7 +9,7 @@ login_manager = LoginManager()
 auth = Blueprint('auth', __name__, template_folder='templates/auth')
 
 
-@auth.route('/login', methods=['GET', 'POST'])
+@auth.route('/auth/login', methods=['GET', 'POST'])
 def login():
     """
     .. :quickref: User; login user
@@ -50,7 +50,7 @@ def login():
     return render_template('login.html')
 
 
-@auth.route('/signup', methods=['GET', 'POST'])
+@auth.route('/auth/signup', methods=['GET', 'POST'])
 def signup():
     """
     .. :quickref: User; signup for a new account
@@ -82,7 +82,7 @@ def signup():
     return render_template('signup.html')
 
 
-@auth.route("/logout")
+@auth.route("/auth/logout")
 @login_required
 def logout():
     """

ivoryos/routes/control/control.py

@@ -1,8 +1,10 @@
 import os
 
-from flask import Blueprint, redirect, url_for, flash, request, render_template, session, current_app, jsonify
+from flask import Blueprint, redirect, url_for, flash, request, render_template, session, current_app, jsonify, \
+    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
 from ivoryos.utils import utils
 from ivoryos.utils.form import create_form_from_module, format_name
@@ -14,7 +16,7 @@ runner = TaskRunner()
 control = Blueprint('control', __name__, template_folder='templates/control')
 
 
-@control.route("/my_deck")
+@control.route("/control/home/deck", strict_slashes=False)
 @login_required
 def deck_controllers():
     """
@@ -22,15 +24,15 @@ def deck_controllers():
 
     deck control home interface for listing all deck instruments
 
-    .. http:get:: /my_deck
+    .. http:get:: /control/home/deck
     """
     deck_variables = global_config.deck_snapshot.keys()
     deck_list = utils.import_history(os.path.join(current_app.config["OUTPUT_FOLDER"], 'deck_history.txt'))
     return render_template('controllers_home.html', defined_variables=deck_variables, deck=True, history=deck_list)
 
 
-@control.route("/new_controller/")
-@control.route("/new_controller/<instrument>", methods=['GET', 'POST'])
+@control.route("/control/new/", strict_slashes=False)
+@control.route("/control/new/<instrument>", methods=['GET', 'POST'])
 @login_required
 def new_controller(instrument=None):
     """
@@ -38,12 +40,12 @@ def new_controller(instrument=None):
 
     interface for connecting a new <instrument>
 
-    .. http:get:: /new_controller
+    .. http:get:: /control/new/
 
     :param instrument: instrument name
     :type instrument: str
 
-    .. http:post:: /new_controller
+    .. http:post:: /control/new/
 
     :form device_name: module instance name (e.g. my_instance = MyClass())
     :form kwargs: dynamic module initialization kwargs fields
@@ -88,7 +90,7 @@ def new_controller(instrument=None):
                            device=device, args=args, defined_variables=global_config.defined_variables)
 
 
-@control.route("/controllers")
+@control.route("/control/home/temp", strict_slashes=False)
 @login_required
 def controllers_home():
     """
@@ -96,14 +98,15 @@ def controllers_home():
 
     temporarily connected devices home interface for listing all instruments
 
-    .. http:get:: /controllers
+    .. http:get:: /control/home/temp
 
     """
     # defined_variables = parse_deck(deck)
-    return render_template('controllers_home.html', defined_variables=global_config.defined_variables)
+    defined_variables = global_config.defined_variables.keys()
+    return render_template('controllers_home.html', defined_variables=defined_variables)
 
 
-@control.route("/controllers/<instrument>", methods=['GET', 'POST'])
+@control.route("/control/<instrument>/methods", methods=['GET', 'POST'])
 @login_required
 def controllers(instrument: str):
     """
@@ -111,12 +114,12 @@ def controllers(instrument: str):
 
     control interface for selected <instrument>
 
-    .. http:get:: /controllers
+    .. http:get:: /control/<instrument>/methods
 
     :param instrument: instrument name
     :type instrument: str
 
-    .. http:post:: /controllers
+    .. http:post:: /control/<instrument>/methods
 
     :form hidden_name: function name (hidden field)
     :form kwargs: dynamic kwargs field
@@ -154,24 +157,50 @@ def controllers(instrument: str):
             flash(form.errors)
     return render_template('controllers.html', instrument=instrument, forms=forms, format_name=format_name)
 
+@control.route("/control/download", strict_slashes=False)
+@login_required
+def download_proxy():
+    """
+    .. :quickref: Direct Control; download proxy interface
+
+    download proxy interface
 
-@control.route("/backend_control/<instrument>", methods=['POST'])
+    .. 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)
+
+@control.route("/api/control/", strict_slashes=False, methods=['GET'])
+@control.route("/api/control/<instrument>", methods=['POST'])
 def backend_control(instrument: str=None):
     """
     .. :quickref: Backend Control; backend control
 
     backend control through http requests
 
-    .. http:get:: /backend_control
+    .. http:get:: /api/control/
 
     :param instrument: instrument name
     :type instrument: str
 
-    .. http:post:: /backend_control
+    .. http:post:: /api/control/
 
     """
-    inst_object = find_instrument_by_name(instrument)
-    forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
+    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)
@@ -183,42 +212,48 @@ def backend_control(instrument: str=None):
                                             current_app=current_app._get_current_object())
             return jsonify(output), 200
 
-
-@control.route("/backend_control", methods=['GET'])
-def backend_client():
-    """
-    .. :quickref: Backend Control; get snapshot
-
-    backend control through http requests
-
-    .. http:get:: /backend_control
-    """
-    # Create a snapshot of the current deck configuration
     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
 
-    json_output = jsonify(snapshot)
-    return json_output, 200
+# @control.route("/api/control", strict_slashes=False, methods=['GET'])
+# def backend_client():
+#     """
+#     .. :quickref: Backend Control; get snapshot
+#
+#     backend control through http requests
+#
+#     .. http:get:: /api/control/summary
+#     """
+#     # Create a snapshot of the current deck configuration
+#     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
 
 
-@control.route("/import_api", methods=['POST'])
+@control.route("/control/import/module", methods=['POST'])
 def import_api():
     """
     .. :quickref: Advanced Features; Manually import API module(s)
 
     importing other Python modules
 
-    .. http:post:: /import_api
+    .. http:post:: /control/import/module
 
     :form filepath: API (Python class) module filepath
 
-    import the module and redirect to :http:get:`/ivoryos/new_controller/`
+    import the module and redirect to :http:get:`/ivoryos/control/new/`
 
     """
     filepath = request.form.get('filepath')
@@ -266,12 +301,12 @@ def import_api():
 #     return redirect(url_for('control.deck_controllers'))
 
 
-@control.route("/import_deck", methods=['POST'])
+@control.route("/control/import/deck", methods=['POST'])
 def import_deck():
     """
     .. :quickref: Advanced Features; Manually import a deck
 
-    .. http:post:: /import_deck
+    .. http:post:: /control/import_deck
 
     :form filepath: deck module filepath
 
@@ -304,12 +339,12 @@ def import_deck():
     return redirect(back)
 
 
-@control.route('/save-order/<instrument>', methods=['POST'])
+@control.route('/control/<instrument>/save-order', methods=['POST'])
 def save_order(instrument: str):
     """
     .. :quickref: Control Customization; Save functions' order
 
-    .. http:post:: /save-order
+    .. http:post:: /control/save-order
 
     save function drag and drop order for the given <instrument>
 
@@ -320,12 +355,12 @@ def save_order(instrument: str):
     return '', 204
 
 
-@control.route('/hide_function/<instrument>/<function>')
+@control.route('/control/<instrument>/<function>/hide')
 def hide_function(instrument, function):
     """
     .. :quickref: Control Customization; Hide function
 
-    .. http:get:: /hide_function
+    .. http:get:: //control/<instrument>/<function>/hide
 
     Hide the given <instrument> and <function>
 
@@ -341,12 +376,12 @@ def hide_function(instrument, function):
     return redirect(back)
 
 
-@control.route('/remove_hidden/<instrument>/<function>')
+@control.route('/control/<instrument>/<function>/unhide')
 def remove_hidden(instrument: str, function: str):
     """
     .. :quickref: Control Customization; Remove a hidden function
 
-    .. http:get:: /remove_hidden
+    .. http:get:: /control/<instrument>/<function>/unhide
 
     Un-hide the given <instrument> and <function>
 

ivoryos/routes/control/templates/control/controllers_home.html

@@ -6,21 +6,21 @@
         {% for instrument in defined_variables %}
             <div class="col-xl-3 col-lg-4 col-md-6 mb-4 ">
                 <div class="bg-white rounded shadow-sm position-relative">
-{#                    {% if not deck %}#}
+                    {% if deck %}
 {#                        <a href="{{ url_for('control.disconnect', instrument=instrument) }}" class="stretched-link controller-card" style="float: right;color: red; position: relative;">Disconnect <i class="bi bi-x-square"></i></a>#}
                         <div class="p-4 controller-card">
                             <h5 class=""><a href="{{ url_for('control.controllers', instrument=instrument) }}" class="text-dark stretched-link">{{instrument.split(".")[1]}}</a></h5>
                         </div>
-{#                    {% else %}#}
-{#                        <div class="p-4 controller-card">#}
-{#                            <h5 class=""><a href="{{ url_for('control.controllers', instrument=instrument) }}" class="text-dark stretched-link">{{instrument}}</a></h5>#}
-{#                        </div>#}
-{#                    {% endif %}#}
+                    {% else %}
+                        <div class="p-4 controller-card">
+                            <h5 class=""><a href="{{ url_for('control.controllers', instrument=instrument) }}" class="text-dark stretched-link">{{instrument}}</a></h5>
+                        </div>
+                    {% endif %}
                 </div>
             </div>
         {% endfor %}
         <div class="d-flex mb-3">
-            <a href="{{ url_for('design.download', filetype='proxy') }}" class="btn btn-outline-primary">
+            <a href="{{ url_for('control.download_proxy', filetype='proxy') }}" class="btn btn-outline-primary">
                 <i class="bi bi-download"></i> Download remote control script
             </a>
         </div>

ivoryos/routes/database/database.py

@@ -8,21 +8,21 @@ database = Blueprint('database', __name__, template_folder='templates/database')
 
 
 
-@database.route("/edit_workflow/<workflow_name>")
+@database.route("/database/scripts/edit/<script_name>")
 @login_required
-def edit_workflow(workflow_name):
+def edit_workflow(script_name:str):
     """
-    .. :quickref: Database; load workflow to canvas
+    .. :quickref: Database; load workflow script to canvas
 
     load the selected workflow to the design canvas
 
-    .. http:get:: /edit_workflow/<workflow_name>
+    .. http:get:: /database/scripts/edit/<script_name>
 
-    :param workflow_name: workflow name
-    :type workflow_name: str
+    :param script_name: script name
+    :type script_name: str
     :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
     """
-    row = Script.query.get(workflow_name)
+    row = Script.query.get(script_name)
     script = Script(**row.as_dict())
     post_script_file(script)
     pseudo_name = session.get("pseudo_deck", "")
@@ -37,27 +37,27 @@ def edit_workflow(workflow_name):
     return redirect(url_for('design.experiment_builder'))
 
 
-@database.route("/delete_workflow/<workflow_name>")
+@database.route("/database/scripts/delete/<script_name>")
 @login_required
-def delete_workflow(workflow_name: str):
+def delete_workflow(script_name: str):
     """
     .. :quickref: Database; delete workflow
 
     delete workflow from database
 
-    .. http:get:: /delete_workflow/<workflow_name>
+    .. http:get:: /database/scripts/delete/<script_name>
 
-    :param workflow_name: workflow name
-    :type workflow_name: str
-    :status 302: redirect to :http:get:`/ivoryos/database/`
+    :param script_name: workflow name
+    :type script_name: str
+    :status 302: redirect to :http:get:`/ivoryos/database/scripts/`
 
     """
-    Script.query.filter(Script.name == workflow_name).delete()
+    Script.query.filter(Script.name == script_name).delete()
     db.session.commit()
     return redirect(url_for('database.load_from_database'))
 
 
-@database.route("/publish")
+@database.route("/database/scripts/save")
 @login_required
 def publish():
     """
@@ -65,7 +65,7 @@ def publish():
 
     save workflow to database
 
-    .. http:get:: /publish
+    .. http:get:: /database/scripts/save
 
     :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
     """
@@ -84,7 +84,7 @@ def publish():
     return redirect(url_for('design.experiment_builder'))
 
 
-@database.route("/finalize")
+@database.route("/database/scripts/finalize")
 @login_required
 def finalize():
     """
@@ -106,8 +106,8 @@ def finalize():
     return redirect(url_for('design.experiment_builder'))
 
 
-@database.route("/database/", strict_slashes=False)
-@database.route("/database/<deck_name>")
+@database.route("/database/scripts/", strict_slashes=False)
+@database.route("/database/scripts/<deck_name>")
 @login_required
 def load_from_database(deck_name=None):
     """
@@ -115,7 +115,7 @@ def load_from_database(deck_name=None):
 
     backend control through http requests
 
-    .. http:get:: /database/<deck_name>
+    .. http:get:: /database/scripts/<deck_name>
 
     :param deck_name: filter for deck name
     :type deck_name: str
@@ -135,19 +135,19 @@ def load_from_database(deck_name=None):
     page = request.args.get('page', default=1, type=int)
     per_page = 10
 
-    workflows = query.paginate(page=page, per_page=per_page, error_out=False)
+    scripts = query.paginate(page=page, per_page=per_page, error_out=False)
     if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
-        workflows = query.all()
-        workflow_names = [w.name for w in workflows]
+        scripts = query.all()
+        script_names = [script.name for script in scripts]
         return jsonify({
-            "workflows": workflow_names,
+            "workflows": script_names,
         })
     else:
         # return HTML
-        return render_template("experiment_database.html", workflows=workflows, deck_list=deck_list, deck_name=deck_name)
+        return render_template("scripts_database.html", scripts=scripts, deck_list=deck_list, deck_name=deck_name)
 
 
-@database.route("/edit_run_name", methods=['POST'])
+@database.route("/database/scripts/rename", methods=['POST'])
 @login_required
 def edit_run_name():
     """
@@ -155,7 +155,7 @@ def edit_run_name():
 
     edit the name of the current workflow, won't save to the database
 
-    .. http:post:: /edit_run_name
+    .. http:post:: database/scripts/rename
 
     : form run_name: new workflow name
     :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
@@ -173,15 +173,15 @@ def edit_run_name():
         return redirect(url_for("design.experiment_builder"))
 
 
-@database.route("/save_as", methods=['POST'])
+@database.route("/database/scripts/save_as", methods=['POST'])
 @login_required
 def save_as():
     """
     .. :quickref: Database; save the run name as
 
-    save the workflow name as
+    save the current workflow script as
 
-    .. http:post:: /save_as
+    .. http:post:: /database/scripts/save_as
 
     : form run_name: new workflow name
     :status 302: redirect to :http:get:`/ivoryos/experiment/build/`
@@ -203,9 +203,20 @@ def save_as():
         return redirect(url_for("design.experiment_builder"))
 
 
-@database.route('/workflow_runs')
+# -----------------------------------------------------------
+# ------------------  Workflow logs   -----------------------
+# -----------------------------------------------------------
+@database.route('/database/workflows/')
 def list_workflows():
-    query = WorkflowRun.query
+    """
+    .. :quickref: Database; list all workflow logs
+
+    list all workflow logs
+
+    .. http:get:: /database/workflows/
+
+    """
+    query = WorkflowRun.query.order_by(WorkflowRun.id.desc())
     search_term = request.args.get("keyword", None)
     if search_term:
         query = query.filter(WorkflowRun.name.like(f'%{search_term}%'))
@@ -219,11 +230,20 @@ def list_workflows():
         return jsonify({
             "workflow_data": workflow_data,
         })
-    return render_template('workflow_run_database.html', workflows=workflows)
+    else:
+        return render_template('workflow_database.html', workflows=workflows)
 
 
-@database.route("/workflow_steps/<int:workflow_id>")
-def get_workflow_steps(workflow_id):
+@database.route("/database/workflows/<int:workflow_id>")
+def get_workflow_steps(workflow_id:int):
+    """
+    .. :quickref: Database; list all workflow logs
+
+    list all workflow logs
+
+    .. http:get:: /database/workflows/<int:workflow_id>
+
+    """
     workflow = WorkflowRun.query.get_or_404(workflow_id)
     steps = WorkflowStep.query.filter_by(workflow_id=workflow_id).order_by(WorkflowStep.start_time).all()
 
@@ -261,23 +281,23 @@ def get_workflow_steps(workflow_id):
             "workflow_info": workflow.as_dict(),
             "steps": grouped_json,
         })
-
-    return render_template("experiment_step_view.html", workflow=workflow, grouped=grouped)
+    else:
+        return render_template("workflow_view.html", workflow=workflow, grouped=grouped)
 
 
-@database.route("/delete_workflow_data/<workflow_id>")
+@database.route("/database/workflows/delete/<int:workflow_id>")
 @login_required
-def delete_workflow_data(workflow_id: str):
+def delete_workflow_data(workflow_id: int):
     """
     .. :quickref: Database; delete experiment data from database
 
     delete workflow data from database
 
-    .. http:get:: /delete_workflow_data/<workflow_id>
+    .. http:get:: /database/workflows/delete/<int:workflow_id>
 
     :param workflow_id: workflow id
-    :type workflow_id: str
-    :status 302: redirect to :http:get:`/ivoryos/workflow_runs/`
+    :type workflow_id: int
+    :status 302: redirect to :http:get:`/ivoryos/database/workflows/`
 
     """
     run = WorkflowRun.query.get(workflow_id)

ivoryos/routes/database/templates/database/{experiment_database.html → scripts_database.html}

@@ -35,19 +35,19 @@
             </tr>
         </thead>
         <tbody>
-            {% for workflow in workflows %}
+            {% for script in scripts %}
                 <tr>
-                    <td><a href="{{ url_for('database.edit_workflow', workflow_name=workflow.name) }}">{{ workflow.name }}</a></td>
-                    <td>{{ workflow.deck }}</td>
-                    <td>{{ workflow.status }}</td>
-                    <td>{{ workflow.time_created }}</td>
-                    <td>{{ workflow.last_modified }}</td>
-                    <td>{{ workflow.author }}</td>
+                    <td><a href="{{ url_for('database.edit_workflow', script_name=script.name) }}">{{ script.name }}</a></td>
+                    <td>{{ script.deck }}</td>
+                    <td>{{ script.status }}</td>
+                    <td>{{ script.time_created }}</td>
+                    <td>{{ script.last_modified }}</td>
+                    <td>{{ script.author }}</td>
 {#                    <td>{{ workflow.registered }}</td>#}
                     <td>
                         {#not workflow.status == "finalized" or#}
-                        {% if session['user'] == 'admin' or session['user'] == workflow.author %}
-                            <a href="{{ url_for('database.delete_workflow', workflow_name=workflow.name) }}">delete</a>
+                        {% if session['user'] == 'admin' or session['user'] == script.author %}
+                            <a href="{{ url_for('database.delete_workflow', script_name=script.name) }}">delete</a>
                         {% else %}
                             <a class="disabled-link">delete</a>
                         {% endif %}
@@ -57,18 +57,27 @@
         </tbody>
     </table>
 
-{#    paging#}
+    {#    paging#}
     <div class="pagination justify-content-center">
-        <div class="page-item {{ 'disabled' if not workflows.has_prev else '' }}">
-            <a class="page-link" href="{{ url_for('database.load_from_database', page=workflows.prev_num) }}">Previous</a>
+        <div class="page-item {{ 'disabled' if not scripts.has_prev else '' }}">
+            <a class="page-link" href="{{ url_for('database.load_from_database', page=scripts.prev_num) }}">Previous</a>
         </div>
-        {% for num in workflows.iter_pages() %}
-            <div class="page-item">
-                <a class="page-link {{ 'active' if num == workflows.page else '' }}" href="{{ url_for('database.load_from_database', page=num) }}">{{ num }}</a>
-            </div>
+
+        {% for num in scripts.iter_pages() %}
+            {% if num %}
+                <div class="page-item {{ 'active' if num == scripts.page else '' }}">
+                    <a class="page-link" href="{{ url_for('database.load_from_database', page=num) }}">{{ num }}</a>
+                </div>
+            {% else %}
+                <div class="page-item disabled">
+                    <span class="page-link">…</span>
+                </div>
+            {% endif %}
         {% endfor %}
-        <div class="page-item {{ 'disabled' if not workflows.has_next else '' }}">
-            <a class="page-link" href="{{ url_for('database.load_from_database', page=workflows.next_num) }}">Next</a>
+
+        <div class="page-item {{ 'disabled' if not scripts.has_next else '' }}">
+            <a class="page-link" href="{{ url_for('database.load_from_database', page=scripts.next_num) }}">Next</a>
         </div>
     </div>
+
 {% endblock %}

ivoryos/routes/database/templates/database/{workflow_run_database.html → workflow_database.html}

@@ -2,11 +2,24 @@
 
 {% block title %}IvoryOS | Design Database{% endblock %}
 {% block body %}
+    <div class="div">
+        <form id="search" style="display: inline-block;float: right;" action="{{url_for('database.list_workflows',deck_name=deck_name)}}" method="GET">
+            <div class="input-group">
+                <div class="form-outline">
+                    <input type="search" name="keyword" id="keyword" class="form-control" placeholder="Search workflows...">
+                </div>
+                <button type="submit" class="btn btn-primary">
+                    <i class="bi bi-search"></i>
+                </button>
+            </div>
+        </form>
+    </div>
 
-        <table class="table table-hover" id="workflowResultLibrary">
+    <table class="table table-hover" id="workflowResultLibrary">
         <thead>
             <tr>
                 <th scope="col">Workflow name</th>
+                <th scope="col">Workflow ID</th>
                 <th scope="col">Start time</th>
                 <th scope="col">End time</th>
                 <th scope="col">Data</th>
@@ -16,6 +29,7 @@
             {% for workflow in workflows %}
                 <tr>
                     <td><a href="{{ url_for('database.get_workflow_steps', workflow_id=workflow.id) }}">{{ workflow.name }}</a></td>
+                    <td>{{ workflow.id }}</td>
                     <td>{{ workflow.start_time.strftime("%Y-%m-%d %H:%M:%S") if workflow.start_time else '' }}</td>
                     <td>{{ workflow.end_time.strftime("%Y-%m-%d %H:%M:%S") if workflow.end_time else '' }}</td>
 
@@ -36,16 +50,24 @@
         </tbody>
     </table>
 
-{#    paging#}
+    {#    paging#}
     <div class="pagination justify-content-center">
         <div class="page-item {{ 'disabled' if not workflows.has_prev else '' }}">
             <a class="page-link" href="{{ url_for('database.list_workflows', page=workflows.prev_num) }}">Previous</a>
         </div>
+
         {% for num in workflows.iter_pages() %}
-            <div class="page-item">
-                <a class="page-link {{ 'active' if num == workflows.page else '' }}" href="{{ url_for('database.list_workflows', page=num) }}">{{ num }}</a>
-            </div>
+            {% if num %}
+                <div class="page-item {{ 'active' if num == workflows.page else '' }}">
+                    <a class="page-link" href="{{ url_for('database.list_workflows', page=num) }}">{{ num }}</a>
+                </div>
+            {% else %}
+                <div class="page-item disabled">
+                    <span class="page-link">…</span>
+                </div>
+            {% endif %}
         {% endfor %}
+
         <div class="page-item {{ 'disabled' if not workflows.has_next else '' }}">
             <a class="page-link" href="{{ url_for('database.list_workflows', page=workflows.next_num) }}">Next</a>
         </div>

ivoryos/routes/design/design.py

@@ -3,6 +3,7 @@ import json
 import os
 import pickle
 import sys
+import time
 
 from flask import Blueprint, redirect, url_for, flash, jsonify, send_file, request, render_template, session, \
     current_app, g
@@ -11,7 +12,6 @@ from flask_socketio import SocketIO
 from werkzeug.utils import secure_filename
 
 from ivoryos.utils import utils
-from ivoryos.utils.client_proxy import create_function, export_to_python
 from ivoryos.utils.global_config import GlobalConfig
 from ivoryos.utils.form import create_builtin_form, create_action_button, format_name, create_form_from_pseudo, \
     create_form_from_action, create_all_builtin_forms
@@ -74,8 +74,8 @@ def handle_abort_action():
         socketio.emit('log', {'message': message})
 
 
-@design.route("/experiment/build/", methods=['GET', 'POST'])
-@design.route("/experiment/build/<instrument>/", methods=['GET', 'POST'])
+@design.route("/design/script/", methods=['GET', 'POST'])
+@design.route("/design/script/<instrument>/", methods=['GET', 'POST'])
 @login_required
 def experiment_builder(instrument=None):
     """
@@ -86,7 +86,7 @@ def experiment_builder(instrument=None):
     This route allows users to build and edit experiment workflows. Users can interact with available instruments,
     define variables, and manage experiment scripts.
 
-    .. http:get:: /experiment/build
+    .. http:get:: /design/script
 
     Load the experiment builder interface.
 
@@ -94,7 +94,7 @@ def experiment_builder(instrument=None):
     :type instrument: str
     :status 200: Experiment builder loaded successfully.
 
-    .. http:post:: /experiment/build
+    .. http:post:: /design/script
 
     Submit form data to add or modify actions in the experiment script.
 
@@ -248,17 +248,17 @@ def experiment_builder(instrument=None):
                            use_llm=enable_llm)
 
 
-@design.route("/generate_code", methods=['POST'])
+@design.route("/design/generate_code", methods=['POST'])
 @login_required
 def generate_code():
     """
     .. :quickref: Text to Code; Generate code from user input and update the design canvas.
 
-    .. http:post:: /generate_code
+    .. http:post:: /design/generate_code
 
     :form prompt: user's prompt
     :status 200: and then redirects to :http:get:`/experiment/build`
-    :status 400: failed to initialize the AI agent redirects to :http:get:`/experiment/build`
+    :status 400: failed to initialize the AI agent redirects to :http:get:`/design/script`
 
     """
     agent = global_config.agent
@@ -296,17 +296,17 @@ def generate_code():
     return redirect(url_for("design.experiment_builder", instrument=instrument, use_llm=True))
 
 
-@design.route("/experiment", methods=['GET', 'POST'])
+@design.route("/design/campaign", methods=['GET', 'POST'])
 @login_required
 def experiment_run():
     """
     .. :quickref: Workflow Execution; Execute/iterate the workflow
 
-    .. http:get:: /experiment
+    .. http:get:: /design/campaign
 
     Compile the workflow and load the experiment execution interface.
 
-    .. http:post:: /experiment
+    .. http:post:: /design/campaign
 
     Start workflow execution
 
@@ -328,7 +328,7 @@ def experiment_run():
         # todo
         exec_string = script.python_script if script.python_script else script.compile(current_app.config['SCRIPT_FOLDER'])
         # exec_string = script.compile(current_app.config['SCRIPT_FOLDER'])
-
+        # print(exec_string)
     except Exception as e:
         flash(e.__str__())
         # handle api request
@@ -351,6 +351,7 @@ def experiment_run():
         for key, func_str in exec_string.items():
             exec(func_str)
         line_collection = script.convert_to_lines(exec_string)
+
     except Exception:
         flash(f"Please check {key} syntax!!")
         return redirect(url_for("design.experiment_builder"))
@@ -408,6 +409,9 @@ def experiment_run():
             else:
                 flash(e)
     if request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
+        # wait to get a workflow ID
+        while not global_config.runner_status:
+            time.sleep(1)
         return jsonify({"status": "task started", "task_id": global_config.runner_status.get("id")})
     else:
         return render_template('experiment_run.html', script=script.script_dict, filename=filename,
@@ -418,15 +422,15 @@ def experiment_run():
                            history=deck_list, pause_status=runner.pause_status())
 
 
-@design.route("/toggle_script_type/<stype>")
+@design.route("/design/script/toggle/<stype>")
 @login_required
 def toggle_script_type(stype=None):
     """
     .. :quickref: Workflow Design; toggle the experimental phase for design canvas.
 
-    .. http:get:: /toggle_script_type
+    .. http:get:: /design/script/toggle/<stype>
 
-    :status 200: and then redirects to :http:get:`/experiment/build`
+    :status 200: and then redirects to :http:get:`/design/script`
 
     """
     script = utils.get_script_file()
@@ -446,16 +450,16 @@ def update_list():
 
 
 # --------------------handle all the import/export and download/upload--------------------------
-@design.route("/clear")
+@design.route("/design/clear")
 @login_required
 def clear():
     """
     .. :quickref: Workflow Design; clear the design canvas.
 
-    .. http:get:: /clear
+    .. http:get:: /design/clear
 
     :form prompt: user's prompt
-    :status 200: clear canvas and then redirects to :http:get:`/experiment/build`
+    :status 200: clear canvas and then redirects to :http:get:`/design/script`
     """
     deck = global_config.deck
     pseudo_name = session.get("pseudo_deck", "")
@@ -471,16 +475,16 @@ def clear():
     return redirect(url_for("design.experiment_builder"))
 
 
-@design.route("/import_pseudo", methods=['POST'])
+@design.route("/design/import/pseudo", methods=['POST'])
 @login_required
 def import_pseudo():
     """
     .. :quickref: Workflow Design; Import pseudo deck from deck history
 
-    .. http:post:: /import_pseudo
+    .. http:post:: /design/import/pseudo
 
     :form pkl_name: pseudo deck name
-    :status 302: load pseudo deck and then redirects to :http:get:`/experiment/build`
+    :status 302: load pseudo deck and then redirects to :http:get:`/design/script`
     """
     pkl_name = request.form.get('pkl_name')
     script = utils.get_script_file()
@@ -494,16 +498,16 @@ def import_pseudo():
     return redirect(url_for("design.experiment_builder"))
 
 
-@design.route('/uploads', methods=['POST'])
+@design.route('/design/uploads', methods=['POST'])
 @login_required
 def upload():
     """
     .. :quickref: Workflow Execution; upload a workflow config file (.CSV)
 
-    .. http:post:: /uploads
+    .. http:post:: /design/uploads
 
     :form file: workflow CSV config file
-    :status 302: save csv file and then redirects to :http:get:`/experiment`
+    :status 302: save csv file and then redirects to :http:get:`/design/campaign`
     """
     if request.method == "POST":
         f = request.files['file']
@@ -519,14 +523,20 @@ def upload():
             return redirect(url_for("design.experiment_run"))
 
 
-@design.route('/download_results/<filename>')
+@design.route('/design/workflow/download/<filename>')
 @login_required
 def download_results(filename):
+    """
+    .. :quickref: Workflow Design; download a workflow data file
+
+    .. http:get:: /design/workflow/download/<filename>
+
+    """
     filepath = os.path.join(current_app.config["DATA_FOLDER"], filename)
     return send_file(os.path.abspath(filepath), as_attachment=True)
 
 
-@design.route('/load_json', methods=['POST'])
+@design.route('/design/load_json', methods=['POST'])
 @login_required
 def load_json():
     """
@@ -535,7 +545,7 @@ def load_json():
     .. http:post:: /load_json
 
     :form file: workflow design JSON file
-    :status 302: load pseudo deck and then redirects to :http:get:`/experiment/build`
+    :status 302: load pseudo deck and then redirects to :http:get:`/design/script`
     """
     if request.method == "POST":
         f = request.files['file']
@@ -549,9 +559,15 @@ def load_json():
     return redirect(url_for("design.experiment_builder"))
 
 
-@design.route('/download/<filetype>')
+@design.route('/design/script/download/<filetype>')
 @login_required
 def download(filetype):
+    """
+    .. :quickref: Workflow Design Ext; download a workflow design file
+
+    .. http:get:: /design/script/download/<filetype>
+
+    """
     script = utils.get_script_file()
     run_name = script.name if script.name else "untitled"
     if filetype == "configure":
@@ -569,40 +585,28 @@ def download(filetype):
             outfile.write(json_object)
     elif filetype == "python":
         filepath = os.path.join(current_app.config["SCRIPT_FOLDER"], f"{run_name}.py")
-    elif filetype == "proxy":
-        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")
+    else:
+        return "Unsupported file type", 400
     return send_file(os.path.abspath(filepath), as_attachment=True)
 
 
-@design.route("/edit/<uuid>", methods=['GET', 'POST'])
+@design.route("/design/step/edit/<uuid>", methods=['GET', 'POST'])
 @login_required
 def edit_action(uuid: str):
     """
     .. :quickref: Workflow Design; edit parameters of an action step on canvas
 
-    .. http:get:: /edit
+    .. http:get:: /design/step/edit/<uuid>
 
     Load parameter form of an action step
 
-    .. http:post:: /edit
+    .. http:post:: /design/step/edit/<uuid>
 
     :param uuid: The step's uuid
     :type uuid: str
 
     :form dynamic form: workflow step dynamic inputs
-    :status 302: save changes and then redirects to :http:get:`/experiment/build`
+    :status 302: save changes and then redirects to :http:get:`/design/script`
     """
     script = utils.get_script_file()
     action = script.find_by_uuid(uuid)
@@ -625,18 +629,18 @@ def edit_action(uuid: str):
     return redirect(url_for('design.experiment_builder'))
 
 
-@design.route("/delete/<id>")
+@design.route("/design/step/delete/<id>")
 @login_required
 def delete_action(id: int):
     """
     .. :quickref: Workflow Design; delete an action step on canvas
 
-    .. http:get:: /delete
+    .. http:get:: /design/step/delete/<id>
 
     :param id: The step number id
     :type id: int
 
-    :status 302: save changes and then redirects to :http:get:`/experiment/build`
+    :status 302: save changes and then redirects to :http:get:`/design/script`
     """
     back = request.referrer
     script = utils.get_script_file()
@@ -645,18 +649,18 @@ def delete_action(id: int):
     return redirect(back)
 
 
-@design.route("/duplicate/<id>")
+@design.route("/design/step/duplicate/<id>")
 @login_required
 def duplicate_action(id: int):
     """
     .. :quickref: Workflow Design; duplicate an action step on canvas
 
-    .. http:get:: /duplicate
+    .. http:get:: /design/step/duplicate/<id>
 
     :param id: The step number id
     :type id: int
 
-    :status 302: save changes and then redirects to :http:get:`/experiment/build`
+    :status 302: save changes and then redirects to :http:get:`/design/script`
     """
     back = request.referrer
     script = utils.get_script_file()
@@ -667,8 +671,15 @@ def duplicate_action(id: int):
 
 # ---- HTTP API Endpoints ----
 
-@design.route("/api/status", methods=["GET"])
+@design.route("/api/runner/status", methods=["GET"])
 def runner_status():
+    """
+    .. :quickref: Workflow Design; get the execution status
+
+    .. http:get:: /api/runner/status
+
+    :status 200: status
+    """
     runner_busy = global_config.runner_lock.locked()
     status = {"busy": runner_busy}
     task_status = global_config.runner_status
@@ -692,39 +703,69 @@ def runner_status():
 
 
 
-@design.route("/api/abort_pending", methods=["POST"])
+@design.route("/api/runner/abort_pending", methods=["POST"])
 def api_abort_pending():
+    """
+    .. :quickref: Workflow Design; abort pending action(s) during execution
+
+    .. http:get:: /api/runner/abort_pending
+
+    :status 200: {"status": "ok"}
+    """
     abort_pending()
     return jsonify({"status": "ok"}), 200
 
-@design.route("/api/abort_current", methods=["POST"])
+@design.route("/api/runner/abort_current", methods=["POST"])
 def api_abort_current():
+    """
+    .. :quickref: Workflow Design; abort right after current action during execution
+
+    .. http:get:: /api/runner/abort_current
+
+    :status 200: {"status": "ok"}
+    """
     abort_current()
     return jsonify({"status": "ok"}), 200
 
-@design.route("/api/pause", methods=["POST"])
+@design.route("/api/runner/pause", methods=["POST"])
 def api_pause():
+    """
+    .. :quickref: Workflow Design; pause during execution
+
+    .. http:get:: /api/runner/pause
+
+    :status 200: {"status": "ok"}
+    """
     msg = pause()
     return jsonify({"status": "ok", "pause_status": msg}), 200
 
-@design.route("/api/retry", methods=["POST"])
+@design.route("/api/runner/retry", methods=["POST"])
 def api_retry():
+    """
+    .. :quickref: Workflow Design; retry when error occur during execution
+
+    .. http:get:: /api/runner/retry
+
+    :status 200: {"status": "ok"}
+    """
     retry()
     return jsonify({"status": "ok, retrying failed step"}), 200
 
 
-@design.route("/api/get_script", methods=["GET", "POST"])
-def get_script():
-    script = utils.get_script_file()
-    script.sort_actions()
-    script_collection = script.compile()
-    if request.method == "POST":
-        # create a brand-new script
-        deck = global_config.deck
-        deck_name = os.path.splitext(os.path.basename(deck.__file__))[0] if deck.__name__ == "__main__" else deck.__name__
-        script = Script(author=session.get('user'), deck=deck_name)
-        script_collection = request.get_json()
-        script.python_script = script_collection
-        utils.post_script_file(script)
-        return jsonify({"status": "ok"}), 200
-    return jsonify(script_collection), 200
+@design.route("/api/design/submit", methods=["POST"])
+def submit_script():
+    """
+    .. :quickref: Workflow Design; submit script
+
+    .. http:get:: /api/design/submit
+
+    :status 200: {"status": "ok"}
+    """
+    deck = global_config.deck
+    deck_name = os.path.splitext(os.path.basename(deck.__file__))[0] if deck.__name__ == "__main__" else deck.__name__
+    script = Script(author=session.get('user'), deck=deck_name)
+    script_collection = request.get_json()
+    script.python_script = script_collection
+    # todo check script format
+    utils.post_script_file(script)
+    return jsonify({"status": "ok"}), 200

ivoryos/utils/client_proxy.py

@@ -8,7 +8,7 @@ import os
 
 # Function to create class and methods dynamically
 def create_function(url, class_name, functions):
-    class_template = f'class {class_name.capitalize()}:\n    url = "{url}ivoryos/backend_control/deck.{class_name}"\n'
+    class_template = f'class {class_name.capitalize()}:\n    url = "{url}ivoryos/api/control/deck.{class_name}"\n'
 
     for function_name, details in functions.items():
         signature = details['signature']

ivoryos/utils/script_runner.py

@@ -69,7 +69,7 @@ class ScriptRunner:
 
         if self.current_app is None:
             self.current_app = current_app
-        time.sleep(1)  # Optional: may help ensure deck readiness
+        # time.sleep(1)  # Optional: may help ensure deck readiness
 
         # Try to acquire lock without blocking
         if not self.lock.acquire(blocking=False):
@@ -240,6 +240,7 @@ class ScriptRunner:
             for i in config:
                 try:
                     i = utils.convert_config_type(i, arg_type)
+                    compiled = True
                 except Exception as e:
                     logger.info(e)
                     compiled = False

ivoryos/version.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.3"

{ivoryos-1.0.1.dist-info → ivoryos-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 1.0.1
+Version: 1.0.3
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang

{ivoryos-1.0.1.dist-info → ivoryos-1.0.3.dist-info}/RECORD

@@ -1,24 +1,24 @@
 ivoryos/__init__.py,sha256=1v6LwuIao8WbmSskifzdfde7E_gH3PWCYaNpLaRtYZk,7341
 ivoryos/config.py,sha256=3FPBYTIBhQTKDvsEoR8ZeTmg65D-CSFEdGmOuIL4pSI,1311
-ivoryos/version.py,sha256=d4QHYmS_30j0hPN8NmNPnQ_Z0TphDRbu4MtQj9cT9e8,22
+ivoryos/version.py,sha256=2plzdEEb24FLjE2I2XyBBcJEPYWHccNL4SgtLC_6erg,22
 ivoryos/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/auth/auth.py,sha256=7CdXjGAr1B_xsmwweakTWOoROgsOJf0MNTzlMP_5Nus,3240
+ivoryos/routes/auth/auth.py,sha256=rvqMf4oeYXIjcsNWPbHoxK4QJRbM4YSMCl3IDRMnYtM,3255
 ivoryos/routes/auth/templates/auth/login.html,sha256=WSRrKbdM_oobqSXFRTo-j9UlOgp6sYzS9tm7TqqPULI,1207
 ivoryos/routes/auth/templates/auth/signup.html,sha256=b5LTXtpfTSkSS7X8u1ldwQbbgEFTk6UNMAediA5BwBY,1465
 ivoryos/routes/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/control/control.py,sha256=AbJA1dwWAWZi3eGnsbNObPASVsN7pZbL6la25xB52hI,14209
+ivoryos/routes/control/control.py,sha256=AaXqXqaIIed9xBVQsk52CNnNDTSofje5qQAfDGWd1Q0,16404
 ivoryos/routes/control/templates/control/controllers.html,sha256=iIp0h6WA68gQj9OsoiB7dU1BqH8CGomTueR73F4C8eY,4274
-ivoryos/routes/control/templates/control/controllers_home.html,sha256=VQ77HRvBlyBrQ3al5fcKF5Y6_vKtU8WeAhilqQQltAo,2997
+ivoryos/routes/control/templates/control/controllers_home.html,sha256=qAM4iZBEuXvSgGUWWVVIe2E9MPJOeG7U214hYM84jIE,2976
 ivoryos/routes/control/templates/control/controllers_new.html,sha256=uOQo9kYmwX2jk3KZDkMUF_ylfNUIs_oIWb_kk_MMVDM,4921
 ivoryos/routes/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/database/database.py,sha256=97387fF6tQIfb-BF6krILRP4a4_8jOJmGcE7BoPgjmk,9127
-ivoryos/routes/database/templates/database/experiment_database.html,sha256=edlCcKfrS91gGG1dPFQjC9xD7F7nWNNqS3S6Oa7apzs,3460
-ivoryos/routes/database/templates/database/experiment_step_view.html,sha256=u8_XYhiZ98PzglMzFEkuM1Tk9hVWf79xXIrpHVDxKa0,3618
+ivoryos/routes/database/database.py,sha256=kP5dEb5TvX3GlePk2sxlpwer8AsTM36kdeCkzAiFkR8,9837
+ivoryos/routes/database/templates/database/scripts_database.html,sha256=tEpKOj1UGz7mcDq11guwP48XJxwawjxjPvxRhKiIG2I,3640
 ivoryos/routes/database/templates/database/step_card.html,sha256=F4JRfacrEQfk2rrEbcI_i7G84nzKKDmCrMSmStLb4W4,290
-ivoryos/routes/database/templates/database/workflow_run_database.html,sha256=MczK9my9u0SyQsMFLbc6CXeZqKaBo5vk1SpwjkcZdqk,3571
+ivoryos/routes/database/templates/database/workflow_database.html,sha256=fsJHrYeEHGBKRn1pIxWITE6e93tdZsXH3zRs9Ob5FX0,4467
+ivoryos/routes/database/templates/database/workflow_view.html,sha256=u8_XYhiZ98PzglMzFEkuM1Tk9hVWf79xXIrpHVDxKa0,3618
 ivoryos/routes/design/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/design/design.py,sha256=ameAcgTLlrfOENUa48xxp64psuh2aZ0JuVfIj7zj-LM,28968
+ivoryos/routes/design/design.py,sha256=Ju9Hz0khhAk6HmnZd3Er3PglFkvZBNPAJ-fPJMfrrIM,29328
 ivoryos/routes/design/templates/design/experiment_builder.html,sha256=rEdcHj5onJG_4MejdFBPnJVzsvCMp1KDteqNkpx24kQ,29430
 ivoryos/routes/design/templates/design/experiment_run.html,sha256=7VP0Vo98phcYnFennd5vqaMK1M1QBwDmM-b9aZb8jOw,26282
 ivoryos/routes/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,16 +37,16 @@ ivoryos/static/js/sortable_design.js,sha256=wwpKfIzZGDxfX3moNz0cvPvm9YyHmopZK3wm
 ivoryos/templates/base.html,sha256=sDdwqOIUP2Get-py4E59PkieoGWLFpX6wAJe93s4aRo,8518
 ivoryos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/utils/bo_campaign.py,sha256=CVs7q15Pm2SRuJNaCvZKIxOFuv1xibM2yymtpAMAWOk,3285
-ivoryos/utils/client_proxy.py,sha256=AzcSQGMqeCqVULP1a7vEKNe135NZYryVX63ke0wgK04,2099
+ivoryos/utils/client_proxy.py,sha256=0OT2xTMkqh_2ybgCxMV_71ZVUThWwrsnAhTIBY5vDR8,2095
 ivoryos/utils/db_models.py,sha256=zlmmD2600CYyn79gQq8k0Vra7BDBKJBAyNLYclIWdvs,27382
 ivoryos/utils/form.py,sha256=b3JKxRc1jN45-bXyfzSJT1lcssUuxT86FhRmNUDv5-U,20973
 ivoryos/utils/global_config.py,sha256=OqfDrPgOzRdIUMD4V3pA9t6b-BATMjGZl8Jn7nkI56k,2138
 ivoryos/utils/llm_agent.py,sha256=-lVCkjPlpLues9sNTmaT7bT4sdhWvV2DiojNwzB2Lcw,6422
-ivoryos/utils/script_runner.py,sha256=k7bH9AeFGhx2tns-81q0JZFLCM9cvXCpZF7bH80RVzo,14504
+ivoryos/utils/script_runner.py,sha256=0b5hLKAF2o0SQKiArhUsG8-4MA-eniAcjwi8gCNVwtY,14542
 ivoryos/utils/task_runner.py,sha256=u4nF0wOADu_HVlGYVTOXnUm1woWGgYAccr-ZCzgtb6Q,2899
 ivoryos/utils/utils.py,sha256=OBwrRu02yh7pqG_lyl10zWr_RYes3xhMporxIz8lGYI,13579
-ivoryos-1.0.1.dist-info/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
-ivoryos-1.0.1.dist-info/METADATA,sha256=KEh9s448whM6VP-Knc5UUjl7DpoME989pKBfwLxFcHM,6992
-ivoryos-1.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-ivoryos-1.0.1.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
-ivoryos-1.0.1.dist-info/RECORD,,
+ivoryos-1.0.3.dist-info/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
+ivoryos-1.0.3.dist-info/METADATA,sha256=XE0dH-qpGIUYCXwkzDULsuTLOJPlGj0AnUwhtjeiQPY,6992
+ivoryos-1.0.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+ivoryos-1.0.3.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
+ivoryos-1.0.3.dist-info/RECORD,,