changes suggested in PR feedback

Author: KShivendu

supertokens_python/recipe/session/asyncio/__init__.py

@@ -29,7 +29,7 @@
 )
 from supertokens_python.recipe.session.recipe import SessionRecipe
 from supertokens_python.types import MaybeAwaitable
-from supertokens_python.utils import FRAMEWORKS, resolve
+from supertokens_python.utils import FRAMEWORKS, resolve, deprecated_warn
 from ..utils import get_required_claim_validators
 from ...jwt.interfaces import (
     CreateJwtOkResult,
@@ -54,7 +54,9 @@ async def create_new_session(
     if access_token_payload is None:
         access_token_payload = {}
 
-    claims_added_by_other_recipes = SessionRecipe.get_claims_added_by_other_recipes()
+    claims_added_by_other_recipes = (
+        SessionRecipe.get_instance().get_claims_added_by_other_recipes()
+    )
     final_access_token_payload = access_token_payload
 
     for claim in claims_added_by_other_recipes:
@@ -101,7 +103,7 @@ async def validate_claims_for_session_handle(
         return SessionDoesNotExistError()
 
     claim_validators_added_by_other_recipes = (
-        SessionRecipe.get_claim_validators_added_by_other_recipes()
+        SessionRecipe.get_instance().get_claim_validators_added_by_other_recipes()
     )
     global_claim_validators = await resolve(
         recipe_impl.get_global_claim_validators(
@@ -146,7 +148,7 @@ async def validate_claims_in_jwt_payload(
     recipe_impl = SessionRecipe.get_instance().recipe_implementation
 
     claim_validators_added_by_other_recipes = (
-        SessionRecipe.get_claim_validators_added_by_other_recipes()
+        SessionRecipe.get_instance().get_claim_validators_added_by_other_recipes()
     )
     global_claim_validators = await resolve(
         recipe_impl.get_global_claim_validators(
@@ -338,6 +340,11 @@ async def update_access_token_payload(
 ) -> bool:
     if user_context is None:
         user_context = {}
+
+    deprecated_warn(
+        "update_access_token_payload is deprecated. Use merge_into_access_token_payload instead"
+    )
+
     return await SessionRecipe.get_instance().recipe_implementation.update_access_token_payload(
         session_handle, new_access_token_payload, user_context
     )

supertokens_python/recipe/session/claim_base_classes/primitive_claim.py

@@ -30,7 +30,8 @@
 
 class HasValueSCV(SessionClaimValidator):
     def __init__(self, id_: str, claim: SessionClaim[_T], val: _T):
-        super().__init__(id_, claim)
+        super().__init__(id_)
+        self.claim: SessionClaim[_T] = claim  # Required to fix the type for pyright
         self.val = val
 
     def should_refetch(
@@ -63,7 +64,8 @@ async def validate(
 
 class HasFreshValueSCV(SessionClaimValidator):
     def __init__(self, id_: str, claim: SessionClaim[_T], val: _T, max_age_in_sec: int):
-        super().__init__(id_, claim)
+        super().__init__(id_)
+        self.claim: SessionClaim[_T] = claim
         self.val = val
         self.max_age_in_sec = max_age_in_sec
 

supertokens_python/recipe/session/interfaces.py

@@ -450,7 +450,7 @@ async def get_claim_value(
     @abstractmethod
     async def remove_claim(
         self,
-        claim: SessionClaim[_T],  # pyright: ignore[reportInvalidTypeVarUse]
+        claim: SessionClaim[Any],
         user_context: Union[Dict[str, Any], None] = None,
     ) -> None:
         pass
@@ -602,7 +602,9 @@ class SessionClaimValidator(ABC):
     def __init__(
         self,
         id_: str,
-        claim: SessionClaim[_T],  # pyright: ignore[reportInvalidTypeVarUse]
+        claim: Optional[
+            SessionClaim[_T]  # pyright: ignore[reportInvalidTypeVarUse]
+        ] = None,
     ) -> None:
         self.id = id_
         self.claim = claim
@@ -613,9 +615,7 @@ async def validate(
     ) -> ClaimValidationResult:
         pass
 
-    @abstractmethod
     def should_refetch(
         self, payload: JSONObject, user_context: Dict[str, Any]
     ) -> MaybeAwaitable[bool]:
-        # TODO: Confirm that MaybeAwaitable actually makes the function async
-        pass
+        raise NotImplementedError()

supertokens_python/recipe/session/recipe.py

@@ -303,27 +303,27 @@ def reset():
             raise_general_exception("calling testing function in non testing env")
         SessionRecipe.__instance = None
 
-    @staticmethod
-    def add_claim_from_other_recipe(claim: SessionClaim[Any]):
+    def add_claim_from_other_recipe(self, claim: SessionClaim[Any]):
         # We are throwing here (and not in addClaimValidatorFromOtherRecipe) because if multiple
         # claims are added with the same key they will overwrite each other. Validators will all run
         # and work as expected even if they are added multiple times.
-        if claim.key in [c.key for c in SessionRecipe.claims_added_by_other_recipes]:
+        if claim.key in [c.key for c in self.claims_added_by_other_recipes]:
             raise Exception("Claim added by multiple recipes")
 
-        SessionRecipe.claims_added_by_other_recipes.append(claim)
+        self.claims_added_by_other_recipes.append(claim)
 
-    @staticmethod
-    def get_claims_added_by_other_recipes() -> List[SessionClaim[Any]]:
-        return SessionRecipe.claims_added_by_other_recipes
+    def get_claims_added_by_other_recipes(self) -> List[SessionClaim[Any]]:
+        return self.claims_added_by_other_recipes
 
-    @staticmethod
-    def add_claim_validator_from_other_recipe(claim_validator: SessionClaimValidator):
-        SessionRecipe.claim_validators_added_by_other_recipes.append(claim_validator)
+    def add_claim_validator_from_other_recipe(
+        self, claim_validator: SessionClaimValidator
+    ):
+        self.claim_validators_added_by_other_recipes.append(claim_validator)
 
-    @staticmethod
-    def get_claim_validators_added_by_other_recipes() -> List[SessionClaimValidator]:
-        return SessionRecipe.claim_validators_added_by_other_recipes
+    def get_claim_validators_added_by_other_recipes(
+        self,
+    ) -> List[SessionClaimValidator]:
+        return self.claim_validators_added_by_other_recipes
 
     async def verify_session(
         self,

supertokens_python/recipe/session/recipe_implementation.py

@@ -25,7 +25,6 @@
     get_timestamp_ms,
     normalise_http_method,
     resolve,
-    deprecated_warn,
 )
 from . import session_functions
 from .cookie_and_header import (
@@ -402,9 +401,6 @@ async def update_access_token_payload(
         new_access_token_payload: Dict[str, Any],
         user_context: Dict[str, Any],
     ) -> bool:
-        deprecated_warn(
-            "update_access_token_payload is deprecated. Use merge_into_access_token_payload instead"
-        )
 
         return await session_functions.update_access_token_payload(
             self, session_handle, new_access_token_payload

supertokens_python/recipe/session/utils.py

@@ -491,7 +491,7 @@ async def get_required_claim_validators(
     from .recipe import SessionRecipe
 
     claim_validators_added_by_other_recipes = (
-        SessionRecipe.get_claim_validators_added_by_other_recipes()
+        SessionRecipe.get_instance().get_claim_validators_added_by_other_recipes()
     )
     global_claim_validators = await resolve(
         SessionRecipe.get_instance().recipe_implementation.get_global_claim_validators(

supertokens_python/recipe/session/with_jwt/recipe_implementation.py

@@ -17,7 +17,7 @@
 
 from jwt import decode
 
-from supertokens_python.utils import get_timestamp_ms, deprecated_warn
+from supertokens_python.utils import get_timestamp_ms
 
 from .constants import ACCESS_TOKEN_PAYLOAD_JWT_PROPERTY_NAME_KEY
 from .session_class import get_session_with_jwt
@@ -188,9 +188,6 @@ async def update_access_token_payload(
         new_access_token_payload: Dict[str, Any],
         user_context: Dict[str, Any],
     ) -> bool:
-        deprecated_warn(
-            "update_access_token_payload is deprecated. Use merge_into_access_token_payload instead"
-        )
 
         session_information = await original_implementation.get_session_information(
             session_handle, user_context