fix: adapt cohort group metadata API to current anoph interfaces

Author: Sharon-codes

malariagen_data/anoph/base_params.py

@@ -81,6 +81,13 @@
     """,
 ]
 
+cohort_group_query: TypeAlias = Annotated[
+    str,
+    """
+    A pandas query string to be evaluated against cohort-group metadata.
+    """,
+]
+
 sample_indices: TypeAlias = Annotated[
     List[int],
     """

malariagen_data/anoph/cohort_group_metadata.py

@@ -3,7 +3,7 @@
 import pandas as pd
 from numpydoc_decorator import doc
 
-from ..util import check_types
+from ..util import _check_types
 from . import base_params
 from .base import AnophelesBase
 
@@ -18,7 +18,7 @@ def __init__(
         # to the superclass constructor.
         super().__init__(**kwargs)
 
-    @check_types
+    @_check_types
     @doc(
         summary="""
             Read metadata for a specific cohort group, including cohort size,

tests/anoph/test_cohort_group_metadata.py

@@ -1,43 +1,25 @@
 import pytest
 from pytest_cases import parametrize_with_cases
 
-from malariagen_data import af1 as _af1
 from malariagen_data import ag3 as _ag3
 from malariagen_data.anoph.cohort_group_metadata import AnophelesCohortGroupMetadata
 
 
 @pytest.fixture
 def ag3_sim_api(ag3_sim_fixture):
     return AnophelesCohortGroupMetadata(
-        url=ag3_sim_fixture.url,
+        url=ag3_sim_fixture.bucket_path.as_posix(),
+        public_url=ag3_sim_fixture.bucket_path.as_posix(),
         config_path=_ag3.CONFIG_PATH,
-        gcs_url=_ag3.GCS_URL,
         major_version_number=_ag3.MAJOR_VERSION_NUMBER,
         major_version_path=_ag3.MAJOR_VERSION_PATH,
         pre=True,
     )
 
-
-@pytest.fixture
-def af1_sim_api(af1_sim_fixture):
-    return AnophelesCohortGroupMetadata(
-        url=af1_sim_fixture.url,
-        config_path=_af1.CONFIG_PATH,
-        gcs_url=_af1.GCS_URL,
-        major_version_number=_af1.MAJOR_VERSION_NUMBER,
-        major_version_path=_af1.MAJOR_VERSION_PATH,
-        pre=False,
-    )
-
-
 def case_ag3_sim(ag3_sim_fixture, ag3_sim_api):
     return ag3_sim_fixture, ag3_sim_api
 
 
-def case_af1_sim(af1_sim_fixture, af1_sim_api):
-    return af1_sim_fixture, af1_sim_api
-
-
 def cohort_group_metadata_expected_columns():
     return {
         "cohort_id": "O",