ivoryos 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

ivoryos/static/style.css

@@ -0,0 +1,211 @@
+.login {
+    width: 500px;
+    padding: 8% 0 0;
+    margin: auto;
+    align-content: center;
+}
+.card{
+    display: flex;
+    justify-content: flex-end;
+    cursor: move;
+    border: none;
+    transition: transform 0.3s ease, box-shadow 0.3s ease;
+
+}
+
+.card a {
+    text-decoration: none;
+}
+.card-title {
+    color: #007bff; /* Bootstrap primary color */
+}
+.grid-container {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(350px, 400px));
+    gap: 25px;
+    padding: 10px;
+}
+.navbar-nav {
+    font-size: larger;
+}
+.navbar-nav li{
+    margin-right:10px;
+    margin-left:10px;
+}
+
+.canvas {
+    height: 70vh;
+    overflow: hidden;
+    overflow-y: scroll;
+    background: #e8e8cd;
+    background-size: 20px 20px;
+    background-image: radial-gradient(circle, cadetblue 1px, rgba(0, 0, 0, 0) 1px);
+}
+
+.canvas content{
+    margin-top: 10px;
+}
+body {
+    padding-top: 100px;
+    background-color: #f8f9fa; /* Light grey background */
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+}
+/*.run-panel-row-height {*/
+/*    height: 80vh;*/
+/*}*/
+pre {
+  tab-size: 4;
+}
+.scroll-column{
+  height: 90vh;
+    overflow: hidden;
+  overflow-y: scroll;
+}
+
+label {
+    display:block
+}
+
+.scroll {
+    overflow: auto;
+    -webkit-overflow-scrolling: touch; /* enables momentum-scrolling on iOS */
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+
+
+/*Remove the scrollbar from Chrome, Safari, Edge and IE*/
+::-webkit-scrollbar {
+    background: transparent;
+}
+
+* {
+  -ms-overflow-style: none !important;
+}
+.script-table{
+    background: white;
+    width: fit-content;
+}
+.script-table td {
+    border-bottom: none;
+    border-top: cadetblue;
+}
+.script-table th{
+    border-top: cadetblue;
+    border-bottom: none;
+}
+
+.bottom-button {
+    position: absolute;
+    bottom: 20px;
+}
+
+hr.vertical {
+    width: 5px;
+    height: 100%;
+    display: inline-block;
+  /* or height in PX */
+}
+.list-group a {
+    text-align: left;
+}
+
+.tray input[type="checkbox"]:checked + label{
+    background: radial-gradient(circle, white 40%, midnightblue, dodgerblue 43%);
+}
+
+.btn-vial{
+    height: 50px;
+    width: 50px;
+    border-radius: 50%;
+    background: lightgray;
+    margin-right: 10px;
+    margin-top: 10px;
+    /*text-align: center;*/
+
+}
+
+.tray {
+    width: 70px;
+    height: 70px;
+    display: inline-block;
+    background: darkgrey;
+    /*text-align:center;*/
+    vertical-align: middle;
+}
+
+.disabled-link {
+  pointer-events: none;
+    color: currentColor;
+  cursor: not-allowed;
+  opacity: 0.5;
+  text-decoration: none;
+}
+
+
+.controller-card a {
+    text-decoration: none;
+}
+
+#logging-panel {
+    flex-grow: 1;
+    height: 50vh;
+    overflow-y: auto;
+    background-color: #f5f5f5;
+    padding: 10px;
+}
+
+.dropdown:hover .dropdown-menu {
+  display: block;
+}
+
+#reorder {
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+}
+
+.accordion-item.design-control .accordion-button.collapsed {
+    background-color:#c1f2f1 !important;
+}
+.accordion-item.design-control .accordion-button {
+    background-color:#b3dad9 !important;
+}
+.accordion-item.design-control .accordion-button:hover {
+    background-color:#b3dad9 !important;
+}
+
+.accordion-item.text-to-code .accordion-button.collapsed {
+    background-color: #cdc1f2 !important;
+}
+.accordion-item.text-to-code .accordion-button {
+    background-color: #cdc1f2 !important;
+}
+.accordion-item.text-to-code .accordion-button:hover {
+    background-color: #b8afdc !important;
+}
+.overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: none;
+    z-index: 1000;
+    text-align: center;
+    color: white;
+    font-size: 24px;
+    padding-top: 20%;
+}
+.drop-placeholder {
+    height: 2px !important;  /* Keep it very thin */
+    min-height: 2px !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    background: rgba(0, 0, 0, 0.2); /* Slight visibility */
+    border-radius: 2px;
+    list-style: none; /* Remove any default list styling */
+}

ivoryos/templates/base.html

