ivoryos 0.1.6__tar.gz → 0.1.7__tar.gz

{ivoryos-0.1.6/ivoryos.egg-info → ivoryos-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.6
+Version: 0.1.7
 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.6 → ivoryos-0.1.7}/ivoryos/__init__.py

@@ -2,7 +2,7 @@ import os
 import sys
 from typing import Union
 
-from flask import Flask
+from flask import Flask, redirect, url_for
 
 from ivoryos.config import Config, get_config
 from ivoryos.routes.auth.auth import auth, login_manager
@@ -19,7 +19,8 @@ global_config = GlobalConfig()
 
 
 def create_app(config_class=None):
-    app = Flask(__name__)
+    url_prefix = os.getenv('URL_PREFIX', None)
+    app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='static')
     app.config.from_object(config_class or 'config.get_config()')
 
     # Initialize extensions
@@ -45,11 +46,15 @@ def create_app(config_class=None):
         g.logger = logger
         g.socketio = socketio
 
-    app.register_blueprint(main)
-    app.register_blueprint(auth)
-    app.register_blueprint(design)
-    app.register_blueprint(database)
-    app.register_blueprint(control)
+    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)
+
+    @app.route('/')
+    def redirect_to_prefix():
+        return redirect(url_for('main.index'))  # Assuming 'index' is a route in your blueprint
 
     return app
 

{ivoryos-0.1.6 → ivoryos-0.1.7}/ivoryos/static/js/socket_handler.js

