ivoryos 1.0.9__py3-none-any.whl → 1.4.4__py3-none-any.whl

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

@@ -2,25 +2,28 @@
 
 {% block title %}IvoryOS | Design Database{% endblock %}
 {% block body %}
-    <div class="database-filter">
-        {% for deck_name in deck_list %}
-            {% if deck_name == "ALL" %}<a class="btn btn-secondary" href="{{url_for('database.load_from_database')}}">Back</a>
-            {% else %}<a class="btn btn-secondary" href="{{url_for('database.load_from_database',deck_name=deck_name)}}">{{deck_name}}</a>
-            {% endif %}
+    <!-- Deck Filter Buttons -->
+    <div class="btn-group" role="group">
+        {% for deck in deck_list %}
+            <a class="btn {% if deck == current_deck_name %}btn-primary{% else %}btn-secondary{% endif %}"
+               href="{{ url_for('library.load_from_database', deck_name=deck) }}">
+                {{ deck }}
+            </a>
         {% endfor %}
-
-        <form id="search" style="display: inline-block;float: right;" action="{{url_for('database.load_from_database',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>
 
+    <!-- Search Form -->
+    <form id="search" class="d-flex " method="GET" style="display: inline-block;float: right;"
+          action="{{ url_for('library.load_from_database', deck_name=current_deck_name or 'ALL') }}">
+        <div class="input-group">
+            <input type="search" name="keyword" id="keyword" class="form-control"
+                   placeholder="Search workflows..." value="{{ request.args.get('keyword', '') }}">
+            <button type="submit" class="btn btn-primary">
+                <i class="bi bi-search"></i>
+            </button>
+        </div>
+    </form>
+
     <table class="table table-hover" id="workflowLibrary">
         <thead>
             <tr>
@@ -37,7 +40,7 @@
         <tbody>
             {% for script in scripts %}
                 <tr>
-                    <td><a href="{{ url_for('database.edit_workflow', script_name=script.name) }}">{{ script.name }}</a></td>
+                    <td><a href="{{ url_for('library.workflow_script', script_name=script.name) }}">{{ script.name }}</a></td>
                     <td>{{ script.deck }}</td>
                     <td>{{ script.status }}</td>
                     <td>{{ script.time_created }}</td>
