ivoryos 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

ivoryos/utils/script_runner.py

@@ -24,9 +24,11 @@ class ScriptRunner:
         self.stop_current_event = threading.Event()
         self.is_running = False
         self.lock = threading.Lock()
+        self.paused = False
 
     def toggle_pause(self):
         """Toggles between pausing and resuming the script"""
+        self.paused = not self.paused
         if self.pause_event.is_set():
             self.pause_event.clear()  # Pause the script
             return "Paused"
@@ -34,11 +36,18 @@ class ScriptRunner:
             self.pause_event.set()  # Resume the script
             return "Resumed"
 
+    def pause_status(self):
+        """Toggles between pausing and resuming the script"""
+        return self.paused
+
     def reset_stop_event(self):
+        """Resets the stop event"""
         self.stop_pending_event.clear()
         self.stop_current_event.clear()
+        self.pause_event.set()
 
     def abort_pending(self):
+        """Abort the pending iteration after the current is finished"""
         self.stop_pending_event.set()
         # print("Stop pending tasks")
 
@@ -66,7 +75,7 @@ class ScriptRunner:
         thread.start()
         return thread
 
-    def execute_function_line_by_line(self, script, section_name, logger, **kwargs):
+    def exex_steps(self, script, section_name, logger, socketio, **kwargs):
         """
         Executes a function defined in a string line by line.
 
@@ -74,71 +83,89 @@ class ScriptRunner:
         :param kwargs: Arguments to pass to the function
         :return: The final result of the function execution
         """
+        _func_str = script.compile()
+        step_list: list = script.convert_to_lines(_func_str).get(section_name, [])
         global deck
         if deck is None:
             deck = global_config.deck
         # func_str = script.compile()
         # Parse function body from string
-        module = ast.parse(script)
-        func_def = next(node for node in module.body if isinstance(node, ast.FunctionDef))
-
-        # Extract function body as source lines
-        lines = [ast.unparse(node) for node in func_def.body if not isinstance(node, ast.Return)]
+        temp_connections = global_config.defined_variables
         # Prepare execution environment
-        exec_globals = {"deck": deck}  # Add required global objects
+        exec_globals = {"deck": deck, "time":time}  # Add required global objects
+        # exec_globals = {"deck": deck, "time": time, "registered_workflows":registered_workflows}  # Add required global objects
+        exec_globals.update(temp_connections)
         exec_locals = {}  # Local execution scope
 
         # Define function arguments manually in exec_locals
         exec_locals.update(kwargs)
+        index = 0
 
         # Execute each line dynamically
-        for line in lines:
+        while index < len(step_list):
             if self.stop_current_event.is_set():
                 logger.info(f'Stopping execution during {section_name}')
                 break
+            line = step_list[index]
             logger.info(f"Executing: {line}")  # Debugging output
-            exec(line, exec_globals, exec_locals)
+            socketio.emit('execution', {'section': f"{section_name}-{index}"})
+            # self._emit_progress(socketio, 100)
+            try:
+                exec(line, exec_globals, exec_locals)
+            except Exception as e:
+                logger.error(f"Error during script execution: {e}")
+                socketio.emit('error', {'message': e.__str__()})
+                self.toggle_pause()
             self.pause_event.wait()
 
+            # todo update script during the run
+            # _func_str = script.compile()
+            # step_list: list = script.convert_to_lines(_func_str).get(section_name, [])
+            index += 1
         return exec_locals  # Return the 'results' variable
 
