ivoryos 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

ivoryos/__init__.py

@@ -51,6 +51,10 @@ def create_app(config_class=None):
 
     @app.before_request
     def before_request():
+        """
+        Called before
+
+        """
         from flask import g
         g.logger = logger
         g.socketio = socketio

ivoryos/routes/control/control.py

@@ -187,7 +187,7 @@ def backend_control(instrument: str=None):
                 return json_output, 400
         else:
             return "instrument not exist", 400
-    return '', 200
+    return json_output, 200
 
 
 @control.route("/backend_control", methods=['GET'])

ivoryos/routes/design/design.py

@@ -106,8 +106,8 @@ def experiment_builder(instrument=None):
         deck_variables = list(pseudo_deck.keys()) if pseudo_deck else []
         deck_variables.remove("deck_name") if len(deck_variables) > 0 else deck_variables
     if instrument:
-        if instrument in ['if', 'while', 'variable', 'wait']:
-            forms = create_builtin_form(instrument)
+        if instrument in ['if', 'while', 'variable', 'wait', 'repeat']:
+            forms = create_builtin_form(instrument, autofill=autofill, script=script)
         else:
             if deck:
                 function_metadata = global_config.deck_snapshot.get(instrument, {})
@@ -306,6 +306,8 @@ def experiment_run():
                               logger=g.logger, socketio=g.socketio, repeat_count=repeat,
                               output_path=datapath
                               )
