ivoryos 1.3.8__py3-none-any.whl → 1.4.0__py3-none-any.whl

ivoryos/routes/design/templates/components/edit_action_form.html

@@ -23,11 +23,24 @@
             {% else %}
                 {{ forms.hidden_tag() }}
                 {% for field in forms %}
+
                     {% if field.type not in ['CSRFTokenField'] %}
                         <div class="input-group mb-3">
-                            <label class="input-group-text">{{ field.label.text }}</label>
-                            {{ field(class="form-control") }}
-                            <div class="form-text">{{ field.description }} </div>
+                            <label class="input-group-text">{{ field.label.text | format_name }}</label>
+                            {% if field.type == "BooleanField" %}
+                                {{ field(class="form-check-input") }}
+                            {% elif field.type == "FlexibleEnumField" %}
+                               <input type="text" id="{{ field.id }}" name="{{ field.name }}" value="{{ field.data }}"
+                                  list="{{ field.id }}_options" placeholder="{{ field.render_kw.placeholder if field.render_kw and field.render_kw.placeholder }}"
+                                  class="form-control">
+                               <datalist id="{{ field.id }}_options">
+                                  {% for key in field.choices %}
+                                     <option value="{{ key }}">{{ key }}</option>
+                                  {% endfor %}
+                               </datalist>
+                            {% else %}
+                                {{ field(class="form-control") }}
+                            {% endif %}
                         </div>
                     {% endif %}
                 {% endfor %}

ivoryos/routes/design/templates/components/python_code_overlay.html

