wiliot-certificate 4.5.0a2__py3-none-any.whl → 4.5.0a4__py3-none-any.whl

gui_certificate/templates/cert_run.html

@@ -156,6 +156,7 @@
         {%- endmacro %}
         
         {% set non_cert_text = "NOT READY FOR CERTIFICATION" %}
+        {% set unsterile_run_warning = "Unsterile run mode is set - a certifying run must be sterile." %}
         
         <!-- Progress Indicator -->
         <div class="step-indicator">
@@ -326,12 +327,15 @@
                                        name="modules[]" 
                                        id="module_{{ mod.name }}" 
                                        value="{{ mod.name }}"
-                                       {% if is_selected %}checked{% elif is_mandatory and not has_selections %}checked{% endif %}>
+                                       {% if is_selected or (is_mandatory and not has_selections) or (mod.is_mandatory_by_schema and not has_selections) %}checked{% endif %}>
                                 <label class="form-check-label" for="module_{{ mod.name }}" style="font-weight: bold; font-size: 1.1rem;">
                                     {{ mod.name }}
                                     {% if is_mandatory %}
                                         <span class="mandatory-badge">Mandatory</span>
                                     {% endif %}
+                                    {% if mod.is_mandatory_by_schema %}
+                                        <span class="mandatory-badge" style="background: #0066cc;">Mandatory by Schema</span>
+                                    {% endif %}
                                     {{ kb_link(mod_doc) }}
                                 </label>
                                 <p class="text-muted mt-1 mb-0">
@@ -451,7 +455,7 @@
                 {% set common_parameters = ['dut', 'custom_broker'] %}
                 
                 {% for f in cert_schema.fields %}
-                    {% if f.name != 'validation_schema' and f.name != 'tl' and f.name in common_parameters %}
+                    {% if f.name != 'validation_schema' and f.name != 'tl' and f.name != 'custom_broker' and f.name in common_parameters %}
                         {% set arg_label = (f.option_strings|join(', ') if f.option_strings else f.name) %}
                         {% set tip_id = 'help_' ~ f.name %}
                         {% set field_name = cert_schema.title ~ '_' ~ f.name %}
@@ -478,18 +482,6 @@
                                         <input type="checkbox" class="form-check-input" id="{{ field_name }}" name="{{ field_name }}" {% if field_value %}checked{% endif %}>
                                     </div>
                                 </div>
-                            {% elif f.name == "overwrite_defaults" %}
-                                <div class="col-sm-4">
-                                    <textarea id="{{ field_name }}" class="form-control" name="{{ field_name }}" rows="3" placeholder="key1=value1&#10;key2=value2">{{ field_value }}</textarea>
-                                </div>
-                            {% elif f.name == "custom_broker" %}
-                                <div class="col-sm-4">
-                                    <input type="file" class="form-control" id="{{ field_name }}" name="{{ field_name }}_file" accept=".json">
-                                    {% if field_value %}
-                                        {% set path_parts = field_value.replace('\\', '/').split('/') %}
-                                        <div class="form-text">Current: {{ path_parts[-1] if path_parts|length > 1 else field_value }}</div>
-                                    {% endif %}
-                                </div>
                             {% else %}
                                 <div class="col-sm-4">
                                     <input type="{{ f.type }}" class="form-control" id="{{ field_name }}" name="{{ field_name }}" value="{{ field_value }}">
@@ -509,6 +501,43 @@
                     {% endif %}
                 {% endfor %}
                 
