ffbb-data-client 2.4.16__tar.gz → 2.4.18__tar.gz

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffbb-data-client
-Version: 2.4.16
+Version: 2.4.18
 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.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client/__init__.py

@@ -22,6 +22,7 @@ from .exceptions import (
 )
 from .helpers.meilisearch_client_extension import MeilisearchClientExtension
 from .helpers.multi_search_query_helper import generate_queries
+from .models.categorie_type import CategorieType
 from .models.club_contacts import ClubContacts
 from .models.competitions_facet_distribution import CompetitionsFacetDistribution
 from .models.competitions_facet_stats import CompetitionsFacetStats
@@ -55,6 +56,9 @@ from .models.multi_search_result_rencontres import RencontresMultiSearchResult
 from .models.multi_search_result_salles import SallesMultiSearchResult
 from .models.multi_search_result_terrains import TerrainsMultiSearchResult
 from .models.multi_search_result_tournois import TournoisMultiSearchResult
+from .models.niveau_extractor import NiveauExtractor, get_niveau_from_idcompetition
+from .models.niveau_info import NiveauInfo
+from .models.niveau_type import NiveauType
 from .models.organismes_facet_distribution import OrganismesFacetDistribution
 from .models.organismes_facet_stats import OrganismesFacetStats
 from .models.organismes_hit import OrganismesHit
@@ -169,6 +173,12 @@ __all__ = [
     "FFBBTokens",
     "TokenManager",
     "gather_with_concurrency",
+    # Extraction & Helpers
+    "NiveauExtractor",
+    "NiveauInfo",
+    "NiveauType",
+    "CategorieType",
+    "get_niveau_from_idcompetition",
 ]
 
 from importlib.metadata import PackageNotFoundError, version

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client/clients/_mixins/list_methods.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import AsyncIterator
 from typing import Any
 
 import httpx
@@ -219,6 +220,18 @@ class ListAllMixin:
     list_all_pratiques: Any
     list_all_pratiques_async: Any
 
