oscura 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

oscura/export/__init__.py

@@ -19,19 +19,7 @@ Example:
 
 # Import main exports
 from . import wireshark
-from .wavedrom import (
-    WaveDromBuilder,
-    WaveDromEdge,
-    WaveDromSignal,
-    export_wavedrom,
-    from_digital_trace,
-)
 
 __all__ = [
-    "WaveDromBuilder",
-    "WaveDromEdge",
-    "WaveDromSignal",
-    "export_wavedrom",
-    "from_digital_trace",
     "wireshark",
 ]

oscura/export/wireshark/README.md

@@ -64,21 +64,21 @@ Then reload Lua plugins in Wireshark: **Analyze > Reload Lua Plugins** (Ctrl+Shi
 
 ## Supported Field Types
 
-|Oscura Type|Wireshark Type|Size|Notes|
-|---|---|---|---|
-|`uint8`|`ProtoField.uint8`|1 byte|Unsigned 8-bit integer|
-|`uint16`|`ProtoField.uint16`|2 bytes|Unsigned 16-bit integer|
-|`uint32`|`ProtoField.uint32`|4 bytes|Unsigned 32-bit integer|
-|`uint64`|`ProtoField.uint64`|8 bytes|Unsigned 64-bit integer|
-|`int8`|`ProtoField.int8`|1 byte|Signed 8-bit integer|
-|`int16`|`ProtoField.int16`|2 bytes|Signed 16-bit integer|
-|`int32`|`ProtoField.int32`|4 bytes|Signed 32-bit integer|
-|`int64`|`ProtoField.int64`|8 bytes|Signed 64-bit integer|
-|`float32`|`ProtoField.float`|4 bytes|IEEE 754 single precision|
-|`float64`|`ProtoField.double`|8 bytes|IEEE 754 double precision|
-|`bool`|`ProtoField.bool`|1 byte|Boolean value|
-|`bytes`|`ProtoField.bytes`|Variable|Raw byte array|
-|`string`|`ProtoField.string`|Variable|Text string|
+| Oscura Type | Wireshark Type      | Size     | Notes                     |
+| ----------- | ------------------- | -------- | ------------------------- |
+| `uint8`     | `ProtoField.uint8`  | 1 byte   | Unsigned 8-bit integer    |
+| `uint16`    | `ProtoField.uint16` | 2 bytes  | Unsigned 16-bit integer   |
+| `uint32`    | `ProtoField.uint32` | 4 bytes  | Unsigned 32-bit integer   |
+| `uint64`    | `ProtoField.uint64` | 8 bytes  | Unsigned 64-bit integer   |
+| `int8`      | `ProtoField.int8`   | 1 byte   | Signed 8-bit integer      |
+| `int16`     | `ProtoField.int16`  | 2 bytes  | Signed 16-bit integer     |
+| `int32`     | `ProtoField.int32`  | 4 bytes  | Signed 32-bit integer     |
+| `int64`     | `ProtoField.int64`  | 8 bytes  | Signed 64-bit integer     |
+| `float32`   | `ProtoField.float`  | 4 bytes  | IEEE 754 single precision |
+| `float64`   | `ProtoField.double` | 8 bytes  | IEEE 754 double precision |
+| `bool`      | `ProtoField.bool`   | 1 byte   | Boolean value             |
+| `bytes`     | `ProtoField.bytes`  | Variable | Raw byte array            |
+| `string`    | `ProtoField.string` | Variable | Text string               |
 
 ## Display Bases
 

oscura/exporters/json_export.py

@@ -263,52 +263,6 @@ def export_protocol_decode(
             json.dump(output, f, cls=OscuraJSONEncoder)
 
 
-def export_vintage_logic_json(
-    result: Any,
-    path: str | Path,
-    *,
-    indent: int = 2,
-    include_metadata: bool = True,
-) -> None:
-    """Export vintage logic analysis results to JSON.
-
-    Convenience function for exporting VintageLogicAnalysisResult objects.
-    The dataclass is automatically serialized to JSON with all nested objects.
-
-    Args:
-        result: VintageLogicAnalysisResult object.
-        path: Output JSON file path.
-        indent: Indentation level for pretty printing (default: 2).
-        include_metadata: Include export metadata (default: True).
-
-    Example:
-        >>> from oscura.analyzers.digital.vintage import analyze_vintage_logic
-        >>> result = analyze_vintage_logic(traces)
-        >>> export_vintage_logic_json(result, "analysis_results.json")
-    """
-    path = Path(path)
-
-    output: dict[str, Any] = {}
-
-    if include_metadata:
-        output["_metadata"] = {
-            "format": "oscura_vintage_logic",
-            "version": "1.0",
-            "exported_at": datetime.now().isoformat(),
-            "analysis_timestamp": result.timestamp.isoformat(),
-        }
-
-    output["analysis_result"] = result
-
-    # Sanitize to handle inf/nan
-    from oscura.reporting.output import _sanitize_for_serialization
-
-    output = _sanitize_for_serialization(output)
-
-    with open(path, "w") as f:
-        json.dump(output, f, cls=OscuraJSONEncoder, indent=indent)
-
-
 def load_json(path: str | Path) -> dict[str, Any]:
     """Load JSON data file.
 
@@ -333,6 +287,5 @@ __all__ = [
     "export_json",
     "export_measurements",
     "export_protocol_decode",
-    "export_vintage_logic_json",
     "load_json",
 ]

oscura/inference/active_learning/README.md

@@ -140,13 +140,13 @@ Information and Computation, 75(2), 87-106.
 
 ## Comparison with RPNI
 
-|Feature|L\* (Active)|RPNI (Passive)|
-|---|---|---|---|---|---|---|
-|Learning type|Active (queries oracle)|Passive (fixed dataset)|
-|Minimal DFA|Yes|No (may have extra states)|
-|Negative examples|Not required|Optional|
-|Live learning|Yes|No|
-|Query complexity|O(|Q|²|Σ|)|N/A|## See Also
+| Feature           | L\* (Active)            | RPNI (Passive)             |
+| ----------------- | ----------------------- | -------------------------- | --- | --- | --- | --- | ----------- |
+| Learning type     | Active (queries oracle) | Passive (fixed dataset)    |
+| Minimal DFA       | Yes                     | No (may have extra states) |
+| Negative examples | Not required            | Optional                   |
+| Live learning     | Yes                     | No                         |
+| Query complexity  | O(                      | Q                          | ²   | Σ   | )   | N/A | ## See Also |
 
 - `oscura.inference.state_machine`: RPNI passive learning
 - `examples/lstar_demo.py`: Complete usage examples

oscura/pipeline/composition.py

@@ -60,8 +60,16 @@ def compose(*funcs: TraceFunc) -> TraceFunc:
         # Apply functions in reverse order (right to left)
         return reduce(lambda val, func: func(val), reversed(funcs), x)
 
-    # Preserve function metadata
-    composed.__name__ = "compose(" + ", ".join(f.__name__ for f in funcs) + ")"
+    # Preserve function metadata (handle functools.partial which lacks __name__)
+    func_names = []
+    for f in funcs:
+        if hasattr(f, "__name__"):
+            func_names.append(f.__name__)
+        elif hasattr(f, "func"):  # functools.partial
+            func_names.append(f.func.__name__)
+        else:
+            func_names.append(repr(f))
+    composed.__name__ = "compose(" + ", ".join(func_names) + ")"
     composed.__doc__ = f"Composition of {len(funcs)} functions"
 
     return composed

oscura/reporting/__init__.py

@@ -138,10 +138,6 @@ from oscura.reporting.template_system import (
     list_templates,
     load_template,
 )
-from oscura.reporting.vintage_logic_report import (
-    VintageLogicReport,
-    generate_vintage_logic_report,
-)
 
 __all__ = [
     # Comprehensive Analysis Report API (CAR-001 through CAR-007)
@@ -191,8 +187,6 @@ __all__ = [
     "TemplateEngine",
     "TemplateSection",
     "UnsupportedFormatError",
-    # Vintage Logic Reporting
-    "VintageLogicReport",
     "VisualEmphasis",
     "aggregate_batch_measurements",
     "analyze",
@@ -241,7 +235,6 @@ __all__ = [
     "generate_presentation_from_report",
     "generate_report",
     "generate_summary",
-    "generate_vintage_logic_report",
     "get_available_analyses",
     "get_axis_scaling",
     "list_templates",

oscura/reporting/templates/index.md

@@ -2,22 +2,22 @@
 
 ## Report Metadata
 
-|Field|Value|
-|---|---|
-|**Input File**|{{input_name}}|
-|**File Size**|{{input_size}}|
-|**Input Type**|{{input_type}}|
-|**Generated**|{{timestamp}}|
-|**Analysis Duration**|{{duration}}|
+| Field                 | Value          |
+| --------------------- | -------------- |
+| **Input File**        | {{input_name}} |
+| **File Size**         | {{input_size}} |
+| **Input Type**        | {{input_type}} |
+| **Generated**         | {{timestamp}}  |
+| **Analysis Duration** | {{duration}}   |
 
 ## Analysis Summary
 
-|Metric|Count|
-|---|---|
-|Total Analyses|{{total_analyses}}|
-|Successful|{{successful}}|
-|Failed|{{failed}}|
-|Analysis Domains|{{domains_count}}|
+| Metric           | Count              |
+| ---------------- | ------------------ |
+| Total Analyses   | {{total_analyses}} |
+| Successful       | {{successful}}     |
+| Failed           | {{failed}}         |
+| Analysis Domains | {{domains_count}}  |
 
 {{#if has_errors}}
 

oscura/schemas/bus_configuration.json

@@ -0,0 +1,322 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://oscura.io/schemas/bus_configuration.json",
+  "title": "Bus Configuration Schema",
+  "description": "Schema for validating parallel bus configurations for multi-bit protocols (CFG-001).",
+  "type": "object",
+  "required": ["name", "settings"],
+  "additionalProperties": true,
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Bus configuration identifier",
+      "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$",
+      "minLength": 1
+    },
+    "version": {
+      "type": "string",
+      "description": "Configuration version",
+      "pattern": "^\\d+\\.\\d+$"
+    },
+    "description": {
+      "type": "string",
+      "description": "Human-readable description"
+    },
+    "settings": {
+      "type": "object",
+      "description": "Global bus settings",
+      "properties": {
+        "active_low": {
+          "type": "boolean",
+          "description": "Signals are active-low (inverted)"
+        },
+        "sample_on": {
+          "type": "string",
+          "enum": ["rising", "falling", "both"],
+          "description": "Sample on clock/timing pulse edge"
+        },
+        "bit_numbering": {
+          "type": "string",
+          "enum": ["lsb_0", "msb_0"],
+          "description": "Bit numbering convention"
+        }
+      },
+      "additionalProperties": false
+    },
+    "data_bus": {
+      "type": "object",
+      "description": "Data bus definition",
+      "required": ["name", "width", "bits"],
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Bus name",
+          "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
+        },
+        "width": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 128,
+          "description": "Bus width in bits"
+        },
+        "description": {
+          "type": "string",
+          "description": "Bus description"
+        },
+        "active_low": {
+          "type": "boolean",
+          "description": "Override global active_low setting"
+        },
+        "bits": {
+          "type": "array",
+          "description": "Bit mappings from channel to position",
+          "minItems": 1,
+          "items": {
+            "type": "object",
+            "required": ["channel", "bit"],
+            "properties": {
+              "channel": {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Source channel index"
+              },
+              "bit": {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Bit position in bus"
+              },
+              "name": {
+                "type": "string",
+                "description": "Signal name",
+                "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
+              }
+            },
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "address_bus": {
+      "type": "object",
+      "description": "Address bus definition",
+      "required": ["name", "width", "bits"],
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Bus name",
+          "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
+        },
+        "width": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 128,
+          "description": "Bus width in bits"
+        },
+        "description": {
+          "type": "string",
+          "description": "Bus description"
+        },
+        "active_low": {
+          "type": "boolean",
+          "description": "Override global active_low setting"
+        },
+        "bits": {
+          "type": "array",
+          "description": "Bit mappings from channel to position",
+          "minItems": 1,
+          "items": {
+            "type": "object",
+            "required": ["channel", "bit"],
+            "properties": {
+              "channel": {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Source channel index"
+              },
+              "bit": {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Bit position in bus"
+              },
+              "name": {
+                "type": "string",
+                "description": "Signal name",
+                "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
+              }
+            },
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "control_signals": {
+      "type": "array",
+      "description": "Control signal definitions",
+      "items": {
+        "type": "object",
+        "required": ["name", "channel"],
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Signal name",
+            "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
+          },
+          "channel": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Source channel index"
+          },
+          "active_low": {
+            "type": "boolean",
+            "description": "Signal is active-low"
+          },
+          "description": {
+            "type": "string",
+            "description": "Signal description"
+          },
+          "short_name": {
+            "type": "string",
+            "description": "Short name/abbreviation",
+            "maxLength": 8
+          }
+        },
+        "additionalProperties": false
+      }
+    },
+    "timing": {
+      "type": "object",
+      "description": "Timing constraints and validation",
+      "properties": {
+        "clock_period_ns": {
+          "type": "number",
+          "exclusiveMinimum": 0,
+          "description": "Clock period in nanoseconds"
+        },
+        "setup_time_ns": {
+          "type": "number",
+          "minimum": 0,
+          "description": "Setup time requirement in nanoseconds"
+        },
+        "hold_time_ns": {
+          "type": "number",
+          "minimum": 0,
+          "description": "Hold time requirement in nanoseconds"
+        },
+        "pulse_width_ns": {
+          "type": "object",
+          "description": "Pulse width requirements by signal type",
+          "additionalProperties": {
+            "type": "number",
+            "minimum": 0
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "transactions": {
+      "type": "object",
+      "description": "Transaction decoding rules",
+      "properties": {
+        "types": {
+          "type": "array",
+          "description": "Transaction type definitions",
+          "items": {
+            "type": "object",
+            "required": ["name", "conditions"],
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "Transaction type name",
+                "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$"
+              },
+              "conditions": {
+                "type": "object",
+                "description": "Signal conditions for this transaction",
+                "additionalProperties": {
+                  "type": "boolean"
+                }
+              },
+              "sample_on": {
+                "type": "string",
+                "description": "Control signal to sample on"
+              },
+              "capture": {
+                "type": "object",
+                "description": "Buses/signals to capture",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "instruction_decode": {
+      "type": "object",
+      "description": "Instruction decoding (if data contains opcodes)",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Enable instruction decoding"
+        },
+        "opcode_bits": {
+          "type": "array",
+          "description": "Bit range for opcode [start, end]",
+          "items": { "type": "integer", "minimum": 0 },
+          "minItems": 2,
+          "maxItems": 2
+        },
+        "opcodes": {
+          "type": "object",
+          "description": "Opcode to instruction mappings (keys can be integers or binary/hex strings)",
+          "additionalProperties": {
+            "type": "object",
+            "required": ["name"],
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "Instruction mnemonic"
+              },
+              "description": {
+                "type": "string",
+                "description": "Instruction description"
+              }
+            },
+            "additionalProperties": false
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "output": {
+      "type": "object",
+      "description": "Output formatting options",
+      "properties": {
+        "format": {
+          "type": "string",
+          "enum": ["raw", "transaction", "annotated"],
+          "description": "Output format type"
+        },
+        "timestamp_format": {
+          "type": "string",
+          "enum": ["absolute", "relative_us", "relative_ns", "sample_index"],
+          "description": "Timestamp format"
+        },
+        "include_raw_values": {
+          "type": "boolean",
+          "description": "Include raw values in output"
+        },
+        "hex_format": {
+          "type": "boolean",
+          "description": "Display values in hexadecimal"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}