+                <!-- Custom Broker Configuration -->
+                {% set cert_schema = cert_schema %}
+                {% set broker_field_prefix = cert_schema.title ~ '_custom_broker_' %}
+                <div class="card mb-3">
+                    <div class="card-header d-flex align-items-center">
+                        <button class="btn btn-sm btn-link text-decoration-none test-toggle me-2 collapsed"
+                                type="button"
+                                data-bs-toggle="collapse"
+                                data-bs-target="#customBrokerConfig"
+                                aria-expanded="false">
+                            <svg class="chev" width="16" height="16" viewBox="0 0 16 16">
+                                <path d="M4.646 5.646a.5.5 0 0 1 .708 0L8 8.293l2.646-2.647a.5.5 0 1 1 .708.708L8.354 9.354a.5.5 0 0 1-.708 0L4.646 6.354a.5.5 0 0 1 0-.708z" fill="currentColor"/>
+                            </svg>
+                        </button>
+                        <strong>Custom MQTT Broker Configuration</strong>
+                        <span class="text-danger ms-2">*</span>
+                    </div>
+                    <div id="customBrokerConfig" class="collapse">
+                        <div class="card-body">
+                            {% for field_key, field_default in custom_broker_defaults.items() %}
+                                {% set field_name = broker_field_prefix ~ field_key %}
+                                {% set field_value = form_data.get(field_name, field_default) %}
+                                {% set input_type = 'number' if field_key == 'port' else 'password' if field_key == 'password' else 'text' %}
+                                {% set is_required = field_key not in ['username', 'password'] %}
+                                <div class="row mb-3">
+                                    <label for="{{ field_name }}" class="col-sm-3 col-form-label">
+                                        {{ field_key }}{% if is_required %} <span class="text-danger">*</span>{% endif %}
+                                    </label>
+                                    <div class="col-sm-4">
+                                        <input type="{{ input_type }}" class="form-control" id="{{ field_name }}" name="{{ field_name }}" value="{{ field_value }}" {% if is_required %}required{% endif %}>
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+                
                 <div class="card mb-3">
                     <div class="card-header d-flex align-items-center">
                         <button class="btn btn-sm btn-link text-decoration-none test-toggle me-2 collapsed"
@@ -615,10 +644,20 @@
                                 <small class="text-muted d-block mt-1">All mandatory modules and tests are selected</small>
                             {% else %}
                                 <span class="badge bg-warning text-dark">{{ non_cert_text }}</span>
-                                <small class="text-muted d-block mt-1">Some mandatory modules or tests are missing</small>
+                                <small class="text-muted d-block mt-1">
+                                    {% if not unsterile_run %}
+                                        Some mandatory modules or tests are missing
+                                    {% endif %}
+                                </small>
                             {% endif %}
                         </p>
                         
+                        {% if unsterile_run %}
+                        <div class="alert alert-warning">
+                            <strong>⚠️ Warning:</strong> {{ unsterile_run_warning }}
+                        </div>
+                        {% endif %}
+                        
                         {% if not is_certified %}
                             {% if missing_modules %}
                                 <div class="alert alert-warning">
@@ -644,12 +683,13 @@
                             {% endif %}
                             {% if missing_tests_details %}
                                 <div class="alert alert-warning">
-                                    <strong>Missing Mandatory Tests:</strong>
+                                    <strong>Missing Mandatory Tests from Selected Modules:</strong>
                                     <ul class="mb-0">
                                         {% for test in missing_tests_details %}
                                             <li>{{ test.label }} <small class="text-muted">({{ test.module }})</small></li>
                                         {% endfor %}
                                     </ul>
+                                    <small class="d-block mt-2">When a module is selected, its mandatory tests must also be selected.</small>
                                 </div>
                             {% endif %}
                         {% endif %}
@@ -662,7 +702,10 @@
                         <h5 class="mb-0">Schema Verification</h5>
                     </div>
                     <div class="card-body">
-                        {% if schema_errors or schema_warnings %}
+                        {% if schema_errors or schema_warnings or missing_modules_by_schema %}
+                            <p><strong>Schema Status:</strong> 
+                                <span class="badge bg-warning text-dark">SCHEMA DOES NOT MATCH RUN SETTINGS</span>
+                            </p>
                             {% if schema_errors %}
                                 <div class="alert alert-danger">
                                     <strong>Errors:</strong>
@@ -683,84 +726,26 @@
                                     </ul>
                                 </div>
                             {% endif %}
+                            {% if missing_modules_by_schema %}
+                                <div class="alert alert-warning mt-3">
+                                    <strong>Missing Modules Mandatory by Schema:</strong>
+                                    <ul class="mb-0">
+                                        {% for mod in missing_modules_by_schema %}
+                                            <li>{{ mod }}</li>
+                                        {% endfor %}
+                                    </ul>
+                                    <small class="d-block mt-2">These modules are declared in your validation schema but are not selected. They should be included for proper certification.</small>
+                                </div>
+                            {% endif %}
                         {% else %}
                             <p><strong>Schema Status:</strong> 
