ffbb-data-client 2.4.29__tar.gz → 2.4.30__tar.gz

{ffbb_data_client-2.4.29 → ffbb_data_client-2.4.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffbb-data-client
-Version: 2.4.29
+Version: 2.4.30
 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.29 → ffbb_data_client-2.4.30}/src/ffbb_data_client/api.py

@@ -97,7 +97,7 @@ l'ensemble des données publiques de la **Fédération Française de BasketBall*
 - ⭐ **Code Source GitHub** : [`https://github.com/nickdesi/ffbb-data-client`](https://github.com/nickdesi/ffbb-data-client)
 - 📖 **Documentation Sphinx complète** : [`https://nickdesi.github.io/ffbb-data-client/`](https://nickdesi.github.io/ffbb-data-client/)
 """,
-    version="2.4.25",
+    version="2.4.30",
     openapi_tags=TAGS_METADATA,
     docs_url=None,
     redoc_url=None,
@@ -693,9 +693,23 @@ async def search_ffbb(
             status_code=400,
             detail="Le terme de recherche doit comporter au moins 2 caractères.",
         )
+    # Résolution des acronymes fréquents (ex: SCBA -> Stade Clermontois Basket Auvergne)
+    _SEARCH_ACRONYMS = {
+        "SCBA": "Stade Clermontois Basket Auvergne",
+        "SCBF": "Stade Clermontois Basket Féminin",
+        "ASVEL": "LDLC ASVEL",
+        "SIG": "Strasbourg IG",
+        "JDA": "JDA Dijon",
+        "MSB": "Le Mans Sarthe Basket",
+        "EBPLO": "Elan Béarnais",
+        "CSP": "Limoges CSP",
+        "BCM": "Gravelines Dunkerque",
+        "ESSM": "Le Portel",
+    }
+    effective_query = _SEARCH_ACRONYMS.get(search_term.upper(), search_term)
     client = get_client()
     try:
-        results = client.multi_search(name=search_term)
+        results = client.multi_search(name=effective_query)
         return results
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Erreur de recherche: {e}")
@@ -975,6 +989,14 @@ async def get_club_matches(
             else (parsed_cat.numero_equipe if parsed_cat.numero_equipe else 1)
         )
 
+        res1 = getattr(m, "resultatEquipe1", None)
+        res2 = getattr(m, "resultatEquipe2", None)
+        is_played = bool(
+            getattr(m, "joue", False) or res1 is not None or res2 is not None
+        )
+        score_local = res1 if is_home else res2
+        score_opp = res2 if is_home else res1
+
         match_data: dict[str, Any] = {
             "ffbbMatchId": m_id,
             "team": scba_team,
@@ -990,6 +1012,14 @@ async def get_club_matches(
             "competition": comp_nom,
             "poule": poule_nom,
             "pouleId": poule_id,
+            "round": getattr(m, "numeroJournee", None)
+            or getattr(m, "numero_journee", None),
+            "isPlayed": is_played,
+            "scoreLocal": score_local,
+            "scoreOpponent": score_opp,
+            "scoreEquipe1": res1,
+            "scoreEquipe2": res2,
+            "competitionUrl": getattr(m, "url_competition", "") or "",
             "teamLogo": club_logo_url,
         }
         if opponent_logo:
@@ -1164,6 +1194,113 @@ async def get_lives():
         raise HTTPException(status_code=500, detail=str(e))
 
 
+@app.get(
+    "/api/v1/rencontre/{rencontre_id}",
+    tags=["Matchs & Calendriers"],
+    summary="Détails complets d'une rencontre FFBB",
+    response_description="Fiche officielle détaillée de la rencontre, scores, salle et officiels",
+)
+@app.get(
+    "/api/v1/match/{rencontre_id}",
+    tags=["Matchs & Calendriers"],
+    summary="Détails complets d'une rencontre FFBB (alias /match)",
+    include_in_schema=False,
+)
+async def get_rencontre_detail(
+    rencontre_id: str = PathParam(
+        ...,
+        description="ID FFBB de la rencontre (ex: '200000014753740')",
+        examples=["200000014753740"],
+    ),
+):
+    """Retourne la fiche détaillée d'un match officiel FFBB avec scores, salle résolue et détails des équipes."""
+    client = get_client()
+    try:
+        match_data = await client.get_rencontre_async(rencontre_id)
+        if not match_data:
+            raise HTTPException(
+                status_code=404, detail=f"Rencontre {rencontre_id} introuvable."
+            )
+        return match_data
+    except HTTPException:
+        raise
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@app.get(
+    "/api/v1/salle/{salle_id}",
+    tags=["Clubs"],
+    summary="Détails d'une salle / gymnase",
+    response_description="Fiche gymnase avec adresse complète et géolocalisation",
+)
+async def get_salle_detail(
+    salle_id: str = PathParam(
+        ...,
+        description="ID FFBB de la salle (ex: '6543')",
+        examples=["6543"],
+    ),
+):
+    """Retourne les informations complètes d'un gymnase (nom, rue, code postal, ville, cartographie)."""
+    client = get_client()
+    try:
+        salle = await client.get_salle_async(salle_id)
+        if not salle:
+            raise HTTPException(
+                status_code=404, detail=f"Salle {salle_id} introuvable."
+            )
+        return salle
+    except HTTPException:
+        raise
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@app.get(
+    "/api/v1/competition/{competition_id}",
+    tags=["Compétitions & Poules"],
+    summary="Détails d'une compétition",
+    response_description="Informations sur la compétition et composition des poules",
+)
+async def get_competition_detail(
+    competition_id: int = PathParam(
+        ...,
+        ge=1,
+        description="ID FFBB de la compétition (ex: 200000002898785)",
+        examples=[200000002898785],
+    ),
+):
+    """Retourne les métadonnées et la liste des poules associées à une compétition officielle FFBB."""
+    client = get_client()
+    try:
+        comp = await client.get_competition_async(competition_id)
+        if not comp:
+            raise HTTPException(
+                status_code=404,
+                detail=f"Compétition {competition_id} introuvable.",
+            )
+        return comp
+    except HTTPException:
+        raise
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@app.get(
+    "/api/v1/saisons",
+    tags=["Compétitions & Poules"],
+    summary="Liste des saisons officielles FFBB",
+    response_description="Historique et saison active",
+)
+async def get_saisons():
+    """Retourne la liste des saisons officielles FFBB avec indication de la saison en cours."""
+    client = get_client()
+    try:
+        return await client.get_saisons_async()
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 # --------------------------------------------------------------------------
 # Modern API Documentation Interfaces (Scalar, Swagger UI, ReDoc)
 # --------------------------------------------------------------------------

{ffbb_data_client-2.4.29 → ffbb_data_client-2.4.30}/src/ffbb_data_client/helpers/meilisearch_client_extension.py

@@ -79,10 +79,11 @@ def _build_pagination_jobs(
     return jobs
 
 
-def _single_result(multi: MultiSearchResults, index: int) -> MultiSearchResults:
+def _single_result(multi: MultiSearchResults, index: int) -> MultiSearchResults | None:
     """Isole le i-ème sous-résultat d'un multi_search dans un MultiSearchResults
     à un élément, pour une fusion cohérente avec ``_merge_page``."""
-    assert multi.results is not None
+    if not multi.results or index >= len(multi.results):
+        return None
     return MultiSearchResults(results=[multi.results[index]])
 
 
@@ -148,7 +149,10 @@ class MeilisearchClientExtension(MeilisearchClient):
         out: list[tuple[int, int, MultiSearchResults | None]] = []
         if new_result and new_result.results:
             for k, (orig_idx, offset, _q) in enumerate(batch):
-                out.append((orig_idx, offset, _single_result(new_result, k)))
+                if k < len(new_result.results):
+                    res = _single_result(new_result, k)
+                    if res is not None:
+                        out.append((orig_idx, offset, res))
         return out
 
     async def _fetch_batch_async(
@@ -162,7 +166,10 @@ class MeilisearchClientExtension(MeilisearchClient):
         out: list[tuple[int, int, MultiSearchResults | None]] = []
         if new_result and new_result.results:
             for k, (orig_idx, offset, _q) in enumerate(batch):
-                out.append((orig_idx, offset, _single_result(new_result, k)))
+                if k < len(new_result.results):
+                    res = _single_result(new_result, k)
+                    if res is not None:
+                        out.append((orig_idx, offset, res))
         return out
 
     def recursive_smart_multi_search(

{ffbb_data_client-2.4.29 → ffbb_data_client-2.4.30}/src/ffbb_data_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffbb-data-client
-Version: 2.4.29
+Version: 2.4.30
 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.29 → ffbb_data_client-2.4.30}/src/ffbb_data_client.egg-info/SOURCES.txt

@@ -320,6 +320,7 @@ tests/unit/test_310_discover_endpoints.py
 tests/unit/test_311_normalize_team_name.py
 tests/unit/test_312_api_cors.py
 tests/unit/test_313_api_metrics.py
+tests/unit/test_314_api_endpoints.py
 tests/unit/test_314_discover_permissions.py
 tests/unit/clients/__init__.py
 tests/unit/clients/test_200_api_ffbb_app_client.py

{ffbb_data_client-2.4.29 → ffbb_data_client-2.4.30}/src/ffbb_data_client.egg-info/scm_file_list.json

@@ -366,6 +366,7 @@
     "tests/unit/test_311_normalize_team_name.py",
     "tests/unit/test_312_api_cors.py",
     "tests/unit/test_313_api_metrics.py",
+    "tests/unit/test_314_api_endpoints.py",
     "tests/unit/test_314_discover_permissions.py",
     "tests/unit/utils/__init__.py",
     "tests/unit/utils/test_300_secure_logging.py",

{ffbb_data_client-2.4.29 → ffbb_data_client-2.4.30}/src/ffbb_data_client.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "2.4.29",
+  "tag": "2.4.30",
   "distance": 0,
-  "node": "gb20d81aba622329ff8f2e58ef0050f0e37df273c",
+  "node": "gfaf1a9cb9c6837dac2689031d7e582829983f79e",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-09-23"

{ffbb_data_client-2.4.29 → ffbb_data_client-2.4.30}/tests/unit/helpers/test_meilisearch_client_extension_recursive_pagination.py

@@ -91,3 +91,12 @@ def test_merge_page_with_empty_or_missing_results():
 
     # 3. orig_idx out of bounds
     _merge_page(res, 999, empty_page)
+
+
+def test_single_result_out_of_bounds_safety():
+    from ffbb_data_client.helpers.meilisearch_client_extension import _single_result
+
+    res = MultiSearchResults(results=[CompetitionsMultiSearchResult()])
+    assert _single_result(res, 0) is not None
+    assert _single_result(res, 1) is None
+    assert _single_result(MultiSearchResults(results=[]), 0) is None

ffbb_data_client-2.4.30/tests/unit/test_314_api_endpoints.py

@@ -0,0 +1,92 @@
+"""Tests for the new REST endpoints and match card enrichment in api.py."""
+
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+from httpx import ASGITransport, AsyncClient
+
+from ffbb_data_client.api import app
+
+
+@pytest.mark.asyncio
+async def test_search_acronym_expansion():
+    transport = ASGITransport(app=app)
+    mock_client = MagicMock()
+    mock_client.multi_search = MagicMock(
+        return_value=[
+            {"index_uid": "organismes", "hits": [{"nom": "STADE CLERMONTOIS"}]}
+        ]
+    )
+    with patch("ffbb_data_client.api.get_client", return_value=mock_client):
+        async with AsyncClient(transport=transport, base_url="http://test") as ac:
+            r = await ac.get("/api/v1/search?query=SCBA")
+            assert r.status_code == 200
+            # Ensure multi_search was called with expanded name
+            mock_client.multi_search.assert_called_with(
+                name="Stade Clermontois Basket Auvergne"
+            )
+
+
+@pytest.mark.asyncio
+async def test_match_card_enrichment():
+    transport = ASGITransport(app=app)
+    mock_client = MagicMock()
+    mock_org = MagicMock()
+    mock_org.nom = "STADE CLERMONTOIS BASKET AUVERGNE"
+    mock_org.logo = None
+    mock_org.engagements = []
+    mock_client.get_organisme_async = AsyncMock(return_value=mock_org)
+
+    with patch("ffbb_data_client.api.get_client", return_value=mock_client):
+        async with AsyncClient(transport=transport, base_url="http://test") as ac:
+            r = await ac.get("/api/v1/club/9326/matches")
+            assert r.status_code == 200
+            data = r.json()
+            assert "matches" in data
+
+
+@pytest.mark.asyncio
+async def test_rencontre_endpoint():
+    transport = ASGITransport(app=app)
+    mock_client = MagicMock()
+    mock_match = {"id": "12345", "nomEquipe1": "Eq A", "nomEquipe2": "Eq B"}
+    mock_client.get_rencontre_async = AsyncMock(return_value=mock_match)
+
+    with patch("ffbb_data_client.api.get_client", return_value=mock_client):
+        async with AsyncClient(transport=transport, base_url="http://test") as ac:
+            r = await ac.get("/api/v1/rencontre/12345")
+            assert r.status_code == 200
+            assert r.json().get("id") == "12345"
+
+            # Test alias /match
+            r_alias = await ac.get("/api/v1/match/12345")
+            assert r_alias.status_code == 200
+
+
+@pytest.mark.asyncio
+async def test_salle_and_competition_endpoints():
+    transport = ASGITransport(app=app)
+    mock_client = MagicMock()
+    mock_client.get_salle_async = AsyncMock(
+        return_value={"id": "6543", "libelle": "Gymnase Fleury"}
+    )
+    mock_client.get_competition_async = AsyncMock(
+        return_value={"id": "999", "nom": "DMU13"}
+    )
+    mock_client.get_saisons_async = AsyncMock(
+        return_value=[{"id": "1037", "nom": "2026-2027"}]
+    )
+
+    with patch("ffbb_data_client.api.get_client", return_value=mock_client):
+        async with AsyncClient(transport=transport, base_url="http://test") as ac:
+            r_salle = await ac.get("/api/v1/salle/6543")
+            assert r_salle.status_code == 200
+            assert r_salle.json().get("libelle") == "Gymnase Fleury"
+
+            r_comp = await ac.get("/api/v1/competition/999")
+            assert r_comp.status_code == 200
+            assert r_comp.json().get("nom") == "DMU13"
+
+            r_saisons = await ac.get("/api/v1/saisons")
+            assert r_saisons.status_code == 200
+            assert len(r_saisons.json()) == 1