+    # Method stubs for dynamically generated aiter_all generators
+    aiter_all_rencontres: Any
+    aiter_all_salles: Any
+    aiter_all_terrains: Any
+    aiter_all_tournois: Any
+    aiter_all_engagements: Any
+    aiter_all_formations: Any
+    aiter_all_entraineurs: Any
+    aiter_all_communes: Any
+    aiter_all_officiels: Any
+    aiter_all_pratiques: Any
+
     async def _list_all_directus_items_async(
         self,
         endpoint: str,
@@ -266,6 +279,43 @@ class ListAllMixin:
                 break
         return results[:max_items]
 
+    async def _aiter_all_directus_items(
+        self,
+        endpoint: str,
+        model_cls: type,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[Any]:
+        """Streaming async generator: yields items one by one across paginated Directus requests."""
+        offset = 0
+        yielded = 0
+        while yielded < max_items:
+            current_limit = min(page_size, max_items - yielded)
+            batch = await self._list_directus_items_async(
+                endpoint,
+                limit=current_limit,
+                filter_criteria=filter_criteria,
+                sort=sort,
+                offset=offset,
+                search=search,
+                cached_session=self.async_cached_session,
+            )
+            if not batch:
+                break
+            for r in batch:
+                if r:
+                    yield model_cls.from_dict(r)  # type: ignore[attr-defined]
+                    yielded += 1
+                    if yielded >= max_items:
+                        return
+            if len(batch) < current_limit:
+                break
+            offset += len(batch)
+
     def _list_all(
         self,
         endpoint: str,
@@ -341,8 +391,38 @@ def _make_list_all_method(endpoint: str, model_cls: Any, name: str) -> tuple[Any
     return list_all_method, list_all_method_async
 
 
+def _make_aiter_all_method(endpoint: str, model_cls: Any, name: str) -> Any:
+    """Factory: creates async aiter_all_X generator on ListAllMixin."""
+
+    def aiter_all_method(
+        self: Any,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[Any]:
+        return self._aiter_all_directus_items(  # type: ignore[no-any-return]
+            endpoint,
+            model_cls,
+            filter_criteria=filter_criteria,
+            sort=sort,
+            search=search,
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    aiter_all_method.__name__ = name
+    aiter_all_method.__qualname__ = f"ListAllMixin.{name}"
+    return aiter_all_method
+
+
 for _name, _cls in _LIST_ENDPOINTS.items():
     _endpoint = _ENDPOINT_MODULES[_name]
     _sync, _async = _make_list_all_method(_endpoint, _cls, f"list_all_{_name}")
     setattr(ListAllMixin, f"list_all_{_name}", _sync)
     setattr(ListAllMixin, f"list_all_{_name}_async", _async)
+    _aiter = _make_aiter_all_method(_endpoint, _cls, f"aiter_all_{_name}")
+    setattr(ListAllMixin, f"aiter_all_{_name}", _aiter)

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client/clients/_rest_facade.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import json
+from collections.abc import AsyncIterator
 from typing import Any
 
 import httpx
@@ -208,6 +209,27 @@ class _RestFacade:
             organisme=organisme, club_contact=club_contact, membres=membres
         )
 
+    async def get_club_contacts_async(
+        self,
+        organisme_id: int,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> ClubContacts | None:
+        """Async version: return club contact information (club-level + membres) for an organisme.
+
+        This method delegates to `get_organisme_async()` and uses the extractor helpers
+        to produce a compact `ClubContacts` object.
+        """
+        organisme = await self.get_organisme_async(
+            organisme_id, cached_session=cached_session
+        )
+        if not organisme:
+            return None
+        club_contact = extract_club_info(organisme)
+        membres = extract_membres_contacts(organisme)
+        return ClubContacts(
+            organisme=organisme, club_contact=club_contact, membres=membres
+        )
+
     def get_poule(
         self,
         poule_id: int,
@@ -1666,6 +1688,220 @@ class _RestFacade:
             cached_session=cached_session,
         )
 
+    # ------------------------------------------------------------------
+    # Streaming async generators (aiter_all_*)
+    # ------------------------------------------------------------------
+
+    def aiter_all_rencontres(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetRencontreResponse]:
+        """Streaming async generator for rencontres."""
+        return self._api.aiter_all_rencontres(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_salles(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetSalleResponse]:
+        """Streaming async generator for salles."""
+        return self._api.aiter_all_salles(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_terrains(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetTerrainResponse]:
+        """Streaming async generator for terrains."""
+        return self._api.aiter_all_terrains(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_tournois(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetTournoiResponse]:
+        """Streaming async generator for tournois."""
+        return self._api.aiter_all_tournois(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_engagements(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetEngagementResponse]:
+        """Streaming async generator for engagements."""
+        return self._api.aiter_all_engagements(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_formations(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetFormationResponse]:
+        """Streaming async generator for formations."""
+        return self._api.aiter_all_formations(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_entraineurs(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetEntraineurResponse]:
+        """Streaming async generator for entraineurs."""
+        return self._api.aiter_all_entraineurs(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_communes(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetCommuneResponse]:
+        """Streaming async generator for communes."""
+        return self._api.aiter_all_communes(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_officiels(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetOfficielResponse]:
+        """Streaming async generator for officiels."""
+        return self._api.aiter_all_officiels(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
+    def aiter_all_pratiques(
+        self,
+        filter_criteria: str | None = None,
+        sort: list[str] | None = None,
+        search: str | None = None,
+        page_size: int = 100,
+        max_items: int = 10000,
+        cached_session: httpx.AsyncClient | None = None,
+    ) -> AsyncIterator[GetPratiqueResponse]:
+        """Streaming async generator for pratiques."""
+        return self._api.aiter_all_pratiques(  # type: ignore[no-any-return]
+            filter_criteria=validate_filter_criteria(
+                filter_criteria, "filter_criteria"
+            ),
+            sort=validate_string_list(sort, "sort"),
+            search=validate_search_query(search, "search"),
+            page_size=page_size,
+            max_items=max_items,
+            cached_session=cached_session,
+        )
+
     # ------------------------------------------------------------------
     # Batch helpers
     # ------------------------------------------------------------------

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client/config.py

@@ -1,17 +1,12 @@
 """Centralized configuration for FFBB API client."""
 
-from importlib.metadata import PackageNotFoundError, version
-
 # API URLs
 API_FFBB_BASE_URL = "https://api.ffbb.app/"
 MEILISEARCH_BASE_URL = "https://meilisearch-prod.ffbb.app/"
 
 # HTTP Headers
-try:
-    _PACKAGE_VERSION = version("ffbb-data-client")
-except PackageNotFoundError:
-    _PACKAGE_VERSION = "development"
-DEFAULT_USER_AGENT = f"ffbb-data-client/{_PACKAGE_VERSION}"
+# Must impersonate the official mobile client (okhttp) to avoid BunnyCDN / WAF 403 Forbidden
+DEFAULT_USER_AGENT = "okhttp/4.12.0"
 
 # Environment variable names for tokens
 ENV_API_TOKEN = "API_FFBB_APP_BEARER_TOKEN"  # noqa: S105

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client/models/niveau_extractor.py

@@ -31,31 +31,39 @@ class NiveauExtractor:
         NiveauType.REGIONAL: [
             re.compile(r"\bREGIONAL\b"),
             re.compile(r"\bRÉGIONAL\b"),
+            re.compile(r"\bREGIONALE\b"),
+            re.compile(r"\bRÉGIONALE\b"),
             re.compile(r"\bR1\b"),
             re.compile(r"\bR2\b"),
             re.compile(r"\bR3\b"),
-            re.compile(r"\bREGIONALE\b"),
-            re.compile(r"^RÉGIONALE\b"),  # Format simple: "Régionale masculine seniors"
+            re.compile(r"\bPRE\s*REGIONAL\b"),
+            re.compile(r"\bPRÉ\s*RÉGIONAL\b"),
         ],
         NiveauType.DEPARTEMENTAL: [
             re.compile(r"\bDEPARTEMENTAL\b"),
             re.compile(r"\bDÉPARTEMENTAL\b"),
+            re.compile(r"\bDEPARTEMENTALE\b"),
+            re.compile(r"\bDÉPARTEMENTALE\b"),
             re.compile(r"\bD1\b"),
             re.compile(r"\bD2\b"),
             re.compile(r"\bD3\b"),
-            re.compile(r"\bDEPARTEMENTALE\b"),
-            re.compile(
-                r"^DÉPARTEMENTALE\b"
-            ),  # Format simple: "Départementale masculine seniors"
+            re.compile(r"\bD4\b"),
+            re.compile(r"\bD5\b"),
         ],
     }
 
     # Patterns pour extraire les numéros de division
     DIVISION_PATTERNS = [
-        re.compile(r"\b[DR](\d+)\b"),  # R1, R2, D1, D2, etc.
-        re.compile(r"\bREGIONAL\s+(\d+)\b"),  # REGIONAL 1, REGIONAL 2
-        re.compile(r"\bDEPARTEMENTAL\s+(\d+)\b"),  # DEPARTEMENTAL 1, DEPARTEMENTAL 2
+        re.compile(r"\b[DR](\d+)\b"),  # R1, R2, D1, D2, N1, etc.
+        re.compile(
+            r"\bR[ÉE]GIONALE?\s+(\d+)\b"
+        ),  # REGIONAL 1, REGIONALE 2, RÉGIONALE 2
+        re.compile(
+            r"\bD[ÉE]PARTEMENTALE?\s+(\d+)\b"
+        ),  # DEPARTEMENTAL 1, DEPARTEMENTALE 2
+        re.compile(r"\bNATIONALE?\s+(\d+)\b"),  # NATIONAL 1, NATIONALE 2
         re.compile(r"-\s*DIVISION\s+(\d+)\b"),  # - Division 3, - DIVISION 1
+        re.compile(r"\bDIV(?:ISION)?\s*(\d+)\b"),  # DIV 1, DIVISION 2
     ]
 
     # Patterns pour les catégories
@@ -182,14 +190,12 @@ class NiveauExtractor:
         Returns:
             Objet Niveau ou None
         """
-        # Essayer d'abord avec le nom de la compétition
         nom = competition_data.get("nom", "")
         niveau = cls.extract_niveau(nom)
 
         if niveau:
             return niveau
 
-        # Essayer avec le code de la compétition
         code = competition_data.get("code", "")
         if code:
             niveau = cls.extract_niveau(code)
@@ -197,7 +203,6 @@ class NiveauExtractor:
         return niveau
 
 
-# Fonctions utilitaires pour l'analyse
 def get_niveau_from_idcompetition(idcompetition) -> NiveauInfo | None:
     """
     Extrait le niveau depuis un objet IdCompetitionModel.

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client.egg-info/PKG-INFO

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

@@ -333,6 +333,7 @@ tests/unit/clients/test_meilisearch_async.py
 tests/unit/clients/test_search_many.py
 tests/unit/clients/test_v2_backport_search.py
 tests/unit/clients/test_v3_new_features.py
+tests/unit/clients/test_v4_aiter_and_contacts.py
 tests/unit/clients/test_warm_cache.py
 tests/unit/helpers/__init__.py
 tests/unit/helpers/test_400_http_helpers.py

{ffbb_data_client-2.4.16 → ffbb_data_client-2.4.18}/src/ffbb_data_client.egg-info/scm_file_list.json

@@ -323,6 +323,7 @@
     "tests/unit/clients/test_search_many.py",
     "tests/unit/clients/test_v2_backport_search.py",
     "tests/unit/clients/test_v3_new_features.py",
+    "tests/unit/clients/test_v4_aiter_and_contacts.py",
     "tests/unit/clients/test_warm_cache.py",
     "tests/unit/conftest.py",
     "tests/unit/helpers/__init__.py",

ffbb_data_client-2.4.18/src/ffbb_data_client.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.4.18",
+  "distance": 0,
+  "node": "g39d469ef3ba333658f0d405760eebb1bb3641b15",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-16"
+}