-                                <span class="badge bg-success">SCHEMA MATCHES TEST CONFIGURATION</span>
+                                <span class="badge bg-success">SCHEMA MATCHES RUN SETTINGS</span>
                                 <small class="text-muted d-block mt-1">The uploaded schema matches the selected flavor, modules, and tests</small>
                             </p>
                         {% endif %}
-                    </div>
-                </div>
-                
-                <!-- Run Parameters Summary -->
-                {% set cert_schema = cert_schema %}
-                {% set cb_index = -1 %}
-                {% for f in cert_schema.fields %}
-                    {% if f.name == 'custom_broker' %}
-                        {% set cb_index = loop.index0 %}
-                    {% endif %}
-                {% endfor %}
-                {% set has_advanced = False %}
-                {% for f in cert_schema.fields %}
-                    {% if f.name != 'validation_schema' and f.name != 'tl' and cb_index >= 0 and loop.index0 > cb_index %}
-                        {% set has_advanced = True %}
-                    {% endif %}
-                {% endfor %}
-                {% if has_advanced %}
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h5 class="mb-0">Run Parameters</h5>
-                    </div>
-                    <div class="card-body">
-                        {% for f in cert_schema.fields %}
-                            {% if f.name != 'validation_schema' and f.name != 'tl' %}
-                                {% set field_name = cert_schema.title ~ '_' ~ f.name %}
-                                {% set field_value = form_data.get(field_name, f.default if f.default is not none else '') %}
-                                {% set is_advanced = cb_index >= 0 and loop.index0 > cb_index %}
-                                
-                                {% if not is_advanced %}
-                                    {% set arg_label = (f.option_strings|join(', ') if f.option_strings else f.name) %}
-                                    <p><strong>{{ arg_label }}:</strong> 
-                                        {% if f.is_flag %}
-                                            {{ 'Yes' if field_value else 'No' }}
-                                        {% else %}
-                                            {{ field_value if field_value else '(not set)' }}
-                                        {% endif %}
-                                    </p>
-                                {% endif %}
-                            {% endif %}
-                        {% endfor %}
                         
-                        {% if has_advanced %}
-                            <div class="mb-3">
-                                <button class="btn btn-outline-secondary btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#advancedParamsReview" aria-expanded="false" aria-controls="advancedParamsReview">
-                                    Advanced Parameters ▼
-                                </button>
-                            </div>
-                            <div class="collapse" id="advancedParamsReview">
-                                {% for f in cert_schema.fields %}
-                                    {% if f.name != 'validation_schema' and f.name != 'tl' %}
-                                        {% set field_name = cert_schema.title ~ '_' ~ f.name %}
-                                        {% set field_value = form_data.get(field_name, f.default if f.default is not none else '') %}
-                                        {% set is_advanced = cb_index >= 0 and loop.index0 > cb_index %}
-                                        
-                                        {% if is_advanced %}
-                                            {% set arg_label = (f.option_strings|join(', ') if f.option_strings else f.name) %}
-                                            <p><strong>{{ arg_label }}:</strong> 
-                                                {% if f.is_flag %}
-                                                    {{ 'Yes' if field_value else 'No' }}
-                                                {% else %}
-                                                    {{ field_value if field_value else '(not set)' }}
-                                                {% endif %}
-                                            </p>
-                                        {% endif %}
-                                    {% endif %}
-                                {% endfor %}
-                            </div>
-                        {% endif %}
                     </div>
                 </div>
-                {% endif %}
                 
                 <!-- Edit Links -->
                 <div class="mb-4">
@@ -841,8 +826,10 @@
             const mandatoryTests = {{ mandatory_tests_for_js|tojson|safe }};
             const currentSelectedModules = {{ selected_modules|tojson|safe }};
             const brgCertSchema = {{ cert_schema|tojson|safe }};
+            const customBrokerFieldKeys = {{ custom_broker_field_keys|tojson|safe }};
             
             // Step 3: Module selection validation
