Switches the VW API backend from carconnectivity + connector-volkswagen
to volkswagencarnet (local fork with the cariad-hybrid-auth-fix patch
applied), fixing authentication against the current CARIAD BFF endpoints.
- requirements.txt: point at local volkswagencarnet git repo via
git+file:// URL (editable path no longer needed now the patch is
committed there)
- we_connect.py: rewrite around the async volkswagencarnet Connection
class; a persistent asyncio event loop held in _Session lets the rest
of the code stay synchronous
- data_model.py: remap all extractors to volkswagencarnet Vehicle
properties and Paths constants; output shape preserved so
apply_procedural and the GUI client continue to work unchanged
- collect.py: swap carconnectivity error import, drop
TemporaryAuthenticationError (no equivalent), fix vehicle.vin.value →
vehicle.vin
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Add extract_windows() and register 'windows' in ALL_DOMAINS
- Remove windows extraction from extract_doors; no more double keys
- extract_windows also captures the overall windows.open_state
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Don't store attributes whose .value is None; avoids spurious "None"
strings in the snapshot (lock_state, open_state were unset)
- Flatten the structure: overall lock_state/open_state now live directly
under 'doors' instead of the double-nested 'doors.doors.overallState'
- Give vehicle.windows its own try/except, independent of vehicle.doors
- Capture doors.open_state (overall open state) which was missing before
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
server/install.sh was broken after moving into server/: SCRIPT_DIR now
resolves to the server/ subdirectory, so requirements path, log dir, and
systemd WorkingDirectory all pointed at wrong locations. Introduce REPO_DIR
(parent of SCRIPT_DIR) and use it throughout.
client/install.sh creates a venv at client/.venv, installs
client/requirements.txt, and writes a client/run.sh launcher.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
run() stays in server/collect.py with relative imports.
main() (CLI arg parsing, credential loading) moves to server/main.py.
install.sh updated to use `python -m server.main` (required for relative
imports to resolve correctly when invoked as a module).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Move client.py and gui_client.py into client/, split root requirements.txt
into server/requirements.txt and client/requirements.txt, update install.sh
to reference server/requirements.txt.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Remove the local copy of jay_diff and its tests/data; switch all four
import sites to `jaydiff.diff.diff_full` / `jaydiff.merge.merge_full`
from the shared Gitea package (http://192.168.22.90:3001/jayfield/jaypy).
Add the package as a VCS dependency in requirements.txt.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- gui_client: update _TRACE_LABELS paths to new flat snapshot structure
- README: update library name, pip command, domain list, credentials
template, output example, and module reference
- install.sh: update credentials template and systemd service description
- client.py: update docstring
- data_model: Kelvin→Celsius conversion for battery temps (CarConnectivity
returns Kelvin); round range_estimated_full to 1 decimal
- jay_diff: fix merge when old value is not a dict; skip empty-dict
branches in delete
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Flatten the snapshot structure so each domain maps directly to its
fields rather than mirroring the old WeConnect status-object nesting.
New domains: electric_drive (range, battery/SOC/temps, odometer),
connectivity, vehicle, position, doors — replacing the old readiness,
parking, access, and measurements domains. Update apply_procedural
paths and collect.py defaults accordingly.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Replace the weconnect library with carconnectivity and
carconnectivity-connector-volkswagen. The connector is configured via
a dict passed to CarConnectivity(); startup()/fetch_all() replace
login()/update(). All domain extractors in data_model.py are rewritten
for the new object model (vehicle.charging.*, vehicle.get_electric_drive(),
vehicle.climatization.*, etc.). Remaining time fields are now derived
from estimated_date_reached DateAttributes. Battery temperatures are
read directly in °C (no Kelvin conversion). Auth error handling drops
the manual re-login since the connector manages token refresh internally.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Compute estimated full-charge range from totalRange and current SOC.
Guard against None values (_get returns None for missing keys) and
SOC = 0 to avoid TypeError / ZeroDivisionError on incomplete records.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
server/data_model.py:
- apply_procedural(record) — stub function; add computed fields to the
proc dict inside and they appear under record['procedural'] in every
record stored and broadcast.
- _get(data, *keys) — safe nested dict accessor for use inside
apply_procedural.
collect.py:
- New snapshots: apply_procedural() called after collect_snapshot(),
before appending to the store and broadcasting.
- Preloaded 24-h history: guarded apply (skip if 'procedural' already
present) applied after load_last_24h_records().
- Current-day store loaded from disk: same guarded apply after
load_store(), so legacy records sent to clients are enriched on the fly.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Server (network.py): send every record in diff mode starting from
prev={}, including the first — fixes history drop on new client connect.
Collect (collect.py): remove payload["_diff"] = True from live broadcast.
GUI client (gui_client.py): always call jay_merge_full in diff mode;
drop the _diff key check that gated reconstruction.
CLI client (client.py): fix `args.diff or True` guard that made --diff
irrelevant.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Server (collect.py --diff):
- History burst: first record sent full, subsequent as jay_diff_full diffs
- Live broadcast: each snapshot diffed against the previous one
- Diff payloads tagged with "_diff": true
Client (client.py --diff):
- Reconstructs full state via jay_merge_full before printing
GUI (Connector tab "Diff mode" checkbox):
- TcpReader.connect_to() accepts diff_mode; maintains _state dict
- Merges incoming diffs before emitting to Dashboard/Plot
- Checkbox state persisted to plot_settings.json
Both sides default to off; must be enabled consistently on server and client.
utils/__init__.py added so utils.jay_diff is importable as a package.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Replace load_today_records with load_last_24h_records which computes a
rolling 24 h cutoff, globs log files for both the current and previous
calendar day, and filters records by timestamp — so clients always
receive a full 24 h window regardless of when midnight falls.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Previously load_today() was only called if in-memory records were empty,
which was never true once the first WeConnect poll had completed.
Now disk records are loaded unconditionally at startup and merged with
live in-memory records (dedup by ts) when a client connects.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
storage_helpers: load_today_records() scans logs/ for all files
matching today's UTC date and VIN, merges and sorts their records.
network: _accept_loop receives an optional load_today callable;
if store_ref["current"] has no records it calls load_today() to
replay the day's history from disk before adding the client.
collect: passes a load_today lambda (None when -o is used).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
data_model, log_config, network, storage_helpers, we_connect are now
under server/. collect.py stays in the project root and imports via
the server package.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
jensandClaude Sonnet 4.6