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

ivoryos/routes/main/main.py

@@ -1,5 +1,9 @@
-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')
@@ -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/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

@@ -3,7 +3,7 @@ from flask import current_app
 from flask_socketio import SocketIO
 from ivoryos.utils.script_runner import ScriptRunner
 
-socketio = SocketIO()
+socketio = SocketIO(cors_allowed_origins="*")
 runner = ScriptRunner()
 
 def abort_pending():

ivoryos/static/js/action_handlers.js

@@ -1,6 +1,148 @@
+// ============================================================================
+// STATE MANAGEMENT
+// ============================================================================
 
+let previousHtmlState = null;  // Store previous instrument panel state
+let lastFocusedElement = null; // Track focus for modal management
 
+// ============================================================================
+// MODE & BATCH MANAGEMENT
+// ============================================================================
 
+function getMode() {
+    return sessionStorage.getItem("mode") || "single";
+}
+
+function setMode(mode, triggerUpdate = true) {
+    sessionStorage.setItem("mode", mode);
+
+    const modeButtons = document.querySelectorAll(".mode-toggle");
+    const batchOptions = document.getElementById("batch-options");
+
+    modeButtons.forEach(b => b.classList.toggle("active", b.dataset.mode === mode));
+
+    if (batchOptions) {
+        batchOptions.style.display = (mode === "batch") ? "inline-flex" : "none";
+    }
+
+    if (triggerUpdate) updateCode();
+}
+
+function getBatch() {
+    return sessionStorage.getItem("batch") || "sample";
+}
+
+function setBatch(batch, triggerUpdate = true) {
+    sessionStorage.setItem("batch", batch);
+
+    const batchButtons = document.querySelectorAll(".batch-toggle");
+    batchButtons.forEach(b => b.classList.toggle("active", b.dataset.batch === batch));
+
+    if (triggerUpdate) updateCode();
+}
+
+// ============================================================================
+// CODE OVERLAY MANAGEMENT
+// ============================================================================
+
+async function updateCode() {
+    try {
+        const params = new URLSearchParams({ mode: getMode(), batch: getBatch() });
+        const res = await fetch(scriptCompileUrl + "?" + params.toString());
+        if (!res.ok) return;
+
+        const data = await res.json();
+        const codeElem = document.getElementById("python-code");
+
+        codeElem.removeAttribute("data-highlighted"); // Reset highlight.js flag
+        codeElem.textContent = data.code['script'] || "# No code found";
+
+        if (window.hljs) {
+            hljs.highlightElement(codeElem);
+        }
+    } catch (err) {
+        console.error("Error updating code:", err);
+    }
+}
+
+function initializeCodeOverlay() {
+    const codeElem = document.getElementById("python-code");
+    const copyBtn = document.getElementById("copy-code");
+    const downloadBtn = document.getElementById("download-code");
+
+    if (!copyBtn || !downloadBtn) return; // Elements don't exist
+
+    // Remove old listeners by cloning (prevents duplicate bindings)
+    const newCopyBtn = copyBtn.cloneNode(true);
+    const newDownloadBtn = downloadBtn.cloneNode(true);
+    copyBtn.parentNode.replaceChild(newCopyBtn, copyBtn);
+    downloadBtn.parentNode.replaceChild(newDownloadBtn, downloadBtn);
+
+    // Copy to clipboard
+    newCopyBtn.addEventListener("click", () => {
+        navigator.clipboard.writeText(codeElem.textContent)
+            .then(() => alert("Code copied!"))
+            .catch(err => console.error("Failed to copy", err));
+    });
+
+    // Download current code
+    newDownloadBtn.addEventListener("click", () => {
+        const blob = new Blob([codeElem.textContent], { type: "text/plain" });
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = "script.py";
+        a.click();
+        URL.revokeObjectURL(url);
+    });
+    updateCode();
+}
+
+// ============================================================================
+// UI UPDATE FUNCTIONS
+// ============================================================================
+
+function updateActionCanvas(html) {
+    document.getElementById("canvas-action-wrapper").innerHTML = html;
+    initializeCanvas();
+
+    const mode = getMode();
+    const batch = getBatch();
+
+    // Rebind event handlers for mode/batch toggles
+    document.querySelectorAll(".mode-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setMode(btn.dataset.mode));
+    });
+    document.querySelectorAll(".batch-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setBatch(btn.dataset.batch));
+    });
+
+    // Restore toggle UI state (without triggering updates)
+    setMode(mode, false);
+    setBatch(batch, false);
+
+    // Reinitialize code overlay buttons
+    initializeCodeOverlay();
+
+}
+
+function updateInstrumentPanel(link) {
+    const url = link.dataset.getUrl;
+
+    fetch(url)
+        .then(res => res.json())
+        .then(data => {
+            if (data.html) {
+                document.getElementById("sidebar-wrapper").innerHTML = data.html;
+                initializeDragHandlers();
+            }
+        })
+        .catch(err => console.error("Error updating instrument panel:", err));
+}
+
+// ============================================================================
+// WORKFLOW MANAGEMENT
+// ============================================================================
 
 function saveWorkflow(link) {
     const url = link.dataset.postUrl;
@@ -14,9 +156,7 @@ function saveWorkflow(link) {
     .then(res => res.json())
     .then(data => {
         if (data.success) {
-            // flash a success message
-            flash("Workflow saved successfully", "success");
-            window.location.reload();  // or update the UI dynamically
+            window.location.reload();
         } else {
             alert("Failed to save workflow: " + data.error);
         }
@@ -27,21 +167,30 @@ function saveWorkflow(link) {
     });
 }
 
-
-function updateInstrumentPanel(link) {
-    const url = link.dataset.getUrl;
-    fetch(url)
+function clearDraft() {
+    fetch(scriptDeleteUrl, {
+        method: "DELETE",
+        headers: {
+            "Content-Type": "application/json",
+        },
+    })
     .then(res => res.json())
     .then(data => {
-        if (data.html) {
-            document.getElementById("sidebar-wrapper").innerHTML = data.html;
-            initializeDragHandlers()
+        if (data.success) {
+            window.location.reload();
+        } else {
+            alert("Failed to clear draft");
         }
     })
+    .catch(error => console.error("Failed to clear draft", error));
 }
 
+// ============================================================================
+// ACTION MANAGEMENT (CRUD Operations)
+// ============================================================================
+
 function addMethodToDesign(event, form) {
-    event.preventDefault(); // Prevent default form submission
+    event.preventDefault();
 
     const formData = new FormData(form);
 
@@ -61,31 +210,58 @@ function addMethodToDesign(event, form) {
     .catch(error => console.error('Error:', error));
 }
 
+function editAction(uuid) {
+    if (!uuid) {
+        console.error('Invalid UUID');
+        return;
+    }
 
-function updateActionCanvas(html) {
-    document.getElementById("canvas-action-wrapper").innerHTML = html;
-    initializeCanvas(); // Reinitialize canvas functionality
-    document.querySelectorAll('#pythonCodeOverlay pre code').forEach((block) => {
-        hljs.highlightElement(block);
-    });
-}
-
-
-let lastFocusedElement = null;
+    // Store current state for rollback
+    previousHtmlState = document.getElementById('instrument-panel').innerHTML;
 
+    fetch(scriptStepUrl.replace('0', uuid), {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+    .then(response => {
+        if (!response.ok) {
+            return response.json().then(err => {
+                if (err.warning) {
+                    alert(err.warning);
+                }
+                // Restore panel so user isn't stuck
+                if (previousHtmlState) {
+                    document.getElementById('instrument-panel').innerHTML = previousHtmlState;
+                    previousHtmlState = null;
+                }
+                throw new Error("Step fetch failed: " + response.status);
+            });
+        }
+        return response.text();
+    })
+    .then(html => {
+        document.getElementById('instrument-panel').innerHTML = html;
 
-function hideModal() {
-    if (document.activeElement) {
-        document.activeElement.blur();
-    }
-    $('#dropModal').modal('hide');
-    if (lastFocusedElement) {
-        lastFocusedElement.focus();  // Return focus to the triggering element
-    }
+        // Set up back button
+        const backButton = document.getElementById('back');
+        if (backButton) {
+            backButton.addEventListener('click', function(e) {
+                e.preventDefault();
+                if (previousHtmlState) {
+                    document.getElementById('instrument-panel').innerHTML = previousHtmlState;
+                    previousHtmlState = null;
+                }
+            });
+        }
+    })
+    .catch(error => console.error('Error:', error));
 }
 
 function submitEditForm(event) {
     event.preventDefault();
+
     const form = event.target;
     const formData = new FormData(form);
 
@@ -96,43 +272,21 @@ function submitEditForm(event) {
     .then(response => response.text())
     .then(html => {
         if (html) {
-            // Update only the action list
             updateActionCanvas(html);
 
+            // Restore previous instrument panel state
             if (previousHtmlState) {
                 document.getElementById('instrument-panel').innerHTML = previousHtmlState;
-                previousHtmlState = null;  // Clear the stored state
+                previousHtmlState = null;
             }
-        }
-    })
-    .catch(error => {
-        console.error('Error:', error);
-    });
-}
 
-function clearDraft() {
-    fetch(scriptDeleteUrl, {
-        method: "DELETE",
-        headers: {
-            "Content-Type": "application/json",
-        },
-    })
-    .then(res => res.json())
-    .then(data => {
-        if (data.success) {
-            window.location.reload();
-        } else {
-            alert("Failed to clear draft");
+            // Check for warnings
+            showWarningIfExists(html);
         }
     })
-    .catch(error => console.error("Failed to clear draft", error));
+    .catch(error => console.error('Error:', error));
 }
 
-
-
-
-let previousHtmlState = null;  // Store the previous state
-
 function duplicateAction(uuid) {
     if (!uuid) {
         console.error('Invalid UUID');
@@ -145,69 +299,86 @@ function duplicateAction(uuid) {
             'Content-Type': 'application/json'
         }
     })
-
     .then(response => response.text())
     .then(html => {
         updateActionCanvas(html);
+        showWarningIfExists(html);
     })
     .catch(error => console.error('Error:', error));
 }
 
-function editAction(uuid) {
+function deleteAction(uuid) {
     if (!uuid) {
         console.error('Invalid UUID');
         return;
     }
 
-    // Save current state before fetching new content
-    previousHtmlState = document.getElementById('instrument-panel').innerHTML;
-
     fetch(scriptStepUrl.replace('0', uuid), {
-        method: 'GET',
+        method: 'DELETE',
         headers: {
             'Content-Type': 'application/json'
         }
     })
     .then(response => response.text())
     .then(html => {
-        document.getElementById('instrument-panel').innerHTML = html;
-
-        // Add click handler for back button
-        document.getElementById('back').addEventListener('click', function(e) {
-            e.preventDefault();
-            if (previousHtmlState) {
-                document.getElementById('instrument-panel').innerHTML = previousHtmlState;
-                previousHtmlState = null;  // Clear the stored state
-            }
-        });
+        updateActionCanvas(html);
+        showWarningIfExists(html);
     })
     .catch(error => console.error('Error:', error));
 }
 
+// ============================================================================
+// MODAL MANAGEMENT
+// ============================================================================
 
+function hideModal() {
+    if (document.activeElement) {
+        document.activeElement.blur();
+    }
 
-function deleteAction(uuid) {
-    if (!uuid) {
-        console.error('Invalid UUID');
-        return;
+    $('#dropModal').modal('hide');
+
+    if (lastFocusedElement) {
+        lastFocusedElement.focus();
     }
+}
 
-    fetch(scriptStepUrl.replace('0', uuid), {
-        method: 'DELETE',
-        headers: {
-            'Content-Type': 'application/json'
-        }
-    })
-    .then(response => response.text())
-    .then(html => {
-        // Find the first list element's content and replace it
-        updateActionCanvas(html);
-    })
-    .catch(error => console.error('Error:', error));
+// ============================================================================
+// UTILITY FUNCTIONS
+// ============================================================================
+
+function showWarningIfExists(html) {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(html, 'text/html');
+    const warningDiv = doc.querySelector('#warning');
+
+    if (warningDiv && warningDiv.textContent.trim()) {
+        alert(warningDiv.textContent.trim());
+    }
 }
 
+// ============================================================================
+// INITIALIZATION
+// ============================================================================
 
+document.addEventListener("DOMContentLoaded", function() {
+    const mode = getMode();
+    const batch = getBatch();
 
+    // Set up mode/batch toggle listeners
+    document.querySelectorAll(".mode-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setMode(btn.dataset.mode));
+    });
+
+    document.querySelectorAll(".batch-toggle").forEach(btn => {
+        btn.addEventListener("click", () => setBatch(btn.dataset.batch));
+    });
 
+    // Restore UI state (without triggering updates)
+    setMode(mode, false);
+    setBatch(batch, false);
 
+    // Initialize code overlay
+    initializeCodeOverlay();
 
+});