ivoryos 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

ivoryos/__init__.py

@@ -19,7 +19,7 @@ global_config = GlobalConfig()
 
 
 def create_app(config_class=None):
-    url_prefix = os.getenv('URL_PREFIX', None)
+    url_prefix = os.getenv('URL_PREFIX', "/ivoryos")
     app = Flask(__name__, static_url_path=f'{url_prefix}/static', static_folder='static')
     app.config.from_object(config_class or 'config.get_config()')
 

ivoryos/routes/control/templates/control/controllers.html

@@ -37,7 +37,7 @@
                                     {% endfor %}
                                 </div>
                                 <div class="input-group mb-3">
-                                    <button type="submit" name="{{ function }}" id="{{ function }}" class="form-control" style="background-color: #a5cece;">{{function}} </button>
+                                    <button type="submit" name="{{ function }}" id="{{ function }}" class="form-control" style="background-color: #a5cece;">{{format_name(function)}} </button>
                                 </div>
                             </form>
                         </div>

ivoryos/routes/database/database.py

@@ -7,15 +7,6 @@ from ivoryos.utils.utils import get_script_file, post_script_file
 database = Blueprint('database', __name__, template_folder='templates/database')
 
 
-@database.route("/delete/<id>")
-@login_required
-def delete_action(id):
-    back = request.referrer
-    script = get_script_file()
-    script.delete_action(id)
-    post_script_file(script)
-    return redirect(back)
-
 
 @database.route("/edit_workflow/<workflow_name>")
 @login_required

ivoryos/routes/design/design.py

@@ -13,7 +13,7 @@ from werkzeug.utils import secure_filename
 from ivoryos.utils import utils
 from ivoryos.utils.global_config import GlobalConfig
 from ivoryos.utils.form import create_builtin_form, create_action_button, format_name, create_form_from_pseudo
-from ivoryos.utils.llm_agent import LlmAgent
+
 from ivoryos.utils.db_models import Script
 from ivoryos.utils.script_runner import ScriptRunner
 
@@ -165,6 +165,7 @@ def generate_code():
                 model = current_app.config["LLM_MODEL"]
                 server = current_app.config["LLM_SERVER"]
                 module = current_app.config["MODULE"]
+                from ivoryos.utils.llm_agent import LlmAgent
                 agent = LlmAgent(host=server, model=model, output_path=os.path.dirname(os.path.abspath(module)))
             except Exception as e:
                 flash(e.__str__())
@@ -394,3 +395,23 @@ def edit_action(uuid):
                 flash(e.__str__())
         session.pop('edit_action')
     return redirect(url_for('design.experiment_builder'))
+
+
+@design.route("/delete/<id>", methods=['GET', 'POST'])
+@login_required
+def delete_action(id):
+    back = request.referrer
+    script = utils.get_script_file()
+    script.delete_action(id)
+    utils.post_script_file(script)
+    return redirect(back)
+
+
+@design.route("/duplicate/<id>", methods=['GET', 'POST'])
+@login_required
+def duplicate_action(id):
+    back = request.referrer
+    script = utils.get_script_file()
+    script.duplicate_action(id)
+    utils.post_script_file(script)
+    return redirect(back)

ivoryos/routes/design/templates/design/experiment_builder.html

@@ -301,8 +301,11 @@
                     <ul class="reorder">
                     {% for button in buttons %}
                         <li id="{{ button['id'] }}" style="list-style-type: none;">
-                        <a href="{{ url_for('design.edit_action', uuid=button['uuid']) }}" type="button" class="btn btn-light" style="{{ button['style'] }}">{{ button['label'] }}</a>
-                        <a href="/delete/{{ button['id'] }}" type="button" class="btn btn-light"><span class="bi bi-trash"></span></a>
+                            <a href="{{ url_for('design.edit_action', uuid=button['uuid']) }}" type="button" class="btn btn-light" style="{{ button['style'] }}">{{ button['label'] }}</a>
+                            {% if not button["instrument"] in ["if","while"] %}
+                                <a href="{{ url_for('design.duplicate_action', id=button['id']) }}" type="button" class="btn btn-light"><span class="bi bi-copy"></span></a>
+                            {% endif %}
+                            <a href="{{ url_for('design.delete_action', id=button['id']) }}" type="button" class="btn btn-light"><span class="bi bi-trash"></span></a>
                         </li>
                     {% endfor %}
                     </ul>

ivoryos/templates/base.html

