python-xbox 0.1.0rc3__tar.gz → 0.1.1__tar.gz

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/.gitignore

@@ -74,3 +74,5 @@ target/
 # Node
 node_modules
 
+# mkdocs site
+site/

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2020 OpenXbox
+Copyright (c) 2025 Manfred Dennerlein Rodelo
+Copyright (c) 2020 - 2025 OpenXbox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/PKG-INFO

@@ -1,15 +1,16 @@
 Metadata-Version: 2.4
 Name: python-xbox
-Version: 0.1.0rc3
+Version: 0.1.1
 Summary: A library to authenticate with Xbox Network and use their API
-Project-URL: Homepage, https://github.com/tr4nt0r/python-xbox
-Author: OpenXbox
+Project-URL: Source, https://github.com/tr4nt0r/python-xbox
+Author-email: Manfred Dennerlein Rodelo <manfred@dennerlein.name>
 License-Expression: MIT
 License-File: LICENSE
 Keywords: xbox one live api
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -17,22 +18,23 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
-Requires-Dist: ecdsa
-Requires-Dist: httpx
-Requires-Dist: ms-cv
-Requires-Dist: pydantic==2.*
+Requires-Dist: ecdsa>=0.19
+Requires-Dist: httpx>=0.25.1
+Requires-Dist: ms-cv>=0.1.1
+Requires-Dist: pydantic>=2.12
 Provides-Extra: cli
 Requires-Dist: platformdirs>=4.5.0; extra == 'cli'
 Description-Content-Type: text/markdown
 
-# Xbox-WebAPI
+# python-xbox
 