+            const mandatoryModulesBySchema = {{ mandatory_modules_by_schema_for_js|tojson|safe }};
             function checkStep3Validation() {
                 if (stepNum !== 3) return;
                 
@@ -861,6 +848,14 @@
                     warnings.push('Missing mandatory modules: ' + missingMandatory.join(', '));
                 }
                 
+                // Check if schema-mandatory modules are deselected
+                if (mandatoryModulesBySchema && mandatoryModulesBySchema.length > 0) {
+                    const missingBySchema = mandatoryModulesBySchema.filter(m => !selectedModules.includes(m));
+                    if (missingBySchema.length > 0) {
+                        warnings.push('Missing modules mandatory by schema: ' + missingBySchema.join(', '));
+                    }
+                }
+                
                 // Check Bridge/Combo requirement for at least one additional module
                 if (selectedFlavor === 'bridge_only' || selectedFlavor === 'combo') {
                     const nonMandatorySelected = selectedModules.filter(m => !mandatoryModules.includes(m));
@@ -897,18 +892,33 @@
                 
                 let warnings = [];
                 
+                // Check if unsterile_run is enabled
+                const unsterileRunField = document.querySelector('input[id*="unsterile_run"], input[name*="unsterile_run"]');
+                if (unsterileRunField && unsterileRunField.checked) {
+                    warnings.push('{{ unsterile_run_warning }}');
+                }
+                
                 // Check if mandatory modules are deselected (from step 3)
                 const missingMandatoryModules = mandatoryModules.filter(m => !selectedModules.includes(m));
                 if (missingMandatoryModules.length > 0) {
                     warnings.push('Missing mandatory modules: ' + missingMandatoryModules.join(', '));
                 }
                 
-                // Check if mandatory tests are deselected
+                // Check if schema-mandatory modules are deselected
+                if (mandatoryModulesBySchema && mandatoryModulesBySchema.length > 0) {
+                    const missingBySchema = mandatoryModulesBySchema.filter(m => !selectedModules.includes(m));
+                    if (missingBySchema.length > 0) {
+                        warnings.push('Missing modules mandatory by schema: ' + missingBySchema.join(', '));
+                    }
+                }
+                
+                // Check if mandatory tests from selected modules are deselected
+                // When a module is selected, its mandatory tests become mandatory
                 const missingMandatoryTests = mandatoryTests
                     .filter(t => selectedModules.includes(t.module) && !selectedTests.includes(t.id))
                     .map(t => t.label + ' (' + t.module + ')');
                 if (missingMandatoryTests.length > 0) {
-                    warnings.push('Missing mandatory tests: ' + missingMandatoryTests.length + ' test(s)');
+                    warnings.push('Missing mandatory tests from selected modules: ' + missingMandatoryTests.length + ' test(s)');
                 }
                 
                 if (warnings.length > 0) {
@@ -1035,6 +1045,18 @@
                     if (stepNum === 3) checkStep3Validation();
                     if (stepNum === 4) checkStep4Validation();
                 }
+                
+                // Unsterile run checkbox change
+                const unsterileRunField = document.querySelector('input[id*="unsterile_run"], input[name*="unsterile_run"]');
+                if (unsterileRunField && e.target === unsterileRunField) {
+                    // Show/hide warning and update validation
+                    const warningDiv = document.getElementById('step4_warning');
+                    const warningText = document.getElementById('step4_warning_text');
+                    if (warningDiv && warningText) {
+                        // Re-run validation to update warning
+                        if (stepNum === 4) checkStep4Validation();
+                    }
+                }
             });
             
             // Initialize params visibility for pre-checked tests
@@ -1067,17 +1089,25 @@
                     const fieldName = `${brgCertSchema.title}_${field.name}`;
                     let fieldValue = null;
                     
