Closing issue #1 (“Show QObserva meta, agent, and collector versions on Run details”)

packages/qobserva/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "qobserva"
-version = "0.1.4"
+version = "0.1.5"
 description = "QObserva - Quantum program observability and benchmarking. One command to install and run everything."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -31,9 +31,9 @@ classifiers = [
 dependencies = [
   "typer>=0.12.0",
   "rich>=13.7.0",
-  "qobserva-agent>=0.1.0",
-  "qobserva-collector>=0.1.2",
-  "qobserva-local>=0.1.1",
+    "qobserva-agent>=0.1.1",
+    "qobserva-collector>=0.1.3",
+    "qobserva-local>=0.1.2",
 ]
 
 [project.optional-dependencies]

packages/qobserva/qobserva/__init__.py

@@ -1,9 +1,14 @@
 """QObserva - Unified quantum observability package."""
 
-__version__ = "0.1.4"
+from pkgutil import extend_path
 
-# In PyPI installs, qobserva-agent and qobserva share the same package namespace.
-# Import directly from the installed namespace package modules.
+# Merge `qobserva` from meta + agent when they live on different sys.path entries
+# (e.g. `pip install -e packages/qobserva` and `pip install -e packages/qobserva_agent`).
+__path__ = extend_path(__path__, __name__)
+
+__version__ = "0.1.5"
+
+# Agent modules (`observe`, `client`, …) ship in the `qobserva-agent` distribution.
 try:
     from .observe import observe_run
     from .client import QObservaClient

packages/qobserva_agent/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "qobserva-agent"
-version = "0.1.0"
+version = "0.1.1"
 description = "QObserva agent: decorator-first telemetry for quantum runs (Qiskit, Braket, Cirq, PennyLane, pyQuil, D-Wave)."
 readme = "README.md"
 requires-python = ">=3.10"

packages/qobserva_agent/qobserva/__init__.py

@@ -1,8 +1,12 @@
 """QObserva agent public API."""
 
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)
+
 from .observe import observe_run
 from .client import QObservaClient
 from .report import report_run
 
 __all__ = ["observe_run", "QObservaClient", "report_run"]
-__version__ = "0.1.0"
+__version__ = "0.1.1"

packages/qobserva_agent/qobserva/observe.py

@@ -14,6 +14,16 @@
 from .report import iso_now, report_run
 from .sanitize import sanitize_error_message
 
+def _package_version(dist_name: str) -> str | None:
+    """Installed distribution version, or None if not importable as a wheel/sdist."""
+    try:
+        from importlib import metadata
+
+        return metadata.version(dist_name)
+    except Exception:
+        return None
+
+
 def _hash_program(obj: Any) -> str:
     try:
         b = json.dumps(str(obj), sort_keys=True).encode("utf-8")
@@ -188,6 +198,20 @@ def wrapper(*args, **kwargs):
 
             shots = int(extracted.get("shots", 1) or 1)
 
+            _sw: Dict[str, Any] = {
+                "sdk": extracted.get("sdk", {}),
+                "python_version": platform.python_version(),
+            }
+            _av = _package_version("qobserva-agent")
+            if _av:
+                _sw["agent_version"] = _av
+            _qv = _package_version("qobserva")
+            if _qv:
+                _sw["qobserva_version"] = _qv
+            _cv = _package_version("qobserva-collector")
+            if _cv:
+                _sw["collector_version"] = _cv
+
             event = {
                 "schema_version": "0.1.0",
                 "event_id": str(uuid.uuid4()),
@@ -196,11 +220,7 @@ def wrapper(*args, **kwargs):
                 "project": project,
                 "tags": tags,
                 "actor": {"host": socket.gethostname()},
-                "software": {
-                    "agent_version": "0.1.0",
-                    "sdk": extracted.get("sdk", {}),
-                    "python_version": platform.python_version(),
-                },
+                "software": _sw,
                 "backend": extracted.get("backend", {"provider": "unknown", "name": "unknown"}),
                 "program": extracted.get("program", {
                     "kind": "circuit",

packages/qobserva_collector/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "qobserva-collector"
-version = "0.1.2"
+version = "0.1.3"
 description = "QObserva local collector service (FastAPI) for ingesting and storing run events."
 readme = "README.md"
 requires-python = ">=3.10"

packages/qobserva_collector/qobserva_collector/api.py

@@ -18,7 +18,7 @@
 from .analysis import compute_metrics_and_insights
 
 def create_app() -> FastAPI:
-    app = FastAPI(title="QObserva Collector", version="0.1.0")
+    app = FastAPI(title="QObserva Collector", version="0.1.3")
 
     app.add_middleware(
         CORSMiddleware,
@@ -43,6 +43,36 @@ def _get_installed_version(dist_name: str) -> str:
         except metadata.PackageNotFoundError:
             return "unknown"
 
+    def _dist_version_or_none(dist_name: str) -> str | None:
+        try:
+            return metadata.version(dist_name)
+        except metadata.PackageNotFoundError:
+            return None
+
+    def _enrich_software_versions(ev: Dict[str, Any]) -> None:
+        """
+        Fill missing software.* version strings from this collector's environment.
+
+        Client telemetry is preferred when present; this only backfills gaps so
+        stored run artifacts and Run Details stay useful for older agents or sparse payloads.
+        """
+        sw = ev.get("software")
+        if sw is None:
+            sw = {}
+            ev["software"] = sw
+        if not isinstance(sw, dict):
+            return
+        for key, dist in (
+            ("qobserva_version", "qobserva"),
+            ("agent_version", "qobserva-agent"),
+            ("collector_version", "qobserva-collector"),
+        ):
+            cur = sw.get(key)
+            if cur is None or (isinstance(cur, str) and not cur.strip()):
+                v = _dist_version_or_none(dist)
+                if v:
+                    sw[key] = v
+
     def auth(authorization: str | None = Header(default=None)):
         cfg = load_config()
         if not cfg.require_token:
@@ -60,6 +90,8 @@ def ingest_run_event(event: Dict[str, Any], _auth: bool = Depends(auth), db: Ses
         if errs:
             raise HTTPException(status_code=400, detail={"errors": errs})
 
+        _enrich_software_versions(event)
+
         run_id = event["run_id"]
         if db.query(Run).filter(Run.run_id == run_id).first():
             return {"accepted": True, "run_id": run_id, "duplicate": True}

packages/qobserva_local/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "qobserva-local"
-version = "0.1.1"
+version = "0.1.2"
 description = "One-command local stack runner (collector + UI) for QObserva."
 readme = "README.md"
 requires-python = ">=3.10"

packages/qobserva_local/qobserva_local/ui_dist/index.html

@@ -17,8 +17,8 @@
     <link rel="manifest" href="/site.webmanifest?v=6" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>QObserva Dashboard</title>
-    <script type="module" crossorigin src="/assets/index-C5K8xCns.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-Au4EQVmF.css">
+    <script type="module" crossorigin src="/assets/index-DscupHIx.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C6Dqxgn4.css">
   </head>
   <body>
     <div id="root"></div>

packages/qobserva_ui_react/dist/index.html

@@ -17,8 +17,8 @@
     <link rel="manifest" href="/site.webmanifest?v=6" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>QObserva Dashboard</title>
-    <script type="module" crossorigin src="/assets/index-C5K8xCns.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-Au4EQVmF.css">
+    <script type="module" crossorigin src="/assets/index-DscupHIx.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-C6Dqxgn4.css">
   </head>
   <body>
     <div id="root"></div>