@@ -1,5 +1,4 @@
-{# Python code overlay component #}
-{#{% if session.get('show_code') %}#}
+{# Python code overlay component - Pure HTML #}
 <style>
 .code-overlay {
     position: fixed;
@@ -16,7 +15,7 @@
     transform: translateX(0);
 }
 </style>
-<script>hljs.highlightAll();</script>
+
 {% if session.get('show_code') %}
 <div id="pythonCodeOverlay" class="code-overlay bg-light border-start show">
 {% else %}
@@ -29,11 +28,29 @@
         </button>
     </div>
     <div class="overlay-content p-3">
-        {% for stype, script in session.get('python_code', {}).items() %}
-            <pre><code class="language-python">{{ script }}</code></pre>
-        {% endfor %}
-        <a href="{{ url_for('design.design_files.download_python', filetype='python') }}">
-            Download <i class="bi bi-download"></i>
-        </a>
+        <!-- Top toggles (Single / Batch) -->
+        <div class="btn-group mb-3">
+            <button type="button" class="btn btn-outline-primary mode-toggle active" data-mode="single">Single</button>
+            <button type="button" class="btn btn-outline-primary mode-toggle" data-mode="batch">Batch</button>
+        </div>
+
+{#        <!-- Secondary toggles (By Sample / By Step) TODO -->#}
+{#        <div class="btn-group mb-3" id="batch-options" style="display: none;">#}
+{#            <button type="button" class="btn btn-outline-secondary batch-toggle active" data-batch="sample">By Sample</button>#}
+{#            <button type="button" class="btn btn-outline-secondary batch-toggle" data-batch="step">By Step</button>#}
+{#        </div>#}
+
+        <!-- Code display -->
+        <pre><code id="python-code" class="language-python">Loading...</code></pre>
+
+        <!-- Action buttons -->
+        <div class="mt-2">
+            <button type="button" id="copy-code" class="btn btn-sm btn-outline-success">
+                <i class="bi bi-clipboard"></i> Copy
+            </button>
+            <button type="button" id="download-code" class="btn btn-sm btn-outline-primary">
+                <i class="bi bi-download"></i> Download
+            </button>
+        </div>
     </div>
-</div>
+</div>

ivoryos/routes/design/templates/experiment_builder.html

@@ -32,6 +32,7 @@
         const scriptStepUrl = `{{ url_for('design.design_steps.get_step', uuid=0) }}`;
         const scriptStepDupUrl = `{{ url_for('design.design_steps.duplicate_action', uuid=0) }}`;
         const scriptDeleteUrl = "{{ url_for('design.clear_draft') }}";
+        const scriptCompileUrl = "{{ url_for('design.compile_preview') }}";
     </script>
     <script src="{{ url_for('static', filename='js/sortable_design.js') }}"></script>
     <script src="{{ url_for('static', filename='js/action_handlers.js') }}"></script>

ivoryos/routes/execute/execute.py

@@ -76,14 +76,17 @@ def experiment_run():
         if isinstance(exec_string, dict):
             for key, func_str in exec_string.items():
                 exec(func_str)
-            line_collection = script.convert_to_lines(exec_string)
+
         else:
             # Handle string case - you might need to adjust this based on your needs
-            line_collection = []
+            line_collection = {}
     except Exception:
         flash(f"Please check syntax!!")
         return redirect(url_for("design.experiment_builder"))
 
+
+    line_collection = script.render_script_lines(script.script_dict)
+
     run_name = script.name if script.name else "untitled"
 
     dismiss = session.get("dismiss", None)
@@ -92,8 +95,13 @@ def experiment_run():
 
     _, return_list = script.config_return()
     config_list, config_type_list = script.config("script")
-    data_list = os.listdir(current_app.config['DATA_FOLDER'])
-    data_list.remove(".gitkeep") if ".gitkeep" in data_list else data_list
+    data_list = [f for f in os.listdir(current_app.config['DATA_FOLDER']) if f.endswith('.csv')]
+    # Remove .gitkeep if present
+    if ".gitkeep" in data_list:
+        data_list.remove(".gitkeep")
+
+    # Sort by creation time, newest first
+    data_list.sort(key=lambda f: os.path.getctime(os.path.join(current_app.config['DATA_FOLDER'], f)), reverse=True)
 
     if deck is None:
         no_deck_warning = True
@@ -115,21 +123,26 @@ def experiment_run():
             elif "parameters" in payload_json:
                 bo_args = payload_json
             repeat = payload_json.pop("repeat", None)
+            batch_size = payload_json.pop('batch_size', 1)
         else:
             if "bo" in request.form:
                 bo_args = request.form.to_dict()
                 existing_data = bo_args.pop("existing_data")
             if "online-config" in request.form:
-                config = utils.web_config_entry_wrapper(request.form.to_dict(), config_list)
+                config_args = request.form.to_dict()
+                config_args.pop("batch_size", None)
+                config = utils.web_config_entry_wrapper(config_args, config_list)
+            batch_size = int(request.form.get('batch_size', 1))
             repeat = request.form.get('repeat', None)
 
         try:
+        # if True:
             datapath = current_app.config["DATA_FOLDER"]
             run_name = script.validate_function_name(run_name)
             runner.run_script(script=script, run_name=run_name, config=config, bo_args=bo_args,
                               logger=g.logger, socketio=g.socketio, repeat_count=repeat,
                               output_path=datapath, compiled=compiled, history=existing_data,
-                              current_app=current_app._get_current_object()
+                              current_app=current_app._get_current_object(), batch_size=batch_size
                               )
             if utils.check_config_duplicate(config):
                 flash(f"WARNING: Duplicate in config entries.")
@@ -176,19 +189,35 @@ def run_bo():
     repeat = payload.pop("repeat", None)
     optimizer_type = payload.pop("optimizer_type", None)
     existing_data = payload.pop("existing_data", None)
+    batch_mode = payload.pop("batch_mode", None)
+    batch_size = payload.pop("batch_size", 1)
+
+    # Get constraint expressions (new single-line input)
+    constraint_exprs = request.form.getlist("constraint_expr")
+    constraints = [expr.strip() for expr in constraint_exprs if expr.strip()]
+
+    # Remove constraint_expr entries from payload before parsing parameters
+    for key in list(payload.keys()):
+        if key.startswith("constraint_expr"):
+            payload.pop(key, None)
+
     parameters, objectives, steps = parse_optimization_form(payload)
     try:
+
+    # if True:
         datapath = current_app.config["DATA_FOLDER"]
         run_name = script.validate_function_name(run_name)
         Optimizer = global_config.optimizers.get(optimizer_type, None)
         if not Optimizer:
             raise ValueError(f"Optimizer {optimizer_type} is not supported or not found.")
         optimizer = Optimizer(experiment_name=run_name, parameter_space=parameters, objective_config=objectives,
+                              parameter_constraints = constraints,
                               optimizer_config=steps, datapath=datapath)
         runner.run_script(script=script, run_name=run_name, optimizer=optimizer,
                           logger=g.logger, socketio=g.socketio, repeat_count=repeat,
                           output_path=datapath, compiled=False, history=existing_data,
-                          current_app=current_app._get_current_object()
+                          current_app=current_app._get_current_object(), batch_mode=batch_mode, batch_size=int(batch_size),
+                          objectives=objectives
                           )
 
     except Exception as e:

ivoryos/routes/execute/templates/components/run_tabs.html

@@ -1,4 +1,4 @@
-{# Run tabs component for experiment run #}
+<!-- Main template structure -->
 <ul class="nav nav-tabs" id="myTabs" role="tablist">
     <li class="nav-item" role="presentation">
         <a class="nav-link {{ 'disabled' if config_list else '' }} {{ 'active' if not config_list else '' }}" id="tab1-tab" data-bs-toggle="tab" href="#tab1" role="tab" aria-controls="tab1" aria-selected="false">Repeat</a>
@@ -14,4 +14,47 @@
     {% include 'components/tab_repeat.html' %}
     {% include 'components/tab_configuration.html' %}
     {% include 'components/tab_bayesian.html' %}
-</div> 
+</div>
+
+<!-- ============================================ -->
+<!-- SWITCH TO THE LAST ACTIVE TAB ON PAGE LOAD   -->
+<!-- ============================================ -->
+<script>
+(function() {
+   'use strict';
+
+   // Store active tab when changed
+   document.addEventListener('shown.bs.tab', function(e) {
+       const tabId = e.target.id.replace('-tab', '');
+       if (tabId === 'tab2' || tabId === 'tab3') {
+            localStorage.setItem('ivoryosLastTab', tabId);
+            console.log('Saved last active tab:', tabId);
+        }
+
+       // Optional: run specific load logic per tab
+       if (tabId === 'tab2' && typeof window.loadConfigData === 'function') {
+           window.loadConfigData();
+       } else if (tabId === 'tab3' && typeof window.saveBO === 'function') {
+           window.saveBO();
+       }
+   });
+
+   // Restore tab from last session
+   document.addEventListener('DOMContentLoaded', function() {
+       const lastTab = localStorage.getItem('ivoryosLastTab');
+       const tabElement = lastTab ? document.getElementById(lastTab + '-tab') : null;
+
+       if (tabElement && !tabElement.classList.contains('disabled')) {
+           new bootstrap.Tab(tabElement).show();
+           console.log('Restored last active tab:', lastTab);
+       } else {
+           // Default to first non-disabled tab
+           const firstTab = document.querySelector('#myTabs .nav-link:not(.disabled)');
+           if (firstTab) {
+               new bootstrap.Tab(firstTab).show();
+               console.log('Defaulted to first available tab.');
+           }
+       }
+   });
+})();
+</script>