ctftime-api 0.1.5__tar.gz → 0.2.0__tar.gz

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/.github/workflows/codeql.yml

@@ -21,7 +21,7 @@ jobs:
             build-mode: none
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/.github/workflows/docs.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6
@@ -46,7 +46,7 @@ jobs:
       - name: Upload docs
         if: ${{ (github.event.inputs.upload || github.ref_type == 'tag') }}
         id: deployment
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: site/
 

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/.github/workflows/publish.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6
@@ -50,7 +50,7 @@ jobs:
       - name: Sign build artifacts
         id: sign
         if: ${{ (github.event.inputs.upload || github.ref_type == 'tag') }}
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v3
         with:
           subject-path: "dist/*"
 
@@ -78,7 +78,7 @@ jobs:
     steps:
       - name: Retrieve release distributions
         id: download
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: release-dists
           path: dist/

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install uv
         uses: astral-sh/setup-uv@v6

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ctftime_api
-Version: 0.1.5
+Version: 0.2.0
 Summary: CTFTime API wrapper
 Project-URL: repository, https://github.com/jotonedev/ctftime_api
 Project-URL: documentation, https://jotonedev.github.io/ctftime_api/
@@ -20,16 +20,13 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
-Requires-Dist: httpx<0.29.0,>=0.28.1
-Requires-Dist: pycountry<25.0.0,>=24.6.1
-Requires-Dist: pydantic-extra-types<3.0.0,>=2.10.2
-Requires-Dist: pydantic<3.0.0,>=2.10.6
-Provides-Extra: speed
-Requires-Dist: brotli<2.0.0,>=1.1.0; (platform_python_implementation == 'CPython') and extra == 'speed'
-Requires-Dist: brotlicffi<2.0.0.0,>=1.1.0.0; (platform_python_implementation != 'CPython') and extra == 'speed'
-Requires-Dist: h2<5.0.0,>=4.2.0; extra == 'speed'
-Requires-Dist: uvloop<1.0.0,>=0.21.0; (sys_platform != 'win32') and extra == 'speed'
-Requires-Dist: zstandard<0.24.0,>=0.23.0; extra == 'speed'
+Requires-Dist: dataclasses-json==0.6.7
+Requires-Dist: httpx[http2]<0.29.0,>=0.28.1
+Requires-Dist: yarl>=1.20.1
+Provides-Extra: brotli
+Requires-Dist: httpx[brotli]; extra == 'brotli'
+Provides-Extra: zstd
+Requires-Dist: httpx[zstd]; extra == 'zstd'
 Description-Content-Type: text/markdown
 
 # ctftime_api

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/ctftime_api/client.py

@@ -4,10 +4,10 @@ from typing import Any
 
 import httpx
 from httpx import URL, Timeout
-from pydantic_extra_types.country import CountryAlpha2
 
+from ctftime_api.models.country import CountryCode
 from ctftime_api.models.event import Event, EventResult
-from ctftime_api.models.team import TeamRank, Team, TeamComplete
+from ctftime_api.models.team import Team, TeamComplete, TeamRank
 from ctftime_api.models.vote import Vote
 
 __all__ = ["CTFTimeClient"]
@@ -65,10 +65,10 @@ class CTFTimeClient:
         response: dict[str, list[dict]] = await self._get(url, params={"limit": limit})
         teams = response.get(f"{year}", [])
 
-        return [TeamRank.model_validate(team) for team in teams]
+        return [TeamRank.from_dict(team) for team in teams]
 
     async def get_top_team_by_country(
-        self, country: str | CountryAlpha2
+        self, country: str | CountryCode
     ) -> list[TeamRank]:
         """
         Get the top teams in the leaderboard for a specific country.
@@ -78,9 +78,7 @@ class CTFTimeClient:
         :raise httpx.HTTPStatusError: If the response status code is not successful.
         :raise ValueError: If the country is not a two-letter country code or a pycountry Country object.
         """