-    def _run_with_stop_check(self, script: Script, repeat_count, run_name, logger, socketio, config, bo_args,
+    def _run_with_stop_check(self, script: Script, repeat_count: int, run_name: str, logger, socketio, config, bo_args,
                              output_path):
         time.sleep(1)
-        func_str = script.compile()
+        # _func_str = script.compile()
+        # step_list_dict: dict = script.convert_to_lines(_func_str)
         self._emit_progress(socketio, 1)
-        try:
-            # Run "prep" section once
-            script_dict = script.script_dict
-            self._run_actions(script_dict.get("prep", []), func_str.get("prep", ''), section_name="prep", logger=logger)
-            output_list = []
-            _, arg_type = script.config("script")
-            _, return_list = script.config_return()
-            # Run "script" section multiple times
-            if repeat_count:
-                self._run_repeat_section(repeat_count, arg_type, bo_args, output_list,  func_str.get("script", ''), run_name, return_list, logger, socketio)
-            elif config:
-                self._run_config_section(config, arg_type, output_list, func_str.get("script", ''), run_name, logger, socketio)
-            # Run "cleanup" section once
-            self._run_actions(script_dict.get("cleanup", []), func_str.get("cleanup", ''), section_name="cleanup", logger=logger)
-            # Save results if necessary
-            if output_list:
-                self._save_results(run_name, arg_type, return_list, output_list, logger, output_path)
-        except Exception as e:
-            logger.error(f"Error during script execution: {e}")
-        finally:
-            with self.lock:
-                self.is_running = False  # Reset the running flag when done
-            self._emit_progress(socketio, 100)
-
-    def _run_actions(self, actions, func_str, section_name="", logger=None):
-        logger.info(f'Executing {section_name} steps') if actions else logger.info(f'No {section_name} steps')
+
+        # Run "prep" section once
+        script_dict = script.script_dict
+        self._run_actions(script, section_name="prep", logger=logger, socketio=socketio)
+        output_list = []
+        _, arg_type = script.config("script")
+        _, return_list = script.config_return()
+
+        # Run "script" section multiple times
+        if repeat_count:
+            self._run_repeat_section(repeat_count, arg_type, bo_args, output_list, script,
+                                     run_name, return_list, logger, socketio)
+        elif config:
+            self._run_config_section(config, arg_type, output_list, script, run_name, logger,
+                                     socketio)
+
+        # Run "cleanup" section once
+        self._run_actions(script, section_name="cleanup", logger=logger, socketio=socketio)
+        # Reset the running flag when done
+        with self.lock:
+            self.is_running = False
+        # Save results if necessary
+        if output_list:
+            self._save_results(run_name, arg_type, return_list, output_list, logger, output_path)
+        self._emit_progress(socketio, 100)
+
+    def _run_actions(self, script, section_name="", logger=None, socketio=None):
+        _func_str = script.compile()
+        step_list: list = script.convert_to_lines(_func_str).get(section_name, [])
+        logger.info(f'Executing {section_name} steps') if step_list else logger.info(f'No {section_name} steps')
         if self.stop_pending_event.is_set():
             logger.info(f"Stopping execution during {section_name} section.")
             return
-        self.execute_function_line_by_line(func_str, section_name, logger)
+        self.exex_steps(script, section_name, logger, socketio)
 
-    def _run_config_section(self, config, arg_type, output_list, func_str, run_name, logger, socketio):
+    def _run_config_section(self, config, arg_type, output_list, script, run_name, logger, socketio):
         compiled = True
         for i in config:
             try:
@@ -158,12 +185,13 @@ class ScriptRunner:
                 self._emit_progress(socketio, progress)
                 # fname = f"{run_name}_script"
                 # function = self.globals_dict[fname]
-                output = self.execute_function_line_by_line(func_str, "script", logger, **kwargs)
+                output = self.exex_steps(script, "script", logger, socketio, **kwargs)
                 if output:
                     # kwargs.update(output)
                     output_list.append(output)
 
-    def _run_repeat_section(self, repeat_count, arg_types, bo_args, output_list,  func_str, run_name, return_list, logger, socketio):
+    def _run_repeat_section(self, repeat_count, arg_types, bo_args, output_list, script, run_name, return_list,
+                            logger, socketio):
         if bo_args:
             logger.info('Initializing optimizer...')
             ax_client = utils.ax_initiation(bo_args, arg_types)
@@ -180,7 +208,7 @@ class ScriptRunner:
                     logger.info(f'Output value: {parameters}')
                     # fname = f"{run_name}_script"
                     # function = self.globals_dict[fname]
-                    output = self.execute_function_line_by_line(func_str, "script", logger, **parameters)
+                    output = self.exex_steps(script, "script", logger, socketio, **parameters)
 
                     _output = {key: value for key, value in output.items() if key in return_list}
                     ax_client.complete_trial(trial_index=trial_index, raw_data=_output)
@@ -191,7 +219,7 @@ class ScriptRunner:
             else:
                 # fname = f"{run_name}_script"
                 # function = self.globals_dict[fname]
-                output = self.execute_function_line_by_line(func_str, "script", logger)
+                output = self.exex_steps(script, "script", logger, socketio)
 
             if output:
                 output_list.append(output)

ivoryos/utils/utils.py

@@ -97,7 +97,7 @@ def _inspect_class(class_object=None, debug=False):
     under_score = "_"
     if debug:
         under_score = "__"
-    for function, method in inspect.getmembers(type(class_object), predicate=inspect.isfunction):
+    for function, method in inspect.getmembers(type(class_object), predicate=callable):
         if not function.startswith(under_score) and not function.isupper():
             try:
                 annotation = inspect.signature(method)

ivoryos/version.py

@@ -1 +1 @@
-__version__ = "0.1.19"
+__version__ = "0.1.21"

{ivoryos-0.1.19.dist-info → ivoryos-0.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.19
+Version: 0.1.21
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang
@@ -21,6 +21,9 @@ Requires-Dist: python-dotenv
 [![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/)
 ![License](https://img.shields.io/pypi/l/ivoryos)
+[![YouTube](https://img.shields.io/badge/YouTube-video-red?logo=youtube)](https://youtu.be/dFfJv9I2-1g)
+[![Research Square](https://img.shields.io/badge/Preprint-blue)](https://www.researchsquare.com/article/rs-5307798/v1)
+
 
 ![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/source/_static/ivoryos.png)
 # ivoryOS: interoperable Web UI for self-driving laboratories (SDLs)
@@ -32,6 +35,7 @@ Requires-Dist: python-dotenv
 - [Installation](#installation)
 - [Instructions for use](#instructions-for-use)
 - [Demo](#demo)
+- [Roadmap](#roadmap)
 - [License](#license)
 
 ## Description
@@ -160,15 +164,10 @@ When you run the application for the first time, it will automatically create th
 - **`ivoryos.db`**: Database file that stores application data locally.
 
 
-### Demo video
-Intro + Tutorial + Demo with PurPOSE platform
-https://youtu.be/dFfJv9I2-1g 
-
-
 ## Roadmap
 
 - [x] Allow plugin pages ✅  
-- [ ] pause, resume, abort current and pending workflows
+- [x] pause, resume, abort current and pending workflows ✅ 
 - [ ] snapshot version control
 - [ ] dropdown input
 - [ ] show line number option

{ivoryos-0.1.19.dist-info → ivoryos-0.1.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ivoryos/__init__.py,sha256=F3KenDZX1zqei3PZ3tx1U77yXsbeytgMMhVJyJMkmJ0,6071
+ivoryos/__init__.py,sha256=bx8EuJ5ObYwuwlW3KnWQwXG-AdWWyi-F0kaOLe7WeUo,5978
 ivoryos/config.py,sha256=3FPBYTIBhQTKDvsEoR8ZeTmg65D-CSFEdGmOuIL4pSI,1311
-ivoryos/version.py,sha256=cAJAbAh288a9AL-3yxwFzEM1L26izSJ6wma5aiml_9Y,23
+ivoryos/version.py,sha256=qEmNtjnOwhDYQ0cHPPtUkUaghzD2xl0thJEznl4giYw,23
 ivoryos/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/auth/auth.py,sha256=7CdXjGAr1B_xsmwweakTWOoROgsOJf0MNTzlMP_5Nus,3240
@@ -12,35 +12,35 @@ ivoryos/routes/control/templates/control/controllers.html,sha256=iIp0h6WA68gQj9O
 ivoryos/routes/control/templates/control/controllers_home.html,sha256=xFnBXTWMlyi2naMSsCEqFlX-Z1HJJDDtzITPvq-3nng,2733
 ivoryos/routes/control/templates/control/controllers_new.html,sha256=uOQo9kYmwX2jk3KZDkMUF_ylfNUIs_oIWb_kk_MMVDM,4921
 ivoryos/routes/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/database/database.py,sha256=IOrdtdsZ28bV7R1ZQfcwAeS5JDCkX-QYsP9i8BseD38,5684
-ivoryos/routes/database/templates/database/experiment_database.html,sha256=ABchwHYDovzwECc7UD4Mh8C_9JUl0YZpAAF9sFjNCs0,3434
+ivoryos/routes/database/database.py,sha256=h4b5r1K5W3psqze0v2QF_jX0ADppy8XdFBQLJb41LOU,5808
+ivoryos/routes/database/templates/database/experiment_database.html,sha256=GeZjx220PdAt_dVN6kigsaNzvaruPlrSSii1cka56NE,3530
 ivoryos/routes/design/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/design/design.py,sha256=hV8rtyIgbw5HsDY9h_Xtq96NIoaZB8XXLKyxaxbnYEA,21361
-ivoryos/routes/design/templates/design/experiment_builder.html,sha256=-C84nHcK1grC8b_B5Lgbg6StJcP8x1oj2XAjRPj1oU0,28239
-ivoryos/routes/design/templates/design/experiment_run.html,sha256=JY44cyWyi470Z_GeDGROU6cyFsTlbTYtlFVXmPjf4XA,23944
+ivoryos/routes/design/design.py,sha256=rIy6LCMw6ck4bxuPqoxIV6F1vZxY8aZ3Au5pm74dfr8,23934
+ivoryos/routes/design/templates/design/experiment_builder.html,sha256=2cT25URI6NoRDKuU6xl8Vsv4pqyQhhx-Fu8JOfPIP8k,27110
+ivoryos/routes/design/templates/design/experiment_run.html,sha256=t4Pq6uIltm3sq5cDb4zQa9i98iOQFNumkSa24vzCZrY,26001
 ivoryos/routes/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/main/main.py,sha256=yuVJzXAob1kc1dfflkTBIZQ0tdf6kChfuq-uQlN1e9Q,957
 ivoryos/routes/main/templates/main/help.html,sha256=IOktMEsOPk0SCiMBXZ4mpffClERAyX8W82fel71M3M0,9370
 ivoryos/routes/main/templates/main/home.html,sha256=ujM0YC0yrHhCfkuprNnZZZd8XEEguS_6NjrY5ktfctg,3356
 ivoryos/static/favicon.ico,sha256=RhlrPtfITOkzC9BjP1UB1V5L9Oyp6NwNtWeMcGOnpyc,15406
 ivoryos/static/logo.webp,sha256=lXgfQR-4mHTH83k7VV9iB54-oC2ipe6uZvbwdOnLETc,14974
-ivoryos/static/style.css,sha256=cbQ8T8h42smwuyF5qQ_pNhlptDXGcuyK2u4sUppqnyI,3717
+ivoryos/static/style.css,sha256=zQVx35A5g6JMJ-K84-6fSKtzXGjp_p5ZVG6KLHPM2IE,4021
 ivoryos/static/gui_annotation/Slide1.png,sha256=Lm4gdOkUF5HIUFaB94tl6koQVkzpitKj43GXV_XYMMc,121727
 ivoryos/static/gui_annotation/Slide2.PNG,sha256=z3wQ9oVgg4JTWVLQGKK_KhtepRHUYP1e05XUWGT2A0I,118761
 ivoryos/static/js/overlay.js,sha256=dPxop19es0E0ZUSY3d_4exIk7CJuQEnlW5uTt5fZfzI,483
-ivoryos/static/js/socket_handler.js,sha256=psIz61RgTzFk7B9SBZWtHWpG9vJjaRxEDTueFDKQcO4,2580
+ivoryos/static/js/socket_handler.js,sha256=fJ_SKCfS2ZejnECPKZuD8DTEPhBxmm0m-yCvxf2UtIQ,4885
 ivoryos/static/js/sortable_card.js,sha256=ifmlGe3yy0U_KzMphV4ClRhK2DLOvkELYMlq1vECuac,807
-ivoryos/static/js/sortable_design.js,sha256=1lI1I8FbL66tv6n-SX2FkbHNDYo36xVo2qDBKVLmxnQ,1120
-ivoryos/templates/base.html,sha256=8HDi7I74ugcCAV4c3ha4C__-7xopt4ZsC0OQ2E_AsQ8,8313
+ivoryos/static/js/sortable_design.js,sha256=wwpKfIzZGDxfX3moNz0cvPvm9YyHmopZK3wmkUdnBiw,4333
+ivoryos/templates/base.html,sha256=OM4D_1A_RawOLBRhiCbKVn7a1UgPxji0BZlnCURl5WM,8325
 ivoryos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/utils/db_models.py,sha256=GiBvsQqleXa7sXjh-118Q1rDTWYKrBsz25fben3aKC4,23712
-ivoryos/utils/form.py,sha256=1h6eytHz1tv5_CIc_C6KGYn5JEPYniIOxo49yzM37o0,17149
-ivoryos/utils/global_config.py,sha256=Ojcz6xKATSbMLnTT0kiKqSnu_bNqCMyIAnZyHaKxJns,1589
+ivoryos/utils/db_models.py,sha256=LG78TSc9VAEELH9pgTVRRpmyEsCjtxkQOM176N0HAw8,25179
+ivoryos/utils/form.py,sha256=Eqrg4G44hoG6TizxTEP4DNd-rEoyN77t9Y7cB1WdrcQ,19205
+ivoryos/utils/global_config.py,sha256=P0xs_33bZfNQ-D71lCkq7HJyT4ngQWPqUKnkoMrmM8c,1908
 ivoryos/utils/llm_agent.py,sha256=DTf-AF56vy1Em1fUKagl5NURKittmNoxTKIw1PlyC2o,6413
-ivoryos/utils/script_runner.py,sha256=fa35LmNHUXdU0R-_e2Wadok4GjQ_MaYNMvOFJfxSdCI,9308
-ivoryos/utils/utils.py,sha256=nQbGSR_FmlZyBb9lwKy3ws4FDAWWfDyu96hZg2DVIeI,14081
-ivoryos-0.1.19.dist-info/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
-ivoryos-0.1.19.dist-info/METADATA,sha256=z55ToyL0h0YAkAS9pEeaXrG2TFT-fSWeJBsaKto3Xc0,6539
-ivoryos-0.1.19.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-ivoryos-0.1.19.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
-ivoryos-0.1.19.dist-info/RECORD,,
+ivoryos/utils/script_runner.py,sha256=1B6iImRvJ--VSD036p5YSjl76yxMRqDa1OCoRi9ZMM4,10304
+ivoryos/utils/utils.py,sha256=SWVlMjpcUnQ2hgVasXwKugX781eiq78Dv6oZa21lg5Q,14071
+ivoryos-0.1.21.dist-info/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
+ivoryos-0.1.21.dist-info/METADATA,sha256=3eE6xsyC4fYuUeXA5OsAhWbdrRPCGXaxAFbTTLbCCNA,6697
+ivoryos-0.1.21.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+ivoryos-0.1.21.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
+ivoryos-0.1.21.dist-info/RECORD,,