python-xbox 0.1.0rc1__tar.gz → 0.1.0rc3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-xbox
-Version: 0.1.0rc1
+Version: 0.1.0rc3
 Summary: A library to authenticate with Xbox Network and use their API
 Project-URL: Homepage, https://github.com/tr4nt0r/python-xbox
 Author: OpenXbox
@@ -17,11 +17,12 @@ 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: appdirs
 Requires-Dist: ecdsa
 Requires-Dist: httpx
 Requires-Dist: ms-cv
 Requires-Dist: pydantic==2.*
+Provides-Extra: cli
+Requires-Dist: platformdirs>=4.5.0; extra == 'cli'
 Description-Content-Type: text/markdown
 
 # Xbox-WebAPI

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

@@ -5,7 +5,6 @@ authors = [
     {name = "OpenXbox"},
 ]
 dependencies = [
-    "appdirs",
     "ecdsa",
     "httpx",
     "ms_cv",
@@ -31,24 +30,35 @@ dynamic = ["version"]
 [project.urls]
 Homepage = "https://github.com/tr4nt0r/python-xbox"
 
+[project.optional-dependencies]
+cli = [
+    "platformdirs>=4.5.0"
+]
+
 [project.scripts]
-xbox-authenticate = "xbox.webapi.scripts.authenticate:main"
-xbox-change-gt = "xbox.webapi.scripts.change_gamertag:main"
-xbox-friends = "xbox.webapi.scripts.friends:main"
-xbox-searchlive = "xbox.webapi.scripts.search:main"
-xbox-xal = "xbox.webapi.scripts.xal:main"
+xbox-authenticate = "pythonxbox.scripts.authenticate:main"
+xbox-change-gt = "pythonxbox.scripts.change_gamertag:main"
+xbox-friends = "pythonxbox.scripts.friends:main"
+xbox-searchlive = "pythonxbox.scripts.search:main"
+xbox-xal = "pythonxbox.scripts.xal:main"
 
 [tool.ruff]
 line-length = 88
-target-version = "py38"
+target-version = "py311"
 
 [tool.ruff.lint]
-select = ["E4", "E7", "E9", "F"]
+select = ["E4", "E7", "E9", "F", "UP", "S"]
 ignore = []
 
+
+[tool.ruff.lint.per-file-ignores]
+"**/scripts/*" = ["UP", "S104"]
+"tests/*" = ["S101"]
+"src/pythonxbox/authentication/xal.py" = ["S101"]
+
 [tool.ruff.lint.isort]
 force-sort-within-sections = true
-known-first-party = ["aiontfy"]
+known-first-party = ["pythonxbox"]
 combine-as-imports = true
 split-on-trailing-comma = false
 
@@ -56,41 +66,22 @@ split-on-trailing-comma = false
 quote-style = "double"
 indent-style = "space"
 
-
-[tool.bandit]
-exclude_dirs = ["tests"]
-tests = [
-  "B108",
-  "B306",
-  "B307",
-  "B313",
-  "B314",
-  "B315",
-  "B316",
-  "B317",
-  "B318",
-  "B319",
-  "B320",
-  "B602",
-  "B604"
-]
-
 [tool.hatch.version]
 source = "regex_commit"
 commit_extra_args = ["-e"]
-path = "xbox/webapi/__init__.py"
+path = "src/pythonxbox/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [
-    "/xbox",
+    "src/pythonxbox",
 ]
 [tool.hatch.build.targets.wheel]
