dandri/meshcore-bot
1
0
Fork 0
mirror of https://github.com/agessaman/meshcore-bot.git synced 2026-08-02 08:49:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): add type ignore for optionxform and handle None values in path inference

Browse Source 
- Added a type ignore comment for the assignment of optionxform in config_schema.py to suppress type checker warnings.
- Updated path inference logic to return None when bot latitude or longitude is not set, ensuring safer handling of missing values.
- Enhanced the decoding of path nodes to check for None before appending repeater details, preventing potential errors.
This commit is contained in:
agessaman
2026-07-12 16:31:05 -07:00
parent 2324f23832
commit ffee28c0ff
6 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/path_inference.py
+29 -24
View File
@@ -316,6 +316,9 @@ def get_node_location(node_id: str, cfg: PathInferenceConfig, *, db_manager, log
def select_by_simple_proximity(repeaters_with_location, cfg: PathInferenceConfig, *, logger):
"""Select the closest repeater to the bot, with a strong recency bias."""
if cfg.bot_latitude is None or cfg.bot_longitude is None:
return None, 0.0
scored_repeaters = calculate_recency_weighted_scores(repeaters_with_location, cfg)
scored_repeaters = [(r, score) for r, score in scored_repeaters if score >= MIN_RECENCY_THRESHOLD]
@@ -1118,18 +1121,19 @@ def decode_path_nodes(
if selection.status == 'resolved':
selected_repeater = selection.repeater
decoded_path.append({
'node_id': node_id,
'name': selected_repeater['name'],
'public_key': selected_repeater['public_key'],
'device_type': selected_repeater['device_type'],
'role': selected_repeater.get('role', 'repeater'),
'found': True,
'geographic_guess': selection.confidence < 0.8,
'collision': True,
'matches': selection.matches,
**_loc(selected_repeater),
})
if selected_repeater is not None:
decoded_path.append({
'node_id': node_id,
'name': selected_repeater['name'],
'public_key': selected_repeater['public_key'],
'device_type': selected_repeater['device_type'],
'role': selected_repeater.get('role', 'repeater'),
'found': True,
'geographic_guess': selection.confidence < 0.8,
'collision': True,
'matches': selection.matches,
**_loc(selected_repeater),
})
elif selection.status == 'collision':
fallback = selection.recent_repeaters[0]
decoded_path.append({
@@ -1146,18 +1150,19 @@ def decode_path_nodes(
})
elif selection.status == 'single':
repeater = selection.repeater
decoded_path.append({
'node_id': node_id,
'name': repeater['name'],
'public_key': repeater['public_key'],
'device_type': repeater['device_type'],
'role': repeater.get('role', 'repeater'),
'found': True,
'geographic_guess': False,
'collision': False,
'matches': 1,
**_loc(repeater),
})
if repeater is not None:
decoded_path.append({
'node_id': node_id,
'name': repeater['name'],
'public_key': repeater['public_key'],
'device_type': repeater['device_type'],
'role': repeater.get('role', 'repeater'),
'found': True,
'geographic_guess': False,
'collision': False,
'matches': 1,
**_loc(repeater),
})
else:
decoded_path.append({
'node_id': node_id,