From 28a111704b0b8d90c33cd3aa83a1bc4c3bf4fd5a Mon Sep 17 00:00:00 2001 From: Andrei Betlen Date: Thu, 20 Jul 2023 18:52:10 -0400 Subject: [PATCH] Fix compatibility with older python versions --- llama_cpp/server/app.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/llama_cpp/server/app.py b/llama_cpp/server/app.py index 8a8268f..ba68ba8 100644 --- a/llama_cpp/server/app.py +++ b/llama_cpp/server/app.py @@ -3,7 +3,7 @@ import multiprocessing from re import compile, Match, Pattern from threading import Lock from functools import partial -from typing import Callable, Coroutine, Iterator, List, Optional, Union, Dict +from typing import Callable, Coroutine, Iterator, List, Optional, Tuple, Union, Dict from typing_extensions import TypedDict, Literal import llama_cpp @@ -115,7 +115,7 @@ class ErrorResponseFormatters: match (Match[str]): Match object from regex pattern Returns: - tuple[int, ErrorResponse]: Status code and error response + Tuple[int, ErrorResponse]: Status code and error response """ @staticmethod @@ -123,8 +123,8 @@ class ErrorResponseFormatters: request: Union[ "CreateCompletionRequest", "CreateChatCompletionRequest" ], - match: Match[str], - ) -> tuple[int, ErrorResponse]: + match, # type: Match[str] # type: ignore + ) -> Tuple[int, ErrorResponse]: """Formatter for context length exceeded error""" context_window = int(match.group(2)) @@ -163,8 +163,8 @@ class ErrorResponseFormatters: request: Union[ "CreateCompletionRequest", "CreateChatCompletionRequest" ], - match: Match[str], - ) -> tuple[int, ErrorResponse]: + match # type: Match[str] # type: ignore + ) -> Tuple[int, ErrorResponse]: """Formatter for model_not_found error""" model_path = str(match.group(1)) @@ -182,14 +182,14 @@ 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", Callable[ [ Union["CreateCompletionRequest", "CreateChatCompletionRequest"], - Match[str], + "Match[str]", ], - tuple[int, ErrorResponse], + Tuple[int, ErrorResponse], ], ] = { compile( @@ -210,7 +210,7 @@ class RouteErrorHandler(APIRoute): "CreateEmbeddingRequest", ] ] = None, - ) -> tuple[int, ErrorResponse]: + ) -> Tuple[int, ErrorResponse]: """Wraps error message in OpenAI style error response""" if body is not None and isinstance(