fix: params_b crashes the whole ranking on a malformed parameter_count (#1550)

This commit is contained in:
Afonso Coutinho
2026-06-03 06:23:30 +01:00
committed by GitHub
parent 398892cced
commit f93755e7a4
2 changed files with 31 additions and 1 deletions

View File

@@ -123,7 +123,13 @@ def params_b(model):
pc = pc.strip().upper() pc = pc.strip().upper()
m = re.match(r"^([\d.]+)\s*([BKMGT]?)$", pc) m = re.match(r"^([\d.]+)\s*([BKMGT]?)$", pc)
if m: if m:
val = float(m.group(1)) try:
val = float(m.group(1))
except ValueError:
# Malformed count like "1.5.3B" — [\d.]+ matches but float()
# rejects it. One bad catalog row must not abort the whole
# ranking pass, so treat it as unknown size.
return 0.0
suffix = m.group(2) suffix = m.group(2)
if suffix == "B": if suffix == "B":
return val return val

View File

@@ -0,0 +1,24 @@
"""Regression: params_b must not crash the ranking pass on a malformed count.
`parameter_count` is matched with `^([\\d.]+)\\s*([BKMGT]?)$`. The `[\\d.]+`
class happily matches a multi-dot value like "1.5.3B", but `float("1.5.3")`
raises ValueError. params_b is called for every model in analyze_model/
rank_models, so one bad catalog row aborted the entire ranking request. A
malformed count is now treated as unknown size (0.0) instead of raising.
"""
from services.hwfit.models import params_b
def test_malformed_multidot_count_does_not_raise():
assert params_b({"parameter_count": "1.5.3B"}) == 0.0
assert params_b({"parameter_count": "7.0.1B"}) == 0.0
def test_valid_counts_still_parse():
assert params_b({"parameter_count": "7B"}) == 7.0
assert params_b({"parameter_count": "70B"}) == 70.0
assert params_b({"parameter_count": "355M"}) == 0.355
def test_raw_param_count_preferred():
assert params_b({"parameters_raw": 7_000_000_000}) == 7.0