-        if isinstance(country, CountryAlpha2):
-            country = country
-        elif isinstance(country, str):
+        if isinstance(country, str):
             if len(country) != 2:
                 raise ValueError(
                     "Country must be a two-letter country code or a pycountry Country object."
@@ -89,7 +87,7 @@ class CTFTimeClient:
         url = self._base_url.join("top-by-country/").join(f"{country}/")
         teams: list[dict[str, Any]] = await self._get(url)
 
-        return [TeamRank.model_validate(team) for team in teams]
+        return [TeamRank.from_dict(team) for team in teams]
 
     async def get_events_information(
         self, start: int | datetime, end: int | datetime, limit: int = 10
@@ -118,7 +116,7 @@ class CTFTimeClient:
             url, params={"start": start, "finish": end, "limit": limit}
         )
 
-        return [Event.model_validate(event) for event in events]
+        return [Event.from_dict(event) for event in events]
 
     async def get_event_information(self, event_id: int) -> Event:
         """
@@ -130,7 +128,7 @@ class CTFTimeClient:
         url = self._base_url.join(f"events/{event_id}/")
         event: dict[str, Any] = await self._get(url)
 
-        return Event.model_validate(event)
+        return Event.from_dict(event)
 
     async def get_teams_information(
         self, limit: int = 100, offset: int = 0
@@ -149,7 +147,7 @@ class CTFTimeClient:
         )
         teams: list[dict[str, Any]] = response.get("results", [])
 
-        return [Team.model_validate(team) for team in teams]
+        return [Team.from_dict(team) for team in teams]
 
     async def get_team_information(self, team_id: int) -> TeamComplete:
         """
@@ -161,7 +159,7 @@ class CTFTimeClient:
         url = self._base_url.join(f"teams/{team_id}/")
         team: dict[str, Any] = await self._get(url)
 
-        return TeamComplete.model_validate(team)
+        return TeamComplete.from_dict(team)
 
     async def get_event_results(
         self, year: int | None = None
@@ -181,7 +179,7 @@ class CTFTimeClient:
         event: dict[str, dict] = await self._get(url)
 
         return {
-            int(ctf_id): EventResult(**result, ctf_id=int(ctf_id))
+            int(ctf_id): EventResult.from_dict(result)
             for ctf_id, result in event.items()
         }
 
@@ -206,4 +204,4 @@ class CTFTimeClient:
         url = self._base_url.join(f"votes/{year}/")
         votes: list[dict] = await self._get(url, timeout=timeout)
 
-        return [Vote(**vote) for vote in votes]
+        return [Vote.from_dict(vote) for vote in votes]

ctftime_api-0.2.0/ctftime_api/models/country.py

@@ -0,0 +1,259 @@
+from enum import StrEnum
+
+__all__ = ["CountryCode"]
+
+
+class CountryCode(StrEnum):
+    """
+    An enum for ISO 3166-1 alpha-2 country codes.
+    """
+
+    AFGHANISTAN = "AF"
+    ALAND_ISLANDS = "AX"
+    ALBANIA = "AL"
+    ALGERIA = "DZ"
+    AMERICAN_SAMOA = "AS"
+    ANDORRA = "AD"
+    ANGOLA = "AO"
+    ANGUILLA = "AI"
+    ANTARCTICA = "AQ"
+    ANTIGUA_AND_BARBUDA = "AG"
+    ARGENTINA = "AR"
+    ARMENIA = "AM"
+    ARUBA = "AW"
+    AUSTRALIA = "AU"
+    AUSTRIA = "AT"
+    AZERBAIJAN = "AZ"
+    BAHAMAS = "BS"
+    BAHRAIN = "BH"
+    BANGLADESH = "BD"
+    BARBADOS = "BB"
+    BELARUS = "BY"
+    BELGIUM = "BE"
+    BELIZE = "BZ"
+    BENIN = "BJ"
+    BERMUDA = "BM"
+    BHUTAN = "BT"
+    BOLIVIA_PLURINATIONAL_STATE_OF = "BO"
+    BONAIRE_SINT_EUSTATIUS_AND_SABA = "BQ"
+    BOSNIA_AND_HERZEGOVINA = "BA"
+    BOTSWANA = "BW"
+    BOUVET_ISLAND = "BV"
+    BRAZIL = "BR"
+    BRITISH_INDIAN_OCEAN_TERRITORY = "IO"
+    BRUNEI_DARUSSALAM = "BN"
+    BULGARIA = "BG"
+    BURKINA_FASO = "BF"
+    BURUNDI = "BI"
+    CABO_VERDE = "CV"
+    CAMBODIA = "KH"
+    CAMEROON = "CM"
+    CANADA = "CA"
+    CAYMAN_ISLANDS = "KY"
+    CENTRAL_AFRICAN_REPUBLIC = "CF"
+    CHAD = "TD"
+    CHILE = "CL"
+    CHINA = "CN"
+    CHRISTMAS_ISLAND = "CX"
+    COCOS_KEELING_ISLANDS = "CC"
+    COLOMBIA = "CO"
+    COMOROS = "KM"
+    CONGO_THE_DEMOCRATIC_REPUBLIC_OF_THE = "CD"
+    CONGO = "CG"
+    COOK_ISLANDS = "CK"
+    COSTA_RICA = "CR"
+    COTE_D_IVOIRE = "CI"
+    CROATIA = "HR"
+    CUBA = "CU"
+    CURACAO = "CW"
+    CYPRUS = "CY"
+    CZECHIA = "CZ"
+    DENMARK = "DK"
+    DJIBOUTI = "DJ"
+    DOMINICA = "DM"
+    DOMINICAN_REPUBLIC = "DO"
+    ECUADOR = "EC"
+    EGYPT = "EG"
+    EL_SALVADOR = "SV"
+    EQUATORIAL_GUINEA = "GQ"
+    ERITREA = "ER"
+    ESTONIA = "EE"
+    ESWATINI = "SZ"
+    ETHIOPIA = "ET"
+    FALKLAND_ISLANDS_MALVINAS = "FK"
+    FAROE_ISLANDS = "FO"
+    FIJI = "FJ"
+    FINLAND = "FI"
+    FRANCE = "FR"
+    FRENCH_GUIANA = "GF"
+    FRENCH_POLYNESIA = "PF"
+    FRENCH_SOUTHERN_TERRITORIES = "TF"
+    GABON = "GA"
+    GAMBIA = "GM"
+    GEORGIA = "GE"
+    GERMANY = "DE"
+    GHANA = "GH"
+    GIBRALTAR = "GI"
+    GREECE = "GR"
+    GREENLAND = "GL"
+    GRENADA = "GD"
+    GUADELOUPE = "GP"
+    GUAM = "GU"
+    GUATEMALA = "GT"
+    GUERNSEY = "GG"
+    GUINEA = "GN"
+    GUINEA_BISSAU = "GW"
+    GUYANA = "GY"
+    HAITI = "HT"
+    HEARD_ISLAND_AND_MCDONALD_ISLANDS = "HM"
+    HOLY_SEE = "VA"
+    HONDURAS = "HN"
+    HONG_KONG = "HK"
+    HUNGARY = "HU"
+    ICELAND = "IS"
+    INDIA = "IN"
+    INDONESIA = "ID"
+    IRAN_ISLAMIC_REPUBLIC_OF = "IR"
+    IRAQ = "IQ"
+    IRELAND = "IE"
+    ISLE_OF_MAN = "IM"
+    ISRAEL = "IL"
+    ITALY = "IT"
+    JAMAICA = "JM"
+    JAPAN = "JP"
+    JERSEY = "JE"
+    JORDAN = "JO"
+    KAZAKHSTAN = "KZ"
+    KENYA = "KE"
+    KIRIBATI = "KI"
+    KOREA_THE_DEMOCRATIC_PEOPLES_REPUBLIC_OF = "KP"
+    KOREA_THE_REPUBLIC_OF = "KR"
+    KUWAIT = "KW"
+    KYRGYZSTAN = "KG"
+    LAO_PEOPLES_DEMOCRATIC_REPUBLIC = "LA"
+    LATVIA = "LV"
+    LEBANON = "LB"
+    LESOTHO = "LS"
+    LIBERIA = "LR"
+    LIBYA = "LY"
+    LIECHTENSTEIN = "LI"
+    LITHUANIA = "LT"
+    LUXEMBOURG = "LU"
+    MACAO = "MO"
+    REPUBLIC_OF_NORTH_MACEDONIA = "MK"
+    MADAGASCAR = "MG"
+    MALAWI = "MW"
+    MALAYSIA = "MY"
+    MALDIVES = "MV"
+    MALI = "ML"
+    MALTA = "MT"
+    MARSHALL_ISLANDS = "MH"
+    MARTINIQUE = "MQ"
+    MAURITANIA = "MR"
+    MAURITIUS = "MU"
+    MAYOTTE = "YT"
+    MEXICO = "MX"
+    MICRONESIA_FEDERATED_STATES_OF = "FM"
+    MOLDOVA_THE_REPUBLIC_OF = "MD"
+    MONACO = "MC"
+    MONGOLIA = "MN"
+    MONTENEGRO = "ME"
+    MONTSERRAT = "MS"
+    MOROCCO = "MA"
+    MOZAMBIQUE = "MZ"
+    MYANMAR = "MM"
+    NAMIBIA = "NA"
+    NAURU = "NR"
+    NEPAL = "NP"
+    NETHERLANDS = "NL"
+    NEW_CALEDONIA = "NC"
+    NEW_ZEALAND = "NZ"
+    NICARAGUA = "NI"
+    NIGER = "NE"
+    NIGERIA = "NG"
+    NIUE = "NU"
+    NORFOLK_ISLAND = "NF"
+    NORTHERN_MARIANA_ISLANDS = "MP"
+    NORWAY = "NO"
+    OMAN = "OM"
+    PAKISTAN = "PK"
+    PALAU = "PW"
+    PALESTINE_STATE_OF = "PS"
+    PANAMA = "PA"
+    PAPUA_NEW_GUINEA = "PG"
+    PARAGUAY = "PY"
+    PERU = "PE"
+    PHILIPPINES = "PH"
+    PITCAIRN = "PN"
+    POLAND = "PL"
+    PORTUGAL = "PT"
+    PUERTO_RICO = "PR"
+    QATAR = "QA"
+    REUNION = "RE"
+    ROMANIA = "RO"
+    RUSSIAN_FEDERATION = "RU"
+    RWANDA = "RW"
+    SAINT_BARTHELEMY = "BL"
+    SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA = "SH"
+    SAINT_KITTS_AND_NEVIS = "KN"
+    SAINT_LUCIA = "LC"
+    SAINT_MARTIN_FRENCH_PART = "MF"
+    SAINT_PIERRE_AND_MIQUELON = "PM"
+    SAINT_VINCENT_AND_THE_GRENADINES = "VC"
+    SAMOA = "WS"
+    SAN_MARINO = "SM"
+    SAO_TOME_AND_PRINCIPE = "ST"
+    SAUDI_ARABIA = "SA"
+    SENEGAL = "SN"
+    SERBIA = "RS"
+    SEYCHELLES = "SC"
+    SIERRA_LEONE = "SL"
+    SINGAPORE = "SG"
+    SINT_MAARTEN_DUTCH_PART = "SX"
+    SLOVAKIA = "SK"
+    SLOVENIA = "SI"
+    SOLOMON_ISLANDS = "SB"
+    SOMALIA = "SO"
+    SOUTH_AFRICA = "ZA"
+    SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS = "GS"
+    SOUTH_SUDAN = "SS"
+    SPAIN = "ES"
+    SRI_LANKA = "LK"
+    SUDAN = "SD"
+    SURINAME = "SR"
+    SVALBARD_AND_JAN_MAYEN = "SJ"
+    SWEDEN = "SE"
+    SWITZERLAND = "CH"
+    SYRIAN_ARAB_REPUBLIC = "SY"
+    TAIWAN_PROVINCE_OF_CHINA = "TW"
+    TAJIKISTAN = "TJ"
+    TANZANIA_UNITED_REPUBLIC_OF = "TZ"
+    THAILAND = "TH"
+    TIMOR_LESTE = "TL"
+    TOGO = "TG"
+    TOKELAU = "TK"
+    TONGA = "TO"
+    TRINIDAD_AND_TOBAGO = "TT"
+    TUNISIA = "TN"
+    TURKEY = "TR"
+    TURKMENISTAN = "TM"
+    TURKS_AND_CAICOS_ISLANDS = "TC"
+    TUVALU = "TV"
+    UGANDA = "UG"
+    UKRAINE = "UA"
+    UNITED_ARAB_EMIRATES = "AE"
+    UNITED_KINGDOM_OF_GREAT_BRITAIN_AND_NORTHERN_IRELAND = "GB"
+    UNITED_STATES_MINOR_OUTLYING_ISLANDS = "UM"
+    UNITED_STATES_OF_AMERICA = "US"
+    URUGUAY = "UY"
+    UZBEKISTAN = "UZ"
+    VANUATU = "VU"
+    VENEZUELA_BOLIVARIAN_REPUBLIC_OF = "VE"
+    VIET_NAM = "VN"
+    VIRGIN_ISLANDS_BRITISH = "VG"
+    VIRGIN_ISLANDS_US = "VI"
+    WALLIS_AND_FUTUNA = "WF"
+    WESTERN_SAHARA = "EH"
+    YEMEN = "YE"
+    ZAMBIA = "ZM"
+    ZIMBABWE = "ZW"

ctftime_api-0.2.0/ctftime_api/models/duration.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+
+from dataclasses_json import DataClassJsonMixin, Undefined, dataclass_json
+
+__all__ = ["Duration"]
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class Duration(DataClassJsonMixin):
+    hours: int
+    days: int

ctftime_api-0.2.0/ctftime_api/models/event.py

@@ -0,0 +1,53 @@
+from dataclasses import dataclass
+from datetime import datetime
+
+from dataclasses_json import DataClassJsonMixin, Undefined, dataclass_json
+from yarl import URL
+
+from .duration import Duration
+from .team import BaseTeam, TeamResult
+
+__all__ = ["Event", "EventResult"]
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class Event(DataClassJsonMixin):
+    """Represents a CTF event."""
+
+    organizers: list[BaseTeam]
+    ctftime_url: URL
+    ctf_id: int
+    weight: float
+    duration: Duration
+    live_feed: str
+    logo: URL | str
+    id: int
+    title: str
+    participants: int
+    location: str
+    description: str
+    format: str
+    is_votable_now: bool
+    prizes: str
+    restrictions: str
+    url: URL | str
+    public_votable: bool
+    start: datetime | str
+    finish: datetime | str
+
+    def __post_init__(self):
+        if isinstance(self.start, str):
+            object.__setattr__(self, "start", datetime.fromisoformat(self.start))
+        if isinstance(self.finish, str):
+            object.__setattr__(self, "finish", datetime.fromisoformat(self.finish))
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class EventResult(DataClassJsonMixin):
+    """Represents a CTF event result."""
+
+    title: str
+    time: datetime
+    scores: list[TeamResult]

ctftime_api-0.2.0/ctftime_api/models/rating.py

@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+
+from dataclasses_json import DataClassJsonMixin, Undefined, dataclass_json
+
+__all__ = ["Rating"]
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class Rating(DataClassJsonMixin):
+    """Represents a CTF team rating."""
+
+    rating_place: int | None = None
+    organizer_points: float | None = None
+    rating_points: float | None = None
+    country_place: int | None = None

ctftime_api-0.2.0/ctftime_api/models/team.py

@@ -0,0 +1,61 @@
+from dataclasses import dataclass, field
+
+from dataclasses_json import DataClassJsonMixin, Undefined, config, dataclass_json
+from yarl import URL
+
+from .country import CountryCode
+from .rating import Rating
+
+__all__ = ["BaseTeam", "Team", "TeamRank", "TeamComplete", "TeamResult"]
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class BaseTeam(DataClassJsonMixin):
+    """Represents a CTF team. Contains only the minimal information."""
+
+    team_id: int = field(metadata=config(field_name="id"))
+    team_name: str = field(metadata=config(field_name="name"))
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class Team(BaseTeam):
+    """Represents a CTF team"""
+
+    team_country: CountryCode | None = None
+    academic: bool = False
+    aliases: list[str] = field(default_factory=list)
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class TeamRank(BaseTeam):
+    """Represents a CTF team in the leaderboard"""
+
+    points: float
+    country_place: int | None = None
+    place: int | None = None
+    events: int | None = None
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class TeamResult(DataClassJsonMixin):
+    """Represents a CTF team result"""
+
+    team_id: int
+    points: float
+    place: int
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class TeamComplete(Team):
+    """Represents a CTF team with complete information"""
+
+    primary_alias: str | None = None
+    logo: URL | str | None = None
+    university: str | None = None
+    university_website: URL | str | None = None
+    rating: dict[int, Rating | None] = field(default_factory=dict)

ctftime_api-0.2.0/ctftime_api/models/vote.py

@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+from datetime import datetime
+
+from dataclasses_json import DataClassJsonMixin, Undefined, dataclass_json
+
+__all__ = ["Vote"]
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass(frozen=True)
+class Vote(DataClassJsonMixin):
+    event_id: int
+    user_id: int
+    user_teams: list[int]  # list of team IDs
+    weight: str
+    creation_date: datetime

{ctftime_api-0.1.5 → ctftime_api-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ctftime_api"
-version = "0.1.5"
+version = "0.2.0"
 description = "CTFTime API wrapper"
 authors = [{ name = "John Toniutti", email = "john.toniutti@gmail.com" }]
 requires-python = ">=3.11"
@@ -25,19 +25,17 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "httpx (>=0.28.1,<0.29.0)",
-    "pydantic (>=2.10.6,<3.0.0)",
-    "pydantic-extra-types (>=2.10.2,<3.0.0)",
-    "pycountry (>=24.6.1,<25.0.0)",
+    "dataclasses-json==0.6.7",
+    "httpx[http2] (>=0.28.1,<0.29.0)",
+    "yarl>=1.20.1",
 ]
 
 [project.optional-dependencies]
-speed = [
-    "uvloop (>=0.21.0,<1.0.0) ; sys_platform != 'win32'",
-    "brotli (>=1.1.0,<2.0.0) ; platform_python_implementation == 'CPython' ",
-    "brotlicffi (>=1.1.0.0,<2.0.0.0) ; platform_python_implementation != 'CPython' ",
-    "h2 (>=4.2.0,<5.0.0)",
-    "zstandard (>=0.23.0,<0.24.0)",
+brotli = [
+    "httpx[brotli]",
+]
+zstd = [
+    "httpx[zstd]",
 ]
 
 [project.urls]
@@ -49,7 +47,7 @@ dev = [
     "ruff~=0.9",
     "pytest~=8.3",
     "pytest-cov~=6.1",
-    "pytest-asyncio~=0.24",
+    "pytest-asyncio>=0.24,<2.0",
     "mypy~=1.11",
 ]
 docs = [