-[![PyPi - latest](https://img.shields.io/pypi/v/xbox-webapi.svg)](https://pypi.python.org/pypi/xbox-webapi/)
-[![Documentation status](https://readthedocs.org/projects/xbox-webapi-python/badge/?version=latest)](http://xbox-webapi-python.readthedocs.io/en/latest/?badge=latest)
-[![Build status](https://img.shields.io/github/actions/workflow/status/OpenXbox/xbox-webapi-python/build.yml?branch=master)](https://github.com/OpenXbox/xbox-webapi-python/actions?query=workflow%3Abuild)
-[![Discord chat channel](https://img.shields.io/badge/discord-OpenXbox-blue.svg)](https://openxbox.org/discord)
+[![PyPi - latest](https://img.shields.io/pypi/v/python-xbox.svg)](https://pypi.python.org/pypi/python-xbox/)
+[![Build](https://github.com/tr4nt0r/python-xbox/actions/workflows/build.yml/badge.svg)](https://github.com/tr4nt0r/python-xbox/actions/workflows/build.yml)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/python-xbox?style=flat&label=pypi%20downloads)
+[!["Buy Me A Coffee"](https://img.shields.io/badge/-buy_me_a%C2%A0coffee-gray?logo=buy-me-a-coffee)](https://www.buymeacoffee.com/tr4nt0r)
+[![GitHub Sponsor](https://img.shields.io/badge/GitHub-Sponsor-blue?logo=github)](https://github.com/sponsors/tr4nt0r)
 
-Xbox-WebAPI is a python library to authenticate with Xbox Live via your Microsoft Account and provides Xbox related Web-API.
+python-xbox is a python library to authenticate with Xbox Network via your Microsoft Account and provides Xbox related Web-API.
 
 Authentication is supported via OAuth2.
 
@@ -46,21 +48,22 @@ Authentication is supported via OAuth2.
 
 ## Dependencies
 
-- Python >= 3.8
+- Python >= 3.11
 
 ## How to use
 
-Install
+### Install
 
-```text
-pip install xbox-webapi
+```bash
+pip install python-xbox
 ```
 
-Authentication
+### Authentication
 
-**Note: You must use non child account (> 18 years old)**
+> [!NOTE]
+> You must use non child account (> 18 years old)
 
-Token save location: If tokenfile is not provided via cmdline, fallback of `<appdirs.user_data_dir>/tokens.json` is used as save-location
+Token save location: If tokenfile is not provided via cmdline, fallback of `<platformdirs.user_data_dir>/tokens.json` is used as save-location
 
 Specifically:
 
@@ -70,32 +73,32 @@ Mac OSX: `/Users/<username>/Library/Application Support/xbox/tokens.json`
 
 Linux: `/home/<username>/.local/share/xbox`
 
-For more information, see: <https://pypi.org/project/appdirs> and module: `xbox.webapi.scripts.constants`
+For more information, see: <https://pypi.org/project/platformdirs> and module: `python-xbox.scripts.constants`
 
-```
+```bash
 xbox-authenticate --client-id <client-id> --client-secret <client-secret>
 ```
 
 Example: Search Xbox Live via cmdline tool
 
-```text
+```bash
   # Search Xbox One Catalog
   xbox-searchlive "Some game title"
 ```
 
 API usage
 
-```py
+```python
 import asyncio
 import sys
 
 from httpx import HTTPStatusError
 
-from xbox.webapi.api.client import XboxLiveClient
-from xbox.webapi.authentication.manager import AuthenticationManager
-from xbox.webapi.authentication.models import OAuth2TokenResponse
-from xbox.webapi.common.signed_session import SignedSession
-from xbox.webapi.scripts import CLIENT_ID, CLIENT_SECRET, TOKENS_FILE
+from pythonxbox.api.client import XboxLiveClient
+from pythonxbox.authentication.manager import AuthenticationManager
+from pythonxbox.authentication.models import OAuth2TokenResponse
+from pythonxbox.common.signed_session import SignedSession
+from pythonxbox.scripts import CLIENT_ID, CLIENT_SECRET, TOKENS_FILE
 
 """
 This uses the global default client identification by OpenXbox
@@ -107,7 +110,7 @@ client_secret = CLIENT_SECRET
 tokens_file = TOKENS_FILE
 
 """
-For doing authentication, see xbox/webapi/scripts/authenticate.py
+For doing authentication, see pythonxbox/scripts/authenticate.py
 """
 
 
@@ -121,7 +124,7 @@ async def async_main():
 
         """
         Read in tokens that you received from the `xbox-authenticate`-script previously
-        See `xbox/webapi/scripts/authenticate.py`
+        See `pythonxbox/scripts/authenticate.py`
         """
         try:
             with open(tokens_file) as f:
@@ -199,8 +202,7 @@ asyncio.run(async_main())
 
 ## Credits
 
-This package uses parts of [Cookiecutter](https://github.com/audreyr/cookiecutter)
-and the [audreyr/cookiecutter-pypackage](https://github.com/audreyr/cookiecutter-pypackage) project template.
+This library is derived from [xbox-webapi](https://github.com/OpenXbox/xbox-webapi-python) library from the [OpenXbox](https://github.com/openxbox) project
 The authentication code is based on [joealcorn/xbox](https://github.com/joealcorn/xbox)
 
 Informations on endpoints gathered from:

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/README.md

@@ -1,11 +1,12 @@
-# Xbox-WebAPI
+# python-xbox
 
-[![PyPi - latest](https://img.shields.io/pypi/v/xbox-webapi.svg)](https://pypi.python.org/pypi/xbox-webapi/)
-[![Documentation status](https://readthedocs.org/projects/xbox-webapi-python/badge/?version=latest)](http://xbox-webapi-python.readthedocs.io/en/latest/?badge=latest)
-[![Build status](https://img.shields.io/github/actions/workflow/status/OpenXbox/xbox-webapi-python/build.yml?branch=master)](https://github.com/OpenXbox/xbox-webapi-python/actions?query=workflow%3Abuild)
-[![Discord chat channel](https://img.shields.io/badge/discord-OpenXbox-blue.svg)](https://openxbox.org/discord)
+[![PyPi - latest](https://img.shields.io/pypi/v/python-xbox.svg)](https://pypi.python.org/pypi/python-xbox/)
+[![Build](https://github.com/tr4nt0r/python-xbox/actions/workflows/build.yml/badge.svg)](https://github.com/tr4nt0r/python-xbox/actions/workflows/build.yml)
+![PyPI - Downloads](https://img.shields.io/pypi/dm/python-xbox?style=flat&label=pypi%20downloads)
+[!["Buy Me A Coffee"](https://img.shields.io/badge/-buy_me_a%C2%A0coffee-gray?logo=buy-me-a-coffee)](https://www.buymeacoffee.com/tr4nt0r)
+[![GitHub Sponsor](https://img.shields.io/badge/GitHub-Sponsor-blue?logo=github)](https://github.com/sponsors/tr4nt0r)
 
-Xbox-WebAPI is a python library to authenticate with Xbox Live via your Microsoft Account and provides Xbox related Web-API.
+python-xbox is a python library to authenticate with Xbox Network via your Microsoft Account and provides Xbox related Web-API.
 
 Authentication is supported via OAuth2.
 
@@ -19,21 +20,22 @@ Authentication is supported via OAuth2.
 
 ## Dependencies
 
-- Python >= 3.8
+- Python >= 3.11
 
 ## How to use
 
-Install
+### Install
 
-```text
-pip install xbox-webapi
+```bash
+pip install python-xbox
 ```
 
-Authentication
+### Authentication
 
-**Note: You must use non child account (> 18 years old)**
+> [!NOTE]
+> You must use non child account (> 18 years old)
 
-Token save location: If tokenfile is not provided via cmdline, fallback of `<appdirs.user_data_dir>/tokens.json` is used as save-location
+Token save location: If tokenfile is not provided via cmdline, fallback of `<platformdirs.user_data_dir>/tokens.json` is used as save-location
 
 Specifically:
 
@@ -43,32 +45,32 @@ Mac OSX: `/Users/<username>/Library/Application Support/xbox/tokens.json`
 
 Linux: `/home/<username>/.local/share/xbox`
 
-For more information, see: <https://pypi.org/project/appdirs> and module: `xbox.webapi.scripts.constants`
+For more information, see: <https://pypi.org/project/platformdirs> and module: `python-xbox.scripts.constants`
 
-```
+```bash
 xbox-authenticate --client-id <client-id> --client-secret <client-secret>
 ```
 
 Example: Search Xbox Live via cmdline tool
 
-```text
+```bash
   # Search Xbox One Catalog
   xbox-searchlive "Some game title"
 ```
 
 API usage
 
-```py
+```python
 import asyncio
 import sys
 
 from httpx import HTTPStatusError
 
-from xbox.webapi.api.client import XboxLiveClient
-from xbox.webapi.authentication.manager import AuthenticationManager
-from xbox.webapi.authentication.models import OAuth2TokenResponse
-from xbox.webapi.common.signed_session import SignedSession
-from xbox.webapi.scripts import CLIENT_ID, CLIENT_SECRET, TOKENS_FILE
+from pythonxbox.api.client import XboxLiveClient
+from pythonxbox.authentication.manager import AuthenticationManager
+from pythonxbox.authentication.models import OAuth2TokenResponse
+from pythonxbox.common.signed_session import SignedSession
+from pythonxbox.scripts import CLIENT_ID, CLIENT_SECRET, TOKENS_FILE
 
 """
 This uses the global default client identification by OpenXbox
@@ -80,7 +82,7 @@ client_secret = CLIENT_SECRET
 tokens_file = TOKENS_FILE
 
 """
-For doing authentication, see xbox/webapi/scripts/authenticate.py
+For doing authentication, see pythonxbox/scripts/authenticate.py
 """
 
 
@@ -94,7 +96,7 @@ async def async_main():
 
         """
         Read in tokens that you received from the `xbox-authenticate`-script previously
-        See `xbox/webapi/scripts/authenticate.py`
+        See `pythonxbox/scripts/authenticate.py`
         """
         try:
             with open(tokens_file) as f:
@@ -172,8 +174,7 @@ asyncio.run(async_main())
 
 ## Credits
 
-This package uses parts of [Cookiecutter](https://github.com/audreyr/cookiecutter)
-and the [audreyr/cookiecutter-pypackage](https://github.com/audreyr/cookiecutter-pypackage) project template.
+This library is derived from [xbox-webapi](https://github.com/OpenXbox/xbox-webapi-python) library from the [OpenXbox](https://github.com/openxbox) project
 The authentication code is based on [joealcorn/xbox](https://github.com/joealcorn/xbox)
 
 Informations on endpoints gathered from:

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/pyproject.toml

@@ -2,20 +2,20 @@
 name = "python-xbox"
 description = "A library to authenticate with Xbox Network and use their API"
 authors = [
-    {name = "OpenXbox"},
+    {name = "Manfred Dennerlein Rodelo", email = "manfred@dennerlein.name"},
 ]
 dependencies = [
-    "ecdsa",
-    "httpx",
-    "ms_cv",
-    "pydantic==2.*",
+    "ecdsa>=0.19",
+    "httpx>=0.25.1",
+    "ms_cv>=0.1.1",
+    "pydantic>=2.12",
 ]
 requires-python = ">=3.11"
 readme = "README.md"
 license = "MIT"
 keywords = ["xbox one live api"]
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
@@ -23,12 +23,13 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dynamic = ["version"]
 
 [project.urls]
-Homepage = "https://github.com/tr4nt0r/python-xbox"
+Source = "https://github.com/tr4nt0r/python-xbox"
 
 [project.optional-dependencies]
 cli = [
@@ -47,13 +48,14 @@ line-length = 88
 target-version = "py311"
 
 [tool.ruff.lint]
-select = ["E4", "E7", "E9", "F", "UP", "S"]
-ignore = []
+select = ["E4", "E7", "E9", "F", "UP", "S", "ANN", "C4", "I", "RUF", "SIM", "PLR", "ERA", "RET", "B", "A"]
+# select = ["ALL"]
+ignore = ["ANN003", "ANN401", "D", "COM"]
 
 
 [tool.ruff.lint.per-file-ignores]
 "**/scripts/*" = ["UP", "S104"]
-"tests/*" = ["S101"]
+"tests/*" = ["S101", "PLR2004"]
 "src/pythonxbox/authentication/xal.py" = ["S101"]
 
 [tool.ruff.lint.isort]
@@ -85,7 +87,7 @@ dependencies = [
     "ecdsa==0.19.1",
     "httpx==0.28.1",
     "ms_cv==0.1.1",
-    "pydantic==2.12.3",
+    "pydantic==2.12.4",
     "pytest==8.4.2",
     "pytest-asyncio==1.2.0",
     "pytest-cov==7.0.0",
@@ -113,10 +115,19 @@ python = ["3.14", "3.13", "3.12", "3.11"]
 
 [tool.hatch.envs.hatch-static-analysis]
 dependencies = [
-    "ruff==0.14.2",
+    "ruff==0.14.4",
 ]
 config-path = "none"
 
+[tool.hatch.envs.docs]
+dependencies = [
+    "mkdocs-material==9.6.23",
+    "mkdocstrings[python]==0.30.1",
+]
+[tool.hatch.envs.docs.scripts]
+serve = "mkdocs serve"
+build = "mkdocs build"
+
 [build-system]
 requires = ["hatchling", "hatch-regex-commit"]
 build-backend = "hatchling.build"

python_xbox-0.1.1/src/pythonxbox/__init__.py

@@ -0,0 +1,4 @@
+"""Top-level package for python-xbox."""
+
+__author__ = """tr4nt0r"""
+__version__ = "0.1.1"

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/client.py

@@ -36,7 +36,7 @@ log = logging.getLogger("xbox.api")
 
 
 class Session:
-    def __init__(self, auth_mgr: AuthenticationManager):
+    def __init__(self, auth_mgr: AuthenticationManager) -> None:
         self._auth_mgr = auth_mgr
         self._cv = CorrelationVector()
 
@@ -84,10 +84,9 @@ class Session:
             data = data or {}
             data.update(extra_data)
 
-        if rate_limits:
+        if rate_limits and rate_limits.is_exceeded():
             # Check if rate limits have been exceeded for this endpoint
-            if rate_limits.is_exceeded():
-                raise RateLimitExceededException("Rate limit exceeded", rate_limits)
+            raise RateLimitExceededException("Rate limit exceeded", rate_limits)
 
         response = await self._auth_mgr.session.request(
             method, url, **kwargs, headers=headers, params=params, data=data
@@ -125,7 +124,7 @@ class XboxLiveClient:
         self,
         auth_mgr: AuthenticationManager,
         language: XboxLiveLanguage = DefaultXboxLiveLanguages.United_States,
-    ):
+    ) -> None:
         self._auth_mgr = auth_mgr
         self.session = Session(auth_mgr)
         self._language = language

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/language.py

@@ -4,7 +4,13 @@ Language definitions
 
 
 class XboxLiveLanguage:
-    def __init__(self, name, short_id, identifier, locale):
+    def __init__(
+        self,
+        name: str,
+        short_id: str,
+        identifier: str,
+        locale: str,
+    ) -> None:
         """
         Initialize a new instance of :class:`XboxLiveLanguage`
 

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/provider/account/__init__.py

@@ -1,3 +1,5 @@
+from typing import ClassVar
+
 from pythonxbox.api.provider.account.models import (
     ChangeGamertagResult,
     ClaimGamertagResult,
@@ -9,10 +11,12 @@ class AccountProvider(BaseProvider):
     BASE_URL_USER_MGT = "https://user.mgt.xboxlive.com"
     BASE_URL_ACCOUNT = "https://accounts.xboxlive.com"
 
-    HEADERS_USER_MGT = {"x-xbl-contract-version": "1"}
-    HEADERS_ACCOUNT = {"x-xbl-contract-version": "2"}
+    HEADERS_USER_MGT: ClassVar = {"x-xbl-contract-version": "1"}
+    HEADERS_ACCOUNT: ClassVar = {"x-xbl-contract-version": "2"}
 
-    async def claim_gamertag(self, xuid, gamertag, **kwargs) -> ClaimGamertagResult:
+    async def claim_gamertag(
+        self, xuid: str, gamertag: str, **kwargs
+    ) -> ClaimGamertagResult:
         """
         Claim gamertag
 
@@ -40,7 +44,7 @@ class AccountProvider(BaseProvider):
             resp.raise_for_status()
 
     async def change_gamertag(
-        self, xuid, gamertag, preview=False, **kwargs
+        self, xuid: str, gamertag: str, preview: bool = False, **kwargs
     ) -> ChangeGamertagResult:
         """
         Change your gamertag.

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/provider/achievements/__init__.py

@@ -4,6 +4,8 @@ Achievements
 Get Xbox 360 and Xbox One Achievement data
 """
 
+from typing import ClassVar
+
 from pythonxbox.api.provider.achievements.models import (
     Achievement360ProgressResponse,
     Achievement360Response,
@@ -15,13 +17,13 @@ from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider
 
 class AchievementsProvider(RateLimitedProvider):
     ACHIEVEMENTS_URL = "https://achievements.xboxlive.com"
-    HEADERS_GAME_360_PROGRESS = {"x-xbl-contract-version": "1"}
-    HEADERS_GAME_PROGRESS = {"x-xbl-contract-version": "2"}
+    HEADERS_GAME_360_PROGRESS: ClassVar = {"x-xbl-contract-version": "1"}
+    HEADERS_GAME_PROGRESS: ClassVar = {"x-xbl-contract-version": "2"}
 
-    RATE_LIMITS = {"burst": 100, "sustain": 300}
+    RATE_LIMITS: ClassVar = {"burst": 100, "sustain": 300}
 
     async def get_achievements_detail_item(
-        self, xuid, service_config_id, achievement_id, **kwargs
+        self, xuid: str, service_config_id: str, achievement_id: str, **kwargs
     ) -> AchievementResponse:
         """
         Get achievement detail for specific item
@@ -42,10 +44,10 @@ class AchievementsProvider(RateLimitedProvider):
             **kwargs,
         )
         resp.raise_for_status()
-        return AchievementResponse(**resp.json())
+        return AchievementResponse.model_validate_json(resp.text)
 
     async def get_achievements_xbox360_all(
-        self, xuid, title_id, **kwargs
+        self, xuid: str, title_id: str, **kwargs
     ) -> Achievement360Response:
         """
         Get all achievements for specific X360 title Id
@@ -67,10 +69,10 @@ class AchievementsProvider(RateLimitedProvider):
             **kwargs,
         )
         resp.raise_for_status()
-        return Achievement360Response(**resp.json())
+        return Achievement360Response.model_validate_json(resp.text)
 
     async def get_achievements_xbox360_earned(
-        self, xuid, title_id, **kwargs
+        self, xuid: str, title_id: str, **kwargs
     ) -> Achievement360Response:
         """
         Get earned achievements for specific X360 title id
@@ -92,10 +94,10 @@ class AchievementsProvider(RateLimitedProvider):
             **kwargs,
         )
         resp.raise_for_status()
-        return Achievement360Response(**resp.json())
+        return Achievement360Response.model_validate_json(resp.text)
 
     async def get_achievements_xbox360_recent_progress_and_info(
-        self, xuid, **kwargs
+        self, xuid: str, **kwargs
     ) -> Achievement360ProgressResponse:
         """
         Get recent achievement progress and information
@@ -114,10 +116,10 @@ class AchievementsProvider(RateLimitedProvider):
             **kwargs,
         )
         resp.raise_for_status()
-        return Achievement360ProgressResponse(**resp.json())
+        return Achievement360ProgressResponse.model_validate_json(resp.text)
 
     async def get_achievements_xboxone_gameprogress(
-        self, xuid, title_id, **kwargs
+        self, xuid: str, title_id: str, **kwargs
     ) -> AchievementResponse:
         """
         Get gameprogress for Xbox One title
@@ -139,10 +141,10 @@ class AchievementsProvider(RateLimitedProvider):
             **kwargs,
         )
         resp.raise_for_status()
-        return AchievementResponse(**resp.json())
+        return AchievementResponse.model_validate_json(resp.text)
 
     async def get_achievements_xboxone_recent_progress_and_info(
-        self, xuid, **kwargs
+        self, xuid: str, **kwargs
     ) -> RecentProgressResponse:
         """
         Get recent achievement progress and information
@@ -161,4 +163,4 @@ class AchievementsProvider(RateLimitedProvider):
             **kwargs,
         )
         resp.raise_for_status()
-        return RecentProgressResponse(**resp.json())
+        return RecentProgressResponse.model_validate_json(resp.text)

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/provider/baseprovider.py

@@ -4,9 +4,14 @@ BaseProvider
 Subclassed by every *real* provider
 """
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pythonxbox.api.client import XboxLiveClient
+
 
 class BaseProvider:
-    def __init__(self, client):
+    def __init__(self, client: "XboxLiveClient") -> None:
         """
         Initialize an the BaseProvider
 

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/provider/catalog/__init__.py

@@ -36,11 +36,11 @@ class CatalogProvider(BaseProvider):
             url, params=params, include_auth=False, **kwargs
         )
         resp.raise_for_status()
-        return CatalogResponse(**resp.json())
+        return CatalogResponse.model_validate_json(resp.text)
 
     async def get_product_from_alternate_id(
         self,
-        id: str,
+        id: str,  # noqa: A002
         id_type: AlternateIdType,
         fields: FieldsTemplate = FieldsTemplate.DETAILS,
         top: int = 25,
@@ -60,7 +60,7 @@ class CatalogProvider(BaseProvider):
             url, params=params, include_auth=False, **kwargs
         )
         resp.raise_for_status()
-        return CatalogResponse(**resp.json())
+        return CatalogResponse.model_validate_json(resp.text)
 
     async def product_search(
         self,
@@ -83,4 +83,4 @@ class CatalogProvider(BaseProvider):
             url, params=params, include_auth=False, **kwargs
         )
         resp.raise_for_status()
-        return CatalogSearchResponse(**resp.json())
+        return CatalogSearchResponse.model_validate_json(resp.text)

{python_xbox-0.1.0rc3 → python_xbox-0.1.1}/src/pythonxbox/api/provider/catalog/models.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from pydantic import Field, field_validator
@@ -7,18 +7,18 @@ from pydantic import Field, field_validator
 from pythonxbox.common.models import PascalCaseModel
 
 
-class AlternateIdType(str, Enum):
+class AlternateIdType(StrEnum):
     LEGACY_XBOX_PRODUCT_ID = "LegacyXboxProductId"
     XBOX_TITLE_ID = "XboxTitleId"
     PACKAGE_FAMILY_NAME = "PackageFamilyName"
 
 
-class FieldsTemplate(str, Enum):
+class FieldsTemplate(StrEnum):
     BROWSE = "browse"
     DETAILS = "details"
 
 
-class PlatformType(str, Enum):
+class PlatformType(StrEnum):
     XBOX = "windows.xbox"
     DESKTOP = "windows.desktop"
 
@@ -250,7 +250,7 @@ class SkuProperties(PascalCaseModel):
     is_bundle: bool
 
     @field_validator("last_update_date", mode="before", check_fields=True)
-    def validator(x):
+    def validator(x: "SkuProperties") -> "SkuProperties":
         return x or None