+            if utils.check_config_duplicate(config):
+                flash(f"WARNING: Duplicate in config entries.")
         except Exception as e:
             flash(e)
     return render_template('experiment_run.html', script=script.script_dict, filename=filename, dot_py=exec_string,

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

@@ -72,7 +72,7 @@
 <!--                    <div class="rounded flex-fill" style="height: 30px;background-color: aliceblue">-->
 <!--                        <h6  style=" text-align: center; ">{{ format_name(instrument) }}</h6>-->
 <!--                    </div>-->
-                    {% if instrument in ['if' , 'while' , 'variable' ,'wait'] %}
+                    {% if instrument in ['if' , 'while' , 'variable' ,'wait', 'repeat'] %}
                         {# form for builtin functions #}
                         <form role="form" method='POST' name="{{instrument}}" action="{{url_for('design.experiment_builder',instrument=instrument)}}" >
                             <div class="form-group">
@@ -185,7 +185,7 @@
                         </h5>
                         <div class="accordion-collapse collapse show" id="advanced">
                             <ul class="list-group">
-                                {% for instrument in ['if', 'while', 'variable', 'wait'] %}
+                                {% for instrument in ['if', 'while', 'variable', 'wait', 'repeat'] %}
                                     <form role="form" method='GET' name="device" action="{{url_for('design.experiment_builder',instrument=instrument)}}">
                                         <div class="form-group">
                                             <button class="list-group-item list-group-item-action" aria-current="true" type="submit">{{instrument}}</button>
@@ -302,7 +302,7 @@
                     {% 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>
-                            {% if not button["instrument"] in ["if","while"] %}
+                            {% if not button["instrument"] in ["if","while","repeat"] %}
                                 <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>
@@ -403,7 +403,7 @@
     </div>
 </div>
 
-    {% if instrument and not instrument in ['if' , 'while' , 'variable' ,'wait'] and use_llm %}
+    {% if instrument and not instrument in ['if' , 'while' , 'variable' ,'wait', 'repeat'] and use_llm %}
         <script>
             const buttonIds = {{ ['generate'] | tojson }};
         </script>

ivoryos/routes/design/templates/design/experiment_run.html

@@ -50,7 +50,7 @@
                                         <form role="form" method='POST' name="run" action="{{url_for('design.experiment_run')}}">
                                             <div class="input-group mb-3">
                                                 <label class="input-group-text" for="repeat">Repeat for </label>
-                                                <input class="form-control" type="number" id="repeat" name="repeat" min="1" max="100">
+                                                <input class="form-control" type="number" id="repeat" name="repeat" min="1" max="1000" value="1">
                                                 <label class="input-group-text" for="repeat"> times</label>
                                             </div>
 {#                                            {% if not no_deck_warning%}#}
@@ -185,7 +185,7 @@
                                                 <p><h5>Budget:</h5></p>
                                                 <div class="input-group mb-3">
                                                     <label class="input-group-text" for="repeat">Max iteration </label>
-                                                    <input class="form-control" type="number" id="repeat" name="repeat" min="1" max="100">
+                                                    <input class="form-control" type="number" id="repeat" name="repeat" min="1" max="1000" value="25">
                                                 </div>
                                                 {% if not no_deck_warning%}
                                                     <div class="input-group mb-3">

ivoryos/utils/db_models.py

@@ -241,6 +241,13 @@ class Script(db.Model):
                      "args": '0' if statement == '' else statement,
                      "return": '', "uuid": uid, "arg_types": "float"},
                 ],
+            "repeat":
+                [
+                    {"id": current_len + 1, "instrument": 'repeat', "action": "repeat",
+                     "args": '1' if statement == '' else statement, "return": '', "uuid": uid, "arg_types": "int"},
+                    {"id": current_len + 2, "instrument": 'repeat', "action": 'endrepeat',
+                     "args": '', "return": '', "uuid": uid},
+                ],
         }
         action_list = logic_dict[logic_type]
         self.currently_editing_script.extend(action_list)
@@ -366,11 +373,14 @@ class Script(db.Model):
         """
         Generate the function header.
         """
-        configure, _ = self.config(stype)
+        configure, config_type = self.config(stype)
+
+        configure = [param + f":{param_type}" if not param_type == "any" else "" for param, param_type in config_type.items()]
+
         function_header = f"\n\ndef {run_name}_{stype}("
 
         if stype == "script":
-            function_header += ",".join(configure)
+            function_header += ", ".join(configure)
 
         function_header += "):"
         function_header += self.indent(1) + f"global {run_name}_{stype}"
@@ -389,7 +399,6 @@ class Script(db.Model):
         return_str, return_list = self.config_return()
         if return_list and stype == "script":
             body += self.indent(indent_unit) + return_str
-
         return body
 
     def _process_action(self, indent_unit, action, index, stype):
@@ -409,6 +418,9 @@ class Script(db.Model):
             return self.indent(indent_unit) + f"{action_name} = {args}", indent_unit
         elif instrument == 'wait':
             return f"{self.indent(indent_unit)}time.sleep({args})", indent_unit
+        elif instrument == 'repeat':
+            return self._process_repeat(indent_unit, action_name, args, next_action)
+
         else:
             return self._process_instrument_action(indent_unit, instrument, action_name, args, save_data)
 
@@ -456,6 +468,20 @@ class Script(db.Model):
             indent_unit -= 1
         return exec_string, indent_unit
 
+    def _process_repeat(self, indent_unit, action, args, next_action):
+        """
+        Process 'while' and 'endwhile' actions.
+        """
+        exec_string = ""
+        if action == 'repeat':
+            exec_string += self.indent(indent_unit) + f"for _ in range({args}):"
+            indent_unit += 1
+            if next_action and next_action['instrument'] == 'repeat':
+                exec_string += self.indent(indent_unit) + "pass"
+        elif action == 'endrepeat':
+            indent_unit -= 1
+        return exec_string, indent_unit
+
     def _process_instrument_action(self, indent_unit, instrument, action, args, save_data):
         """
         Process actions related to instruments.

ivoryos/utils/form.py

@@ -269,17 +269,25 @@ def create_form_from_pseudo(pseudo: dict, autofill: bool, script=None, design=Tr
     return method_forms
 
 
-def create_builtin_form(logic_type):
+def create_builtin_form(logic_type, autofill, script):
     class BuiltinFunctionForm(FlaskForm):
         pass
-
-    placeholder_text = f'Enter numbers' if logic_type == 'wait' else f'Enter statement'
-    description_text = f'Your variable can be numbers, boolean (True or False) or text ("text")' if logic_type == 'variable' else ''
-    field_class = FloatField if logic_type == 'wait' else StringField  # Default to StringField as a fallback
+    placeholder_text = {
+        'wait': 'Enter second',
+        'repeat': 'Enter an integer'
+    }.get(logic_type, 'Enter statement')
+    description_text = {
+        'variable': 'Your variable can be numbers, boolean (True or False) or text ("text")',
+    }.get(logic_type, '')
+    field_class = {
+        'wait': VariableOrFloatField,
+        'repeat': VariableOrIntField
+    }.get(logic_type, VariableOrStringField)  # Default to StringField as a fallback
     field_kwargs = {
         "label": f'statement',
         "validators": [InputRequired()] if logic_type in ['wait', "variable"] else [],
         "description": description_text,
+        "script": script
     }
     render_kwargs = {"placeholder": placeholder_text}
     field = field_class(**field_kwargs, render_kw=render_kwargs)
@@ -295,10 +303,8 @@ def create_builtin_form(logic_type):
 
 
 def create_action_button(s: dict):
-    style = ""
-    if s['instrument'] in ['if', 'while']:
+    if s['instrument'] in ['if', 'while', 'repeat']:
         text = f"{s['action']} {s['args']}"
-        style = "background-color: tomato"
     elif s['instrument'] == 'variable':
         text = f"{s['action']} = {s['args']}"
     else:
@@ -313,4 +319,10 @@ def create_action_button(s: dict):
                 arg_string = f"= {s['args']}"
 
         text = f"{prefix}{action_text}  {arg_string}"
+    style = {
+        "repeat": "background-color: lightsteelblue",
+        "if": "background-color: salmon",
+        "while": "background-color: salmon",
+
+    }.get(s['instrument'], "")
     return dict(label=text, style=style, uuid=s["uuid"], id=s["id"], instrument=s['instrument'])

ivoryos/utils/script_runner.py

@@ -133,7 +133,8 @@ class ScriptRunner:
                     function = self.globals_dict[fname]
                     output = function(**parameters)
                     # output = eval(f"{run_name}_script(**{parameters})")
-                    ax_client.complete_trial(trial_index=trial_index, raw_data=output)
+                    _output = output.copy()
+                    ax_client.complete_trial(trial_index=trial_index, raw_data=_output)
                     output.update(parameters)
                 except Exception as e:
                     logger.info(f'Optimization error: {e}')

ivoryos/utils/utils.py

@@ -6,6 +6,7 @@ import os
 import pickle
 import subprocess
 import sys
+from collections import Counter
 from typing import Optional, Dict, Tuple
 
 from flask import session
@@ -317,8 +318,9 @@ def ax_wrapper(data: dict, arg_types:list):
                 is_min = True if value == "minimize" else False
 
                 threshold = None if f"{obj_name}_threshold" not in data else data[f"{obj_name}_threshold"]
-                properties = ObjectiveProperties(minimize=is_min, threshold=threshold)
+                properties = ObjectiveProperties(minimize=is_min)
                 objectives[obj_name] = properties
+
     return parameter, objectives
 
 
@@ -331,7 +333,7 @@ def ax_initiation(data, arg_types):
     parameter, objectives = ax_wrapper(data, arg_types)
     from ax.service.ax_client import AxClient
     ax_client = AxClient()
-    ax_client.create_experiment(parameter, objectives)
+    ax_client.create_experiment(parameter, objectives=objectives)
     return ax_client
 
 
@@ -423,3 +425,13 @@ def load_deck(pkl_name: str):
         return pseudo_deck
     except FileNotFoundError:
         return None
+
+
+def check_config_duplicate(config):
+    """
+    Checks if the config entry has any duplicate
+    :param config: [{"arg": 1}, {"arg": 1}, {"arg": 1}]
+    :return: [True, False]
+    """
+    hashable_data = [tuple(sorted(d.items())) for d in config]
+    return any(count > 1 for count in Counter(hashable_data).values())

ivoryos/version.py

@@ -1 +1 @@
-__version__ = "0.1.10"
+__version__ = "0.1.12"

{ivoryos-0.1.10.dist-info → ivoryos-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ivoryos
-Version: 0.1.10
+Version: 0.1.12
 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.10.dist-info → ivoryos-0.1.12.dist-info}/RECORD

@@ -1,13 +1,13 @@
-ivoryos/__init__.py,sha256=UesIiRxex8LSz0zECPf6NpefKD-rwui2ZCdA5c7tAeM,4696
+ivoryos/__init__.py,sha256=pKaEGt1aqh4U0ofAVm2jdhyoyrR1jYlEO-Qi2T7Sfp4,4743
 ivoryos/config.py,sha256=3FPBYTIBhQTKDvsEoR8ZeTmg65D-CSFEdGmOuIL4pSI,1311
-ivoryos/version.py,sha256=z0zCHFTcKSR0tJ6h5qrpNmRVP21QIPP8N0p7quCnnm0,23
+ivoryos/version.py,sha256=LcIlFjHZFfiF9Rd4UHoakmombOFkxIYk00I181frGBM,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
 ivoryos/routes/auth/templates/auth/login.html,sha256=WSRrKbdM_oobqSXFRTo-j9UlOgp6sYzS9tm7TqqPULI,1207
 ivoryos/routes/auth/templates/auth/signup.html,sha256=b5LTXtpfTSkSS7X8u1ldwQbbgEFTk6UNMAediA5BwBY,1465
 ivoryos/routes/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/control/control.py,sha256=iQTOKqkYFvJArNfdhv5ZtF0CVXDUmPxodHvwjmB1rdo,14154
+ivoryos/routes/control/control.py,sha256=MmrcKrkjSKS589XhDdvPc7kWO0ApCNVZCtrgfzTAAN8,14163
 ivoryos/routes/control/templates/control/controllers.html,sha256=QdZAieEA4ODC-3KlsgHmFO35q8KXjm0KT43ZNpcBgEs,4084
 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
@@ -15,9 +15,9 @@ ivoryos/routes/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 ivoryos/routes/database/database.py,sha256=IOrdtdsZ28bV7R1ZQfcwAeS5JDCkX-QYsP9i8BseD38,5684
 ivoryos/routes/database/templates/database/experiment_database.html,sha256=ABchwHYDovzwECc7UD4Mh8C_9JUl0YZpAAF9sFjNCs0,3434
 ivoryos/routes/design/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/routes/design/design.py,sha256=sWau2fYkwWQwlSuAZjFgbf6QRPCq7eJB5obO-kwYWZE,20715
-ivoryos/routes/design/templates/design/experiment_builder.html,sha256=B9JSH27oTAW5rDisaB18bIBPLINs-TDC4ol6AVjcTm4,27288
-ivoryos/routes/design/templates/design/experiment_run.html,sha256=u-VS6C1i_ErhrtCHGEA57i7JIB3TbKdnvNjI4ey0yXU,22520
+ivoryos/routes/design/design.py,sha256=ZAUh-XOMhePCmY7q-hfru-4X6fDR3aKKyktrD2NC6M4,20876
+ivoryos/routes/design/templates/design/experiment_builder.html,sha256=lF8fDMHtwQjVznbCL4klV3o1p0tkqMptPY5IXR7WSuE,27327
+ivoryos/routes/design/templates/design/experiment_run.html,sha256=JxYEbJqeJH8vZaSVI25EtNYmI_W5GSFdc02Y8y3kZGc,22543
 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
@@ -34,14 +34,14 @@ ivoryos/static/js/sortable_card.js,sha256=ifmlGe3yy0U_KzMphV4ClRhK2DLOvkELYMlq1v
 ivoryos/static/js/sortable_design.js,sha256=1lI1I8FbL66tv6n-SX2FkbHNDYo36xVo2qDBKVLmxnQ,1120
 ivoryos/templates/base.html,sha256=OR04eHEgmq4Wj0en3z6J2l-CdcJjZryRBjLsWyKdnCo,7800
 ivoryos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ivoryos/utils/db_models.py,sha256=CWBPJaBiLj2QioOsBw1PxoGd6vTtQSlo67fg8nCkfL8,19691
-ivoryos/utils/form.py,sha256=CYS8XzJsz2ff4xalXFQXbJosCjY7P8khi7A_MmvMc2A,12028
+ivoryos/utils/db_models.py,sha256=XoReukuWiroDX4OTfyd9dHRpGIN2woWL017P7N-VZ0U,20918
+ivoryos/utils/form.py,sha256=zpEFUyx9nMZkkTYVL0DIT3kEWd1DQsDGSBu4UysXf4s,12338
 ivoryos/utils/global_config.py,sha256=Ojcz6xKATSbMLnTT0kiKqSnu_bNqCMyIAnZyHaKxJns,1589
 ivoryos/utils/llm_agent.py,sha256=DTf-AF56vy1Em1fUKagl5NURKittmNoxTKIw1PlyC2o,6413
-ivoryos/utils/script_runner.py,sha256=t0K-TxhiRDNl__tx9H4aW9K2z1k2oWBCt3qPyTTymOo,7034
-ivoryos/utils/utils.py,sha256=AGG_1bqV52K23ujIKXkckClUXcuvGvZdtVWJ1Pxml9Q,15025
-ivoryos-0.1.10.dist-info/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
-ivoryos-0.1.10.dist-info/METADATA,sha256=NSPuLi_YIePqKUKgDBXWvupOvz1WeveHZYXJFdWk-U0,6335
-ivoryos-0.1.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-ivoryos-0.1.10.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
-ivoryos-0.1.10.dist-info/RECORD,,
+ivoryos/utils/script_runner.py,sha256=sFAUGCcfsA8DEPgw7koqEAr9fnxxYNRuiOC3L3yOwwc,7079
+ivoryos/utils/utils.py,sha256=5pNF5QJMXmImxDR0IRqaMzIy9n0fD_M1SUY1v9koEc8,15368
+ivoryos-0.1.12.dist-info/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
+ivoryos-0.1.12.dist-info/METADATA,sha256=-aWjCWBd57wVqDBrPxwJdUPW3picfwV-I47vgpo0xX8,6335
+ivoryos-0.1.12.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+ivoryos-0.1.12.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
+ivoryos-0.1.12.dist-info/RECORD,,