-packages = ["xbox"]
+packages = ["src/pythonxbox"]
 
 [tool.hatch.envs.default]
 python = "3.13"
 dependencies = [
-    "appdirs==1.4.4",
+    "platformdirs==4.5.0",
     "ecdsa==0.19.1",
     "httpx==0.28.1",
     "ms_cv==0.1.1",
@@ -110,12 +101,12 @@ extra-dependencies = [
   "respx~=0.22",
   "freezegun==1.5.5"
 ]
-extra-args = ["--cov=xbox/webapi/", "--cov-report=term-missing", "--cov-report=xml", "-vv"]
+extra-args = ["--cov=src/", "--cov-report=term-missing", "--cov-report=xml", "-vv"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 testpaths = ["tests"]
-pythonpath = ["xbox/webapi"]
+pythonpath = ["src"]
 
 [[tool.hatch.envs.hatch-test.matrix]]
 python = ["3.14", "3.13", "3.12", "3.11"]

{python_xbox-0.1.0rc1/xbox/webapi → python_xbox-0.1.0rc3/src/pythonxbox}/__init__.py

@@ -1,4 +1,4 @@
 """Top-level package for xbox-webapi-python."""
 
 __author__ = """OpenXbox"""
-__version__ = "0.1.0rc1"
+__version__ = "0.1.0rc3"

{python_xbox-0.1.0rc1/xbox/webapi → python_xbox-0.1.0rc3/src/pythonxbox}/api/client.py

@@ -11,26 +11,26 @@ from typing import Any
 from httpx import Response
 from ms_cv import CorrelationVector
 
-from xbox.webapi.api.language import DefaultXboxLiveLanguages, XboxLiveLanguage
-from xbox.webapi.api.provider.account import AccountProvider
-from xbox.webapi.api.provider.achievements import AchievementsProvider
-from xbox.webapi.api.provider.catalog import CatalogProvider
-from xbox.webapi.api.provider.cqs import CQSProvider
-from xbox.webapi.api.provider.gameclips import GameclipProvider
-from xbox.webapi.api.provider.lists import ListsProvider
-from xbox.webapi.api.provider.mediahub import MediahubProvider
-from xbox.webapi.api.provider.message import MessageProvider
-from xbox.webapi.api.provider.people import PeopleProvider
-from xbox.webapi.api.provider.presence import PresenceProvider
-from xbox.webapi.api.provider.profile import ProfileProvider
-from xbox.webapi.api.provider.screenshots import ScreenshotsProvider
-from xbox.webapi.api.provider.smartglass import SmartglassProvider
-from xbox.webapi.api.provider.titlehub import TitlehubProvider
-from xbox.webapi.api.provider.usersearch import UserSearchProvider
-from xbox.webapi.api.provider.userstats import UserStatsProvider
-from xbox.webapi.authentication.manager import AuthenticationManager
-from xbox.webapi.common.exceptions import RateLimitExceededException
-from xbox.webapi.common.ratelimits import RateLimit
+from pythonxbox.api.language import DefaultXboxLiveLanguages, XboxLiveLanguage
+from pythonxbox.api.provider.account import AccountProvider
+from pythonxbox.api.provider.achievements import AchievementsProvider
+from pythonxbox.api.provider.catalog import CatalogProvider
+from pythonxbox.api.provider.cqs import CQSProvider
+from pythonxbox.api.provider.gameclips import GameclipProvider
+from pythonxbox.api.provider.lists import ListsProvider
+from pythonxbox.api.provider.mediahub import MediahubProvider
+from pythonxbox.api.provider.message import MessageProvider
+from pythonxbox.api.provider.people import PeopleProvider
+from pythonxbox.api.provider.presence import PresenceProvider
+from pythonxbox.api.provider.profile import ProfileProvider
+from pythonxbox.api.provider.screenshots import ScreenshotsProvider
+from pythonxbox.api.provider.smartglass import SmartglassProvider
+from pythonxbox.api.provider.titlehub import TitlehubProvider
+from pythonxbox.api.provider.usersearch import UserSearchProvider
+from pythonxbox.api.provider.userstats import UserStatsProvider
+from pythonxbox.authentication.manager import AuthenticationManager
+from pythonxbox.common.exceptions import RateLimitExceededException
+from pythonxbox.common.ratelimits import RateLimit
 
 log = logging.getLogger("xbox.api")
 

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

@@ -1,8 +1,8 @@
-from xbox.webapi.api.provider.account.models import (
+from pythonxbox.api.provider.account.models import (
     ChangeGamertagResult,
     ClaimGamertagResult,
 )
-from xbox.webapi.api.provider.baseprovider import BaseProvider
+from pythonxbox.api.provider.baseprovider import BaseProvider
 
 
 class AccountProvider(BaseProvider):

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

@@ -4,13 +4,13 @@ Achievements
 Get Xbox 360 and Xbox One Achievement data
 """
 
-from xbox.webapi.api.provider.achievements.models import (
+from pythonxbox.api.provider.achievements.models import (
     Achievement360ProgressResponse,
     Achievement360Response,
     AchievementResponse,
     RecentProgressResponse,
 )
-from xbox.webapi.api.provider.ratelimitedprovider import RateLimitedProvider
+from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider
 
 
 class AchievementsProvider(RateLimitedProvider):

{python_xbox-0.1.0rc1/xbox/webapi → python_xbox-0.1.0rc3/src/pythonxbox}/api/provider/achievements/models.py

@@ -1,13 +1,13 @@
 from datetime import datetime, time
-from typing import Any, List, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
-from xbox.webapi.common.models import CamelCaseModel
+from pythonxbox.common.models import CamelCaseModel
 
 
 class PagingInfo(CamelCaseModel):
-    continuation_token: Optional[str] = None
+    continuation_token: str | None = None
     total_records: int
 
 
@@ -37,20 +37,20 @@ class Title360(CamelCaseModel):
     sequence: int
     title_id: int
     title_type: int
-    platforms: List[int]
+    platforms: list[int]
     name: str
     total_achievements: int
     total_gamerscore: int
 
 
 class Achievement360Response(CamelCaseModel):
-    achievements: List[Achievement360]
+    achievements: list[Achievement360]
     paging_info: PagingInfo
     version: datetime
 
 
 class Achievement360ProgressResponse(CamelCaseModel):
-    titles: List[Title360]
+    titles: list[Title360]
     paging_info: PagingInfo
     version: datetime
 
@@ -62,7 +62,7 @@ class TitleAssociation(BaseModel):
 
 class Requirement(CamelCaseModel):
     id: str
-    current: Optional[str] = None
+    current: str | None = None
     target: str
     operation_type: str
     value_type: str
@@ -70,7 +70,7 @@ class Requirement(CamelCaseModel):
 
 
 class Progression(CamelCaseModel):
-    requirements: List[Requirement]
+    requirements: list[Requirement]
     time_unlocked: datetime
 
 
@@ -93,11 +93,11 @@ class Achievement(CamelCaseModel):
     id: str
     service_config_id: str
     name: str
-    title_associations: List[TitleAssociation]
+    title_associations: list[TitleAssociation]
     progress_state: str
     progression: Progression
-    media_assets: List[MediaAsset]
-    platforms: List[str]
+    media_assets: list[MediaAsset]
+    platforms: list[str]
     is_secret: bool
     description: str
     locked_description: str
@@ -105,14 +105,14 @@ class Achievement(CamelCaseModel):
     achievement_type: str
     participation_type: str
     time_window: Any = None
-    rewards: List[Reward]
+    rewards: list[Reward]
     estimated_time: time
     deeplink: Any = None
     is_revoked: bool
 
 
 class AchievementResponse(CamelCaseModel):
-    achievements: List[Achievement]
+    achievements: list[Achievement]
     paging_info: PagingInfo
 
 
@@ -129,5 +129,5 @@ class Title(CamelCaseModel):
 
 
 class RecentProgressResponse(CamelCaseModel):
-    titles: List[Title]
+    titles: list[Title]
     paging_info: PagingInfo

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

@@ -2,10 +2,8 @@
 Store Catalog - Lookup Product Information
 """
 
-from typing import List
-
-from xbox.webapi.api.provider.baseprovider import BaseProvider
-from xbox.webapi.api.provider.catalog.models import (
+from pythonxbox.api.provider.baseprovider import BaseProvider
+from pythonxbox.api.provider.catalog.models import (
     AlternateIdType,
     CatalogResponse,
     CatalogSearchResponse,
@@ -20,7 +18,7 @@ class CatalogProvider(BaseProvider):
 
     async def get_products(
         self,
-        big_ids: List[str],
+        big_ids: list[str],
         fields: FieldsTemplate = FieldsTemplate.DETAILS,
         **kwargs,
     ) -> CatalogResponse:

{python_xbox-0.1.0rc1/xbox/webapi → python_xbox-0.1.0rc3/src/pythonxbox}/api/provider/catalog/const.py

@@ -1,6 +1,6 @@
 """Web API Constants."""
 
-from xbox.webapi.api.provider.catalog.models import AlternateIdType
+from pythonxbox.api.provider.catalog.models import AlternateIdType
 
 HOME_APP_IDS = {
     AlternateIdType.LEGACY_XBOX_PRODUCT_ID: "7b3ca835-5ef5-4d96-bc84-c1d8b5084236",