Update for pydantic v2 compatibility

Author: tuxuser

README.md

@@ -100,12 +100,17 @@ async def async_main():
             with open(tokens_file) as f:
                 tokens = f.read()
             # Assign gathered tokens
-            auth_mgr.oauth = OAuth2TokenResponse.parse_raw(tokens)
+            auth_mgr.oauth = OAuth2TokenResponse.model_validate_json(tokens)
         except FileNotFoundError as e:
             print(
                 f"File {tokens_file} isn`t found or it doesn`t contain tokens! err={e}"
             )
-            sys.exit(-1)
+            print("Authorizing via OAUTH")
+            url = auth_mgr.generate_authorization_url()
+            print(f"Auth via URL: {url}")
+            authorization_code = input("Enter authorization code> ")
+            tokens = await auth_mgr.request_oauth_token(authorization_code)
+            auth_mgr.oauth = tokens
 
         """
         Refresh tokens, just in case

readme_example.py

@@ -39,12 +39,17 @@ async def async_main():
             with open(tokens_file) as f:
                 tokens = f.read()
             # Assign gathered tokens
-            auth_mgr.oauth = OAuth2TokenResponse.parse_raw(tokens)
+            auth_mgr.oauth = OAuth2TokenResponse.model_validate_json(tokens)
         except FileNotFoundError as e:
             print(
                 f"File {tokens_file} isn`t found or it doesn`t contain tokens! err={e}"
             )
-            sys.exit(-1)
+            print("Authorizing via OAUTH")
+            url = auth_mgr.generate_authorization_url()
+            print(f"Auth via URL: {url}")
+            authorization_code = input("Enter authorization code> ")
+            tokens = await auth_mgr.request_oauth_token(authorization_code)
+            auth_mgr.oauth = tokens
 
         """
         Refresh tokens, just in case

requirements.txt

@@ -3,7 +3,7 @@ httpx
 appdirs
 ecdsa
 ms_cv
-pydantic
+pydantic==2.*
 
 # Dev
 pytest

tests/conftest.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, UTC
 import uuid
 
 from ecdsa.keys import SigningKey, VerifyingKey
@@ -29,9 +29,9 @@
 async def auth_mgr(event_loop):
     session = SignedSession()
     mgr = AuthenticationManager(session, "abc", "123", "http://localhost")
-    mgr.oauth = OAuth2TokenResponse.parse_raw(get_response("auth_oauth2_token"))
-    mgr.user_token = XAUResponse.parse_raw(get_response("auth_user_token"))
-    mgr.xsts_token = XSTSResponse.parse_raw(get_response("auth_xsts_token"))
+    mgr.oauth = OAuth2TokenResponse.model_validate_json(get_response("auth_oauth2_token"))
+    mgr.user_token = XAUResponse.model_validate_json(get_response("auth_user_token"))
+    mgr.xsts_token = XSTSResponse.model_validate_json(get_response("auth_xsts_token"))
     yield mgr
     await session.aclose()
 
@@ -77,4 +77,4 @@ def synthetic_request_signer(ecdsa_signing_key) -> RequestSigner:
 
 @pytest.fixture(scope="session")
 def synthetic_timestamp() -> datetime:
-    return datetime.utcfromtimestamp(1586999965)
+    return datetime.fromtimestamp(1586999965, UTC)

xbox/webapi/api/provider/achievements/models.py

@@ -7,7 +7,7 @@
 
 
 class PagingInfo(CamelCaseModel):
-    continuation_token: Optional[str]
+    continuation_token: Optional[str] = None
     total_records: int
 
 
@@ -62,7 +62,7 @@ class TitleAssociation(BaseModel):
 
 class Requirement(CamelCaseModel):
     id: str
-    current: Optional[str]
+    current: Optional[str] = None
     target: str
     operation_type: str
     value_type: str
@@ -81,11 +81,11 @@ class MediaAsset(BaseModel):
 
 
 class Reward(CamelCaseModel):
-    name: Any
-    description: Any
+    name: Any = None
+    description: Any = None
     value: str
     type: str
-    media_asset: Any
+    media_asset: Any = None
     value_type: str
 
 
@@ -104,10 +104,10 @@ class Achievement(CamelCaseModel):
     product_id: str
     achievement_type: str
     participation_type: str
-    time_window: Any
+    time_window: Any = None
     rewards: List[Reward]
     estimated_time: time
-    deeplink: Any
+    deeplink: Any = None
     is_revoked: bool