Equipos y variables: pool por liga-temporada, similitud %, autocompletar variables

- Top equipos: pool por liga-temporada (chips) + selector de N (5/10/20/30).
- Similares: mismo pool por liga-temporada; el score ahora es similitud 0-100%
(exp(-dist/sqrt(#vars))) en vez de distancia.
- Variables: validación al escribir — solo permite variables existentes, autocompleta
a la más parecida o limpia con aviso.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

src/racing_reports/api/routes_team_vars.py

@@ -21,6 +21,7 @@ class SearchRequest(BaseModel):
     season: str
     specs: list[VarSpec]
     top: int = 5
+    pool: list[str] = []   # pool por liga-temporada ['Liga|Temp', ...] (prioridad)
 
 
 class ProfileRequest(BaseModel):
@@ -41,6 +42,7 @@ class SimilarRequest(BaseModel):
     scope: str = "all"  # "all" (todas las ligas/temporadas) | "liga"
     top: int = 8
     leagues: list[str] = []   # pool de ligas elegidas (prioridad sobre scope)
+    pool: list[str] = []      # pool por liga-temporada ['Liga|Temp', ...] (máxima prioridad)
     z_mode: str = "pool"      # "pool" (la selección) | "todas" | "liga" (cada uno vs su liga)
 
 
@@ -61,12 +63,13 @@ def search(req: SearchRequest) -> dict:
     bad = [s.direction for s in req.specs if s.direction not in team_vars.DIRECTIONS]
     if bad:
         raise HTTPException(status_code=400, detail=f"Dirección inválida: {bad}")
-    top = min(max(req.top, 1), 25)
+    top = min(max(req.top, 1), 30)
     specs = [s.model_dump() for s in req.specs]
-    res = team_vars.search(req.league, req.season, specs, top=top)
+    res = team_vars.search(req.league, req.season, specs, top=top, pool_pairs=req.pool or None)
     # radar comparando el top (hasta 6 para que sea legible); best-effort
     try:
-        res["radar_b64"] = team_vars.search_radar_png(req.league, req.season, specs, top=min(top, 6))
+        res["radar_b64"] = team_vars.search_radar_png(req.league, req.season, specs,
+                                                      top=min(top, 6), pool_pairs=req.pool or None)
     except Exception:
         res["radar_b64"] = None
     return res
@@ -96,4 +99,5 @@ def similar(req: SimilarRequest) -> dict:
     z_mode = req.z_mode if req.z_mode in ("pool", "todas", "liga") else "pool"
     top = min(max(req.top, 1), 30)
     return team_vars.similar_teams(req.league, req.season, req.team, req.variables, scope,
-                                   top=top, leagues=req.leagues or None, z_mode=z_mode)
+                                   top=top, leagues=req.leagues or None, z_mode=z_mode,
+                                   pool_pairs=req.pool or None)

src/racing_reports/team_vars.py

@@ -108,6 +108,30 @@ def _pool(league: str, season: str) -> pd.DataFrame:
     return p[p["n_partidos"] >= MIN_PARTIDOS].copy()
 
 
+def _parse_pairs(pool: list[str] | None) -> list[tuple[str, str]]:
+    """['Liga|25-26', ...] -> [('Liga','25-26'), ...]. Ignora entradas mal formadas."""
+    out: list[tuple[str, str]] = []
+    for item in pool or []:
+        s = str(item)
+        if "|" in s:
+            lg, se = s.split("|", 1)
+            lg, se = lg.strip(), se.strip()
+            if lg and se:
+                out.append((lg, se))
+    return out
+
+
+def _pool_from_pairs(pairs: list[tuple[str, str]]) -> pd.DataFrame:
+    """Pool = unión de las (liga, temporada) elegidas (con ≥MIN_PARTIDOS)."""
+    d = _df()
+    if d.empty or not pairs:
+        return d.iloc[0:0] if not d.empty else d
+    keyset = {(lg, se) for lg, se in pairs}
+    key = list(zip(d["competencia"].astype(str), d["temporada"].astype(str)))
+    mask = pd.Series([k in keyset for k in key], index=d.index)
+    return d[mask & (d["n_partidos"] >= MIN_PARTIDOS)].copy()
+
+
 def teams(league: str, season: str) -> list[str]:
     """Equipos de una liga+temporada (para el selector del perfil)."""
     d = _df()
@@ -202,13 +226,15 @@ def _zmatrix_per_league(pool: pd.DataFrame, variables: list[str]) -> pd.DataFram
 
 def similar_teams(league: str, season: str, team: str, variables: list[str],
                   scope: str = "all", top: int = 8,
-                  leagues: list[str] | None = None, z_mode: str = "pool") -> dict:
+                  leagues: list[str] | None = None, z_mode: str = "pool",
+                  pool_pairs: list[str] | None = None) -> dict:
     """Equipos más parecidos por DISTANCIA EUCLÍDEA en el espacio de z-scores.
 
-    Pool: ``leagues`` (lista de ligas elegidas, todas sus temporadas) tiene prioridad;
-    si no, ``scope='all'`` (todo) o ``'liga'`` (su liga-temporada).
-    z_mode: ``'pool'`` = stats de la selección; ``'todas'`` = stats de todas las
-    ligas/temporadas; ``'liga'`` = cada equipo estandarizado contra SU liga-temporada.
+    Pool (por prioridad): ``pool_pairs`` (['Liga|Temp', ...]) > ``leagues`` (ligas,
+    todas sus temporadas) > ``scope='all'`` (todo) / ``'liga'`` (su liga-temporada).
+    Devuelve ``similitud`` en 0-100% (además de la distancia).
+    z_mode: ``'pool'`` = stats de la selección; ``'todas'`` = todas las ligas;
+    ``'liga'`` = cada equipo estandarizado contra SU liga-temporada.
     """
     d = _df()
     if d.empty:
@@ -219,7 +245,11 @@ def similar_teams(league: str, season: str, team: str, variables: list[str],
         return {"teams": [], "error": f"No se encontró {team} en {league} {season}."}
     row_idx = row.index[0]
     row = row.iloc[0]
-    if leagues:
+    pairs = _parse_pairs(pool_pairs)
+    if pairs:
+        pool = _pool_from_pairs(pairs)
+        scope_label = ", ".join(f"{lg} {se}" for lg, se in pairs)
+    elif leagues:
         pool = d[(d["n_partidos"] >= MIN_PARTIDOS) & (d["competencia"].astype(str).isin([str(x) for x in leagues]))]
         scope_label = "ligas: " + ", ".join(leagues)
     elif scope == "all":
@@ -257,12 +287,17 @@ def similar_teams(league: str, season: str, team: str, variables: list[str],
                & (pool["equipo"].astype(str) == str(team)))
     dist = dist[~is_self.values]
     order = dist.sort_values().head(top).index
+    # Similitud 0-100%: normaliza la distancia por variable (RMS de z) y la pasa por
+    # una exponencial. 100% = idéntico; ~1 desvío promedio por variable ≈ 37%.
+    n_vars = max(1, zmat.shape[1])
+    import math
     teams = [{
         "equipo": str(pool.loc[i, "equipo"]),
         "competencia": str(pool.loc[i, "competencia"]),
         "temporada": str(pool.loc[i, "temporada"]),
         "partidos": int(pool.loc[i, "n_partidos"]),
         "distancia": round(float(dist[i]), 2),
+        "similitud": round(100.0 * math.exp(-float(dist[i]) / (n_vars ** 0.5)), 1),
     } for i in order]
     return {"equipo": str(team), "competencia": str(league), "temporada": str(season),
             "scope": scope_label,
@@ -341,7 +376,8 @@ def radar_png(league: str, season: str, team: str, variables: list[str], scope:
     return base64.b64encode(buf.getvalue()).decode("ascii")
 
 
-def search_radar_png(league: str, season: str, specs: list[dict], top: int = 5) -> str | None:
+def search_radar_png(league: str, season: str, specs: list[dict], top: int = 5,
+                     pool_pairs: list[str] | None = None) -> str | None:
     """Radar comparando los TOP-N equipos de la búsqueda en las variables elegidas.
     Cada eje = una variable (en z-score sobre el pool); un polígono por equipo.
     Devuelve PNG base64 o None si hay <3 variables válidas o sin resultados."""
@@ -354,12 +390,13 @@ def search_radar_png(league: str, season: str, specs: list[dict], top: int = 5)
     from matplotlib.lines import Line2D
     from mplsoccer import Radar
 
-    pool = _pool(league, season)
+    pairs = _parse_pairs(pool_pairs)
+    pool = _pool_from_pairs(pairs) if pairs else _pool(league, season)
     valid = [s for s in specs if s.get("variable") in pool.columns and s.get("direction") in DIRECTIONS]
     variables = list(dict.fromkeys(s["variable"] for s in valid))
     if pool.empty or len(variables) < 3:
         return None
-    res = search(league, season, specs, top=top)
+    res = search(league, season, specs, top=top, pool_pairs=pool_pairs)
     teams = res.get("teams", [])
     if not teams:
         return None
@@ -400,11 +437,19 @@ def search_radar_png(league: str, season: str, specs: list[dict], top: int = 5)
     return base64.b64encode(buf.getvalue()).decode("ascii")
 
 
-def search(league: str, season: str, specs: list[dict], top: int = 5) -> dict:
-    """specs = [{"variable", "direction"}]. Devuelve top-N equipos por puntaje."""
-    pool = _pool(league, season)
-    lg_lbl = "todas las ligas" if (not league or league == ALL) else league
-    se_lbl = "todas las temporadas" if (not season or season == ALL) else season
+def search(league: str, season: str, specs: list[dict], top: int = 5,
+           pool_pairs: list[str] | None = None) -> dict:
+    """specs = [{"variable", "direction"}]. Devuelve top-N equipos por puntaje.
+    ``pool_pairs`` (['Liga|Temp', ...]) define el pool por liga-temporada; si no,
+    se usa ``league``/``season`` (o el sentinela ALL)."""
+    pairs = _parse_pairs(pool_pairs)
+    if pairs:
+        pool = _pool_from_pairs(pairs)
+        lg_lbl, se_lbl = ", ".join(f"{lg} {se}" for lg, se in pairs), ""
+    else:
+        pool = _pool(league, season)
+        lg_lbl = "todas las ligas" if (not league or league == ALL) else league
+        se_lbl = "todas las temporadas" if (not season or season == ALL) else season
     if pool.empty:
         return {"teams": [], "pool_size": 0,
                 "warning": f"Sin equipos con ≥{MIN_PARTIDOS} partidos en {lg_lbl} · {se_lbl}."}

src/racing_reports/web/templates/home.html

@@ -265,6 +265,31 @@
         <datalist id="tv-vars-list">
           <template x-for="v in tvVarLabels" :key="v"><option :value="v"></option></template>
         </datalist>
+        <datalist id="tv-ls-list">
+          <template x-for="o in tvLsOptions" :key="o.value"><option :value="o.label"></option></template>
+        </datalist>
+        <!-- Pool por liga-temporada -->
+        <div class="flex flex-wrap items-end gap-3 mb-2">
+          <div>
+            <label class="block text-xs text-gray-400 mb-1">Pool: elegí liga-temporada/s</label>
+            <input list="tv-ls-list" x-model="tvPoolIn" @change="tvAddPool()" placeholder="Ej: Spanish La Liga · 25-26"
+                   class="bg-ink-800 border border-ink-600 rounded-lg px-3 py-2 text-sm w-72">
+          </div>
+          <div>
+            <label class="block text-xs text-gray-400 mb-1">Mostrar</label>
+            <select x-model.number="tvTop" class="bg-ink-800 border border-ink-600 rounded-lg px-3 py-2 text-sm">
+              <option :value="5">5 equipos</option><option :value="10">10 equipos</option>
+              <option :value="20">20 equipos</option><option :value="30">30 equipos</option>
+            </select>
+          </div>
+        </div>
+        <div class="flex flex-wrap gap-1 mb-2" x-show="tvPool.length">
+          <template x-for="(p,i) in tvPool" :key="'tvpool'+p.value">
+            <span class="text-xs bg-ink-800 border border-ink-600 rounded-full px-2 py-1"><span x-text="p.label"></span>
+              <button @click="tvPool.splice(i,1)" class="text-red-300 ml-1">×</button></span>
+          </template>
+        </div>
+        <p class="text-xs text-gray-500 mb-2" x-show="tvPool.length">Con pool armado, el ranking sale de esas ligas-temporadas (se ignora el selector de arriba).</p>
         <div class="flex flex-wrap items-center gap-1 mb-2">
           <span class="text-xs text-gray-400 mr-1">Agregar tipo:</span>
           <template x-for="t in tvTypeList" :key="t">
@@ -275,7 +300,8 @@
         <div class="space-y-2">
           <template x-for="(sp, i) in tvSpecs" :key="i">
             <div class="flex gap-2 items-center">
-              <input x-model="sp.variable" list="tv-vars-list" placeholder="Escribí para buscar una variable…"
+              <input x-model="sp.variable" list="tv-vars-list" @change="tvValidateVar(i)" @blur="tvValidateVar(i)"
+                     placeholder="Escribí para buscar una variable…"
                      class="flex-1 bg-ink-800 border border-ink-600 rounded-lg px-3 py-2 text-sm" />
               <select x-model="sp.direction" class="bg-ink-800 border border-ink-600 rounded-lg px-3 py-2 text-sm">
                 <option value="alto">Alto</option>
@@ -455,10 +481,9 @@
             </select>
           </div>
           <div>
-            <label class="block text-xs text-gray-400 mb-1">…o sumar ligas al pool</label>
-            <input list="tvsligalist" x-model="tvsLigaIn" @change="tvsAddLiga()" placeholder="Liga…"
-                   class="bg-ink-800 border border-ink-600 rounded-lg px-3 py-2 text-sm w-52">
-            <datalist id="tvsligalist"><template x-for="l in tvLeagueList.filter(x=>x!=='__all__')" :key="'tvsl'+l"><option :value="l"></option></template></datalist>
+            <label class="block text-xs text-gray-400 mb-1">…o armá un pool de liga-temporada/s</label>
+            <input list="tv-ls-list" x-model="tvsPoolIn" @change="tvsAddPool()" placeholder="Ej: Spanish La Liga · 25-26"
+                   class="bg-ink-800 border border-ink-600 rounded-lg px-3 py-2 text-sm w-72">
           </div>
           <div>
             <label class="block text-xs text-gray-400 mb-1">Z-score contra</label>
@@ -472,20 +497,18 @@
                   :class="tvsLoading ? 'opacity-40 cursor-not-allowed' : 'hover:bg-racing-600'"
                   class="bg-racing-500 text-racing-900 font-semibold px-4 py-2 rounded-lg text-sm">Buscar similares</button>
         </div>
-        <div class="flex flex-wrap gap-1 mt-2" x-show="tvsLigas.length">
-          <template x-for="(lg,i) in tvsLigas" :key="'tvschip'+i">
-            <span class="text-xs bg-ink-800 border border-ink-600 rounded-full px-2 py-1">
-              <span x-text="lg"></span>
-              <button @click="tvsLigas.splice(i,1)" class="text-red-300 ml-1">×</button>
-            </span>
+        <div class="flex flex-wrap gap-1 mt-2" x-show="tvsPool.length">
+          <template x-for="(p,i) in tvsPool" :key="'tvspool'+p.value">
+            <span class="text-xs bg-ink-800 border border-ink-600 rounded-full px-2 py-1"><span x-text="p.label"></span>
+              <button @click="tvsPool.splice(i,1)" class="text-red-300 ml-1">×</button></span>
           </template>
         </div>
-        <p class="text-xs text-gray-500 mt-1" x-show="tvsLigas.length">Con ligas en el pool, "Buscar en" queda ignorado: los similares se buscan en esas ligas.</p>
+        <p class="text-xs text-gray-500 mt-1" x-show="tvsPool.length">Con pool armado, "Buscar en" queda ignorado: los similares se buscan en esas ligas-temporadas.</p>
         <p class="text-xs text-red-300 mt-2" x-show="tvsError" x-text="tvsError"></p>
         <div x-show="tvsResult && tvsResult.teams" class="mt-3">
           <div class="text-xs text-gray-400 mb-1">Más parecidos a <span class="text-gray-200" x-text="tvsResult?.equipo"></span> · vs <span x-text="tvsResult?.scope"></span> (<span x-text="tvsResult?.pool_size"></span> equipos)</div>
           <table class="w-full text-xs">
-            <thead><tr class="text-gray-400 text-left"><th class="py-1">#</th><th>Equipo</th><th>Liga</th><th>Temp.</th><th class="text-right">Distancia</th></tr></thead>
+            <thead><tr class="text-gray-400 text-left"><th class="py-1">#</th><th>Equipo</th><th>Liga</th><th>Temp.</th><th class="text-right">Similitud</th></tr></thead>
             <tbody>
               <template x-for="(t, i) in (tvsResult?.teams || [])" :key="t.competencia+t.temporada+t.equipo">
                 <tr class="border-t border-ink-600">
@@ -493,7 +516,7 @@
                   <td x-text="t.equipo"></td>
                   <td class="text-gray-400" x-text="t.competencia"></td>
                   <td class="text-gray-400" x-text="t.temporada"></td>
-                  <td class="text-right font-semibold" x-text="t.distancia"></td>
+                  <td class="text-right font-semibold text-racing-500" x-text="(t.similitud!=null? t.similitud+'%' : t.distancia)"></td>
                 </tr>
               </template>
             </tbody>
@@ -992,6 +1015,8 @@
       tvLeagues: {}, tvLeagueList: [], tvLeague: '__all__', tvSeason: '__all__', tvSeasons: [], tvAllSeasons: [],
       tvVarLabels: [], tvLabelToCol: {}, tvColToLabel: {}, tvTypeCols: {}, tvTypeList: [],
       tvSpecs: [{variable:'', direction:'alto'}], tvResult: null, tvLoading: false, tvError: '', tvLoaded: false,
+      tvLsOptions: [], tvPool: [], tvPoolIn: '', tvTop: 10,   // pool por liga-temporada + nº de equipos
+      tvsPool: [], tvsPoolIn: '',                              // pool por liga-temporada (similares)
       // Perfil de un equipo (z-score)
       tvpLeague:'', tvpSeason:'', tvpSeasons:[], tvpTeam:'', tvpTeams:[], tvpScope:'liga',
       tvpVars:[''], tvpResult:null, tvpLoading:false, tvpError:'', tvpZmax:3, tvpShowMean:false, tvpShowBest:false,
@@ -1042,6 +1067,13 @@
           this.tvTypeCols = o.types || {}; this.tvTypeList = Object.keys(this.tvTypeCols);
           this.tvLeagueList = Object.keys(this.tvLeagues);
           this.tvAllSeasons = [...new Set([].concat(...Object.values(this.tvLeagues)))].sort().reverse();
+          // opciones de pool por liga-temporada (para "Top equipos" y "Similares")
+          this.tvLsOptions = [];
+          this.tvLeagueList.filter(l=>l!=='__all__').forEach(lg=>{
+            (this.tvLeagues[lg]||[]).slice().sort().reverse().forEach(se=>{
+              this.tvLsOptions.push({label: lg+' · '+se, value: lg+'|'+se});
+            });
+          });
           this.tvOnLeague();
           // panel de perfil: liga/temporada/equipo concretos por default
           this.tvpLeague = this.tvLeagueList.includes('Spanish Segunda Division') ? 'Spanish Segunda Division' : (this.tvLeagueList[0]||'');
@@ -1101,7 +1133,7 @@
         try {
           const r = await fetch('/api/team-vars/similar', {
             method:'POST', headers:{'Content-Type':'application/json'},
-            body: JSON.stringify({league:this.tvpLeague, season:this.tvpSeason, team:this.tvpTeam, variables:vars, scope:this.tvsScope, top:10, leagues:this.tvsLigas, z_mode:this.tvsZmode}),
+            body: JSON.stringify({league:this.tvpLeague, season:this.tvpSeason, team:this.tvpTeam, variables:vars, scope:this.tvsScope, top:10, leagues:this.tvsLigas, pool:this.tvsPool.map(p=>p.value), z_mode:this.tvsZmode}),
           });
           if (!r.ok) throw new Error((await r.json().catch(()=>({detail:r.statusText}))).detail);
           const res = await r.json();
@@ -1142,16 +1174,32 @@
         if(!this.tvpVars.length) this.tvpVars.push('');
       },
       tvRemoveVar(i){ this.tvSpecs.splice(i,1); if(!this.tvSpecs.length) this.tvAddVar(); },
+      // Solo permite variables que existan; completa a la más parecida o limpia.
+      tvValidateVar(i){
+        const val=(this.tvSpecs[i].variable||'').trim();
+        if(!val) return;
+        if(this.tvVarLabels.includes(val)){ this.tvError=''; return; }
+        const low=val.toLowerCase();
+        const m=this.tvVarLabels.find(l=>l.toLowerCase()===low)
+              || this.tvVarLabels.find(l=>l.toLowerCase().startsWith(low))
+              || this.tvVarLabels.find(l=>l.toLowerCase().includes(low));
+        if(m){ this.tvSpecs[i].variable=m; this.tvError=''; }
+        else { this.tvSpecs[i].variable=''; this.tvError='"'+val+'" no es una variable válida — elegila de la lista.'; }
+      },
+      // Pool por liga-temporada
+      tvAddPool(){ const o=this.tvLsOptions.find(x=>x.label===this.tvPoolIn); if(o && !this.tvPool.some(p=>p.value===o.value)) this.tvPool.push(o); this.tvPoolIn=''; },
+      tvsAddPool(){ const o=this.tvLsOptions.find(x=>x.label===this.tvsPoolIn); if(o && !this.tvsPool.some(p=>p.value===o.value)) this.tvsPool.push(o); this.tvsPoolIn=''; },
       async tvSearch(){
         this.tvError=''; this.tvResult=null;
         const specs = this.tvSpecs.filter(s=>s.variable).map(s=>({variable:(this.tvLabelToCol[s.variable]||s.variable), direction:s.direction}));
         if (!specs.length){ this.tvError='Elegí al menos una variable.'; return; }
-        if (!this.tvLeague || !this.tvSeason){ this.tvError='Elegí liga y temporada.'; return; }
+        const pool = this.tvPool.map(p=>p.value);
+        if (!pool.length && (!this.tvLeague || !this.tvSeason)){ this.tvError='Elegí liga y temporada, o armá un pool.'; return; }
         this.tvLoading=true;
         try {
           const r = await fetch('/api/team-vars/search', {
             method:'POST', headers:{'Content-Type':'application/json'},
-            body: JSON.stringify({league:this.tvLeague, season:this.tvSeason, specs, top:5}),
+            body: JSON.stringify({league:this.tvLeague, season:this.tvSeason, specs, top:(this.tvTop||10), pool}),
           });
           if (!r.ok) throw new Error((await r.json().catch(()=>({detail:r.statusText}))).detail);
           this.tvResult = await r.json();