wiliot-certificate 4.5.0__py3-none-any.whl → 4.5.0a1__py3-none-any.whl

common/web/templates/generator.html

@@ -21,53 +21,24 @@
         <h1 style="color:#00AB83">{{ title }}</h1>
         <hr>
         <form class="form-horizontal" id="form" action="">
-            <div class="row mb-3">
-                <div class="col-md-6">
-                    <label for="filter_category" class="form-label"><strong>Filter by Type:</strong></label>
-                    <select class="form-select" id="filter_category" name="filter_category" onchange="applyFilters()">
-                        <option value="">All Types</option>
-                        {% for cat in categories %}
-                        <option value="{{ cat }}" {% if cat == filter_category or (not filter_category and cat == 'Module') %}selected{% endif %}>{{ cat }}</option>
-                        {% endfor %}
-                    </select>
-                </div>
-                <div class="col-md-6">
-                    <label for="filter_version" class="form-label"><strong>Filter by API Version:</strong></label>
-                    <select class="form-select" id="filter_version" name="filter_version" onchange="applyFilters()">
-                        <option value="">All Versions</option>
-                        {% for ver in api_versions %}
-                        <option value="{{ ver }}" {% if ver == filter_version or (not filter_version and ver|int == API_VERSION_LATEST) %}selected{% endif %}>V{{ ver }}</option>
-                        {% endfor %}
-                    </select>
-                </div>
-            </div>
-            <hr>
             <div id="builder_form">
                 {% for n in pkt_types_list %}
-                        <div class="form-check form-check-inline pkt-radio" 
-                             data-category="{{ pkt_metadata.get(n, {}).get('category', 'Other') }}" 
-                             data-version="{{ pkt_metadata.get(n, {}).get('api_version', '') }}">
-                            <input class="form-check-input" type="radio" name="radios" value="{{ n }}" id="radio_{{ n }}" 
-                                   {% if n == wanted_pkt_type %}checked{% endif %} onclick="show();">
-                            <label class="form-check-label" for="radio_{{ n }}">{{ n }}</label>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input" type="radio" name="radios" value="{{ n }}" onclick="show();">
+                            <label class="form-check-label" for="{{ n }}">{{ n }}</label>
                         </div>
                 {% endfor %}
                 {% for n,p in pkt_types.items() %}
-                    <div id="{{ n }}_form" style="display: none;">
+                    <div id="{{ n }}_form">
                         <hr>
                         {% for k,v in p.__dict__.items() %}
                             <div class="row">
                                 <label for="{{ n }}_{{ k }}" class="col-sm-2">{{ k }}:</label>
-                                {% set field_name = n + '_' + k %}
-                                {% set saved_value = form_values.get(field_name, '') %}
-                                {% if saved_value %}
-                                    {% set display_value = saved_value %}
-                                {% elif k == 'brg_mac' or k == 'pkt_size' or k == 'ad_type' or k == 'uuid_msb' or k == 'uuid_lsb' or k == 'group_id' %}
-                                    {% set display_value = '0x' + ('%0x' % v).upper() %}
+                                {% if k == 'brg_mac' or k == 'pkt_size' or k == 'ad_type' or k == 'uuid_msb' or k == 'uuid_lsb' or k == 'group_id' %}
+                                    <input type="text" class="col-sm-4" name="{{ n }}_{{ k }}" value="{{ '0x'+('%0x' % v).upper() }}">
                                 {% else %}
-                                    {% set display_value = v %}
+                                    <input type="text" class="col-sm-4" name="{{ n }}_{{ k }}" value="{{ v }}">
                                 {% endif %}
-                                <input type="text" class="col-sm-4" name="{{ n }}_{{ k }}" value="{{ display_value }}">
                             </div>
                         {% endfor %}
                     </div>
@@ -92,119 +63,86 @@
         <br>
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
         <script>
