ivoryos 0.1.7__tar.gz → 0.1.9__tar.gz

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

@@ -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 → ivoryos-0.1.9}/README.md

@@ -118,6 +118,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 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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-0.1.7 → ivoryos-0.1.9}/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 → ivoryos-0.1.9/ivoryos.egg-info}/PKG-INFO

@@ -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 → ivoryos-0.1.9}/setup.py

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