Skip to content

fix(plugin): guard against non-dict ledger records in accounting and repos #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tejas Lamba (TejasLamba2006) wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −3
Open

fix(plugin): guard against non-dict ledger records in accounting and repos #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tokeneconomizer/plugin/accounting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def summarize(records):

A session imported from the agent's history (`imported: true`) ran before the plugin: it is
counted on its own (`imported_sessions`) and left out of every other number."""
records = [r for r in records if isinstance(r, dict)]
imported = [r for r in records if r.get("kind") == "session" and r.get("imported")]
records = [r for r in records if not r.get("imported")]
sessions = [r for r in records if r.get("kind") == "session"]
Expand Down
7 changes: 4 additions & 3 deletions tokeneconomizer/plugin/repos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def dir_label(repo_dir):
if names:
return names[0][:-5].replace("__", "/")
for rec in reversed(st.read_lines("ledger.jsonl")):
if rec.get("repo"):
if isinstance(rec, dict) and rec.get("repo"):
return rec["repo"]
return ""

Expand Down Expand Up @@ -386,7 +386,8 @@ def _merge_host(src, dst, sids, whole, label="", timeout=LOCK_WAIT_S):
refold.add(sid)

incoming = set(sids)
s_ledger, d_ledger = src.read_lines("ledger.jsonl"), dst.read_lines("ledger.jsonl")
s_ledger = [r for r in src.read_lines("ledger.jsonl") if isinstance(r, dict)]
d_ledger = [r for r in dst.read_lines("ledger.jsonl") if isinstance(r, dict)]
# One session record per session: 0.1.0 could fold a session it had split over two keys
# under both, and its cost counts once -- the later fold's, which read the longer log.
# A refolded session's record is written again by its fold.
Expand Down Expand Up @@ -421,7 +422,7 @@ def _merge_host(src, dst, sids, whole, label="", timeout=LOCK_WAIT_S):
rec["folded"] = False
dst.write(os.path.join("sessions", f"{sid}.json"), rec)
for r in src.read_lines("events.jsonl"):
if r.get("session_id") in incoming:
if isinstance(r, dict) and r.get("session_id") in incoming:
dst.append("events.jsonl", r)
if whole:
_merge_envelope(src, dst)
Expand Down