-            var pktMetadata = {{ pkt_metadata | tojson | safe }};
-            
-            function applyFilters() {
-                const categoryFilter = document.getElementById('filter_category').value;
-                const versionFilter = document.getElementById('filter_version').value;
-                const radioContainers = document.querySelectorAll('.pkt-radio');
-                radioContainers.forEach(function(container) {
-                    const category = container.getAttribute('data-category');
-                    const version = container.getAttribute('data-version');
-                    const radio = container.querySelector('input[type="radio"]');
-                    let show = true;
-                    // Filter by category
-                    if (categoryFilter && category !== categoryFilter) {
-                        show = false;
-                    }
-                    // Filter by version
-                    if (versionFilter && version !== versionFilter) {
-                        show = false;
-                    }
-                    // Show/hide the container
-                    if (show) {
-                        container.style.display = 'inline-block';
-                    } else {
-                        container.style.display = 'none';
-                        // Uncheck if hidden
-                        if (radio.checked) {
-                            radio.checked = false;
-                        }
-                    }
-                });
-            }
-            
-            const form = document.getElementById('form');
-            const group_id_brg2gw = {{ GROUP_ID_BRG2GW }};
-            const group_id_gw2brg = {{ GROUP_ID_GW2BRG }};
-            const group_id_side_info_sensor = {{ GROUP_ID_SIDE_INFO_SENSOR }};
-            const group_id_side_info = {{ GROUP_ID_SIDE_INFO }};
-            const group_id_signal_indicator = {{ GROUP_ID_SIGNAL_INDICATOR }};
-            const group_id_unified_v0 = {{ GROUP_ID_UNIFIED_PKT_V0 }};
-            const group_id_unified_v1 = {{ GROUP_ID_UNIFIED_PKT_V1 }};
-            const group_id_unified_v2 = {{ GROUP_ID_UNIFIED_PKT_V2 }};
-            const group_id_unified_ext_v0 = {{ GROUP_ID_BLE5_EXTENDED_V0 }};
-            const group_id_unified_ext_v1 = {{ GROUP_ID_BLE5_EXTENDED_V1 }};
-            var pktTypes = {{ pkt_types_list | tojson | safe }};
-            
-            function showPktForm(pktType) {
-                // Hide all packet forms
-                pktTypes.forEach(function(type) {
-                    var formEl = document.getElementById(type + "_form");
-                    if (formEl) formEl.style.display = 'none';
-                });
-                
-                // Show appropriate header and packet form
-                if (pktType && pktType.includes("Unified")) {
-                    document.getElementById("Hdr_form").style.display = 'none';
-                    document.getElementById("DataHdr_form").style.display = 'block';
-                    var default_value = 0;
-                    if (pktType.includes("V0")) {
-                        default_value = pktType.includes("Ext") ? group_id_unified_ext_v0 : group_id_unified_v0;
-                    } else if (pktType.includes("V1")) {
-                        default_value = pktType.includes("Ext") ? group_id_unified_ext_v1 : group_id_unified_v1;
-                    } else if (pktType.includes("V2")) {
-                        default_value = group_id_unified_v2;
+            function show()
+            {
+                const form = document.getElementById('form');
+                const group_id_brg2gw = {{ GROUP_ID_BRG2GW }};
+                const group_id_gw2brg = {{ GROUP_ID_GW2BRG }};
+                const group_id_side_info_sensor = {{ GROUP_ID_SIDE_INFO_SENSOR }};
+                const group_id_side_info = {{ GROUP_ID_SIDE_INFO }};
+                const group_id_signal_indicator = {{ GROUP_ID_SIGNAL_INDICATOR }};
+                const group_id_unified_v0 = {{ GROUP_ID_UNIFIED_PKT_V0 }};
+                const group_id_unified_v1 = {{ GROUP_ID_UNIFIED_PKT_V1 }};
+                const group_id_unified_v2 = {{ GROUP_ID_UNIFIED_PKT_V2 }};
+                const group_id_unified_ext_v0 = {{ GROUP_ID_BLE5_EXTENDED_V0 }};
+                const group_id_unified_ext_v1 = {{ GROUP_ID_BLE5_EXTENDED_V1 }};
+                var radios = document.getElementsByName("radios");
+                var pktTypes = {{ pkt_types_list | tojson | safe }};
+                console.log(pktTypes)
+                var forms = [];
+
+                for (var i = 0; i < pktTypes.length; i++) {
+                    forms[i] = document.getElementById(pktTypes[i]+"_form");
+                    if (pktTypes[i] != "Hdr"){
+                        forms[i].style.display = 'none';
                     }
-                    if (form.elements.DataHdr_group_id_major) {
-                        form.elements.DataHdr_group_id_major.value = "0x" + default_value.toString(16).toUpperCase();
+                }
+
+                for(var i = 0; i < radios.length; i++) {
+                radios[i].onclick = function() {
+                    for(var j = 0; j < radios.length; j++) {
+                        forms[j].style.display = 'none';
                     }
-                } else {
-                    document.getElementById("Hdr_form").style.display = 'block';
-                    document.getElementById("DataHdr_form").style.display = 'none';
-                    var default_value = 0;
-                    if (pktType && pktType.includes("Brg2Gw")) {
-                        default_value = group_id_brg2gw;
-                    } else if (pktType && pktType.includes("Gw2Brg")) {
-                        default_value = group_id_gw2brg;
-                    } else if (pktType && pktType.includes("SignalIndicator")) {
-                        default_value = group_id_signal_indicator;
-                    } else if (pktType && pktType.includes("SideInfoSensor")) {
-                        default_value = group_id_side_info_sensor;
-                    } else if (pktType && pktType.includes("SideInfo")) {
-                        default_value = group_id_side_info;
+                    if (this.value == "DataHdr"){
+                        document.getElementById("Hdr_form").style.display = 'none';
                     }
-                    if (form.elements.Hdr_group_id) {
+                    else{
+                        document.getElementById("Hdr_form").style.display = 'block';
+                        var default_value = 0;
+                        if (this.value.includes("Brg2Gw")){
+                            default_value = group_id_brg2gw;
+                        }
+                        else if (this.value.includes("Gw2Brg")){
+                            default_value = group_id_gw2brg;
+                        }
+                        else if (this.value.includes("SignalIndicator")){
+                            default_value = group_id_signal_indicator;
+                        }
+                        else if (this.value.includes("SideInfoSensor")){
+                            default_value = group_id_side_info_sensor;
+                        }
+                        else if (this.value.includes("SideInfo")){
+                            default_value = group_id_side_info;
+                        }
+                        else if (this.value.includes("Unified")){
+                            if (this.value.includes("V0")){
+                                if (this.value.includes("Ext")){
+                                    default_value = group_id_unified_ext_v0
+                                }
+                                else {
+                                    default_value = group_id_unified_v0
+                                }
+                            }
+                            else if (this.value.includes("V1")){
+                                if (this.value.includes("Ext")){
+                                    default_value = group_id_unified_ext_v1
+                                }
+                                else {
+                                    default_value = group_id_unified_v1
+                                }
+                            }
+                            else if (this.value.includes("V2")){
+                                default_value = group_id_unified_v2
+                            }
+                        }
                         form.elements.Hdr_group_id.value = "0x" + default_value.toString(16).toUpperCase();
                     }
+                    console.log(this.value)
+                    document.getElementById(this.value + "_form").style.display = 'block';
                 }
-                
-                // Show the selected packet form
-                if (pktType) {
-                    var pktForm = document.getElementById(pktType + "_form");
-                    if (pktForm) pktForm.style.display = 'block';
-                }
-            }
-            
-            function show() {
-                // Set up click handlers
-                var radios = document.getElementsByName("radios");
-                for (var i = 0; i < radios.length; i++) {
-                    radios[i].onclick = function() {
-                        showPktForm(this.value);
-                    };
-                }
-                
-                // Show form for checked radio (if any)
-                for (var i = 0; i < radios.length; i++) {
-                    if (radios[i].checked) {
-                        showPktForm(radios[i].value);
-                        break;
-                    }
                 }
             }
-            applyFilters(); // Apply filters on page load
-            show(); // Initialize form display (will show selected packet form if one is checked)
+            show();
         </script>
     </body>
 </html>

common/web/web_utils.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 from flask import render_template, request
+import inspect
 import argparse
 import json
 import re
@@ -27,7 +28,7 @@ FDM = "FDM"
 CERT_WEB = "CERTIFICATE WEB"
 
 # Defines to update jinja_env globals
-GLOBAL_DEFINES_TO_UPDATE = {k:v for k,v in ag.__dict__.items() if 'GROUP_ID' in k or 'API_VERSION_LATEST' in k}
+GLOBAL_DEFINES_TO_UPDATE = {k:v for k,v in ag.__dict__.items() if 'GROUP_ID' in k}
 
 TestSchema = Dict[str, Any]
 ModuleSchema = Dict[str, Any]
@@ -62,90 +63,46 @@ def utils_parser(app):
 def utils_generator(app):
     title = "Packet Generator"
     output = ""
-    def parse_int_input(x, default=0):
-        x = str(x).strip()
-        if x.startswith('0x') or x.startswith('0X'):
-            return int(x, 16)
-        try:
-            return int(x)
-        except ValueError:
-            return default
-    
-    def build_and_dump_pkt(pkt_type):
-        pkt_template = getattr(ag, pkt_type)()
-        pkt_params = {
-            k: parse_int_input(request.args.get(f"{pkt_type}_{k}"), pkt_template.__dict__.get(k, 0))
-            for k in pkt_template.__dict__.keys()
-        }
-        pkt = getattr(ag, pkt_type)(**pkt_params)
-        try:
-            return pkt.dump()
-        except Exception as e:
-            return f"<br>Error encoding {pkt_type} (bit structure error): {str(e)}<br>"
-    
-    # Build packet types dictionary
-    dont_generate_strs = ["Cfg", "SideInfo"]
+    wanted_pkt_type = request.args.get('radios')
+    pkt = None
+    dont_generate = ["Generic", "Gw2BrgHb", "PktTypesMask", "WltPkt"]
     wlt_pkt_types = {
-        'Hdr': ag.Hdr(),
-        'DataHdr': ag.DataHdr(),
-        **{cls.__name__: cls() for cls in ag.WLT_PKT_TYPES if not any([dg in cls.__name__ for dg in dont_generate_strs])}
+    name: cls()
+    for name, cls in inspect.getmembers(ag, inspect.isclass)
+    if cls.__module__ == ag.__name__ and name not in dont_generate
     }
+    # Find selected pkt type
+    for name ,p in wlt_pkt_types.items():
+        if name == wanted_pkt_type:
+            pkt = p
+            break
     
-    # Categorize packets and extract API versions
-    import re
-    pkt_metadata = {}
-    for pkt_name in list(wlt_pkt_types.keys())[2:]:  # Skip Hdr and DataHdr
-        # Determine category
-        if pkt_name.startswith('Unified'):
-            category = 'Unified'
-        elif pkt_name.startswith('Module'):
-            category = 'Module'
-        elif pkt_name.startswith('Action'):
-            category = 'Action'
-        elif pkt_name.startswith('Brg2Brg'):
-            category = 'Brg2Brg'
-        elif pkt_name.startswith('Brg2Gw'):
-            category = 'Brg2Gw'
-        elif pkt_name.startswith('Sensor'):
-            category = 'Sensor'
+    # Handle Hdr
+    hdr = wlt_pkt_types['Hdr']
+    wlt_pkt_types = {'Hdr': hdr, **{k: v for k, v in wlt_pkt_types.items() if k != 'Hdr'}} # Put 'Hdr' first
+    hdr_string = ""
+    for k in hdr.__dict__.keys():
+        if not request.args.get(f"Hdr_{k}"):
+            hdr_string += "{}={},".format(k, str(hdr.__dict__[k]))
         else:
-            category = 'Other'
-        
-        # Extract API version
-        version_match = re.search(r'V(\d+)$', pkt_name)
-        api_version = version_match.group(1) if version_match else None
-        
-        pkt_metadata[pkt_name] = {
-            'category': category,
-            'api_version': api_version
-        }
-    
-    # Get unique categories and API versions for filters
-    categories = sorted(set(m['category'] for m in pkt_metadata.values()))
-    api_versions = sorted(set(m['api_version'] for m in pkt_metadata.values() if m['api_version']), 
-                         key=lambda x: int(x) if x else 0, reverse=True)
-    
-    wanted_pkt_type = request.args.get('radios')
-    if wanted_pkt_type:
-        # Determine header type and build header
-        hdr_type = 'DataHdr' if 'Unified' in wanted_pkt_type else 'Hdr'
-        output += build_and_dump_pkt(hdr_type)
-        output += build_and_dump_pkt(wanted_pkt_type)
-    
-    # Get filter values to preserve them
-    filter_category = request.args.get('filter_category', '')
-    filter_version = request.args.get('filter_version', '')
-    
-    # Get all form values to preserve them (convert MultiDict to regular dict, taking first value)
-    form_values = {k: v for k, v in request.args.items()}
+            hdr_string += "{}={},".format(k, str(request.args.get(f"Hdr_{k}")))
+    hdr = eval_pkt(f"Hdr({hdr_string[:-1]})")
+    output += hdr.dump()
     
+    # Handle selected pkt
+    if pkt:
+        pkt_string = ""
+        for k in pkt.__dict__.keys():
+            if not request.args.get(f"{type(pkt).__name__}_{k}"):
+                pkt_string += "{}={},".format(k, str(0))
+            else:
+                pkt_string += "{}={},".format(k, str(request.args.get(f"{type(pkt).__name__}_{k}")))
+        pkt = eval_pkt(f"{type(pkt).__name__}({pkt_string[0:-1]})")
+        output += pkt.dump()
     print(output)
     return render_template('generator.html',
                             app=app, title=title, output=txt2html(output),
-                            pkt_types=wlt_pkt_types, pkt_types_list=list(wlt_pkt_types.keys())[2:],
-                            pkt_metadata=pkt_metadata, categories=categories, api_versions=api_versions,
-                            wanted_pkt_type=wanted_pkt_type, form_values=form_values,
-                            filter_category=filter_category, filter_version=filter_version)
+                            pkt_types=wlt_pkt_types, pkt_types_list=[k for k in wlt_pkt_types.keys() if k != 'Hdr'])
 
 def utils_tag2brg(app):
     title = "Tag to Bridge Packet Converter"
@@ -338,6 +295,26 @@ def _read_json_safe(p: Path) -> Dict[str, Any]:
     except Exception:
         return {}
     
+def _tooltip(meta: Dict[str, Any], fallback: str) -> str:
+    if not meta:
+        return fallback
+    # prefer human fields; keep it short
+    parts: List[str] = []
+    # for k in ("name", "title"):
+    #     if isinstance(meta.get(k), str):
+    #         parts.append(meta[k].strip())
+    for k in ("description", "desc", "objective", "purpose"):
+        if isinstance(meta.get(k), str):
+            parts.append(meta[k].strip())
+            break
+    if parts:
+        return "\n".join(parts[:2])
+    try:
+        s = json.dumps(meta, ensure_ascii=False, separators=(",", ":"))
+        return s[:240] + ("…" if len(s) > 240 else "")
+    except Exception:
+        return fallback
+
 def scan_tests_dir(root: str | Path) -> Dict[str, Any]:
     """
     Expect: <root>/<module>/<test>/{<test>.py, <test>.json}
@@ -382,12 +359,13 @@ def scan_tests_dir(root: str | Path) -> Dict[str, Any]:
                 "id": tid,
                 "module": mod_dir.name,
                 "name": test_dir.name,
+                # "label": test_dir.name.replace("_", " "),
                 "label": meta.get('name', test_dir.name.replace("_", " ")),
                 "dir": str(test_dir),
                 "py": str(py) if py else "",
                 "json_path": str(j) if j else "",
                 "meta": meta,
-                "tooltip": meta.get('purpose', ""),
+                "tooltip": _tooltip(meta, test_dir.name),
             }
             tests.append(item)
             if py: