bottomtime 0.8.2__tar.gz → 0.8.3__tar.gz

{bottomtime-0.8.2 → bottomtime-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bottomtime
-Version: 0.8.2
+Version: 0.8.3
 Summary: Lossless dive-log store: ingest, decode, and reconcile dives from Garmin (FIT) and Shearwater (Petrel Native Format) dive computers
 Project-URL: Homepage, https://snehankekre.com/bottomtime/
 Project-URL: Documentation, https://snehankekre.com/bottomtime/manual.html

{bottomtime-0.8.2 → bottomtime-0.8.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bottomtime"
-version = "0.8.2"
+version = "0.8.3"
 description = "Lossless dive-log store: ingest, decode, and reconcile dives from Garmin (FIT) and Shearwater (Petrel Native Format) dive computers"
 readme = "README.md"
 license = "MIT"

{bottomtime-0.8.2 → bottomtime-0.8.3}/src/bottomtime/__init__.py

@@ -1,6 +1,6 @@
 """bottomtime: lossless dive-log store for multi-computer divers."""
 
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 
 from .api import compare_logs, list_dives, load_dive
 

{bottomtime-0.8.2 → bottomtime-0.8.3}/src/bottomtime/deco.py

@@ -2,16 +2,19 @@
 doesn't record.
 
 bottomtime rebuilds the computer's Bühlmann ZHL-16C tissue loading from the
-log's depth, gas, and (on a rebreather) loop ppO2, carrying it over from the
-same computer's dives in the 48 hours before. The GF99 that tissue state
-implies is compared with the GF99 the computer logged, so every dive says how
-well the model agreed with the computer before its surface GF is trusted.
+log's depth, gas, and (on a rebreather) loop ppO2. It starts from the tissue
+state the computer itself wrote at the start of the log (PNF records 0x70 to
+0x75), or, for a log without one, carries it over from the same computer's
+dives in the 48 hours before. The GF99 that tissue state implies is compared
+with the GF99 the computer logged, so every dive says how well the model
+agreed with the computer.
 """
 
 from __future__ import annotations
 
 import json
 import sqlite3
+import struct
 from datetime import datetime, timedelta
 from statistics import median
 
@@ -82,6 +85,26 @@ def _run(log: dict, state):
     return (pn, ph), out
 
 
+def first_snapshot(con: sqlite3.Connection, source_dive_id: int):
+    """The tissue state a Shearwater wrote before its first sample, as
+    (16 nitrogen, 16 helium) pressures in bar, or None. A snapshot is six
+    records, 0x70 to 0x75, holding little-endian floats from byte 4: seven in
+    each of the first five records and six in the last, whose last four bytes
+    are a big-endian timestamp. The first 16 floats are nitrogen and the next
+    16 helium. The nine after that aren't known yet."""
+    rows = con.execute(
+        "SELECT type_key, payload FROM undecoded_payloads WHERE source_dive_id=? AND container='pnf_record'"
+        " AND type_key IN ('0x70','0x71','0x72','0x73','0x74','0x75') ORDER BY seq LIMIT 6",
+        (source_dive_id,),
+    ).fetchall()
+    if [k for k, _ in rows] != ["0x70", "0x71", "0x72", "0x73", "0x74", "0x75"]:
+        return None
+    values = []
+    for k, payload in rows:
+        values += struct.unpack("<6f" if k == "0x75" else "<7f", payload[4:28 if k == "0x75" else 32])
+    return values[0:16], values[16:32]
+
+
 def _log(con: sqlite3.Connection, source_dive_id: int) -> dict:
     sd = con.execute(
         "SELECT start_time_local, mode, header_json FROM source_dives WHERE id=?", (source_dive_id,)
@@ -109,6 +132,10 @@ def surface_gf(db_path, source_dive_id: int) -> dict | None:
         log = _log(con, source_dive_id)
         if log["header"].get("deco_model") not in (None, "gf"):
             return None
+        own = first_snapshot(con, source_dive_id)
+        if own:
+            _, out = _run(log, own)
+            return _result(out, log)
         device = con.execute("SELECT device FROM source_dives WHERE id=?", (source_dive_id,)).fetchone()[0]
         earlier = con.execute(
             "SELECT id FROM source_dives WHERE device=? AND start_time_local < ? AND start_time_local >= ?"
@@ -128,6 +155,10 @@ def surface_gf(db_path, source_dive_id: int) -> dict | None:
         _, out = _run(log, state)
     finally:
         con.close()
+    return _result(out, log)
+
+
+def _result(out, log) -> dict:
     gaps = [abs(m - g) for (m, _), g in zip(out, log["samples"]["gf99"]) if g is not None and g >= 5]
     return {
         "surface_gf": [round(max(sf, 0), 1) for _, sf in out],

{bottomtime-0.8.2 → bottomtime-0.8.3}/tests/test_deco.py

@@ -24,3 +24,23 @@ def test_a_rebreather_at_a_high_setpoint_loads_less_than_air():
     _, air = _run(_square(30, 25), _surface_state(1.013))
     _, ccr = _run(_square(30, 25, mode="cc", ppo2=1.3), _surface_state(1.013))
     assert ccr[150][1] < air[150][1]
+
+
+def test_the_computers_own_tissue_snapshot_is_read_as_16_nitrogen_and_16_helium():
+    import sqlite3
+    import struct
+
+    from bottomtime.deco import first_snapshot
+
+    values = [0.75 + i / 100 for i in range(16)] + [0.001 * (i + 1) for i in range(16)] + [0.0] * 9
+    con = sqlite3.connect(":memory:")
+    con.execute("CREATE TABLE undecoded_payloads (source_dive_id, container, type_key, seq, payload)")
+    for k in range(6):
+        floats = values[k * 7:k * 7 + (6 if k == 5 else 7)]
+        payload = bytes([0x70 + k, 0, 0, 0]) + struct.pack("<%df" % len(floats), *floats)
+        payload += struct.pack(">I", 1783338232) if k == 5 else b""
+        con.execute("INSERT INTO undecoded_payloads VALUES (1, 'pnf_record', ?, ?, ?)", (f"0x{0x70 + k:x}", 10 + k, payload))
+    n2, he = first_snapshot(con, 1)
+    assert [round(v, 3) for v in n2] == [round(v, 3) for v in values[:16]]
+    assert [round(v, 4) for v in he] == [round(v, 4) for v in values[16:32]]
+    assert first_snapshot(con, 2) is None