ivoryos 0.1.21__tar.gz → 0.1.22__tar.gz

{ivoryos-0.1.21/ivoryos.egg-info → ivoryos-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.21
+Version: 0.1.22
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang
@@ -28,7 +28,7 @@ License-File: LICENSE
 - [Instructions for use](#instructions-for-use)
 - [Demo](#demo)
 - [Roadmap](#roadmap)
-- [License](#license)
+
 
 ## Description
 Granting SDLs flexibility and modularity makes it almost impossible to design a UI, yet it's a necessity for allowing more people to interact with it (democratisation). 
@@ -85,6 +85,10 @@ Create an account and login (local database)
   - **Database**: manage workflows in _Library_ tab.
 - **Info page**: additional info in _About_ tab.
 
+[//]: # (![Discord](https://img.shields.io/discord/1313641159356059770))
+
+[//]: # (![PyPI - Downloads](https://img.shields.io/pypi/dm/ivoryos))
+
 
 ### Additional settings
 #### AI assistant
@@ -125,7 +129,7 @@ After one successful connection, a blueprint will be automatically saved and mad
 ivoryos.run()
 ```
 ## Demo
-In the [abstract_sdl.py](https://gitlab.com/heingroup/ivoryos/-/blob/main/example/sdl_example/abstract_sdl.py), where instances of `AbstractSDL` is created as `sdl`,
+In the [abstract_sdl.py](https://gitlab.com/heingroup/ivoryos/-/blob/main/example/abstract_sdl_example/abstract_sdl.py), where instances of `AbstractSDL` is created as `sdl`,
 addresses will be available on terminal.
 ```Python
 ivoryos.run(__name__)

{ivoryos-0.1.21 → ivoryos-0.1.22}/README.md

@@ -16,7 +16,7 @@
 - [Instructions for use](#instructions-for-use)
 - [Demo](#demo)
 - [Roadmap](#roadmap)
-- [License](#license)
+
 
 ## Description
 Granting SDLs flexibility and modularity makes it almost impossible to design a UI, yet it's a necessity for allowing more people to interact with it (democratisation). 
@@ -73,6 +73,10 @@ Create an account and login (local database)
   - **Database**: manage workflows in _Library_ tab.
 - **Info page**: additional info in _About_ tab.
 
+[//]: # (![Discord](https://img.shields.io/discord/1313641159356059770))
+
+[//]: # (![PyPI - Downloads](https://img.shields.io/pypi/dm/ivoryos))
+
 
 ### Additional settings
 #### AI assistant
@@ -113,7 +117,7 @@ After one successful connection, a blueprint will be automatically saved and mad
 ivoryos.run()
 ```
 ## Demo
-In the [abstract_sdl.py](https://gitlab.com/heingroup/ivoryos/-/blob/main/example/sdl_example/abstract_sdl.py), where instances of `AbstractSDL` is created as `sdl`,
+In the [abstract_sdl.py](https://gitlab.com/heingroup/ivoryos/-/blob/main/example/abstract_sdl_example/abstract_sdl.py), where instances of `AbstractSDL` is created as `sdl`,
 addresses will be available on terminal.
 ```Python
 ivoryos.run(__name__)

{ivoryos-0.1.21 → ivoryos-0.1.22}/ivoryos/__init__.py

@@ -18,6 +18,16 @@ 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')
@@ -29,8 +39,9 @@ app.register_blueprint(database, url_prefix=url_prefix)
 
 
 def create_app(config_class=None):
-    # url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
-    # app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='static')
+    """
+    create app, init database
+    """
     app.config.from_object(config_class or 'config.get_config()')
 
     # Initialize extensions
@@ -85,7 +96,6 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
     :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 stream_address:
     """
     app = create_app(config_class=config or get_config())  # Create app instance using factory function
 
@@ -110,10 +120,8 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
         app.config["MODULE"] = module
         app.config["OFF_LINE"] = False
         global_config.deck = sys.modules[module]
-        # global_config.heinsight = HeinsightAPI("http://127.0.0.1:8080")
         global_config.deck_snapshot = utils.create_deck_snapshot(global_config.deck,
                                                                  output_path=app.config["DUMMY_DECK"], save=True)
-        # global_config.runner = ScriptRunner(globals())
     else:
         app.config["OFF_LINE"] = True
     if model:

{ivoryos-0.1.21 → ivoryos-0.1.22}/ivoryos/routes/control/control.py

@@ -151,7 +151,7 @@ def controllers(instrument: str):
     return render_template('controllers.html', instrument=instrument, forms=forms, format_name=format_name)
 
 
-@control.route("/backend_control/<instrument>", methods=['GET', 'POST'])
+@control.route("/backend_control/<instrument>", methods=['POST'])
 def backend_control(instrument: str=None):
     """
     .. :quickref: Backend Control; backend control
@@ -187,7 +187,7 @@ def backend_control(instrument: str=None):
                 return json_output, 400
         else:
             return "instrument not exist", 400
-    return json_output, 200
+        return json_output, 200
 
 
 @control.route("/backend_control", methods=['GET'])

{ivoryos-0.1.21 → ivoryos-0.1.22}/ivoryos/routes/control/templates/control/controllers_home.html

@@ -9,7 +9,7 @@
 {#                    {% if not 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}}</a></h5>
+                            <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">#}
@@ -19,6 +19,11 @@
                 </div>
             </div>
         {% endfor %}
+        <div class="d-flex mb-3">
+            <a href="{{ url_for('design.download', filetype='proxy') }}" class="btn btn-outline-primary">
+                <i class="bi bi-download"></i> Download remote control script
+            </a>
+        </div>
         {% if not deck %}
             <div class="col-xl-3 col-lg-4 col-md-6 mb-4 ">
                 <div class="bg-white rounded shadow-sm position-relative">

{ivoryos-0.1.21 → ivoryos-0.1.22}/ivoryos/routes/database/database.py

@@ -1,7 +1,7 @@
-from flask import Blueprint, redirect, url_for, flash, request, render_template, session, current_app
+from flask import Blueprint, redirect, url_for, flash, request, render_template, session, current_app, jsonify
 from flask_login import login_required
 
-from ivoryos.utils.db_models import Script, db
+from ivoryos.utils.db_models import Script, db, WorkflowRun, WorkflowStep
 from ivoryos.utils.utils import get_script_file, post_script_file
 
 database = Blueprint('database', __name__, template_folder='templates/database')
@@ -188,3 +188,44 @@ def save_as():
         else:
             flash("Script name is already exist in database")
         return redirect(url_for("design.experiment_builder"))
+
+
+@database.route('/workflow_runs')
+def list_workflows():
+    query = WorkflowRun.query
+    search_term = request.args.get("keyword", None)
+    if search_term:
+        query = query.filter(WorkflowRun.name.like(f'%{search_term}%'))
+    page = request.args.get('page', default=1, type=int)
+    per_page = 10
+
+    workflows = query.paginate(page=page, per_page=per_page, error_out=False)
+    return render_template('workflow_run_database.html', workflows=workflows)
+
+
+@database.route('/workflow_steps/<int:workflow_id>')
+def get_workflow_steps(workflow_id):
+    steps = WorkflowStep.query.filter_by(workflow_id=workflow_id).all()
+    steps_data = [step.as_dict() for step in steps]
+    return jsonify({'steps': steps_data})
+
+
+@database.route("/delete_workflow_data/<workflow_id>")
+@login_required
+def delete_workflow_data(workflow_id: str):
+    """
+    .. :quickref: Database; delete experiment data from database
+
+    delete workflow data from database
+
+    .. http:get:: /delete_workflow_data/<workflow_id>
+
+    :param workflow_id: workflow id
+    :type workflow_id: str
+    :status 302: redirect to :http:get:`/ivoryos/workflow_runs/`
+
+    """
+    run = WorkflowRun.query.get(workflow_id)
+    db.session.delete(run)
+    db.session.commit()
+    return redirect(url_for('database.list_workflows'))

{ivoryos-0.1.21 → ivoryos-0.1.22}/ivoryos/routes/database/templates/database/experiment_database.html

@@ -30,7 +30,7 @@
                 <th scope="col">Time created</th>
                 <th scope="col">Last modified</th>
                 <th scope="col">Author</th>
-                <th scope="col">Registered</th>
+{#                <th scope="col">Registered</th>#}
                 <th scope="col"></th>
             </tr>
         </thead>
@@ -43,13 +43,13 @@
                     <td>{{ workflow.time_created }}</td>
                     <td>{{ workflow.last_modified }}</td>
                     <td>{{ workflow.author }}</td>
-                    <td>{{ workflow.registered }}</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>
                         {% else %}
-                            <a class="disabled-link" href="{{ url_for('database.delete_workflow', workflow_name=workflow.name) }}">delete</a>
+                            <a class="disabled-link">delete</a>
                         {% endif %}
                     <td>
                 </tr>

ivoryos-0.1.22/ivoryos/routes/database/templates/database/workflow_run_database.html

@@ -0,0 +1,81 @@
+{% extends 'base.html' %}
+
+{% block title %}IvoryOS | Design Database{% endblock %}
+{% block body %}
+
+        <table class="table table-hover" id="workflowResultLibrary">
+        <thead>
+            <tr>
+                <th scope="col">Workflow name</th>
+                <th scope="col">Start time</th>
+                <th scope="col">End time</th>
+                <th scope="col">Data</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for workflow in workflows %}
+                <tr>
+                    <td><a href="{{ url_for('database.get_workflow_steps', workflow_id=workflow.id) }}">{{ workflow.name }}</a></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>
+
+                    <td>
+                        {% if workflow.data_path %}
+                          <a href="{{ url_for('design.download_results', filename=workflow.data_path) }}">{{ workflow.data_path }}</a>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if session['user'] == 'admin' or session['user'] == workflow.author %}
+                            <a href="{{ url_for('database.delete_workflow_data', workflow_id=workflow.id) }}">delete</a>
+                        {% else %}
+                            <a class="disabled-link">delete</a>
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+{#    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>
+        {% 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>
+    </div>
+
+    <div id="steps-container"></div>
+
+    <script>
+        function showSteps(workflowId) {
+            fetch(`/workflow_steps/${workflowId}`)
+                .then(response => response.json())
+                .then(data => {
+                    const container = document.getElementById('steps-container');
+                    container.innerHTML = '';  // Clear previous content
+                    const stepsList = document.createElement('ul');
+
+                    data.steps.forEach(step => {
+                        const li = document.createElement('li');
+                        li.innerHTML = `
+                            <strong>Step: </strong> ${step.method_name} <br>
+                            <strong>Start Time:</strong> ${step.start_time} <br>
+                            <strong>End Time:</strong> ${step.end_time} <br>
+                            <strong>Human Intervention:</strong> ${step.run_error ? 'Yes' : 'No'}
+                        `;
+                        stepsList.appendChild(li);
+                    });
+
+                    container.appendChild(stepsList);
+                });
+        }
+    </script>
+
+{% endblock %}

{ivoryos-0.1.21 → ivoryos-0.1.22}/ivoryos/routes/design/design.py

@@ -11,6 +11,7 @@ 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
@@ -360,7 +361,7 @@ def experiment_run():
             run_name = script.validate_function_name(run_name)
             runner.run_script(script=script, run_name=run_name, config=config, bo_args=bo_args,
                               logger=g.logger, socketio=g.socketio, repeat_count=repeat,
-                              output_path=datapath
+                              output_path=datapath, current_app=current_app._get_current_object()
                               )
             if utils.check_config_duplicate(config):
                 flash(f"WARNING: Duplicate in config entries.")
@@ -525,7 +526,20 @@ 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")
     return send_file(os.path.abspath(filepath), as_attachment=True)