Skip to content

Pass module name with consumables when tracking individual histories #1786

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

Merged
tamuri merged 4 commits into from
Jan 22, 2026
Merged

Pass module name with consumables when tracking individual histories #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22b1894
Pass module name and style fixes in logging
marghe-molaro Jan 21, 2026
3caa2aa
Style fix
marghe-molaro Jan 21, 2026
8a6fd49
Do not try to access module name unless dispatching, was causing prob…
marghe-molaro Jan 21, 2026
cae973e
Update src/tlo/methods/individual_history_tracker.py
marghe-molaro Jan 22, 2026
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
21 changes: 11 additions & 10 deletions src/tlo/methods/consumables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,17 @@ def _request_consumables(
items_used=items_used,
)

data = {
"target": target,
"module": module,
"event_name": event_name,
"Item_Available": str(items_available),
"Item_NotAvailable": str(items_not_available),
"Item_Used": str(items_used),
}

notifier.dispatch("consumables.post-request_consumables", data=data)
if notifier.has_listeners("consumables.post-request_consumables"):
data = {
"target": target,
"module": module.name,
"event_name": event_name,
"Item_Available": str(items_available),
"Item_NotAvailable": str(items_not_available),
"Item_Used": str(items_used),
}

notifier.dispatch("consumables.post-request_consumables", data=data)

# Return the result of the check on availability
return available
Expand Down
12 changes: 8 additions & 4 deletions src/tlo/methods/individual_history_tracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,14 @@ def on_consumable_request(self,data):
return

# Copy this info for individual
self.consumable_access[data['target']] = {
('ConsCall' + str(self.cons_call_number_within_event) + '_' + k): v
for k, v in data.items() if k != 'target'}

if data['target'] not in self.consumable_access:
self.consumable_access[data['target']] = {}

self.consumable_access[data['target']][f'ConsCall{self.cons_call_number_within_event}'] = {
(k): v
for k, v in data.items() if k not in ['target', 'module', 'event_name']
}

self.cons_call_number_within_event += 1
return

Expand Down