ivoryos 0.1.15__tar.gz → 0.1.17__tar.gz

{ivoryos-0.1.15/ivoryos.egg-info → ivoryos-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ivoryos
-Version: 0.1.15
+Version: 0.1.17
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang
@@ -16,6 +16,14 @@ Requires-Dist: Flask-SQLAlchemy
 Requires-Dist: Flask-WTF
 Requires-Dist: SQLAlchemy-Utils
 Requires-Dist: python-dotenv
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 [![Documentation Status](https://readthedocs.org/projects/ivoryos/badge/?version=latest)](https://ivoryos.readthedocs.io/en/latest/?badge=latest)
 [![PyPI version](https://img.shields.io/pypi/v/ivoryos)](https://pypi.org/project/ivoryos/)

{ivoryos-0.1.15 → ivoryos-0.1.17}/ivoryos/__init__.py

@@ -1,8 +1,10 @@
+import importlib
+import inspect
 import os
 import sys
 from typing import Union
 
-from flask import Flask, redirect, url_for
+from flask import Flask, redirect, url_for, Blueprint, g
 
 from ivoryos.config import Config, get_config
 from ivoryos.routes.auth.auth import auth, login_manager
@@ -10,13 +12,13 @@ from ivoryos.routes.control.control import control
 from ivoryos.routes.database.database import database
 from ivoryos.routes.design.design import design, socketio
 from ivoryos.routes.main.main import main
-from ivoryos.routes.monitor.monitor import monitor
+# from ivoryos.routes.monitor.monitor import monitor
 from ivoryos.utils import utils
 from ivoryos.utils.db_models import db
 from ivoryos.utils.global_config import GlobalConfig
 from ivoryos.utils.script_runner import ScriptRunner
-from version import __version__ as ivoryos_version
-
+from ivoryos.version import __version__ as ivoryos_version
+from importlib.metadata import entry_points
 global_config = GlobalConfig()
 
 url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
@@ -51,7 +53,6 @@ def create_app(config_class=None):
         Called before
 
         """
-        from flask import g
         g.logger = logger
         g.socketio = socketio
 
@@ -66,7 +67,7 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
         config: Config = None,
         logger: Union[str, list] = None,
         logger_output_name: str = None,
-        enable_design=True, stream_address=None
+        enable_design=True
         ):
     """
     Start ivoryOS app server.
@@ -80,30 +81,29 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
     :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:
+    :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
-    enable_monitor = stream_address is not None
+
+    app.register_blueprint(main, url_prefix=url_prefix)
+    app.register_blueprint(auth, url_prefix=url_prefix)
+    app.register_blueprint(control, url_prefix=url_prefix)
+
+    if enable_design:
+        app.register_blueprint(design, url_prefix=url_prefix)
+        app.register_blueprint(database, url_prefix=url_prefix)
+
+    plugins = load_plugins(app, socketio)
 
     def inject_nav_config():
         """Make NAV_CONFIG available globally to all templates."""
         return dict(
             enable_design=enable_design,
-            enable_monitor=enable_monitor,
+            plugins=plugins,
         )
 
-    # todo modular page
     app.context_processor(inject_nav_config)
-    app.register_blueprint(main, url_prefix=url_prefix)
-    app.register_blueprint(auth, url_prefix=url_prefix)
-    if enable_design:
-        app.register_blueprint(design, url_prefix=url_prefix)
-        app.register_blueprint(database, url_prefix=url_prefix)
-    if enable_monitor:
-        app.register_blueprint(monitor, url_prefix=url_prefix)
-    app.register_blueprint(control, url_prefix=url_prefix)
-
     port = port or int(os.environ.get("PORT", 8000))
     debug = debug if debug is not None else app.config.get('DEBUG', True)
 
@@ -115,6 +115,7 @@ 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())
@@ -137,3 +138,21 @@ def run(module=None, host="0.0.0.0", port=None, debug=None, llm_server=None, mod
             utils.start_logger(socketio, log_filename=logger_path, logger_name=log)
     socketio.run(app, host=host, port=port, debug=debug, use_reloader=False, allow_unsafe_werkzeug=True)
     # return app
+
+
+def load_plugins(app, socketio):
+    """
+    Dynamically load installed plugins and attach Flask-SocketIO.
+    """
+    plugin_names = []
+    for entry_point in entry_points().get("ivoryos.plugins", []):
+        plugin = entry_point.load()
+
+        # If the plugin has an `init_socketio()` function, pass socketio
+        if hasattr(plugin, 'init_socketio'):
+            plugin.init_socketio(socketio)
+
+        plugin_names.append(entry_point.name)
+        app.register_blueprint(getattr(plugin, entry_point.name), url_prefix=f"{url_prefix}/{entry_point.name}")
+
+    return plugin_names

{ivoryos-0.1.15 → ivoryos-0.1.17}/ivoryos/routes/main/main.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, render_template, current_app
 from flask_login import login_required
-from version import __version__ as ivoryos_version
+from ivoryos.version import __version__ as ivoryos_version
 
 main = Blueprint('main', __name__, template_folder='templates/main')
 

{ivoryos-0.1.15 → ivoryos-0.1.17}/ivoryos/templates/base.html

@@ -47,11 +47,7 @@
                             <a class="nav-link" href="{{ url_for('design.experiment_run') }}">Compile/Run</a>
                         </li>
                     {% endif %}
-                    {% if enable_monitor %}
-                        <li class="nav-item">
-                            <a class="nav-link" href="{{ url_for('monitor.stream_feed') }}">Monitor</a></li>
-                        </li>
-                    {% endif %}
+
                     <li class="nav-item">
                         <a class="nav-link" href="{{ url_for('control.deck_controllers') }}">Devices</a></li>
                     </li>
@@ -61,6 +57,13 @@
                     <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">
 

ivoryos-0.1.17/ivoryos/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.17"

{ivoryos-0.1.15 → ivoryos-0.1.17/ivoryos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ivoryos
-Version: 0.1.15
+Version: 0.1.17
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang
@@ -16,6 +16,14 @@ Requires-Dist: Flask-SQLAlchemy
 Requires-Dist: Flask-WTF
 Requires-Dist: SQLAlchemy-Utils
 Requires-Dist: python-dotenv
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 [![Documentation Status](https://readthedocs.org/projects/ivoryos/badge/?version=latest)](https://ivoryos.readthedocs.io/en/latest/?badge=latest)
 [![PyPI version](https://img.shields.io/pypi/v/ivoryos)](https://pypi.org/project/ivoryos/)

{ivoryos-0.1.15 → ivoryos-0.1.17}/ivoryos.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.md
 setup.py
 ivoryos/__init__.py
 ivoryos/config.py
+ivoryos/version.py
 ivoryos.egg-info/PKG-INFO
 ivoryos.egg-info/SOURCES.txt
 ivoryos.egg-info/dependency_links.txt

{ivoryos-0.1.15 → ivoryos-0.1.17}/setup.py

@@ -1,9 +1,16 @@
 from setuptools import setup, find_packages
-from version import __version__ as ivoryos_version
+
+
+def get_version():
+    version = {}
+    with open("ivoryos/version.py") as f:
+        exec(f.read(), version)
+    return version["__version__"]
+
 
 setup(
     name='ivoryos',
-    version=ivoryos_version,
+    version=get_version(),
     packages=find_packages(exclude=['example', 'example.*', 'docs', 'docs.*']),
     include_package_data=True,
     description='an open-source Python package enabling Self-Driving Labs (SDLs) interoperability',