@@ -46,8 +49,14 @@
 {#                    <td>{{ workflow.registered }}</td>#}
                     <td>
                         {#not workflow.status == "finalized" or#}
-                        {% if session['user'] == 'admin' or session['user'] == script.author %}
-                            <a href="{{ url_for('database.delete_workflow', script_name=script.name) }}">delete</a>
+                        {% set username = current_user.get_id() %}
+                        {% if username == 'admin' or username == script.author %}
+                            <a href="#"
+                               class="text-danger"
+                               data-delete-url="{{ url_for('library.workflow_script', script_name=script.name) }}"
+                               onclick="deleteWorkflow(this); return false;">
+                               Delete
+                            </a>
                         {% else %}
                             <a class="disabled-link">delete</a>
                         {% endif %}
@@ -60,13 +69,13 @@
     {#    paging#}
     <div class="pagination justify-content-center">
         <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>
+            <a class="page-link" href="{{ url_for('library.load_from_database', page=scripts.prev_num) }}">Previous</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>
+                    <a class="page-link" href="{{ url_for('library.load_from_database', page=num) }}">{{ num }}</a>
                 </div>
             {% else %}
                 <div class="page-item disabled">
@@ -76,8 +85,8 @@
         {% endfor %}
 
         <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>
+            <a class="page-link" href="{{ url_for('library.load_from_database', page=scripts.next_num) }}">Next</a>
         </div>
     </div>
-
+    <script src="{{ url_for('static', filename='js/db_delete.js') }}"></script>
 {% endblock %}

ivoryos/routes/main/main.py

@@ -1,8 +1,12 @@
-from flask import Blueprint, render_template, current_app
-from flask_login import login_required
+import os
+
+from flask import Blueprint, render_template, current_app, request, url_for
+from flask_login import login_required, current_user
+from werkzeug.utils import secure_filename, redirect
+from ivoryos.utils.db_models import db
 from ivoryos.version import __version__ as ivoryos_version
 
-main = Blueprint('main', __name__, template_folder='templates/main')
+main = Blueprint('main', __name__, template_folder='templates')
 
 @main.route("/")
 @login_required
@@ -40,3 +44,27 @@ def help_info():
     ivoryos(__name__)
     """
     return render_template('help.html', sample_deck=sample_deck)
+
+
+@main.route('/customize-logo', methods=['POST'])
+@login_required
+def customize_logo():
+    if request.method == 'POST':
+        file = request.files.get('logo')
+        mode = request.form.get('mode')
+
+        if file and file.filename != '':
+            filename = secure_filename(file.filename)
+
+            USER_LOGO_DIR = os.path.join(current_app.static_folder, "user_logos")
+            os.makedirs(USER_LOGO_DIR, exist_ok=True)
+            filepath = os.path.join(USER_LOGO_DIR, filename)
+            file.save(filepath)
+
+            # Save to database
+            current_user.settings = {"logo_filename": filename, "logo_mode": mode}
+            # current_user.logo_mode = mode
+            db.session.commit()
+
+        return redirect(url_for('main.index'))
+

ivoryos/routes/main/templates/{main/home.html → home.html}

@@ -19,7 +19,7 @@
                             <i class="bi bi-folder2-open me-2"></i>Browse designs
                         </h5>
                         <p class="card-text">View all saved workflows from the database.</p>
-                        <a href="{{ url_for('database.load_from_database') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('library.load_from_database') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>
@@ -48,7 +48,7 @@
                             <i class="bi bi-graph-up-arrow me-2"></i>Experiment data
                         </h5>
                         <p class="card-text">Browse workflow logs and output data.</p>
-                        <a href="{{ url_for('database.list_workflows') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('data.list_workflows') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>
@@ -62,7 +62,7 @@
                             <i class="bi bi-play-circle me-2"></i>Run current workflow
                         </h5>
                         <p class="card-text">Execute workflows with configurable parameters.</p>
-                        <a href="{{ url_for('design.experiment_run') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('execute.experiment_run') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>
@@ -93,7 +93,7 @@
                             <i class="bi bi-usb-plug me-2"></i>Connect a new device
                         </h5>
                         <p class="card-text">Add new hardware temporarily or for testing purposes.</p>
-                        <a href="{{ url_for('control.controllers_home') }}" class="stretched-link"></a>
+                        <a href="{{ url_for('control.temp.new_controller') }}" class="stretched-link"></a>
                     </div>
                 </div>
             </div>

ivoryos/server.py

@@ -0,0 +1,180 @@
+import os
+import sqlite3
+import sys
+from typing import Union
+
+from flask import Blueprint
+
+from sqlalchemy import Engine, event
+
+# from ivoryos import BUILDING_BLOCKS
+from ivoryos.app import create_app
+from ivoryos.config import Config, get_config
+from ivoryos.optimizer.registry import OPTIMIZER_REGISTRY
+from ivoryos.routes.auth.auth import login_manager
+from ivoryos.routes.control.control import global_config
+from ivoryos.socket_handlers import socketio
+from ivoryos.utils import utils
+from ivoryos.utils.db_models import db, User
+
+
+url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
+
+@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()
+
+
+
+@login_manager.user_loader
+def load_user(user_id):
+    """
+    This function is called by Flask-Login on every request to get the
+    current user object from the user ID stored in the session.
+    """
+    # The correct implementation is to fetch the user from the database.
+    return db.session.get(User, user_id)
+
+
+
+
+
+def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, model=None,
+        config: Config = None,
+        logger: Union[str, list] = None,
+        logger_output_name: str = None,
+        enable_design: bool = True,
+        blueprint_plugins: Union[list, Blueprint] = [],
+        exclude_names: list = [],
+        notification_handler=None,
+        optimizer_registry: dict = None,
+        ):
+    """
+    Start ivoryOS app server.
+
+    :param module: module name, __name__ for current module
+    :param host: host address, defaults to 0.0.0.0
+    :param port: port, defaults to None, and will use 8000
+    :param debug: debug mode, defaults to None (True)
+    :param llm_server: llm server, defaults to None.
+    :param model: llm model, defaults to None. If None, app will run without text-to-code feature
+    :param config: config class, defaults to None
+    :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 blueprint_plugins: Union[list[Blueprint], Blueprint] custom Blueprint pages
+    :param exclude_names: list[str] module names to exclude from parsing
+    :param notification_handler: notification handler function
+    """
+    app = create_app(config_class=config or get_config())  # Create app instance using factory function
+
+    # plugins = load_installed_plugins(app, socketio)
+    plugins = []
+    if blueprint_plugins:
+        config_plugins = load_plugins(blueprint_plugins, app, socketio)
+        plugins.extend(config_plugins)
+
+    def inject_nav_config():
+        """Make NAV_CONFIG available globally to all templates."""
+        return dict(
+            enable_design=enable_design,
+            plugins=plugins,
+        )
+
+    app.context_processor(inject_nav_config)
+    port = port or int(os.environ.get("PORT", 8000))
+    debug = debug if debug is not None else app.config.get('DEBUG', True)
+
+    app.config["LOGGERS"] = logger
+    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"])
+    if optimizer_registry:
+        global_config.optimizers = optimizer_registry
+    else:
+        global_config.optimizers = OPTIMIZER_REGISTRY
+    if module:
+        app.config["MODULE"] = module
+        app.config["OFF_LINE"] = False
+        global_config.deck = sys.modules[module]
+        global_config.building_blocks = utils.create_block_snapshot()
+        global_config.deck_snapshot = utils.create_deck_snapshot(global_config.deck,
+                                                                 output_path=dummy_deck_path,
+                                                                 save=True,
+                                                                 exclude_names=exclude_names
+                                                                 )
+        global_config.api_variables = utils.create_module_snapshot(global_config.deck)
+
+    else:
+        app.config["OFF_LINE"] = True
+    if model:
+        app.config["ENABLE_LLM"] = True
+        app.config["LLM_MODEL"] = model
+        app.config["LLM_SERVER"] = llm_server
+        utils.install_and_import('openai')
+        from ivoryos.utils.llm_agent import LlmAgent
+        global_config.agent = LlmAgent(host=llm_server, model=model,
+                                       output_path=app.config["OUTPUT_FOLDER"] if module is not None else None)
+    else:
+        app.config["ENABLE_LLM"] = False
+
+
+    # --- Logger registration ---
+    if logger:
+        if isinstance(logger, str):
+            logger = [logger]  # convert single logger to list
+        elif not isinstance(logger, list):
+            raise TypeError("logger must be a string or a list of strings.")
+
+        for log_name in logger:
+            utils.start_logger(socketio, log_filename=logger_path, logger_name=log_name)
+
+    # --- Notification handler registration ---
+    if notification_handler:
+
+        # make it a list if a single function is passed
+        if callable(notification_handler):
+            notification_handler = [notification_handler]
+
+        if not isinstance(notification_handler, list):
+            raise ValueError("notification_handlers must be a callable or a list of callables.")
+
+        # validate all items are callable
+        for handler in notification_handler:
+            if not callable(handler):
+                raise TypeError(f"Handler {handler} is not callable.")
+            global_config.register_notification(handler)
+
+    # TODO in case Python 3.12 or higher doesn't log URL
+    # if sys.version_info >= (3, 12):
+    #     ip = utils.get_local_ip()
+    #     print(f"Server running at http://localhost:{port}")
+    #     if not ip == "127.0.0.1":
+    #         print(f"Server running at http://{ip}:{port}")
+    socketio.run(app, host=host, port=port, debug=debug, use_reloader=False, allow_unsafe_werkzeug=True)
+    # return app
+
+
+
+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):
+        blueprints = [blueprints]
+    for blueprint in blueprints:
+        # If the plugin has an `init_socketio()` function, pass socketio
+        if hasattr(blueprint, 'init_socketio'):
+            blueprint.init_socketio(socketio)
+        plugin_names.append(blueprint.name)
+        app.register_blueprint(blueprint, url_prefix=f"{url_prefix}/{blueprint.name}")
+    return plugin_names
+

ivoryos/socket_handlers.py

@@ -0,0 +1,52 @@
+import os
+from flask import current_app
+from flask_socketio import SocketIO
+from ivoryos.utils.script_runner import ScriptRunner
+
+socketio = SocketIO(cors_allowed_origins="*")
+runner = ScriptRunner()
+
+def abort_pending():
+    runner.abort_pending()
+    socketio.emit('log', {'message': "aborted pending iterations"})
+
+def abort_current():
+    runner.stop_execution()
+    socketio.emit('log', {'message': "stopped next task"})
+
+def pause():
+    runner.retry = False
+    msg = runner.toggle_pause()
+    socketio.emit('log', {'message': msg})
+    return msg
+
+def retry():
+    runner.retry = True
+    msg = runner.toggle_pause()
+    socketio.emit('log', {'message': msg})
+
+# Socket.IO Event Handlers
+@socketio.on('abort_pending')
+def handle_abort_pending():
+    abort_pending()
+
+@socketio.on('abort_current')
+def handle_abort_current():
+    abort_current()
+
+@socketio.on('pause')
+def handle_pause():
+    pause()
+
+@socketio.on('retry')
+def handle_retry():
+    retry()
+
+@socketio.on('connect')
+def handle_connect():
+    # Fetch log messages from local file
+    filename = os.path.join(current_app.config["OUTPUT_FOLDER"], current_app.config["LOGGERS_PATH"])
+    with open(filename, 'r') as log_file:
+        log_history = log_file.readlines()
+    for message in log_history[-10:]:
+        socketio.emit('log', {'message': message})