LCORE-2120: Refactoring - use AuthTuple where appropriate

Author: tisnik

src/authentication/api_key_token.py

@@ -10,7 +10,7 @@
 
 from fastapi import HTTPException, Request, status
 
-from authentication.interface import AuthInterface
+from authentication.interface import AuthInterface, AuthTuple
 from authentication.utils import extract_user_token
 from constants import (
     DEFAULT_USER_NAME,
@@ -45,7 +45,7 @@ def __init__(
         self.config: APIKeyTokenConfiguration = config
         self.skip_userid_check = True
 
-    async def __call__(self, request: Request) -> tuple[str, str, bool, str]:
+    async def __call__(self, request: Request) -> AuthTuple:
         """Validate FastAPI Requests for authentication and authorization.
 
         Args:

src/authentication/k8s.py

@@ -9,7 +9,7 @@
 from kubernetes.client.rest import ApiException
 from kubernetes.config import ConfigException
 
-from authentication.interface import NO_AUTH_TUPLE, AuthInterface
+from authentication.interface import NO_AUTH_TUPLE, AuthInterface, AuthTuple
 from authentication.utils import extract_user_token
 from configuration import configuration
 from constants import DEFAULT_VIRTUAL_PATH
@@ -418,7 +418,7 @@ def __init__(self, virtual_path: str = DEFAULT_VIRTUAL_PATH) -> None:
         self.virtual_path = virtual_path
         self.skip_userid_check = False
 
-    async def __call__(self, request: Request) -> tuple[str, str, bool, str]:
+    async def __call__(self, request: Request) -> AuthTuple:
         """Validate FastAPI Requests for authentication and authorization.
 
         Parameters:

src/authentication/noop.py

@@ -2,7 +2,7 @@
 
 from fastapi import HTTPException, Request
 
-from authentication.interface import AuthInterface
+from authentication.interface import AuthInterface, AuthTuple
 from constants import (
     DEFAULT_USER_NAME,
     DEFAULT_USER_UID,
@@ -31,7 +31,7 @@ def __init__(self, virtual_path: str = DEFAULT_VIRTUAL_PATH) -> None:
         self.virtual_path = virtual_path
         self.skip_userid_check = True
 
-    async def __call__(self, request: Request) -> tuple[str, str, bool, str]:
+    async def __call__(self, request: Request) -> AuthTuple:
         """Validate FastAPI Requests for authentication and authorization.
 
         Parameters:
@@ -40,7 +40,7 @@ async def __call__(self, request: Request) -> tuple[str, str, bool, str]:
 
         Returns:
         -------
-            tuple[str, str, bool, str]: A 4-tuple containing:
+            AuthTuple: A 4-tuple containing:
                 - user_id: the value of the "user_id" query parameter if
                            present, otherwise DEFAULT_USER_UID.
                 - username: DEFAULT_USER_NAME.

src/authentication/noop_with_token.py

@@ -11,7 +11,7 @@
 
 from fastapi import HTTPException, Request
 
-from authentication.interface import AuthInterface
+from authentication.interface import AuthInterface, AuthTuple
 from authentication.utils import extract_user_token
 from constants import (
     DEFAULT_USER_NAME,
@@ -43,7 +43,7 @@ def __init__(self, virtual_path: str = DEFAULT_VIRTUAL_PATH) -> None:
         self.virtual_path = virtual_path
         self.skip_userid_check = True
 
-    async def __call__(self, request: Request) -> tuple[str, str, bool, str]:
+    async def __call__(self, request: Request) -> AuthTuple:
         """Validate FastAPI Requests for authentication and authorization.
 
         Parameters:
@@ -52,7 +52,7 @@ async def __call__(self, request: Request) -> tuple[str, str, bool, str]:
 
         Returns:
         -------
-            tuple[str, str, bool, str]: A 4-tuple containing:
+            AuthTuple: A 4-tuple containing:
                 - user_id: The value of the "user_id" query parameter or
                            DEFAULT_USER_UID if absent.
                 - username: DEFAULT_USER_NAME.

tests/unit/app/endpoints/test_responses.py

@@ -24,6 +24,7 @@
     handle_streaming_response,
     responses_endpoint_handler,
 )
+from authentication.interface import AuthTuple
 from configuration import AppConfig
 from constants import DEFAULT_SYSTEM_PROMPT, SUBSTITUTED_INSTRUCTIONS_PLACEHOLDER
 from models.api.responses.successful import ResponsesResponse
@@ -57,7 +58,7 @@ def build_api_params_and_context(  # pylint: disable=too-many-arguments
     *,
     updated_request: ResponsesRequest,
     client: Any,
-    auth: tuple[str, str, bool, str],
+    auth: AuthTuple,
     input_text: str,
     started_at: datetime,
     moderation_result: Any,