browse MV db: routes/player.py

routes/player.py

@@ -1,4 +1,4 @@
-"""GET /api/player/{player_id}?season=... — full detail row."""
+"""GET /api/player/{player_id}?season=... — full detail for the browse drawer."""
 
 import json
 import math
@@ -10,11 +10,19 @@ from data import get_player
 
 router = APIRouter()
 
+# identity / meta columns excluded from the generic "stats" grid
+META_COLS = {
+    'playerId', 'tm_id', 'Jugador', 'Temporada', 'nationality', 'age', 'date_of_birth',
+    'Equipo', 'Competencia', 'Posicion', 'Posiciones', 'Estado', 'teamId', 'comps_list',
+    'comp_minutes', 'n_competitions', 'Minutos totales', 'Partidos jugados',
+    'mv_eos', 'mv_eos_prev', 'tm_mv_now', 'mv_source', 'match_path', 'match_conf',
+    'tm_position', 'tm_foot', 'tm_height', 'tm_contract_until', 'tm_url', 'tm_injuries',
+    'n_opta_ids',
+}
+
 
 def _clean(v):
-    if v is None:
-        return None
-    if isinstance(v, float) and (math.isnan(v) or pd.isna(v)):
+    if v is None or (isinstance(v, float) and (math.isnan(v) or pd.isna(v))):
         return None
     if isinstance(v, (pd.Timestamp,)):
         return v.isoformat()
@@ -26,17 +34,7 @@ def player_detail(player_id: str, season: str):
     res = get_player(player_id, season)
     if not res:
         raise HTTPException(404, f'player {player_id} season {season} not found')
-
     row = res['row']
-    blocks = {k.replace('block_', ''): float(v) for k, v in row.items()
-              if k.startswith('block_') and pd.notna(v)}
-
-    cm = row.get('comp_minutes')
-    if isinstance(cm, str) and cm.strip().startswith('{'):
-        try:
-            cm = json.loads(cm)
-        except Exception:
-            cm = None
 
     inj = row.get('tm_injuries')
     if isinstance(inj, str) and inj.strip().startswith('['):
@@ -47,6 +45,17 @@ def player_detail(player_id: str, season: str):
     elif not isinstance(inj, list):
         inj = None
 
+    history = [{k: _clean(v) for k, v in h.items()} for h in res['history']]
+
+    # all remaining numeric stat columns, non-null
+    stats = {}
+    for k, v in row.items():
+        if k in META_COLS:
+            continue
+        cv = _clean(v)
+        if cv is not None and isinstance(cv, (int, float)):
+            stats[k] = round(float(cv), 3)
+
     return {
         'playerId': str(row['playerId']),
         'season': row.get('Temporada'),
@@ -56,18 +65,19 @@ def player_detail(player_id: str, season: str):
         'pos': row.get('Posicion'),
         'minutos': int(row.get('Minutos totales') or 0),
         'partidos': int(row.get('Partidos jugados') or 0),
-        'n_competitions': int(row.get('n_competitions') or 1),
-        'comp_minutes': cm,
-        'age': _clean(row.get('age')) or _clean(row.get('tm_age')),
-        'nationality': _clean(row.get('nationality')) or _clean(row.get('tm_nationality')),
-        'foot': _clean(row.get('foot')) or _clean(row.get('tm_foot')),
-        'height': _clean(row.get('height')) or _clean(row.get('tm_height')),
-        'mv': _clean(row.get('tm_market_value')),
-        'contract': _clean(row.get('tm_contract_until')) or _clean(row.get('contract_end_date')),
-        'photo': _clean(row.get('tm_photo')),
+        'age': _clean(row.get('age')),
+        'nationality': _clean(row.get('nationality')),
+        'foot': _clean(row.get('tm_foot')),
+        'height': _clean(row.get('tm_height')),
+        'mv_eos': _clean(row.get('mv_eos')),
+        'mv_eos_prev': _clean(row.get('mv_eos_prev')),
+        'mv_now': _clean(row.get('tm_mv_now')),
+        'mv_source': _clean(row.get('mv_source')),
+        'match_conf': _clean(row.get('match_conf')),
+        'contract': _clean(row.get('tm_contract_until')),
         'tm_id': _clean(row.get('tm_id')),
         'tm_url': _clean(row.get('tm_url')),
-        'blocks': blocks,
-        'history': res['history'],
+        'history': history,
         'injuries': inj,
+        'stats': stats,
     }