Merge pull request #17 from davxy/v0.6.6-rc0

V0.6.6 rc0

Author: qiweiii

.github/workflows/ci.yml

@@ -17,6 +17,7 @@ jobs:
       matrix:
         validator:
           - codec
+          - traces
           - stf/accumulate
           - stf/assurances
           - stf/authorizations

README.md

@@ -31,13 +31,16 @@ def decode(self):
         return decoded
 
 
-def convert_to_json(filename, subsystem_type):
+def convert_to_json(filename, subsystem_type, spec_name = None):
+    if spec_name in ("tiny", "full"):
+        spec.set_spec(spec_name)
+    print("* Converting:", filename)
     with open(filename, 'rb') as file:
         blob = file.read()
         scale_bytes = ScaleBytes(blob)
         dump = subsystem_type(data=scale_bytes)
         decoded = dump.decode()
-        json_filename = filename.replace('.bin', '.json')
+        json_filename = str(filename).replace('.bin', '.json')
         with open(json_filename, 'w') as json_file:
             json.dump(decoded, json_file, indent=4)
             json_file.write('\n')
@@ -47,5 +50,4 @@ def convert_group(group_name, spec_name, subsystem_type):
         spec.set_spec(spec_name)
     print(f"\n[Converting {group_name} ({spec_name})]")
     for file in glob.glob(f"{spec_name}/*.bin"):
-        print("* Converting:", file)
         convert_to_json(file, subsystem_type)

lib/bin_to_json.py

@@ -76,24 +76,30 @@ def path_to_type_name(path):
     return name
 
 
-def validate(schema, json_file, json_tweaks_callback=None):
+def validate(schema, json_file, root_type = None, json_tweaks_callback = None):
     """Validate a JSON file against an ASN.1 schema.
     
-    The root type for decoding is determined as follows:
-    - If the schema contains "TestCase", use that type
-    - Otherwise, derive the type from the filename (e.g., "my_type.json" → "MyType")
-
     Args:
         schema: Compiled ASN.1 schema
         json_file: Path to JSON file to validate
+        root_type_name: Optional schema type name to be used to parse the json_file
         json_tweaks_callback: Optional callback to modify JSON before validation
+
+    If the `root_type_name` arg is None or is not present in the schema, then the root
+    type for decoding is determined as follows:
+    - If the schema contains "TestCase", use that type
+    - Otherwise, derive the type from the filename (e.g., "my_type.json" → "MyType")
+
     """
+    print("* Validating:", json_file)
+
     # Determine root type used for decoding
-    if "TestCase" in schema.types:
-        root_type = "TestCase"
-    else:
-        # Auto-detect root type from filename
-        root_type = path_to_type_name(json_file)
+    if root_type is None:
+        if "TestCase" in schema.types:
+            root_type = "TestCase"
+        else:
+            # Auto-detect root type from filename
+            root_type = path_to_type_name(json_file)
 
     # Read and prepare JSON
     with open(json_file, "rb") as f:
@@ -121,7 +127,7 @@ def validate_group(group_name, group_schema, spec_name, json_tweaks_callback=Non
     Args:
         group_name: Name of the validation group (for display)
         group_schema: ASN.1 schema file name (or None for base schema only)
-        spec_name: Specification name ("tiny", "full", or "data")
+        spec_name: Specification name ("tiny", "full")
         json_tweaks_callback: Optional callback to modify JSON before validation
     """
     print(f"\n[Validating {group_name} ({spec_name})]")
@@ -134,5 +140,4 @@ def validate_group(group_name, group_schema, spec_name, json_tweaks_callback=Non
     # Compile schema and validate all JSON files
     schema = asn1tools.compile_files(schema_files, codec="jer")
     for json_file in glob.glob(f"{spec_name}/*.json"):
-        print("* Validating:", json_file)
-        validate(schema, json_file, json_tweaks_callback)
+        validate(schema, json_file, None, json_tweaks_callback)

lib/validate_asn1.py

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Get the directory containing this script
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Get the parent directory
+PARENT_DIR="$(dirname "$SCRIPT_DIR")"
+
+# Check if jam_types python library can be imported
+if ! python3 -c "import jam_types" 2>/dev/null; then
+    echo "Error: We depend on jam-types. Please install the jam_types Python library." >&2
+    exit 1
+fi
+
+echo "Searching for convert.py scripts in: $PARENT_DIR"
+
+# Find all convert.py files and execute them
+find "$PARENT_DIR" -name "convert.py" -type f | while read -r convert_script; do
+    echo "Executing: $convert_script"
+    cd "$(dirname "$convert_script")"
+    python3 "$(basename "$convert_script")"
+done
+
+echo "All convert.py scripts have been executed."

scripts/convert-all.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Get the directory containing this script
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Get the parent directory
+PARENT_DIR="$(dirname "$SCRIPT_DIR")"
+
+# Check if jam_types python library can be imported
+if ! python3 -c "import asn1tools" 2>/dev/null; then
+    echo "Error: We depend on asn1tools. Please install the asn1tools Python library." >&2
+    exit 1
+fi
+
+echo "Searching for validate.py scripts in: $PARENT_DIR"
+
+# Find all validate.py files and execute them
+find "$PARENT_DIR" -name "validate.py" -type f | while read -r validate_script; do
+    echo "Executing: $validate_script"
+    cd "$(dirname "$validate_script")"
+    python3 "$(basename "$validate_script")"
+done
+
+echo "All validate.py scripts have been executed."