@@ -6,7 +6,7 @@
     <title>{% block title %}{% endblock %}</title>
     {#bootstrap#}
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha2/dist/css/bootstrap.min.css" integrity="sha384-aFq/bzH65dt+w6FI2ooMVUpc+21e0SRygnTpmBvdBgSdnuTN7QbdgL+OapgHtvPp" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.3/font/bootstrap-icons.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
     {#static#}
     <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">

ivoryos/utils/db_models.py

@@ -197,9 +197,10 @@ class Script(db.Model):
 
     def add_action(self, action: dict):
         current_len = len(self.currently_editing_script)
-        action['id'] = current_len + 1
-        action['uuid'] = uuid.uuid4().fields[-1]
-        self.currently_editing_script.append(action)
+        action_to_add = action.copy()
+        action_to_add['id'] = current_len + 1
+        action_to_add['uuid'] = uuid.uuid4().fields[-1]
+        self.currently_editing_script.append(action_to_add)
         self.currently_editing_order.append(str(current_len + 1))
         self.update_time_stamp()
 
@@ -257,6 +258,23 @@ class Script(db.Model):
         self.sort_actions()
         self.update_time_stamp()
 
+    def duplicate_action(self, id: int):
+        action_to_duplicate = next((action for action in self.currently_editing_script if action['id'] == int(id)), None)
+        insert_id = action_to_duplicate.get("id")
+        self.add_action(action_to_duplicate)
+        # print(self.currently_editing_script)
+        if action_to_duplicate is not None:
+            # Update IDs for all subsequent actions
+            for action in self.currently_editing_script:
+                if action['id'] > insert_id:
+                    action['id'] += 1
+            self.currently_editing_script[-1]['id'] = insert_id + 1
+            # Sort actions if necessary and update the time stamp
+            self.sort_actions()
+            self.update_time_stamp()
+        else:
+            raise ValueError("Action not found: Unable to duplicate the action with ID", id)
+
     def config(self, stype):
         """
         take the global script_dict

ivoryos/utils/form.py

@@ -220,7 +220,8 @@ def create_form_for_method(method, method_name, autofill, script=None, design=Tr
         formatted_param_name = format_name(param.name)
         field_kwargs = {
             "label": formatted_param_name,
-            "default": f'#{param.name}' if autofill else (param.default if param.default is not param.empty else ""),
+            "default": f'#{param.name}' if autofill else (param.default if param.default is not param.empty else None),
+            "validators": [InputRequired()] if param.default is param.empty else None,
             **({"script": script} if (autofill or design) else {})
         }
         field_class, placeholder_text = annotation_mapping.get(
@@ -255,7 +256,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[format_name(attr_name)] = form_class()
+            method_forms[attr_name] = form_class()
     return method_forms
 
 
@@ -312,4 +313,4 @@ def create_action_button(s: dict):
                 arg_string = f"= {s['args']}"
 
         text = f"{prefix}{action_text}  {arg_string}"
-    return dict(label=text, style=style, uuid=s["uuid"], id=s["id"])
+    return dict(label=text, style=style, uuid=s["uuid"], id=s["id"], instrument=s['instrument'])

{ivoryos-0.1.7.dist-info → ivoryos-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.7
+Version: 0.1.9
 Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
 Home-page: https://gitlab.com/heingroup/ivoryos
 Author: Ivory Zhang
@@ -137,6 +137,9 @@ ivoryos.run(__name__)
 ### Deck function and web form 
 ![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/demo.gif)
 
+### Text-to-code demo
+![](https://gitlab.com/heingroup/ivoryos/raw/main/docs/text-to-code.gif)
+
 ### Directory structure
 
 When you run the application for the first time, it will automatically create the following folders and files in the same directory:

{ivoryos-0.1.7.dist-info → ivoryos-0.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ivoryos/__init__.py,sha256=HuYhPOMFGkQ_f9s1dZXaknAylKXds0jYK0nmdf1I6Z8,3932
+ivoryos/__init__.py,sha256=0bjHffTf3m8NWU3zwLz7sZMDqhwNP9FpNXJhxFRliEQ,3938
 ivoryos/config.py,sha256=K03jdGmbUfJ9o4kK6NOtDGJtydGHFq8-oU8nvCyq5zQ,1358
 ivoryos/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,22 +7,21 @@ ivoryos/routes/auth/templates/auth/login.html,sha256=1uxYU7NpxVaA4sfwkC6CuzZXJdy
 ivoryos/routes/auth/templates/auth/signup.html,sha256=QQ7n4OBnF8TNFS5_4s11n4BCqSePn429rZfA6vO8qw8,1497
 ivoryos/routes/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/control/control.py,sha256=YKM1T_bDIggbW_NF6Ld6-rb3d0KbAjyikJztN-ka_XM,11305
-ivoryos/routes/control/templates/control/controllers.html,sha256=CD1DEm9DuBBlKg_ltrEWgNxWhTIR9C2_a0-AkxwGre0,4146
+ivoryos/routes/control/templates/control/controllers.html,sha256=5LKKlhiGdg2fxs-akAAxtm1AMF5HAiuSlputDBMeTc0,4159
 ivoryos/routes/control/templates/control/controllers_home.html,sha256=IND1T3_mPZd-MzfuyodbedMnmsTowiTVdRp5ez6NoZM,2783
 ivoryos/routes/control/templates/control/controllers_new.html,sha256=Wqn9x9D6K7RWHkLFxvZkzbIJxHJR1zywQ6WDgySXOig,5010
 ivoryos/routes/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/database/database.py,sha256=e1OpmQayM0KYUTPiYQzXHo-zLVd5yHtS0EYNce7vcmQ,4357
+ivoryos/routes/database/database.py,sha256=W7axqxlRyIwqdLCuzYzER33obz6PCkevk6NTy-sCOLw,4133
 ivoryos/routes/database/templates/database/experiment_database.html,sha256=x9zf4u4KbG6BEICnH_TOVNNUkp5oAmGBB12OUX0PPl4,3506
 ivoryos/routes/design/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/design/design.py,sha256=FUuO-1iSeKhrLQ5Qz4zQwZiFRC5rax7RwhJBH9Wt42U,16895
-ivoryos/routes/design/templates/design/experiment_builder.html,sha256=IAU9XvtbcEWDlnCqf2Z81gcBB7bNDFOfod3xLJfRbQc,27371
+ivoryos/routes/design/design.py,sha256=dPSLY7sCD4tDqeqhGDlnRGdoeM7tUTeQqhWoeYAZrlU,17442
+ivoryos/routes/design/templates/design/experiment_builder.html,sha256=jlRDAaSFY-ExsgdESYdNi_up-hlGqX02414aApbWYIc,27703
 ivoryos/routes/design/templates/design/experiment_run.html,sha256=xoEHH8CC83KCWTPavwP9JWUI8SE5HX9bkEfJN6vMg5s,22845
 ivoryos/routes/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ivoryos/routes/main/main.py,sha256=Zkagtw0E67FaspNJ87jkYpc-wqqoTq99dyyB7qdnOVM,655
 ivoryos/routes/main/templates/main/help.html,sha256=TY6uD-v8MXpiZlGucchko1Bas5jHRzARIgCgneBZ_ok,9511
 ivoryos/routes/main/templates/main/home.html,sha256=fjeSSXkuVDr2y-CQmskNHf1yYFFdrPPI4wn6_XPb6AY,3252
 ivoryos/static/favicon.ico,sha256=RhlrPtfITOkzC9BjP1UB1V5L9Oyp6NwNtWeMcGOnpyc,15406
-ivoryos/static/logo.png,sha256=7lNyToDllflGPUK2sj7IBR8FkHLC-6gi-OVSL9o4jrs,63464
 ivoryos/static/logo.webp,sha256=lXgfQR-4mHTH83k7VV9iB54-oC2ipe6uZvbwdOnLETc,14974
 ivoryos/static/style.css,sha256=rY6n2mbP_xNavtVin_yUqtcvNm6uqAF82t7ONE2Sx9E,3918
 ivoryos/static/gui_annotation/Slide1.png,sha256=Lm4gdOkUF5HIUFaB94tl6koQVkzpitKj43GXV_XYMMc,121727
@@ -31,17 +30,16 @@ ivoryos/static/js/overlay.js,sha256=44l9THVKYZfa7HX6siyqY7EdFWKBk5pyyKgN0_7ZnrM,
 ivoryos/static/js/socket_handler.js,sha256=2936CldW6Po_saWh1aL_EV-VydJVIvikrNfTaSfU1sE,1449
 ivoryos/static/js/sortable_card.js,sha256=mDVd2YjhusLokUw3xL6YOZLXIzty9yKDsC1U5yR8aC8,831
 ivoryos/static/js/sortable_design.js,sha256=BxNXzqET_yY0xpS1Fc0iwPCnkkDwYMiuVqkgOPMb6JY,1156
-ivoryos/templates/base.html,sha256=KcKMjITaaC23yzIRN535uMhzv5x96nJl245Y2GaqdsM,7943
+ivoryos/templates/base.html,sha256=qmIF66gGOHtS7mnz5Zg_DnI1WgjBh7FtpMC_utaB49U,7943
 ivoryos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/utils/db_models.py,sha256=umEATdxDP-sR_AMaLrOW2PBUcmBf1w38DLeFkBvVjJE,19280
-ivoryos/utils/form.py,sha256=mqNDuaxniaGnKcJ26N9dcXpHQ6TabXTqPVbcrcDvM4s,12239
+ivoryos/utils/db_models.py,sha256=mEQVvbJ-qxFM2uN9ciwx5SUvtGZHBc1HDSscTCfxyt0,20209
+ivoryos/utils/form.py,sha256=fFswxZ-b5n_POVZ4IV-SCQ2iO9TK2Yp2AszoDA6bL84,12344
 ivoryos/utils/global_config.py,sha256=JCQvmZB0pNC-EjveRu48Tp4uvcNwn9DP3Ema6Xd9fJY,1656
 ivoryos/utils/llm_agent.py,sha256=z0DIpZzc-z09p-diUZIOE5L9zfFW8RwseFjbfUvEqoQ,6596
 ivoryos/utils/script_runner.py,sha256=gtqiHy4-40j5FMERXrmGb4jb9RAPzjCR345PMPduDno,7120
-ivoryos/utils/task_manager.py,sha256=xfQ1s9ywWDrCYYpdgliVvoWED0s2xARmo3LXvAy6fgY,2517
 ivoryos/utils/utils.py,sha256=BMmvyBNo8PYs-MiBiiHjYPvSwrHORofbNwhPYpaVnfI,15249
-ivoryos-0.1.7.dist-info/LICENSE,sha256=psyqat4GJkzi42551i0kH-bXLbEzrQEnjPDwy2TVhv8,1105
-ivoryos-0.1.7.dist-info/METADATA,sha256=SgV11aX0JSQjJRsn_1vDlt15DrdAEWKM7DSs5dU6cjE,6101
-ivoryos-0.1.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-ivoryos-0.1.7.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
-ivoryos-0.1.7.dist-info/RECORD,,
+ivoryos-0.1.9.dist-info/LICENSE,sha256=psyqat4GJkzi42551i0kH-bXLbEzrQEnjPDwy2TVhv8,1105
+ivoryos-0.1.9.dist-info/METADATA,sha256=DVCeKpp0iwQQ8WW_Nbdi_yqbdcXHCp9-8fhKexAC5OY,6200
+ivoryos-0.1.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+ivoryos-0.1.9.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
+ivoryos-0.1.9.dist-info/RECORD,,

ivoryos/utils/task_manager.py

@@ -1,80 +0,0 @@
-import threading
-import queue
-import time
-
-
-# A task manager class to manage the queue and tasks
-class TaskManager:
-    def __init__(self):
-        self.task_queue = queue.Queue()
-        self.current_task = None
-        self.stop_event = threading.Event()
-
-    def add_task(self, func, **kwargs):
-        # Add the function and its kwargs to the task queue
-        self.task_queue.put((func, kwargs))
-
-    def run_tasks(self):
-        # Run the tasks from the queue
-        while not self.task_queue.empty():
-            func, kwargs = self.task_queue.get()
-            thread = threading.Thread(target=self.run_task, args=(func, kwargs))
-            self.current_task = thread
-            thread.start()
-            thread.join()  # Wait for the task to finish
-
-    def run_task(self, func, kwargs):
-        # Run the task function with control to stop in the middle
-        self.stop_event.clear()  # Reset the stop flag
-        func(**kwargs)
-        if self.stop_event.is_set():
-            print("Current task was stopped.")
-
-    def stop_current_task(self):
-        # Stop the current task by setting the stop flag
-        if self.current_task and self.current_task.is_alive():
-            print("Stopping current task...")
-            self.stop_event.set()  # Signal to stop the current task
-            self.current_task.join()  # Wait for the task to stop
-
-
-# Wrapping tasks to allow stopping between them
-def function_to_call(stop_event, **kwargs):
-    if stop_event.is_set():
-        return
-    task1(kwargs['arg1'])
-    if stop_event.is_set():
-        return
-    task2(kwargs['arg2'])
-
-
-# Dummy task functions as provided
-def task1(arg1):
-    for i in range(arg1):
-        print(f"Task 1 running: {i}")
-        time.sleep(1)
-
-
-def task2(arg2):
-    for i in range(arg2):
-        print(f"Task 2 running: {i}")
-        time.sleep(1)
-
-
-if __name__ == "__main__":
-    manager = TaskManager()
-
-    # Add tasks to the manager
-    manager.add_task(function_to_call, stop_event=manager.stop_event, arg1=3, arg2=5)
-    manager.add_task(function_to_call, stop_event=manager.stop_event, arg1=2, arg2=4)
-
-    # Run tasks in a separate thread
-    manager_thread = threading.Thread(target=manager.run_tasks)
-    manager_thread.start()
-
-    # Example: Stop the current workflow while task1 is running
-    time.sleep(2)  # Let task1 run for a bit
-    manager.stop_current_task()
-
-    # Wait for all tasks to finish
-    manager_thread.join()