diff --git a/pyproject.toml b/pyproject.toml index 91063ce..a69156c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,11 +32,11 @@ dynamic = ["version"] Homepage = "https://github.com/tr4nt0r/python-xbox" [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 @@ -78,14 +78,14 @@ tests = [ [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/webapi", + "src/pythonxbox", ] [tool.hatch.build.targets.wheel] -packages = ["xbox/webapi"] +packages = ["src/pythonxbox"] [tool.hatch.envs.default] python = "3.13" @@ -110,12 +110,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"] diff --git a/readme_example.py b/readme_example.py index af07cc1..0c26db0 100644 --- a/readme_example.py +++ b/readme_example.py @@ -3,11 +3,11 @@ 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.webapi.api.client import XboxLiveClient +from pythonxbox.webapi.authentication.manager import AuthenticationManager +from pythonxbox.webapi.authentication.models import OAuth2TokenResponse +from pythonxbox.webapi.common.signed_session import SignedSession +from pythonxbox.webapi.scripts import CLIENT_ID, CLIENT_SECRET, TOKENS_FILE """ This uses the global default client identification by OpenXbox diff --git a/xbox/webapi/__init__.py b/src/pythonxbox/__init__.py similarity index 100% rename from xbox/webapi/__init__.py rename to src/pythonxbox/__init__.py diff --git a/xbox/webapi/api/__init__.py b/src/pythonxbox/api/__init__.py similarity index 100% rename from xbox/webapi/api/__init__.py rename to src/pythonxbox/api/__init__.py diff --git a/xbox/webapi/api/client.py b/src/pythonxbox/api/client.py similarity index 78% rename from xbox/webapi/api/client.py rename to src/pythonxbox/api/client.py index 8bdc249..8955b68 100644 --- a/xbox/webapi/api/client.py +++ b/src/pythonxbox/api/client.py @@ -11,26 +11,26 @@ 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") diff --git a/xbox/webapi/api/language.py b/src/pythonxbox/api/language.py similarity index 100% rename from xbox/webapi/api/language.py rename to src/pythonxbox/api/language.py diff --git a/xbox/webapi/api/provider/__init__.py b/src/pythonxbox/api/provider/__init__.py similarity index 100% rename from xbox/webapi/api/provider/__init__.py rename to src/pythonxbox/api/provider/__init__.py diff --git a/xbox/webapi/api/provider/account/__init__.py b/src/pythonxbox/api/provider/account/__init__.py similarity index 94% rename from xbox/webapi/api/provider/account/__init__.py rename to src/pythonxbox/api/provider/account/__init__.py index b9e898b..0d92f05 100644 --- a/xbox/webapi/api/provider/account/__init__.py +++ b/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): diff --git a/xbox/webapi/api/provider/account/models.py b/src/pythonxbox/api/provider/account/models.py similarity index 100% rename from xbox/webapi/api/provider/account/models.py rename to src/pythonxbox/api/provider/account/models.py diff --git a/xbox/webapi/api/provider/achievements/__init__.py b/src/pythonxbox/api/provider/achievements/__init__.py similarity index 97% rename from xbox/webapi/api/provider/achievements/__init__.py rename to src/pythonxbox/api/provider/achievements/__init__.py index b2b6759..0002a82 100644 --- a/xbox/webapi/api/provider/achievements/__init__.py +++ b/src/pythonxbox/api/provider/achievements/__init__.py @@ -4,13 +4,13 @@ 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): diff --git a/xbox/webapi/api/provider/achievements/models.py b/src/pythonxbox/api/provider/achievements/models.py similarity index 98% rename from xbox/webapi/api/provider/achievements/models.py rename to src/pythonxbox/api/provider/achievements/models.py index 99e5406..dca7cc8 100644 --- a/xbox/webapi/api/provider/achievements/models.py +++ b/src/pythonxbox/api/provider/achievements/models.py @@ -3,7 +3,7 @@ from pydantic import BaseModel -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class PagingInfo(CamelCaseModel): diff --git a/xbox/webapi/api/provider/baseprovider.py b/src/pythonxbox/api/provider/baseprovider.py similarity index 100% rename from xbox/webapi/api/provider/baseprovider.py rename to src/pythonxbox/api/provider/baseprovider.py diff --git a/xbox/webapi/api/provider/catalog/__init__.py b/src/pythonxbox/api/provider/catalog/__init__.py similarity index 95% rename from xbox/webapi/api/provider/catalog/__init__.py rename to src/pythonxbox/api/provider/catalog/__init__.py index 0eef81a..18c4d72 100644 --- a/xbox/webapi/api/provider/catalog/__init__.py +++ b/src/pythonxbox/api/provider/catalog/__init__.py @@ -4,8 +4,8 @@ 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, diff --git a/xbox/webapi/api/provider/catalog/const.py b/src/pythonxbox/api/provider/catalog/const.py similarity index 85% rename from xbox/webapi/api/provider/catalog/const.py rename to src/pythonxbox/api/provider/catalog/const.py index f0143d7..1a87c74 100644 --- a/xbox/webapi/api/provider/catalog/const.py +++ b/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", diff --git a/xbox/webapi/api/provider/catalog/models.py b/src/pythonxbox/api/provider/catalog/models.py similarity index 99% rename from xbox/webapi/api/provider/catalog/models.py rename to src/pythonxbox/api/provider/catalog/models.py index a4c5a65..eb16213 100644 --- a/xbox/webapi/api/provider/catalog/models.py +++ b/src/pythonxbox/api/provider/catalog/models.py @@ -4,7 +4,7 @@ from pydantic import Field, field_validator -from xbox.webapi.common.models import PascalCaseModel +from pythonxbox.common.models import PascalCaseModel class AlternateIdType(str, Enum): diff --git a/xbox/webapi/api/provider/cqs/__init__.py b/src/pythonxbox/api/provider/cqs/__init__.py similarity index 95% rename from xbox/webapi/api/provider/cqs/__init__.py rename to src/pythonxbox/api/provider/cqs/__init__.py index b581eca..07a9620 100644 --- a/xbox/webapi/api/provider/cqs/__init__.py +++ b/src/pythonxbox/api/provider/cqs/__init__.py @@ -5,8 +5,8 @@ (RemoteTVInput ServiceChannel on Smartglass) """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.cqs.models import ( +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.cqs.models import ( CqsChannelListResponse, CqsScheduleResponse, ) diff --git a/xbox/webapi/api/provider/cqs/models.py b/src/pythonxbox/api/provider/cqs/models.py similarity index 95% rename from xbox/webapi/api/provider/cqs/models.py rename to src/pythonxbox/api/provider/cqs/models.py index 10f9d76..58841d7 100644 --- a/xbox/webapi/api/provider/cqs/models.py +++ b/src/pythonxbox/api/provider/cqs/models.py @@ -1,6 +1,6 @@ from typing import Any, Dict, List, Optional -from xbox.webapi.common.models import PascalCaseModel +from pythonxbox.common.models import PascalCaseModel class Image(PascalCaseModel): diff --git a/xbox/webapi/api/provider/gameclips/__init__.py b/src/pythonxbox/api/provider/gameclips/__init__.py similarity index 97% rename from xbox/webapi/api/provider/gameclips/__init__.py rename to src/pythonxbox/api/provider/gameclips/__init__.py index f8ce717..8f28a25 100644 --- a/xbox/webapi/api/provider/gameclips/__init__.py +++ b/src/pythonxbox/api/provider/gameclips/__init__.py @@ -2,8 +2,8 @@ Gameclips - Get gameclip info """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.gameclips.models import GameclipsResponse +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.gameclips.models import GameclipsResponse class GameclipProvider(BaseProvider): diff --git a/xbox/webapi/api/provider/gameclips/models.py b/src/pythonxbox/api/provider/gameclips/models.py similarity index 95% rename from xbox/webapi/api/provider/gameclips/models.py rename to src/pythonxbox/api/provider/gameclips/models.py index 6191d9e..e832527 100644 --- a/xbox/webapi/api/provider/gameclips/models.py +++ b/src/pythonxbox/api/provider/gameclips/models.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import List, Optional -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class Thumbnail(CamelCaseModel): diff --git a/xbox/webapi/api/provider/lists/__init__.py b/src/pythonxbox/api/provider/lists/__init__.py similarity index 93% rename from xbox/webapi/api/provider/lists/__init__.py rename to src/pythonxbox/api/provider/lists/__init__.py index fcfb575..861980e 100644 --- a/xbox/webapi/api/provider/lists/__init__.py +++ b/src/pythonxbox/api/provider/lists/__init__.py @@ -2,8 +2,8 @@ EPLists - Mainly used for XBL Pins """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.lists.models import ListMetadata, ListsResponse +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.lists.models import ListMetadata, ListsResponse class ListsProvider(BaseProvider): diff --git a/xbox/webapi/api/provider/lists/models.py b/src/pythonxbox/api/provider/lists/models.py similarity index 92% rename from xbox/webapi/api/provider/lists/models.py rename to src/pythonxbox/api/provider/lists/models.py index 1d05ed4..b21e95b 100644 --- a/xbox/webapi/api/provider/lists/models.py +++ b/src/pythonxbox/api/provider/lists/models.py @@ -1,6 +1,6 @@ from typing import List, Optional -from xbox.webapi.common.models import PascalCaseModel +from pythonxbox.common.models import PascalCaseModel class Item(PascalCaseModel): diff --git a/xbox/webapi/api/provider/mediahub/__init__.py b/src/pythonxbox/api/provider/mediahub/__init__.py similarity index 93% rename from xbox/webapi/api/provider/mediahub/__init__.py rename to src/pythonxbox/api/provider/mediahub/__init__.py index 9870dc4..18210a3 100644 --- a/xbox/webapi/api/provider/mediahub/__init__.py +++ b/src/pythonxbox/api/provider/mediahub/__init__.py @@ -2,8 +2,8 @@ Mediahub - Fetch screenshots and gameclips """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.mediahub.models import ( +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.mediahub.models import ( MediahubGameclips, MediahubScreenshots, ) diff --git a/xbox/webapi/api/provider/mediahub/models.py b/src/pythonxbox/api/provider/mediahub/models.py similarity index 97% rename from xbox/webapi/api/provider/mediahub/models.py rename to src/pythonxbox/api/provider/mediahub/models.py index a8ec3f9..c55f914 100644 --- a/xbox/webapi/api/provider/mediahub/models.py +++ b/src/pythonxbox/api/provider/mediahub/models.py @@ -1,6 +1,6 @@ from typing import List, Optional -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class ContentSegment(CamelCaseModel): diff --git a/xbox/webapi/api/provider/message/__init__.py b/src/pythonxbox/api/provider/message/__init__.py similarity index 97% rename from xbox/webapi/api/provider/message/__init__.py rename to src/pythonxbox/api/provider/message/__init__.py index 78e73f3..3c08b93 100644 --- a/xbox/webapi/api/provider/message/__init__.py +++ b/src/pythonxbox/api/provider/message/__init__.py @@ -4,8 +4,8 @@ TODO: Support group messaging """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.message.models import ( +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.message.models import ( ConversationResponse, InboxResponse, SendMessageResponse, diff --git a/xbox/webapi/api/provider/message/models.py b/src/pythonxbox/api/provider/message/models.py similarity index 97% rename from xbox/webapi/api/provider/message/models.py rename to src/pythonxbox/api/provider/message/models.py index cbe8dfb..93833a5 100644 --- a/xbox/webapi/api/provider/message/models.py +++ b/src/pythonxbox/api/provider/message/models.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Any, List, Optional -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class Part(CamelCaseModel): diff --git a/xbox/webapi/api/provider/people/__init__.py b/src/pythonxbox/api/provider/people/__init__.py similarity index 97% rename from xbox/webapi/api/provider/people/__init__.py rename to src/pythonxbox/api/provider/people/__init__.py index 61b1984..cd082fc 100644 --- a/xbox/webapi/api/provider/people/__init__.py +++ b/src/pythonxbox/api/provider/people/__init__.py @@ -2,16 +2,16 @@ People - Access friendlist from own profiles and others """ -from xbox.webapi.api.provider.people.models import ( +from pythonxbox.api.provider.people.models import ( PeopleDecoration, PeopleResponse, PeopleSummaryResponse, ) -from xbox.webapi.api.provider.ratelimitedprovider import RateLimitedProvider +from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider from typing import TYPE_CHECKING if TYPE_CHECKING: - from xbox.webapi.api.client import XboxLiveClient + from pythonxbox.api.client import XboxLiveClient class PeopleProvider(RateLimitedProvider): diff --git a/xbox/webapi/api/provider/people/models.py b/src/pythonxbox/api/provider/people/models.py similarity index 98% rename from xbox/webapi/api/provider/people/models.py rename to src/pythonxbox/api/provider/people/models.py index 3769952..7fd8224 100644 --- a/xbox/webapi/api/provider/people/models.py +++ b/src/pythonxbox/api/provider/people/models.py @@ -6,7 +6,7 @@ from pydantic import Field -from xbox.webapi.common.models import CamelCaseModel, PascalCaseModel +from pythonxbox.common.models import CamelCaseModel, PascalCaseModel class PeopleDecoration(StrEnum): diff --git a/xbox/webapi/api/provider/presence/__init__.py b/src/pythonxbox/api/provider/presence/__init__.py similarity index 96% rename from xbox/webapi/api/provider/presence/__init__.py rename to src/pythonxbox/api/provider/presence/__init__.py index 3faa7c4..2500985 100644 --- a/xbox/webapi/api/provider/presence/__init__.py +++ b/src/pythonxbox/api/provider/presence/__init__.py @@ -4,8 +4,8 @@ from typing import List -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.presence.models import ( +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.presence.models import ( PresenceBatchResponse, PresenceItem, PresenceLevel, diff --git a/xbox/webapi/api/provider/presence/models.py b/src/pythonxbox/api/provider/presence/models.py similarity index 95% rename from xbox/webapi/api/provider/presence/models.py rename to src/pythonxbox/api/provider/presence/models.py index aec7188..b4c156e 100644 --- a/xbox/webapi/api/provider/presence/models.py +++ b/src/pythonxbox/api/provider/presence/models.py @@ -2,7 +2,7 @@ from typing import List, Optional from pydantic import RootModel -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class PresenceLevel(str, Enum): diff --git a/xbox/webapi/api/provider/profile/__init__.py b/src/pythonxbox/api/provider/profile/__init__.py similarity index 96% rename from xbox/webapi/api/provider/profile/__init__.py rename to src/pythonxbox/api/provider/profile/__init__.py index b86cb5f..077a931 100644 --- a/xbox/webapi/api/provider/profile/__init__.py +++ b/src/pythonxbox/api/provider/profile/__init__.py @@ -6,8 +6,8 @@ from typing import List -from xbox.webapi.api.provider.ratelimitedprovider import RateLimitedProvider -from xbox.webapi.api.provider.profile.models import ProfileResponse, ProfileSettings +from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider +from pythonxbox.api.provider.profile.models import ProfileResponse, ProfileSettings class ProfileProvider(RateLimitedProvider): diff --git a/xbox/webapi/api/provider/profile/models.py b/src/pythonxbox/api/provider/profile/models.py similarity index 95% rename from xbox/webapi/api/provider/profile/models.py rename to src/pythonxbox/api/provider/profile/models.py index f28ba55..4f0ffe4 100644 --- a/xbox/webapi/api/provider/profile/models.py +++ b/src/pythonxbox/api/provider/profile/models.py @@ -1,7 +1,7 @@ from enum import Enum from typing import List -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class ProfileSettings(str, Enum): diff --git a/xbox/webapi/api/provider/ratelimitedprovider.py b/src/pythonxbox/api/provider/ratelimitedprovider.py similarity index 91% rename from xbox/webapi/api/provider/ratelimitedprovider.py rename to src/pythonxbox/api/provider/ratelimitedprovider.py index b95331c..a886c8e 100644 --- a/xbox/webapi/api/provider/ratelimitedprovider.py +++ b/src/pythonxbox/api/provider/ratelimitedprovider.py @@ -6,10 +6,10 @@ from typing import Dict, Union -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.common.exceptions import XboxException -from xbox.webapi.common.ratelimits import CombinedRateLimit -from xbox.webapi.common.ratelimits.models import LimitType, ParsedRateLimit, TimePeriod +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.common.exceptions import XboxException +from pythonxbox.common.ratelimits import CombinedRateLimit +from pythonxbox.common.ratelimits.models import LimitType, ParsedRateLimit, TimePeriod class RateLimitedProvider(BaseProvider): diff --git a/xbox/webapi/api/provider/screenshots/__init__.py b/src/pythonxbox/api/provider/screenshots/__init__.py similarity index 97% rename from xbox/webapi/api/provider/screenshots/__init__.py rename to src/pythonxbox/api/provider/screenshots/__init__.py index 4ef3229..309ab66 100644 --- a/xbox/webapi/api/provider/screenshots/__init__.py +++ b/src/pythonxbox/api/provider/screenshots/__init__.py @@ -2,8 +2,8 @@ Screenshots - Get screenshot info """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.screenshots.models import ScreenshotResponse +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.screenshots.models import ScreenshotResponse class ScreenshotsProvider(BaseProvider): diff --git a/xbox/webapi/api/provider/screenshots/models.py b/src/pythonxbox/api/provider/screenshots/models.py similarity index 95% rename from xbox/webapi/api/provider/screenshots/models.py rename to src/pythonxbox/api/provider/screenshots/models.py index c36fe93..0de8b6e 100644 --- a/xbox/webapi/api/provider/screenshots/models.py +++ b/src/pythonxbox/api/provider/screenshots/models.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Any, List, Optional -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class Thumbnail(CamelCaseModel): diff --git a/xbox/webapi/api/provider/smartglass/__init__.py b/src/pythonxbox/api/provider/smartglass/__init__.py similarity index 98% rename from xbox/webapi/api/provider/smartglass/__init__.py rename to src/pythonxbox/api/provider/smartglass/__init__.py index 9ae8f61..bfff535 100644 --- a/xbox/webapi/api/provider/smartglass/__init__.py +++ b/src/pythonxbox/api/provider/smartglass/__init__.py @@ -7,8 +7,8 @@ from httpx import Response -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.smartglass.models import ( +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.smartglass.models import ( CommandResponse, GuideTab, InputKeyType, diff --git a/xbox/webapi/api/provider/smartglass/models.py b/src/pythonxbox/api/provider/smartglass/models.py similarity index 98% rename from xbox/webapi/api/provider/smartglass/models.py rename to src/pythonxbox/api/provider/smartglass/models.py index caf126a..76789a4 100644 --- a/xbox/webapi/api/provider/smartglass/models.py +++ b/src/pythonxbox/api/provider/smartglass/models.py @@ -2,7 +2,7 @@ from enum import Enum from typing import List, Optional -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel # Responses diff --git a/xbox/webapi/api/provider/titlehub/__init__.py b/src/pythonxbox/api/provider/titlehub/__init__.py similarity index 96% rename from xbox/webapi/api/provider/titlehub/__init__.py rename to src/pythonxbox/api/provider/titlehub/__init__.py index 40d65ea..8d6f144 100644 --- a/xbox/webapi/api/provider/titlehub/__init__.py +++ b/src/pythonxbox/api/provider/titlehub/__init__.py @@ -4,8 +4,8 @@ from typing import List, Optional -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.titlehub.models import TitleFields, TitleHubResponse +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.titlehub.models import TitleFields, TitleHubResponse class TitlehubProvider(BaseProvider): diff --git a/xbox/webapi/api/provider/titlehub/models.py b/src/pythonxbox/api/provider/titlehub/models.py similarity index 97% rename from xbox/webapi/api/provider/titlehub/models.py rename to src/pythonxbox/api/provider/titlehub/models.py index b48937b..c197c64 100644 --- a/xbox/webapi/api/provider/titlehub/models.py +++ b/src/pythonxbox/api/provider/titlehub/models.py @@ -2,7 +2,7 @@ from enum import Enum from typing import Any, List, Optional -from xbox.webapi.common.models import CamelCaseModel, PascalCaseModel +from pythonxbox.common.models import CamelCaseModel, PascalCaseModel class TitleFields(str, Enum): diff --git a/xbox/webapi/api/provider/usersearch/__init__.py b/src/pythonxbox/api/provider/usersearch/__init__.py similarity index 85% rename from xbox/webapi/api/provider/usersearch/__init__.py rename to src/pythonxbox/api/provider/usersearch/__init__.py index 882eb09..4f43f39 100644 --- a/xbox/webapi/api/provider/usersearch/__init__.py +++ b/src/pythonxbox/api/provider/usersearch/__init__.py @@ -2,8 +2,8 @@ Usersearch - Search for gamertags / userprofiles """ -from xbox.webapi.api.provider.baseprovider import BaseProvider -from xbox.webapi.api.provider.usersearch.models import UserSearchResponse +from pythonxbox.api.provider.baseprovider import BaseProvider +from pythonxbox.api.provider.usersearch.models import UserSearchResponse class UserSearchProvider(BaseProvider): diff --git a/xbox/webapi/api/provider/usersearch/models.py b/src/pythonxbox/api/provider/usersearch/models.py similarity index 84% rename from xbox/webapi/api/provider/usersearch/models.py rename to src/pythonxbox/api/provider/usersearch/models.py index a0c993a..d42d094 100644 --- a/xbox/webapi/api/provider/usersearch/models.py +++ b/src/pythonxbox/api/provider/usersearch/models.py @@ -1,6 +1,6 @@ from typing import List -from xbox.webapi.common.models import CamelCaseModel +from pythonxbox.common.models import CamelCaseModel class UserDetail(CamelCaseModel): diff --git a/xbox/webapi/api/provider/userstats/__init__.py b/src/pythonxbox/api/provider/userstats/__init__.py similarity index 97% rename from xbox/webapi/api/provider/userstats/__init__.py rename to src/pythonxbox/api/provider/userstats/__init__.py index 6b9299f..afb9c02 100644 --- a/xbox/webapi/api/provider/userstats/__init__.py +++ b/src/pythonxbox/api/provider/userstats/__init__.py @@ -4,8 +4,8 @@ from typing import List, Optional -from xbox.webapi.api.provider.ratelimitedprovider import RateLimitedProvider -from xbox.webapi.api.provider.userstats.models import ( +from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider +from pythonxbox.api.provider.userstats.models import ( GeneralStatsField, UserStatsResponse, ) diff --git a/xbox/webapi/api/provider/userstats/models.py b/src/pythonxbox/api/provider/userstats/models.py similarity index 93% rename from xbox/webapi/api/provider/userstats/models.py rename to src/pythonxbox/api/provider/userstats/models.py index 744be54..b318bf0 100644 --- a/xbox/webapi/api/provider/userstats/models.py +++ b/src/pythonxbox/api/provider/userstats/models.py @@ -1,6 +1,6 @@ from typing import List, Optional -from xbox.webapi.common.models import LowerCaseModel, PascalCaseModel +from pythonxbox.common.models import LowerCaseModel, PascalCaseModel class GeneralStatsField: diff --git a/xbox/webapi/authentication/__init__.py b/src/pythonxbox/authentication/__init__.py similarity index 100% rename from xbox/webapi/authentication/__init__.py rename to src/pythonxbox/authentication/__init__.py diff --git a/xbox/webapi/authentication/manager.py b/src/pythonxbox/authentication/manager.py similarity index 96% rename from xbox/webapi/authentication/manager.py rename to src/pythonxbox/authentication/manager.py index c43d977..5845e8a 100644 --- a/xbox/webapi/authentication/manager.py +++ b/src/pythonxbox/authentication/manager.py @@ -9,13 +9,13 @@ import httpx -from xbox.webapi.authentication.models import ( +from pythonxbox.authentication.models import ( OAuth2TokenResponse, XAUResponse, XSTSResponse, ) -from xbox.webapi.common.exceptions import AuthenticationException -from xbox.webapi.common.signed_session import SignedSession +from pythonxbox.common.exceptions import AuthenticationException +from pythonxbox.common.signed_session import SignedSession log = logging.getLogger("authentication") diff --git a/xbox/webapi/authentication/models.py b/src/pythonxbox/authentication/models.py similarity index 98% rename from xbox/webapi/authentication/models.py rename to src/pythonxbox/authentication/models.py index d53b610..834fc8e 100644 --- a/xbox/webapi/authentication/models.py +++ b/src/pythonxbox/authentication/models.py @@ -6,7 +6,7 @@ from pydantic import BaseModel, Field from pydantic.dataclasses import dataclass -from xbox.webapi.common.models import PascalCaseModel +from pythonxbox.common.models import PascalCaseModel def utc_now(): diff --git a/xbox/webapi/authentication/xal.py b/src/pythonxbox/authentication/xal.py similarity index 99% rename from xbox/webapi/authentication/xal.py rename to src/pythonxbox/authentication/xal.py index fffff22..d662d89 100644 --- a/xbox/webapi/authentication/xal.py +++ b/src/pythonxbox/authentication/xal.py @@ -15,7 +15,7 @@ import httpx from ms_cv import CorrelationVector -from xbox.webapi.authentication.models import ( +from pythonxbox.authentication.models import ( OAuth2TokenResponse, SisuAuthenticationResponse, SisuAuthorizationResponse, @@ -25,7 +25,7 @@ XalClientParameters, XSTSResponse, ) -from xbox.webapi.common.signed_session import SignedSession +from pythonxbox.common.signed_session import SignedSession log = logging.getLogger("xal.authentication") diff --git a/xbox/webapi/common/__init__.py b/src/pythonxbox/common/__init__.py similarity index 100% rename from xbox/webapi/common/__init__.py rename to src/pythonxbox/common/__init__.py diff --git a/xbox/webapi/common/exceptions.py b/src/pythonxbox/common/exceptions.py similarity index 96% rename from xbox/webapi/common/exceptions.py rename to src/pythonxbox/common/exceptions.py index b3b7bd4..28b60a0 100644 --- a/xbox/webapi/common/exceptions.py +++ b/src/pythonxbox/common/exceptions.py @@ -2,7 +2,7 @@ Special Exception subclasses """ -from xbox.webapi.common.ratelimits import RateLimit +from pythonxbox.common.ratelimits import RateLimit class XboxException(Exception): diff --git a/xbox/webapi/common/filetimes.py b/src/pythonxbox/common/filetimes.py similarity index 100% rename from xbox/webapi/common/filetimes.py rename to src/pythonxbox/common/filetimes.py diff --git a/xbox/webapi/common/models.py b/src/pythonxbox/common/models.py similarity index 100% rename from xbox/webapi/common/models.py rename to src/pythonxbox/common/models.py diff --git a/xbox/webapi/common/ratelimits/__init__.py b/src/pythonxbox/common/ratelimits/__init__.py similarity index 99% rename from xbox/webapi/common/ratelimits/__init__.py rename to src/pythonxbox/common/ratelimits/__init__.py index c7dbfb5..ba70d90 100644 --- a/xbox/webapi/common/ratelimits/__init__.py +++ b/src/pythonxbox/common/ratelimits/__init__.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta from typing import List, Union -from xbox.webapi.common.ratelimits.models import ( +from pythonxbox.common.ratelimits.models import ( IncrementResult, LimitType, ParsedRateLimit, diff --git a/xbox/webapi/common/ratelimits/models.py b/src/pythonxbox/common/ratelimits/models.py similarity index 100% rename from xbox/webapi/common/ratelimits/models.py rename to src/pythonxbox/common/ratelimits/models.py diff --git a/xbox/webapi/common/request_signer.py b/src/pythonxbox/common/request_signer.py similarity index 98% rename from xbox/webapi/common/request_signer.py rename to src/pythonxbox/common/request_signer.py index 53e9cf9..f635554 100644 --- a/xbox/webapi/common/request_signer.py +++ b/src/pythonxbox/common/request_signer.py @@ -12,8 +12,8 @@ from ecdsa import NIST256p, SigningKey, VerifyingKey -from xbox.webapi.authentication.models import SignaturePolicy -from xbox.webapi.common import filetimes +from pythonxbox.authentication.models import SignaturePolicy +from pythonxbox.common import filetimes DEFAULT_SIGNING_POLICY = SignaturePolicy( version=1, supported_algorithms=["ES256"], max_body_bytes=8192 diff --git a/xbox/webapi/common/signed_session.py b/src/pythonxbox/common/signed_session.py similarity index 96% rename from xbox/webapi/common/signed_session.py rename to src/pythonxbox/common/signed_session.py index 9d35b1c..d363ea5 100644 --- a/xbox/webapi/common/signed_session.py +++ b/src/pythonxbox/common/signed_session.py @@ -6,7 +6,7 @@ import httpx from ssl import SSLContext -from xbox.webapi.common.request_signer import RequestSigner +from pythonxbox.common.request_signer import RequestSigner class SignedSession(httpx.AsyncClient): diff --git a/xbox/webapi/scripts/__init__.py b/src/pythonxbox/scripts/__init__.py similarity index 100% rename from xbox/webapi/scripts/__init__.py rename to src/pythonxbox/scripts/__init__.py diff --git a/xbox/webapi/scripts/authenticate.py b/src/pythonxbox/scripts/authenticate.py similarity index 94% rename from xbox/webapi/scripts/authenticate.py rename to src/pythonxbox/scripts/authenticate.py index f822208..6fb2587 100644 --- a/xbox/webapi/scripts/authenticate.py +++ b/src/pythonxbox/scripts/authenticate.py @@ -12,10 +12,10 @@ from urllib.parse import parse_qs, urlparse import webbrowser -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, REDIRECT_URI, TOKENS_FILE +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, REDIRECT_URI, TOKENS_FILE QUEUE = queue.Queue(1) diff --git a/xbox/webapi/scripts/change_gamertag.py b/src/pythonxbox/scripts/change_gamertag.py similarity index 88% rename from xbox/webapi/scripts/change_gamertag.py rename to src/pythonxbox/scripts/change_gamertag.py index cd6f178..7507879 100644 --- a/xbox/webapi/scripts/change_gamertag.py +++ b/src/pythonxbox/scripts/change_gamertag.py @@ -9,15 +9,15 @@ from httpx import HTTPStatusError -from xbox.webapi.api.client import XboxLiveClient -from xbox.webapi.api.provider.account.models import ( +from pythonxbox.api.client import XboxLiveClient +from pythonxbox.api.provider.account.models import ( ChangeGamertagResult, ClaimGamertagResult, ) -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.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 async def async_main(): diff --git a/xbox/webapi/scripts/friends.py b/src/pythonxbox/scripts/friends.py similarity index 85% rename from xbox/webapi/scripts/friends.py rename to src/pythonxbox/scripts/friends.py index 48d14c8..86727c5 100644 --- a/xbox/webapi/scripts/friends.py +++ b/src/pythonxbox/scripts/friends.py @@ -10,11 +10,11 @@ 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 async def async_main(): diff --git a/xbox/webapi/scripts/search.py b/src/pythonxbox/scripts/search.py similarity index 83% rename from xbox/webapi/scripts/search.py rename to src/pythonxbox/scripts/search.py index 45e8938..4df9177 100644 --- a/xbox/webapi/scripts/search.py +++ b/src/pythonxbox/scripts/search.py @@ -9,9 +9,9 @@ from httpx import HTTPStatusError -from xbox.webapi.api.client import XboxLiveClient -from xbox.webapi.authentication.manager import AuthenticationManager -from xbox.webapi.common.signed_session import SignedSession +from pythonxbox.api.client import XboxLiveClient +from pythonxbox.authentication.manager import AuthenticationManager +from pythonxbox.common.signed_session import SignedSession async def async_main(): diff --git a/xbox/webapi/scripts/xal.py b/src/pythonxbox/scripts/xal.py similarity index 93% rename from xbox/webapi/scripts/xal.py rename to src/pythonxbox/scripts/xal.py index 4f74227..567608c 100644 --- a/xbox/webapi/scripts/xal.py +++ b/src/pythonxbox/scripts/xal.py @@ -11,18 +11,18 @@ from pydantic import BaseModel from pydantic.json import pydantic_encoder -from xbox.webapi.authentication.models import ( +from pythonxbox.authentication.models import ( SisuAuthorizationResponse, XalAppParameters, XalClientParameters, ) -from xbox.webapi.authentication.xal import ( +from pythonxbox.authentication.xal import ( APP_PARAMS_GAMEPASS_BETA, CLIENT_PARAMS_ANDROID, XALManager, ) -from xbox.webapi.common.signed_session import SignedSession -from xbox.webapi.scripts import XAL_TOKENS_FILE +from pythonxbox.common.signed_session import SignedSession +from pythonxbox.scripts import XAL_TOKENS_FILE class XALStore(BaseModel): diff --git a/tests/conftest.py b/tests/conftest.py index d8dc324..269cb1a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,20 +5,20 @@ import pytest import pytest_asyncio -from xbox.webapi.api.client import XboxLiveClient -from xbox.webapi.authentication.manager import AuthenticationManager -from xbox.webapi.authentication.models import ( +from pythonxbox.api.client import XboxLiveClient +from pythonxbox.authentication.manager import AuthenticationManager +from pythonxbox.authentication.models import ( OAuth2TokenResponse, XAUResponse, XSTSResponse, ) -from xbox.webapi.authentication.xal import ( +from pythonxbox.authentication.xal import ( APP_PARAMS_GAMEPASS_BETA, CLIENT_PARAMS_ANDROID, XALManager, ) -from xbox.webapi.common.request_signer import RequestSigner -from xbox.webapi.common.signed_session import SignedSession +from pythonxbox.common.request_signer import RequestSigner +from pythonxbox.common.signed_session import SignedSession from tests.common import get_response diff --git a/tests/test_account.py b/tests/test_account.py index dade838..78a97ba 100644 --- a/tests/test_account.py +++ b/tests/test_account.py @@ -1,7 +1,7 @@ from httpx import HTTPStatusError, Response import pytest -from xbox.webapi.api.provider.account.models import ( +from pythonxbox.api.provider.account.models import ( ChangeGamertagResult, ClaimGamertagResult, ) diff --git a/tests/test_catalog.py b/tests/test_catalog.py index c5b90a8..197acea 100644 --- a/tests/test_catalog.py +++ b/tests/test_catalog.py @@ -1,7 +1,7 @@ from httpx import Response import pytest -from xbox.webapi.api.provider.catalog.models import AlternateIdType, FieldsTemplate +from pythonxbox.api.provider.catalog.models import AlternateIdType, FieldsTemplate from tests.common import get_response_json diff --git a/tests/test_presence.py b/tests/test_presence.py index 593719d..6ef4a1f 100644 --- a/tests/test_presence.py +++ b/tests/test_presence.py @@ -1,7 +1,7 @@ from httpx import Response import pytest -from xbox.webapi.api.provider.presence.models import PresenceState +from pythonxbox.api.provider.presence.models import PresenceState from tests.common import get_response_json diff --git a/tests/test_ratelimits.py b/tests/test_ratelimits.py index 78b31fc..b3176fb 100644 --- a/tests/test_ratelimits.py +++ b/tests/test_ratelimits.py @@ -6,10 +6,10 @@ import pytest from tests.common import get_response_json -from xbox.webapi.api.provider.ratelimitedprovider import RateLimitedProvider -from xbox.webapi.common.exceptions import RateLimitExceededException, XboxException -from xbox.webapi.common.ratelimits import CombinedRateLimit -from xbox.webapi.common.ratelimits.models import TimePeriod +from pythonxbox.api.provider.ratelimitedprovider import RateLimitedProvider +from pythonxbox.common.exceptions import RateLimitExceededException, XboxException +from pythonxbox.common.ratelimits import CombinedRateLimit +from pythonxbox.common.ratelimits.models import TimePeriod def helper_test_combinedratelimit( diff --git a/tests/test_request_signer.py b/tests/test_request_signer.py index 9cee80a..2f53e44 100644 --- a/tests/test_request_signer.py +++ b/tests/test_request_signer.py @@ -3,7 +3,7 @@ import pytest from ecdsa.keys import VerifyingKey, BadSignatureError -from xbox.webapi.common.request_signer import RequestSigner +from pythonxbox.common.request_signer import RequestSigner def test_synthetic_proof_key(synthetic_request_signer: RequestSigner): diff --git a/tests/test_signed_session.py b/tests/test_signed_session.py index 387d129..98b5b71 100644 --- a/tests/test_signed_session.py +++ b/tests/test_signed_session.py @@ -1,7 +1,7 @@ from httpx import Request, Response import pytest -from xbox.webapi.common.signed_session import SignedSession +from pythonxbox.common.signed_session import SignedSession from tests.common import get_response_json diff --git a/tests/test_smartglass.py b/tests/test_smartglass.py index a473f98..2bfe144 100644 --- a/tests/test_smartglass.py +++ b/tests/test_smartglass.py @@ -1,7 +1,7 @@ from httpx import Response import pytest -from xbox.webapi.api.provider.smartglass.models import InputKeyType, VolumeDirection +from pythonxbox.api.provider.smartglass.models import InputKeyType, VolumeDirection from tests.common import get_response_json diff --git a/tests/test_xbl_client.py b/tests/test_xbl_client.py index 8300393..66e4b0b 100644 --- a/tests/test_xbl_client.py +++ b/tests/test_xbl_client.py @@ -1,4 +1,4 @@ -from xbox.webapi.api.client import XboxLiveClient +from pythonxbox.api.client import XboxLiveClient def test_authorization_header(auth_mgr):