Update errors.py

Author: Smartappli

llama_cpp/server/errors.py

@@ -3,9 +3,8 @@
 import sys
 import time
 import traceback
-from collections.abc import Callable, Coroutine
 from re import Match, Pattern, compile
-from typing import Dict, Optional, Tuple, Union
+from typing import Callable, Coroutine, Dict, Optional, Tuple, Union
 
 from fastapi import (
     HTTPException,
@@ -28,8 +27,8 @@ class ErrorResponse(TypedDict):
 
     message: str
     type: str
-    param: str | None
-    code: str | None
+    param: Optional[str]
+    code: Optional[str]
 
 
 class ErrorResponseFormatters:
@@ -46,9 +45,9 @@ class ErrorResponseFormatters:
 
     @staticmethod
     def context_length_exceeded(
-        request: CreateCompletionRequest | CreateChatCompletionRequest,
+        request: Union[CreateCompletionRequest, CreateChatCompletionRequest],
         match,  # type: Match[str] # type: ignore
-    ) -> tuple[int, ErrorResponse]:
+    ) -> Tuple[int, ErrorResponse]:
         """Formatter for context length exceeded error"""
 
         context_window = int(match.group(2))
@@ -84,9 +83,9 @@ def context_length_exceeded(
 
     @staticmethod
     def model_not_found(
-        request: CreateCompletionRequest | CreateChatCompletionRequest,
+        request: Union[CreateCompletionRequest, CreateChatCompletionRequest],
         match,  # type: Match[str] # type: ignore
-    ) -> tuple[int, ErrorResponse]:
+    ) -> Tuple[int, ErrorResponse]:
         """Formatter for model_not_found error"""
 
         model_path = str(match.group(1))
@@ -104,29 +103,35 @@ class RouteErrorHandler(APIRoute):
 
     # key: regex pattern for original error message from llama_cpp
     # value: formatter function
-    pattern_and_formatters: dict[
+    pattern_and_formatters: Dict[
         Pattern[str],
         Callable[
             [
-                CreateCompletionRequest | CreateChatCompletionRequest,
+                Union[CreateCompletionRequest, CreateChatCompletionRequest],
                 Match[str],
             ],
-            tuple[int, ErrorResponse],
+            Tuple[int, ErrorResponse],
         ],
     ] = {
         compile(
-            r"Requested tokens \((\d+)\) exceed context window of (\d+)",
+            r"Requested tokens \((\d+)\) exceed context window of (\d+)"
         ): ErrorResponseFormatters.context_length_exceeded,
         compile(
-            r"Model path does not exist: (.+)",
+            r"Model path does not exist: (.+)"
         ): ErrorResponseFormatters.model_not_found,
     }
 
     def error_message_wrapper(
         self,
         error: Exception,
-        body: CreateChatCompletionRequest | CreateCompletionRequest | CreateEmbeddingRequest | None = None,
-    ) -> tuple[int, ErrorResponse]:
+        body: Optional[
+            Union[
+                CreateChatCompletionRequest,
+                CreateCompletionRequest,
+                CreateEmbeddingRequest,
+            ]
+        ] = None,
+    ) -> Tuple[int, ErrorResponse]:
         """Wraps error message in OpenAI style error response"""
         print(f"Exception: {error!s}", file=sys.stderr)
         traceback.print_exc(file=sys.stderr)
@@ -174,7 +179,13 @@ async def custom_route_handler(request: Request) -> Response:
                 try:
                     if "messages" in json_body:
                         # Chat completion
-                        body: CreateChatCompletionRequest | CreateCompletionRequest | CreateEmbeddingRequest | None = CreateChatCompletionRequest(**json_body)
+                        body: Optional[
+                            Union[
+                                CreateChatCompletionRequest,
+                                CreateCompletionRequest,
+                                CreateEmbeddingRequest,
+                            ]
+                        ] = CreateChatCompletionRequest(**json_body)
                     elif "prompt" in json_body:
                         # Text completion
                         body = CreateCompletionRequest(**json_body)