Refactor based on PR reviews

Author: nkshah2

supertokens_python/__init__.py

@@ -12,8 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from typing import Any, Callable, Dict, List, Optional, Union
+
 from typing_extensions import Literal
-from typing import Callable, List, Union
+
+from supertokens_python.framework.request import BaseRequest
 
 from . import supertokens
 from .recipe_module import RecipeModule
@@ -39,3 +42,9 @@ def init(
 
 def get_all_cors_headers() -> List[str]:
     return supertokens.Supertokens.get_instance().get_all_cors_headers()
+
+
+def get_request_from_user_context(
+    user_context: Optional[Dict[str, Any]],
+) -> Optional[BaseRequest]:
+    return Supertokens.get_instance().get_request_from_user_context(user_context)

supertokens_python/asyncio/__init__.py

@@ -11,10 +11,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from typing import Any, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 
 from supertokens_python import Supertokens
-from supertokens_python.framework.request import BaseRequest
 from supertokens_python.interfaces import (
     CreateUserIdMappingOkResult,
     DeleteUserIdMappingOkResult,
@@ -98,9 +97,3 @@ async def update_or_delete_user_id_mapping_info(
     return await Supertokens.get_instance().update_or_delete_user_id_mapping_info(
         user_id, user_id_type, external_user_id_info
     )
-
-
-def get_request_from_user_context(
-    user_context: Optional[Dict[str, Any]],
-) -> Optional[BaseRequest]:
-    return Supertokens.get_instance().get_request_from_user_context(user_context)

supertokens_python/syncio/__init__.py

@@ -11,11 +11,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from typing import Any, Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union
 
 from supertokens_python import Supertokens
 from supertokens_python.async_to_sync_wrapper import sync
-from supertokens_python.framework.request import BaseRequest
 from supertokens_python.interfaces import (
     CreateUserIdMappingOkResult,
     DeleteUserIdMappingOkResult,
@@ -104,9 +103,3 @@ def update_or_delete_user_id_mapping_info(
             user_id, user_id_type, external_user_id_info
         )
     )
-
-
-def get_request_from_user_context(
-    user_context: Optional[Dict[str, Any]],
-) -> Optional[BaseRequest]:
-    return Supertokens.get_instance().get_request_from_user_context(user_context)

tests/test_user_context.py

@@ -17,8 +17,12 @@
 from fastapi.testclient import TestClient
 from pytest import fixture, mark
 
-from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.asyncio import get_request_from_user_context
+from supertokens_python import (
+    InputAppInfo,
+    SupertokensConfig,
+    get_request_from_user_context,
+    init,
+)
 from supertokens_python.framework.fastapi import get_middleware
 from supertokens_python.recipe import emailpassword, session
 from supertokens_python.recipe.emailpassword.asyncio import sign_up