ffbb-data-client 2.4.13__tar.gz → 2.4.14__tar.gz

{ffbb_data_client-2.4.13 → ffbb_data_client-2.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffbb-data-client
-Version: 2.4.13
+Version: 2.4.14
 Summary: API FFBB — SDK Python moderne & asynchrone pour les donnees officielles de la Federation Francaise de BasketBall (clubs, classements, calendriers, lives, Meilisearch). Alternative moderne a ffbb-api-client.
 Home-page: https://github.com/nickdesi/ffbb-data-client
 Author: nickdesi

{ffbb_data_client-2.4.13 → ffbb_data_client-2.4.14}/src/ffbb_data_client/api.py

@@ -25,6 +25,7 @@ from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 
 from .clients.ffbb_data_client import FFBBDataClient
+from .helpers.normalization import parse_categorie
 from .models.query_fields_manager import QueryFieldsManager
 from .utils.retry_utils import aclose_default_clients
 
@@ -165,42 +166,32 @@ def format_french_date(iso_str: str) -> str:
 
 
 def normalize_team_name(team_raw: str, comp_name: str = "") -> str:
-    raw = (team_raw or "").upper().strip()
-    comp = (comp_name or "").upper().strip()
-    combined = f"{raw} {comp}"
-
-    # Détection précise du genre (Féminin, Mixte, Masculin)
-    gender = "M"
-    if re.search(r"\b(F[EÉ]MININ[ES]?|NF\d*|RF\d*|DF\d*|PNF|U\d+F)\b", combined):
-        gender = "F"
-    elif re.search(r"\b(MIXTE|MIXED|U\d+MIXTE)\b", combined):
+    """Normalise le nom d'une équipe en réutilisant le parser centralisé parse_categorie."""
+    raw = (team_raw or "").strip()
+    comp = (comp_name or "").strip()
+    combined = f"{raw} {comp}".strip()
+
+    parsed = parse_categorie(combined)
+    cat = parsed.categorie or "SENIOR"
+    gender = parsed.sexe or "M"
+
+    if "MIXTE" in combined.upper() or "MIXED" in combined.upper():
         gender = "MIXTE"
-    elif re.search(r"\b(MASCULIN[ES]?|NM\d*|RM\d*|DM\d*|PNM|U\d+M)\b", combined):
-        gender = "M"
-
-    m_cat = re.search(r"U\s*(\d+)", combined)
-    if m_cat:
-        cat = m_cat.group(1)
-        m_num = re.search(r"[- ](\d+)$", raw)
-        num = m_num.group(1) if m_num else "1"
-        if gender == "MIXTE":
-            return f"U{cat} MIXTE" if num == "1" else f"U{cat} MIXTE {num}"
-        return f"U{cat} {gender}{num}"
 
+    # Priorité au numéro d'équipe explicitement présent dans le nom brut (ex: "STADE CLERMONTOIS - 2")
     m_num = re.search(r"[- ](\d+)$", raw)
-    num = m_num.group(1) if m_num else None
-
-    if not num:
-        if "RM2" in comp or "RF2" in comp or "DIVISION 2" in comp:
-            num = "2"
-        elif "RM3" in comp or "RF3" in comp or "DIVISION 3" in comp:
-            num = "3"
-        elif any(k in comp for k in ["PNM", "PNF", "PRE NATIONALE", "PRÉ NATIONALE"]):
-            num = "1"
-        else:
-            num = "1"
+    num = (
+        m_num.group(1)
+        if m_num
+        else (str(parsed.numero_equipe) if parsed.numero_equipe else "1")
+    )
+
+    if cat.startswith("U"):
+        if gender == "MIXTE":
+            return f"{cat} MIXTE" if num == "1" else f"{cat} MIXTE {num}"
+        return f"{cat} {gender}{num}"
 
-    return f"SENIOR {gender}{num}"
+    return f"{cat} {gender}{num}"
 
 
 def clean_opponent_name(opp_raw: str) -> str:

{ffbb_data_client-2.4.13 → ffbb_data_client-2.4.14}/src/ffbb_data_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffbb-data-client
-Version: 2.4.13
+Version: 2.4.14
 Summary: API FFBB — SDK Python moderne & asynchrone pour les donnees officielles de la Federation Francaise de BasketBall (clubs, classements, calendriers, lives, Meilisearch). Alternative moderne a ffbb-api-client.
 Home-page: https://github.com/nickdesi/ffbb-data-client
 Author: nickdesi

{ffbb_data_client-2.4.13 → ffbb_data_client-2.4.14}/src/ffbb_data_client.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "2.4.13",
+  "tag": "2.4.14",
   "distance": 0,
-  "node": "g0a154bdb6e13baa0747d442c2ce9ae10f948c833",
+  "node": "gba08d2d49115ef114aaaafa5f790c26d1d4ef9c3",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-09-14"

ffbb_data_client-2.4.14/tests/unit/test_311_normalize_team_name.py

@@ -0,0 +1,37 @@
+from ffbb_data_client.api import normalize_team_name
+
+
+def test_normalize_team_name_masculine():
+    assert (
+        normalize_team_name("GERZAT BASKET", "Départementale masculine U18") == "U18 M1"
+    )
+    assert (
+        normalize_team_name("STADE CLERMONTOIS - 2", "Départementale masculine U13")
+        == "U13 M2"
+    )
+    assert (
+        normalize_team_name(
+            "GERZAT BASKET", "Départementale masculine seniors - Division 3"
+        )
+        == "SENIOR M3"
+    )
+
+
+def test_normalize_team_name_feminine():
+    assert (
+        normalize_team_name("GERZAT BASKET", "Départementale féminine U18") == "U18 F1"
+    )
+    assert (
+        normalize_team_name("GERZAT BASKET", "Départementale féminine U13") == "U13 F1"
+    )
+    assert (
+        normalize_team_name(
+            "GERZAT BASKET", "Départementale féminine seniors - Division 2"
+        )
+        == "SENIOR F2"
+    )
+    assert normalize_team_name("GERZAT BASKET", "Amical U13F") == "U13 F1"
+
+
+def test_normalize_team_name_mixte():
+    assert normalize_team_name("GERZAT BASKET", "Départementale mixte U9") == "U9 MIXTE"

ffbb_data_client-2.4.13/tests/unit/test_311_normalize_team_name.py

@@ -1,19 +0,0 @@
-import pytest
-from ffbb_data_client.api import normalize_team_name
-
-
-def test_normalize_team_name_masculine():
-    assert normalize_team_name("GERZAT BASKET", "Départementale masculine U18") == "U18 M1"
-    assert normalize_team_name("STADE CLERMONTOIS - 2", "Départementale masculine U13") == "U13 M2"
-    assert normalize_team_name("GERZAT BASKET", "Départementale masculine seniors - Division 3") == "SENIOR M3"
-
-
-def test_normalize_team_name_feminine():
-    assert normalize_team_name("GERZAT BASKET", "Départementale féminine U18") == "U18 F1"
-    assert normalize_team_name("GERZAT BASKET", "Départementale féminine U13") == "U13 F1"
-    assert normalize_team_name("GERZAT BASKET", "Départementale féminine seniors - Division 2") == "SENIOR F2"
-    assert normalize_team_name("GERZAT BASKET", "Amical U13F") == "U13 F1"
-
-
-def test_normalize_team_name_mixte():
-    assert normalize_team_name("GERZAT BASKET", "Départementale mixte U9") == "U9 MIXTE"