ivoryos 0.1.7__tar.gz → 0.1.8__tar.gz

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

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

@@ -394,3 +394,13 @@ 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)

{ivoryos-0.1.7 → ivoryos-0.1.8}/ivoryos/routes/design/templates/design/experiment_builder.html

@@ -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>
-                        <a href="/delete/{{ button['id'] }}" type="button" class="btn btn-light"><span class="bi bi-trash"></span></a>
+                        <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.8}/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
 
 

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

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

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