-                    // Special handling for custom_broker file upload
+                    // Special handling for custom_broker - check if all required broker fields have values (like dut)
+                    // Username and password are optional, all other fields are required
                     if (field.name === 'custom_broker') {
-                        const fileInput = document.querySelector(`input[name="${fieldName}_file"]`);
-                        if (fileInput && fileInput.files && fileInput.files.length > 0) {
-                            fieldValue = fileInput.files[0].name;
-                        } else {
-                            // Check if there's a current value displayed
-                            const currentValueDiv = fileInput?.closest('.col-sm-4')?.querySelector('.form-text');
-                            if (currentValueDiv) {
-                                fieldValue = 'exists';
+                        const brokerFieldPrefix = `${brgCertSchema.title}_custom_broker_`;
+                        const optionalFields = ['username', 'password'];
+                        let allRequiredFieldsFilled = true;
+                        for (const brokerField of customBrokerFieldKeys) {
+                            // Skip optional fields
+                            if (optionalFields.includes(brokerField)) {
+                                continue;
                             }
+                            const input = document.querySelector(`input[name="${brokerFieldPrefix}${brokerField}"]`);
+                            if (!input || !input.value || (typeof input.value === 'string' && !input.value.trim())) {
+                                allRequiredFieldsFilled = false;
+                                break;
+                            }
+                        }
+                        if (allRequiredFieldsFilled) {
+                            fieldValue = 'configured';
                         }
                     } else {
                         // For other fields, check input/select value

{wiliot_certificate-4.5.0a2.dist-info → wiliot_certificate-4.5.0a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wiliot_certificate
-Version: 4.5.0a2
+Version: 4.5.0a4
 Summary: A library for certifying Wiliot-compliant boards
 Author-email: Wiliot <support@wiliot.com>
 License-Expression: MIT
@@ -30,7 +30,7 @@ Requires-Dist: reportlab>=4.3.1
 Requires-Dist: google-api-python-client>=2.162.0
 Dynamic: license-file
 
-# wiliot-certificate Version 4.5.0
+# wiliot-certificate
 
 <!-- Description -->
 wiliot-certificate is a Python library that provides tools for testing and certifying boards for compatibility with Wiliot’s ecosystem.
@@ -40,30 +40,27 @@ This python package includes the following tools:
  - Tester Upgrade (`wlt-cert-tester-upgrade`)
  - Registration Certificate (`wlt-cert-reg`)
 
-# Version: 
-wiliot-certificate versions 4.5.0 are compatible with firmware version >=4.5.0 (API VERSION: 13)
+# Versioning: 
+wiliot-certificate versions 4.5.x are compatible with firmware version >=4.5.0 (API VERSION: 13)
 
 ## Installing wiliot-certificate
-Install wiliot-certificate:
 ````commandline
 pip install wiliot-certificate
 ````
 
 ## Using wiliot-certificate
 ### Certification
-In terminal, run:
 ````commandline
 wlt-cert
 ````
 This tool is the default to test and certify your device.
 It runs a setup wizard that walks you through the initialization steps before running the tests.
-You'll need a [validation schema](https://community.wiliot.com/customers/s/article/Validation-Schema), tester device and custom broker json file ([more info here](https://community.wiliot.com/customers/s/article/Wiliot-Gateway-Certification)).
+You'll need a [validation schema](https://community.wiliot.com/customers/s/article/Validation-Schema), tester device and custom broker json file (more info [here](https://community.wiliot.com/customers/s/article/Wiliot-Certification)).
 Once set up it opens a terminal and tests your device.
 
 
 
 ### Certificate CLI
-In terminal, run:
 ````commandline
 wlt-cert-cli -h
 ````
@@ -71,7 +68,6 @@ CLI version of the certificate. Use -h for details on the different arguments.
 
 
 ### Tester Upgrade
-In terminal, run:
 ````commandline
 wlt-cert-tester-upgrade
 ````
@@ -79,13 +75,12 @@ Upgrades the firmware of the tester device to the version required for certifica
 
 
 ### Registration Certificate
-In terminal, run:
 ````commandline
 wlt-cert-reg
 ````
 Certify the gateway registration process to Wiliot platform.
 The gateway must use Wiliot production MQTT broker, and mustn't be registered to any account on Wiliot platform.
-Use -h for details on the arguments. [More info here](https://community.wiliot.com/customers/s/article/Wiliot-Gateway-Certification)
+Use -h for details on the arguments (see [Registration](https://community.wiliot.com/customers/s/article/Wiliot-Certification) for more info).
 
 
 ## The following capabilities are not tested in this version