@@ -6,7 +6,16 @@ document.addEventListener("DOMContentLoaded", function() {
     socket.on('progress', function(data) {
         var progress = data.progress;
         console.log(progress);
-        $('#progress-bar-inner').css('width', progress + '%')
+        // Update the progress bar's width and appearance
+        var progressBar = document.getElementById('progress-bar-inner');
+        progressBar.style.width = progress + '%';
+        progressBar.setAttribute('aria-valuenow', progress);
+
+        if (progress === 100) {
+            // Remove animation and set green color when 100% is reached
+            progressBar.classList.remove('progress-bar-animated');
+            progressBar.classList.add('bg-success'); // Bootstrap class for green color
+        }
     });
     socket.on('log', function(data) {
         var logMessage = data.message;

{ivoryos-0.1.6 → ivoryos-0.1.7}/ivoryos/templates/base.html

@@ -25,7 +25,7 @@
         <div class= "container">
 
             <a class="navbar-brand" href="{{ url_for('main.index') }}">
-                <img src="{{url_for('static', filename='logo.png')}}" alt="Logo" height="60" class="d-inline-block align-text-bottom">
+                <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>
@@ -33,6 +33,9 @@
 
             <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>
                     <li class="nav-item">
                         <a class="nav-link" href="{{ url_for('database.load_from_database') }}" aria-current="page">Library</a>
                     </li>

{ivoryos-0.1.6 → ivoryos-0.1.7}/ivoryos/utils/form.py

@@ -255,7 +255,7 @@ def create_form_from_module(sdl_module, autofill: bool, script=None, design=True
         attr = getattr(sdl_module, attr_name)
         if inspect.ismethod(attr) and not attr_name.startswith('_'):
             form_class = create_add_form(attr, attr_name, autofill, script, design)
-            method_forms[attr_name] = form_class()
+            method_forms[format_name(attr_name)] = form_class()
     return method_forms
 
 

{ivoryos-0.1.6 → ivoryos-0.1.7}/ivoryos/utils/llm_agent.py

@@ -3,7 +3,7 @@ import json
 import os
 import re
 
-from openai import OpenAI, BaseModel
+from openai import OpenAI
 
 
 # from dotenv import load_dotenv

{ivoryos-0.1.6 → ivoryos-0.1.7}/ivoryos/utils/script_runner.py

@@ -53,6 +53,7 @@ class ScriptRunner:
     def _run_with_stop_check(self, script: Script, repeat_count, run_name, logger, socketio, config, bo_args,
                              output_path):
         time.sleep(1)
+        self._emit_progress(socketio, 1)
         try:
             # Run "prep" section once
             script_dict = script.script_dict
@@ -75,6 +76,7 @@ class ScriptRunner:
         finally:
             with self.lock:
                 self.is_running = False  # Reset the running flag when done
+            self._emit_progress(socketio, 100)
 
     def _run_actions(self, actions, section_name="", run_name=None, logger=None):
         logger.info(f'Executing {section_name} steps') if actions else logger.info(f'No {section_name} steps')
@@ -104,7 +106,7 @@ class ScriptRunner:
                     break
                 logger.info(f'Executing {i + 1} of {len(config)} with kwargs = {kwargs}')
                 progress = (i + 1) * 100 / len(config)
-                socketio.emit('progress', {'progress': progress})
+                self._emit_progress(socketio, progress)
                 fname = f"{run_name}_script"
                 function = self.globals_dict[fname]
                 output = function(**kwargs)
@@ -121,8 +123,8 @@ class ScriptRunner:
                 logger.info(f'Stopping execution during {run_name}: {i + 1}/{int(repeat_count)}')
                 break
             logger.info(f'Executing {run_name} experiment: {i + 1}/{int(repeat_count)}')
-            progress = (i + 1) * 100 / int(repeat_count)
-            socketio.emit('progress', {'progress': progress})
+            progress = (i + 1) * 100 / int(repeat_count) - 0.1
+            self._emit_progress(socketio, progress)
             if bo_args:
                 try:
                     parameters, trial_index = ax_client.get_next_trial()
@@ -156,3 +158,7 @@ class ScriptRunner:
             writer.writeheader()
             writer.writerows(output_list)
         logger.info(f'Results saved to {file_path}')
+
+    @staticmethod
+    def _emit_progress(socketio, progress):
+        socketio.emit('progress', {'progress': progress})

{ivoryos-0.1.6 → ivoryos-0.1.7}/ivoryos/utils/utils.py

@@ -1,3 +1,4 @@
+import ast
 import importlib
 import inspect
 import logging
@@ -124,23 +125,22 @@ def _get_type_from_parameters(arg, parameters):
     """get argument types from inspection"""
     arg_type = ''
     if type(parameters) is inspect.Signature:
-        p = parameters.parameters
+        annotation = parameters.parameters[arg].annotation
+    elif type(parameters) is dict:
+        annotation = parameters[arg]
+    if annotation is not inspect._empty:
         # print(p[arg].annotation)
-        if p[arg].annotation is not inspect._empty:
-            # print(p[arg].annotation)
-            if p[arg].annotation.__module__ == 'typing':
+        if annotation.__module__ == 'typing':
+            if hasattr(annotation, '_name') and annotation._name in ["Optional", "Union"]:
                 # print(p[arg].annotation.__args__)
-                arg_type = [i.__name__ for i in p[arg].annotation.__args__]
-            else:
-                arg_type = p[arg].annotation.__name__
-            # print(arg_type)
-    elif type(parameters) is dict:
-        if parameters[arg]:
-
-            if parameters[arg].__module__ == 'typing':
-                arg_type = [i.__name__ for i in parameters[arg].__args__]
+                arg_type = [i.__name__ for i in annotation.__args__]
+            elif hasattr(annotation, '__origin__'):
+                arg_type = annotation.__origin__.__name__
             else:
-                arg_type = parameters[arg].__name__
+                # TODO
+                pass
+        else:
+            arg_type = annotation.__name__
     return arg_type
 
 
@@ -168,17 +168,12 @@ def _convert_by_str(args, arg_types):
     if type(arg_types) is not list:
         arg_types = [arg_types]
     for arg_type in arg_types:
-        if arg_type == "any":
+        if not arg_type == "any":
             try:
-                args = eval(args)
+                args = eval(f'{arg_type}("{args}")') if type(args) is str else eval(f'{arg_type}({args})')
+                return args
             except Exception:
-                pass
-            return args
-        try:
-            args = eval(f'{arg_type}("{args}")')
-            return args
-        except Exception:
-            raise TypeError(f"Input type error: cannot convert '{args}' to {arg_type}.")
+                raise TypeError(f"Input type error: cannot convert '{args}' to {arg_type}.")
 
 
 def _convert_by_class(args, arg_types):
@@ -214,16 +209,20 @@ def convert_config_type(args, arg_types, is_class: bool = False):
                 raise ValueError("config file format not supported.")
             if args[arg] == '' or args[arg] == "None":
                 args[arg] = None
-            elif args[arg] == "True" or args[arg] == "False":
-                args[arg] = bool_dict[args[arg]]
+            # elif args[arg] == "True" or args[arg] == "False":
+            #     args[arg] = bool_dict[args[arg]]
             else:
                 arg_type = arg_types[arg]
-
-                if is_class:
-                    # if arg_type.__module__ == 'builtins':
-                    args[arg] = _convert_by_class(args[arg], arg_type)
-                else:
-                    args[arg] = _convert_by_str(args[arg], arg_type)
+                try:
+                    args[arg] = ast.literal_eval(args[arg])
+                except ValueError:
+                    pass
+                if type(args[arg]) is not arg_type and not type(args[arg]).__name__ == arg_type:
+                    if is_class:
+                        # if arg_type.__module__ == 'builtins':
+                        args[arg] = _convert_by_class(args[arg], arg_type)
+                    else:
+                        args[arg] = _convert_by_str(args[arg], arg_type)
     return args
 
 

{ivoryos-0.1.6 → ivoryos-0.1.7/ivoryos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.6
+Version: 0.1.7
 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.6 → ivoryos-0.1.7}/ivoryos.egg-info/SOURCES.txt

@@ -31,7 +31,7 @@ ivoryos/routes/main/main.py
 ivoryos/routes/main/templates/main/help.html
 ivoryos/routes/main/templates/main/home.html
 ivoryos/static/favicon.ico
-ivoryos/static/logo.png
+ivoryos/static/logo.webp
 ivoryos/static/style.css
 ivoryos/static/gui_annotation/Slide1.png
 ivoryos/static/gui_annotation/Slide2.PNG

{ivoryos-0.1.6 → ivoryos-0.1.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ivoryos',
-    version='0.1.6',
+    version='0.1.7',
     packages=find_packages(exclude=['example', 'example.*', 'docs', 'docs.*']),
     include_package_data=True,
     description='an open-source Python package enabling Self-Driving Labs (SDLs) interoperability',