fix: Cyclic import error

Author: KShivendu

supertokens_python/always_initialised_recipes.py

@@ -18,4 +18,6 @@
     from supertokens_python.recipe_module import RecipeModule
     from supertokens_python import AppInfo
 
-DEFAULT_MULTITENANCY_RECIPE: Optional[Callable[[AppInfo], RecipeModule]] = None
+from supertokens_python.recipe.multitenancy import init
+
+DEFAULT_MULTITENANCY_RECIPE: Optional[Callable[[AppInfo], RecipeModule]] = init()

supertokens_python/recipe/multitenancy/__init__.py

@@ -14,7 +14,6 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Callable, Union
-from supertokens_python import always_initialised_recipes
 
 from . import exceptions as ex
 from . import recipe
@@ -42,6 +41,3 @@ def init(
         error_handlers,
         override,
     )
-
-
-always_initialised_recipes.DEFAULT_MULTITENANCY_RECIPE = init()

supertokens_python/recipe/openid/recipe.py

@@ -17,7 +17,6 @@
 from typing import TYPE_CHECKING, List, Union, Optional, Any, Dict
 
 from supertokens_python.querier import Querier
-from supertokens_python.recipe.jwt import JWTRecipe
 
 from .api.implementation import APIImplementation
 from .api.open_id_discovery_configuration_get import open_id_discovery_configuration_get
@@ -49,6 +48,8 @@ def __init__(
         issuer: Union[str, None] = None,
         override: Union[InputOverrideConfig, None] = None,
     ):
+        from supertokens_python.recipe.jwt import JWTRecipe
+
         super().__init__(recipe_id, app_info)
         self.config = validate_and_normalise_user_input(app_info, issuer, override)
         jwt_feature = None

supertokens_python/recipe/session/recipe.py

@@ -28,7 +28,6 @@
     UnauthorisedError,
     InvalidClaimsError,
 )
-from ... import AppInfo
 from ...types import MaybeAwaitable
 
 if TYPE_CHECKING:

supertokens_python/recipe/session/session_request_functions.py

@@ -51,7 +51,6 @@
     TokenTransferMethod,
     get_required_claim_validators,
 )
-from supertokens_python.supertokens import AppInfo
 from supertokens_python.types import MaybeAwaitable
 from supertokens_python.utils import (
     FRAMEWORKS,
@@ -60,10 +59,11 @@
     normalise_http_method,
     set_request_in_user_context_if_not_defined,
 )
-from supertokens_python import Supertokens
+from supertokens_python.supertokens import Supertokens
 
 if TYPE_CHECKING:
     from supertokens_python.recipe.session.recipe import SessionRecipe
+    from supertokens_python.supertokens import AppInfo
 
 LEGACY_ID_REFRESH_TOKEN_COOKIE_NAME = "sIdRefreshToken"
 

supertokens_python/recipe/thirdparty/providers/custom.py

@@ -204,8 +204,8 @@ def __init__(self, provider_config: ProviderConfig):
         )
         super().__init__(input_config.third_party_id, provider_config_for_client)
 
-    def _normalize_input(
-        self, input_config: ProviderConfig  # pylint: disable=no-self-use
+    def _normalize_input(  # pylint: disable=no-self-use
+        self, input_config: ProviderConfig
     ) -> ProviderConfig:
         if input_config.user_info_map is None:
             input_config.user_info_map = UserInfoMap(

supertokens_python/recipe_module.py

@@ -30,8 +30,6 @@
 from .exceptions import SuperTokensError
 from .normalised_url_path import NormalisedURLPath
 
-from supertokens_python.recipe.multitenancy.recipe import MultitenancyRecipe
-
 
 class ApiIdWithTenantId:
     def __init__(self, api_id: str, tenant_id: str):
@@ -54,6 +52,7 @@ async def return_api_id_if_can_handle_request(
         self, path: NormalisedURLPath, method: str, user_context: Dict[str, Any]
     ) -> Union[ApiIdWithTenantId, None]:
         from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
+        from supertokens_python.recipe.multitenancy.recipe import MultitenancyRecipe
 
         apis_handled = self.get_apis_handled()
 

supertokens_python/supertokens.py

@@ -46,8 +46,6 @@
     send_non_200_response_with_message,
 )
 
-from .always_initialised_recipes import DEFAULT_MULTITENANCY_RECIPE
-from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
 
 if TYPE_CHECKING:
     from .recipe_module import RecipeModule
@@ -154,6 +152,8 @@ def __init__(
         mode: Union[Literal["asgi", "wsgi"], None],
         telemetry: Union[bool, None],
     ):
+        from .always_initialised_recipes import DEFAULT_MULTITENANCY_RECIPE
+
         if not isinstance(app_info, InputAppInfo):  # type: ignore
             raise ValueError("app_info must be an instance of InputAppInfo")
 
@@ -189,17 +189,18 @@ def __init__(
                 "Please provide at least one recipe to the supertokens.init function call"
             )
 
-        multitenancy_found = [False]
+        multitenancy_found = False
 
         def make_recipe(recipe: Callable[[AppInfo], RecipeModule]) -> RecipeModule:
+            nonlocal multitenancy_found
             recipe_module = recipe(self.app_info)
             if recipe_module.get_recipe_id() == "multitenancy":
-                multitenancy_found[0] = True
+                multitenancy_found = True
             return recipe_module
 
         self.recipe_modules: List[RecipeModule] = list(map(make_recipe, recipe_list))
 
-        if callable(DEFAULT_MULTITENANCY_RECIPE) and not multitenancy_found[0]:
+        if callable(DEFAULT_MULTITENANCY_RECIPE) and not multitenancy_found:
             recipe = DEFAULT_MULTITENANCY_RECIPE(  # pylint: disable=not-callable
                 self.app_info
             )
@@ -259,6 +260,8 @@ async def get_user_count(  # pylint: disable=no-self-use
         include_recipe_ids: Union[None, List[str]],
         tenant_id: Optional[str] = None,
     ) -> int:
+        from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
+
         querier = Querier.get_instance(None)
         include_recipe_ids_str = None
         if include_recipe_ids is not None:
@@ -296,6 +299,8 @@ async def get_users(  # pylint: disable=no-self-use
         query: Union[Dict[str, str], None] = None,
         tenant_id: Optional[str] = None,
     ) -> UsersResponse:
+        from supertokens_python.recipe.multitenancy.constants import DEFAULT_TENANT_ID
+
         querier = Querier.get_instance(None)
         params = {"timeJoinedOrder": time_joined_order}
         if limit is not None:

tests/input_validation/test_input_validation.py

@@ -434,27 +434,6 @@ async def test_init_validation_thirdpartyemailpassword():
         )
     assert "sign_up_feature must be of type InputSignUpFeature or None" == str(ex.value)
 
-    with pytest.raises(ValueError) as ex:
-        init(
-            supertokens_config=SupertokensConfig("http://localhost:3567"),
-            app_info=InputAppInfo(
-                app_name="SuperTokens Demo",
-                api_domain="http://api.supertokens.io",
-                website_domain="http://supertokens.io",
-                api_base_path="/auth",
-            ),
-            framework="fastapi",
-            recipe_list=[
-                thirdpartyemailpassword.init(
-                    reset_password_using_token_feature="reset password"  # type: ignore
-                )
-            ],
-        )
-    assert (
-        "reset_password_using_token_feature must be of type InputResetPasswordUsingTokenFeature or None"
-        == str(ex.value)
-    )
-
     with pytest.raises(ValueError) as ex:
         init(
             supertokens_config=SupertokensConfig("http://localhost:3567"),