ivoryos 0.1.14__tar.gz → 0.1.16__tar.gz

{ivoryos-0.1.14/ivoryos.egg-info → ivoryos-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.14
+Version: 0.1.16
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang

{ivoryos-0.1.14 → ivoryos-0.1.16}/ivoryos/__init__.py

@@ -10,6 +10,7 @@ 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.utils import utils
 from ivoryos.utils.db_models import db
 from ivoryos.utils.global_config import GlobalConfig
@@ -20,11 +21,6 @@ global_config = GlobalConfig()
 
 url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
 app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='static')
-app.register_blueprint(main, url_prefix=url_prefix)
-app.register_blueprint(auth, url_prefix=url_prefix)
-app.register_blueprint(design, url_prefix=url_prefix)
-app.register_blueprint(database, url_prefix=url_prefix)
-app.register_blueprint(control, url_prefix=url_prefix)
 
 
 def create_app(config_class=None):
@@ -70,6 +66,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
         ):
     """
     Start ivoryOS app server.
@@ -83,9 +80,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 stream_address:
     """
     app = create_app(config_class=config or get_config())  # Create app instance using factory function
+    enable_monitor = stream_address is not None
+
+    def inject_nav_config():
+        """Make NAV_CONFIG available globally to all templates."""
+        return dict(
+            enable_design=enable_design,
+            enable_monitor=enable_monitor,
+        )
+
+    # 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)

{ivoryos-0.1.14 → ivoryos-0.1.16}/ivoryos/routes/main/templates/main/home.html

@@ -9,32 +9,32 @@
         </h1>
         <p>Version: {{ version }}</p>
         <div class="row">
-
-            <div class="col-lg-6 mb-4 d-flex align-items-stretch">
-                <div class="card rounded shadow-sm flex-fill">
-                    <div class="card-body">
-                        <h5 class="card-title">Browse designs</h5>
-                        <p class="card-text">Browse all workflows saved in the database.</p>
-                        <a href="{{ url_for('database.load_from_database') }}" class="stretched-link"></a>
+            {% if enable_design %}
+                <div class="col-lg-6 mb-4 d-flex align-items-stretch">
+                    <div class="card rounded shadow-sm flex-fill">
+                        <div class="card-body">
+                            <h5 class="card-title">Browse designs</h5>
+                            <p class="card-text">Browse all workflows saved in the database.</p>
+                            <a href="{{ url_for('database.load_from_database') }}" class="stretched-link"></a>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-lg-6 mb-4 d-flex align-items-stretch">
-                <div class="card rounded shadow-sm flex-fill">
-                    <div class="card-body">
-                        <h5 class="card-title">Edit designs</h5>
-                        <p class="card-text">Build your workflow from current deck functions.</p>
-                        <a href="{{ url_for('design.experiment_builder') }}" class="stretched-link"></a>
+                <div class="col-lg-6 mb-4 d-flex align-items-stretch">
+                    <div class="card rounded shadow-sm flex-fill">
+                        <div class="card-body">
+                            <h5 class="card-title">Edit designs</h5>
+                            <p class="card-text">Build your workflow from current deck functions.</p>
+                            <a href="{{ url_for('design.experiment_builder') }}" class="stretched-link"></a>
+                        </div>
                     </div>
                 </div>
-            </div>
+            {% endif %}
         </div>
 
         <br><br><br>
         {% if not off_line %}
-{#            <h5>Only available in online mode</h5>#}
-{#            <hr>#}
             <div class="row">
+                {% if enable_design %}
                 <div class="col-lg-6 mb-4 d-flex align-items-stretch">
                     <div class="card rounded shadow-sm flex-fill">
                         <div class="card-body">
@@ -44,6 +44,8 @@
                         </div>
                     </div>
                 </div>
+                {% endif %}
+
                 <div class="col-lg-6 mb-4 d-flex align-items-stretch">
                     <div class="card rounded shadow-sm flex-fill">
                         <div class="card-body">

ivoryos-0.1.16/ivoryos/routes/monitor/monitor.py

@@ -0,0 +1,21 @@
+from flask import Blueprint, flash, render_template
+from flask_login import login_required
+
+from ivoryos.utils.global_config import GlobalConfig
+
+global_config = GlobalConfig()
+
+monitor = Blueprint('monitor', __name__, template_folder='templates/monitor')
+
+
+@monitor.route("/stream_feed")
+@login_required
+def stream_feed():
+    """
+    .. :quickref: Monitor; stream feed
+
+    display feed by ip address
+    e.g. HeinSight output feed
+    .. http:get:: /my_deck
+    """
+    return render_template('monitor.html', stream_address="http://127.0.0.1:8001/frame")

ivoryos-0.1.16/ivoryos/routes/monitor/templates/monitor/monitor.html

@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+{% block title %}IvoryOS | Monitor {% endblock %}
+
+{% block body %}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.4.1/socket.io.js"></script>
+
+    <h1>Live Stream</h1>
+    <img src="{{ stream_address }}" width="800" height="600">
+
+    {% if no_deck_warning and not dismiss %}
+{#      auto pop import when there is no deck#}
+        <script type="text/javascript">
+            function OpenBootstrapPopup() {
+                $("#importModal").modal('show');
+            }
+            window.onload = function () {
+                OpenBootstrapPopup();
+            };
+        </script>
+    {% endif %}
+
+    <script src="{{ url_for('static', filename='js/socket_handler.js') }}"></script>
+
+{% endblock %}

{ivoryos-0.1.14 → ivoryos-0.1.16}/ivoryos/templates/base.html

@@ -23,7 +23,7 @@
 <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>
@@ -36,15 +36,22 @@
                     <li class="nav-item">
                         <a class="nav-link" href="{{ url_for('main.index') }}" aria-current="page">Home</a>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('database.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('design.experiment_run') }}">Compile/Run</a>
-                    </li>
+                    {% if enable_design %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('database.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('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>

ivoryos-0.1.16/ivoryos/version.py

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

{ivoryos-0.1.14 → ivoryos-0.1.16/ivoryos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.14
+Version: 0.1.16
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang

{ivoryos-0.1.14 → ivoryos-0.1.16}/ivoryos.egg-info/SOURCES.txt

@@ -31,6 +31,8 @@ ivoryos/routes/main/__init__.py
 ivoryos/routes/main/main.py
 ivoryos/routes/main/templates/main/help.html
 ivoryos/routes/main/templates/main/home.html
+ivoryos/routes/monitor/monitor.py
+ivoryos/routes/monitor/templates/monitor/monitor.html
 ivoryos/static/favicon.ico
 ivoryos/static/logo.webp
 ivoryos/static/style.css

{ivoryos-0.1.14 → ivoryos-0.1.16}/setup.py

@@ -1,9 +1,16 @@
 from setuptools import setup, find_packages
-from ivoryos.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',

ivoryos-0.1.14/ivoryos/version.py

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