Merge pull request #50 from devqubit-labs/refactor/adapres-hardening

refactor(adapters): eliminate redundant computation, dead code, and add missing test coverage across adapters

Author: m2papierz

packages/devqubit-braket/src/devqubit_braket/adapter.py

@@ -28,7 +28,7 @@
 from dataclasses import dataclass, field
 from typing import Any
 
-from devqubit_braket.circuits import compute_parametric_hash, compute_structural_hash
+from devqubit_braket.circuits import compute_circuit_hashes
 from devqubit_braket.envelope import create_envelope, log_submission_failure
 from devqubit_braket.execution import TrackedTask, TrackedTaskBatch
 from devqubit_braket.serialization import is_braket_circuit
@@ -175,7 +175,10 @@ def _materialize_task_spec(
     if is_braket_circuit(task_specification):
         return task_specification, [task_specification], True, None
 
-    if isinstance(task_specification, (list, tuple)):
+    if isinstance(task_specification, list):
+        return task_specification, task_specification, False, None
+
+    if isinstance(task_specification, tuple):
         circuit_list = list(task_specification)
         return circuit_list, circuit_list, False, None
 
@@ -353,7 +356,11 @@ def run_batch(
         """
         device_name = get_backend_name(self.device)
         submitted_at = utc_now_iso()
-        circuits_for_logging = list(task_specifications)
+        circuits_for_logging = (
+            task_specifications
+            if isinstance(task_specifications, list)
+            else list(task_specifications)
+        )
 
         # Prepare execution context
         ctx = self._prepare_execution_context(
@@ -428,10 +435,11 @@ def _prepare_execution_context(
         self._execution_count += 1
         exec_count = self._execution_count
 
-        # Compute hashes
-        structural_hash = compute_structural_hash(circuits_for_logging)
+        # Compute both hashes in one pass (avoids 2× circuit_to_op_stream)
         inputs = kwargs.get("inputs")
-        parametric_hash = compute_parametric_hash(circuits_for_logging, inputs)
+        structural_hash, parametric_hash = compute_circuit_hashes(
+            circuits_for_logging, inputs
+        )
 
         is_new_circuit = (
             structural_hash and structural_hash not in self._seen_circuit_hashes

packages/devqubit-braket/src/devqubit_braket/envelope.py

@@ -33,6 +33,7 @@
 from devqubit_braket.utils import braket_version, get_adapter_version, get_backend_name
 from devqubit_engine.circuit.models import CircuitFormat
 from devqubit_engine.storage.types import ArtifactRef
+from devqubit_engine.uec.errors import EnvelopeValidationError
 from devqubit_engine.uec.models.device import DeviceSnapshot
 from devqubit_engine.uec.models.envelope import ExecutionEnvelope
 from devqubit_engine.uec.models.execution import ExecutionSnapshot, ProducerInfo
@@ -60,6 +61,15 @@
 
 _serializer = BraketCircuitSerializer()
 
+# Pre-computed base CountsFormat dict for Braket (source=braket, cbit0_left).
+# Dynamic fields (measured_qubits) are overlaid per-call.
+_BRAKET_COUNTS_FORMAT: dict[str, Any] = CountsFormat(
+    source_sdk="braket",
+    source_key_format="bitstring",
+    bit_order="cbit0_left",
+    transformed=False,
+).to_dict()
+
 
 # =============================================================================
 # Counts Format
@@ -95,7 +105,7 @@ def _get_braket_counts_format(
         bit_order="cbit0_left",
         transformed=transformed,
     )
-    result = fmt.to_dict()
+    result = fmt.to_dict() if transformed else dict(_BRAKET_COUNTS_FORMAT)
 
     if measured_qubits is not None:
         result["measured_qubits"] = measured_qubits
@@ -344,6 +354,7 @@ def _create_result_snapshot(
     raw_result_ref: ArtifactRef | None,
     shots: int | None,
     error: Exception | None = None,
+    counts_payload: dict[str, Any] | None = None,
 ) -> ResultSnapshot:
     """
     Create a ResultSnapshot from Braket result.
@@ -358,6 +369,9 @@ def _create_result_snapshot(
         Number of shots used.
     error : Exception or None
         Exception if execution failed.
+    counts_payload : dict or None
+        Pre-extracted counts payload. When provided, skips redundant
+        extraction. Callers should extract once and pass through.
 
     Returns
     -------
@@ -379,11 +393,12 @@ def _create_result_snapshot(
         # Extract measured qubits if available (for accurate bit-order semantics)
         measured_qubits = _extract_measured_qubits(result)
 
-        # Check if result is already a combined payload dict (from batch)
-        if isinstance(result, dict) and "experiments" in result:
-            counts_payload = result
-        else:
-            counts_payload = extract_counts_payload(result)
+        # Use pre-computed counts_payload if provided
+        if counts_payload is None:
+            if isinstance(result, dict) and "experiments" in result:
+                counts_payload = result
+            else:
+                counts_payload = extract_counts_payload(result)
 
         if counts_payload and counts_payload.get("experiments"):
             format_dict = _get_braket_counts_format(measured_qubits=measured_qubits)
@@ -632,27 +647,31 @@ def finalize_envelope(
         except Exception as e:
             logger.warning("Failed to log error: %s", e)
 
+    # Extract counts once (used for both result snapshot and separate logging)
+    counts_payload: dict[str, Any] | None = None
+    if result is not None and error is None:
+        try:
+            if isinstance(result, dict) and "experiments" in result:
+                counts_payload = result  # Batch: already structured
+            else:
+                counts_payload = extract_counts_payload(result)
+        except Exception as e:
+            logger.debug("Failed to extract counts payload: %s", e)
+
     # Create result snapshot
-    result_snapshot = _create_result_snapshot(result, raw_result_ref, shots, error)
+    result_snapshot = _create_result_snapshot(
+        result, raw_result_ref, shots, error, counts_payload=counts_payload
+    )
 
     # Update execution snapshot with completion time
     if envelope.execution:
         envelope.execution.completed_at = utc_now_iso()
 
     envelope.result = result_snapshot
 
-    # Extract counts for separate logging
-    counts_payload = None
-    if result is not None:
-        try:
-            counts_payload = extract_counts_payload(result)
-        except Exception as e:
-            logger.debug("Failed to extract counts payload: %s", e)
-
     # Validate and log envelope
     # EnvelopeValidationError is raised by log_envelope for adapter runs with
     # invalid envelopes - this MUST propagate to enforce UEC contract
-    from devqubit_engine.uec.errors import EnvelopeValidationError
 
     try:
         tracker.log_envelope(envelope=envelope)

packages/devqubit-braket/src/devqubit_braket/serialization.py

@@ -297,7 +297,7 @@ def circuits_to_text(circuits: list[Any]) -> str:
 # =============================================================================
 
 
-def summarize_circuit(circuit: Any) -> CircuitSummary:
+def summarize_braket_circuit(circuit: Any) -> CircuitSummary:
     """
     Generate a summary of a Braket circuit.
 
@@ -532,45 +532,3 @@ def serialize(
         if fmt == CircuitFormat.OPENQASM3:
             return serialize_openqasm(circuit, name=name, index=index)
         raise SerializerError(f"Unsupported format: {fmt}")
-
-
-def summarize_braket_circuit(circuit: Any) -> CircuitSummary:
-    """
-    Generate a summary of a Braket circuit.
-
-    Extracts gate counts, depth, qubit count, and classification
-    information from the circuit.
-
-    Parameters
-    ----------
-    circuit : braket.circuits.Circuit
-        Braket circuit to summarize.
-
-    Returns
-    -------
-    CircuitSummary
-        Circuit summary with statistics and gate counts.
-    """
-    gate_counts: Counter[str] = Counter()
-
-    for instr in circuit.instructions:
-        op = instr.operator
-        gate_name = getattr(op, "name", type(op).__name__).lower()
-        gate_counts[gate_name] += 1
-
-    # Classify gates using the classifier
-    stats = _classifier.classify_counts(dict(gate_counts))
-
-    return CircuitSummary(
-        num_qubits=circuit.qubit_count,
-        depth=circuit.depth,
-        gate_count_1q=stats["gate_count_1q"],
-        gate_count_2q=stats["gate_count_2q"],
-        gate_count_multi=stats["gate_count_multi"],
-        gate_count_measure=stats["gate_count_measure"],
-        gate_count_total=sum(gate_counts.values()),
-        gate_types=dict(gate_counts),
-        is_clifford=stats["is_clifford"],
-        source_format=CircuitFormat.JAQCD,
-        sdk=SDK.BRAKET,
-    )

packages/devqubit-braket/src/devqubit_braket/utils.py

@@ -18,6 +18,9 @@
 # =============================================================================
 
 
+_braket_version: str | None = None
+
+
 def braket_version() -> str:
     """
     Get the installed Amazon Braket SDK version.
@@ -27,13 +30,24 @@ def braket_version() -> str:
     str
         Braket SDK version string (e.g., "1.70.0"), or "unknown" if
         Braket is not installed or version cannot be determined.
+
+    Notes
+    -----
+    Result is cached: SDK version is immutable during process lifetime.
     """
+    global _braket_version
+    if _braket_version is not None:
+        return _braket_version
     try:
         import braket
 
-        return getattr(braket, "__version__", "unknown")
+        _braket_version = getattr(braket, "__version__", "unknown")
     except ImportError:
-        return "unknown"
+        _braket_version = "unknown"
+    return _braket_version
+
+
+_adapter_version: str | None = None
 
 
 def get_adapter_version() -> str:
@@ -44,13 +58,21 @@ def get_adapter_version() -> str:
     -------
     str
         Adapter version string, or "unknown" if not installed.
+
+    Notes
+    -----
+    Result is cached: adapter version is immutable during process lifetime.
     """
+    global _adapter_version
+    if _adapter_version is not None:
+        return _adapter_version
     try:
         from importlib.metadata import version
 
-        return version("devqubit-braket")
+        _adapter_version = version("devqubit-braket")
     except Exception:
-        return "unknown"
+        _adapter_version = "unknown"
+    return _adapter_version
 
 
 # =============================================================================
@@ -255,19 +277,15 @@ def obj_to_dict(x: Any) -> dict[str, Any] | None:
     try:
         if isinstance(x, dict):
             return x
+        from devqubit_engine.utils.serialization import to_jsonable
+
         # pydantic v1 style
         if hasattr(x, "dict") and callable(getattr(x, "dict")):
-            from devqubit_engine.utils.serialization import to_jsonable
-
             return to_jsonable(x.dict())
         # pydantic v2 or custom style
         if hasattr(x, "to_dict") and callable(getattr(x, "to_dict")):
-            from devqubit_engine.utils.serialization import to_jsonable
-
             return to_jsonable(x.to_dict())
         # Fallback: attempt generic conversion
-        from devqubit_engine.utils.serialization import to_jsonable
-
         return to_jsonable(x)
     except Exception:
         return None