@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{% block title %}{% endblock %}</title>
+    {#bootstrap#}
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha2/dist/css/bootstrap.min.css" integrity="sha384-aFq/bzH65dt+w6FI2ooMVUpc+21e0SRygnTpmBvdBgSdnuTN7QbdgL+OapgHtvPp" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
+    {#static#}
+    <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
+    <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" type="image/x-icon">
+    {#for python code displaying#}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/default.min.css">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha2/dist/js/bootstrap.bundle.min.js" integrity="sha384-qKXV1j0HvMUeCBQ+QVp7JcfGl760yU08IQ+GpUo5hlbpg51QRiuqHAJz8+BrxE/N" crossorigin="anonymous"></script>
+    <script>hljs.highlightAll();</script>
+    {#drag design#}
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
+    {#drag card#}
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+</head>
+<body>
+    <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
+        <div class= "container">
+{#            {{ module_config }}#}
+            <a class="navbar-brand" href="{{ url_for('main.index') }}">
+                <img src="{{url_for('static', filename='logo.webp')}}" alt="Logo" height="60" class="d-inline-block align-text-bottom">
+            </a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                <ul class="navbar-nav mr-auto">
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{ url_for('main.index') }}" aria-current="page">Home</a>
+                    </li>
+                    {% if enable_design %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('library.load_from_database') }}" aria-current="page">Library</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('design.experiment_builder') }}">Design</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('execute.experiment_run') }}">Compile/Run</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('data.list_workflows') }}">Data</a>
+                        </li>
+                    {% endif %}
+
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{ url_for('control.deck_controllers') }}">Devices</a></li>
+                    </li>
+{#                    <li class="nav-item">#}
+{#                        <a class="nav-link" href="{{ url_for('control.controllers_home') }}">Temp Devices</a></li>#}
+{#                    </li>#}
+{#                    <li class="nav-item">#}
+{#                        <a class="nav-link" href="{{ url_for('main.help_info') }}">About</a>#}
+{#                    </li>#}
+                    {% if plugins %}
+                        {% for plugin in plugins %}
+                            <li class="nav-item">
+                                <a class="nav-link" href="{{ url_for(plugin+'.main') }}">{{ plugin.capitalize() }}</a></li>
+                            </li>
+                        {% endfor %}
+                    {% endif %}
+                </ul>
+                <ul class="navbar-nav ms-auto">
+{#                    {{ current_user }}#}
+                    {% if current_user.is_authenticated %}
+                        <div class="dropdown">
+                            <li class="nav-item " aria-expanded="false"><i class="bi bi-person-circle"></i> {{ current_user.get_id() }}</li>
+                            <ul class="dropdown-menu">
+                                <li><a class="dropdown-item" href="{{ url_for("auth.logout") }}" role="button" aria-expanded="false">Logout</a></li>
+                            </ul>
+
+                        </div>
+                    {% else %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for("auth.login") }}">Login</a>
+                        </li>
+                    {% endif %}
+{#                    <li class="nav-item">#}
+{#                        <a class="nav-link"href="{{ url_for("signup") }}">Signup</a>#}
+{#                    </li>#}
+                </ul>
+            </div>
+        </div>
+    </nav>
+
+    <div class= "container">
+        <div class="flash">
+            {% with messages = get_flashed_messages() %}
+                {% if messages %}
+                <div class="alert alert-warning">
+                    Message:
+                    {% for message in messages %}
+                        <div >
+                            {{ message|safe }}
+                        </div>
+                    {% endfor %}
+                </div>
+                {% endif %}
+            {% endwith %}
+        </div>
+        {% block body %}{% endblock %}
+    </div>
+
+    <div class="modal fade" id="importModal" tabindex="-1" aria-labelledby="importModal" aria-hidden="true" >
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h1 class="modal-title fs-5" id="importModal">Import deck by file path</h1>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form method="POST" action="{{ url_for('control.temp.import_deck') }}" enctype="multipart/form-data">
+                    <div class="modal-body">
+                        <h5>from connection history</h5>
+                        <div class="form-group">
+                            <select class="form-select" name="filepath">
+                            <option disabled selected value> -- select an option -- </option>
+                            {% for connection in history %}
+                                <option style="overflow-wrap: break-word;" name="filepath" id="filepath" value="{{connection}}">{{connection}}</option>
+                            {% endfor %}
+{#                            <option>clear history</option>#}
+                            </select>
+                        </div>
+                        <h5>input manually</h5>
+                        <div class="input-group mb-3">
+                            <label class="input-group-text" for="filepath">File Path:</label>
+                            <input type="text" class="form-control" name="filepath" id="filepath">
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input" id="update" name="update" value="update">
+                                <label class="form-check-label" for="update">Update editor config</label>
+                            </div>
+                        </div>
+
+                        <div class="modal-footer">
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input" id="dismiss" name="dismiss" value="dismiss">
+                                <label class="form-check-label" for="dismiss">Don't remind me</label>
+                            </div>
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"> Close </button>
+                            <button type="submit"  class="btn btn-primary"> Save </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

ivoryos/utils/form.py

@@ -1,5 +1,10 @@
 from enum import Enum
-from typing import get_origin, get_args, Union, Any
+from typing import Union, Any
+try:
+    from typing import get_origin, get_args
+except ImportError:
+    # For Python versions = 3.7, use typing_extensions
+    from typing_extensions import get_origin, get_args
 
 from wtforms.fields.choices import SelectField
 from wtforms.fields.core import Field

ivoryos/utils/script_runner.py

@@ -188,44 +188,52 @@ class ScriptRunner:
         # _func_str = script.compile()
         # step_list_dict: dict = script.convert_to_lines(_func_str)
         self._emit_progress(socketio, 1)
-
-        # Run "prep" section once
-        script_dict = script.script_dict
-        with current_app.app_context():
-
-            run = WorkflowRun(name=script.name or "untitled", platform=script.deck or "deck",start_time=datetime.now())
-            db.session.add(run)
-            db.session.commit()
-            run_id = run.id  # Save the ID
-            global_config.runner_status = {"id":run_id, "type": "workflow"}
-            self._run_actions(script, section_name="prep", logger=logger, socketio=socketio, run_id=run_id)
-            output_list = []
-            _, arg_type = script.config("script")
-            _, return_list = script.config_return()
-
-            # Run "script" section multiple times
-            if repeat_count:
-                self._run_repeat_section(repeat_count, arg_type, bo_args, output_list, script,
-                                         run_name, return_list, compiled, logger, socketio,
-                                         history, output_path, run_id=run_id, optimizer=optimizer)
-            elif config:
-                self._run_config_section(config, arg_type, output_list, script, run_name, logger,
-                                         socketio, run_id=run_id, compiled=compiled)
-
-            # Run "cleanup" section once
-            self._run_actions(script, section_name="cleanup", logger=logger, socketio=socketio,run_id=run_id)
-            # Reset the running flag when done
+        filename = None
+        error_flag = False
+        # create a new run entry in the database
+        try:
+            with current_app.app_context():
+                run = WorkflowRun(name=script.name or "untitled", platform=script.deck or "deck",start_time=datetime.now())
+                db.session.add(run)
+                db.session.commit()
+                run_id = run.id  # Save the ID
+                global_config.runner_status = {"id":run_id, "type": "workflow"}
+
+                # Run "prep" section once
+                self._run_actions(script, section_name="prep", logger=logger, socketio=socketio, run_id=run_id)
+                output_list = []
+                _, arg_type = script.config("script")
+                _, return_list = script.config_return()
+                # Run "script" section multiple times
+                if repeat_count:
+                    self._run_repeat_section(repeat_count, arg_type, bo_args, output_list, script,
+                                             run_name, return_list, compiled, logger, socketio,
+                                             history, output_path, run_id=run_id, optimizer=optimizer)
+                elif config:
+                    self._run_config_section(config, arg_type, output_list, script, run_name, logger,
+                                             socketio, run_id=run_id, compiled=compiled)
+                # Run "cleanup" section once
+                self._run_actions(script, section_name="cleanup", logger=logger, socketio=socketio,run_id=run_id)
+                # Reset the running flag when done
+
+                # Save results if necessary
+
+                if not script.python_script and output_list:
+                    filename = self._save_results(run_name, arg_type, return_list, output_list, logger, output_path)
+                self._emit_progress(socketio, 100)
+
+        except Exception as e:
+            logger.error(f"Error during script execution: {e.__str__()}")
+            error_flag = True
+        finally:
             self.lock.release()
-            # Save results if necessary
-            filename = None
-            if not script.python_script and output_list:
-                filename = self._save_results(run_name, arg_type, return_list, output_list, logger, output_path)
-            self._emit_progress(socketio, 100)
-        with current_app.app_context():
-            run = db.session.get(WorkflowRun, run_id)  # SQLAlchemy 1.4+ recommended method
-            run.end_time = datetime.now()
-            run.data_path = filename
-            db.session.commit()
+            with current_app.app_context():
+                run = db.session.get(WorkflowRun, run_id)
+                run.end_time = datetime.now()
+                run.output_file = filename
+                run.run_error = error_flag
+                db.session.commit()
+
 
     def _run_actions(self, script, section_name="", logger=None, socketio=None, run_id=None):
         _func_str = script.python_script or script.compile()
@@ -254,7 +262,7 @@ class ScriptRunner:
                     logger.info(f'Stopping execution during {run_name}: {i + 1}/{len(config)}')
                     break
                 logger.info(f'Executing {i + 1} of {len(config)} with kwargs = {kwargs}')
-                progress = (i + 1) * 100 / len(config)
+                progress = ((i + 1) * 100 / len(config)) - 0.1
                 self._emit_progress(socketio, progress)
                 # fname = f"{run_name}_script"
                 # function = self.globals_dict[fname]

ivoryos/version.py

@@ -1 +1 @@
-__version__ = "1.2.2"
+__version__ = "1.2.4"