Merge branch 'main' into chore/vKeyScript

Author: VisargD

portkey_ai/api_resources/client.py

@@ -103,6 +103,7 @@ def __init__(
             base_url=self.base_url,
             default_headers=self.allHeaders,
             http_client=http_client,
+            max_retries=0,
         )
 
         self.completions = apis.Completion(self)
@@ -279,6 +280,7 @@ def __init__(
             base_url=self.base_url,
             default_headers=self.allHeaders,
             http_client=http_client,
+            max_retries=0,
         )
 
         self.completions = apis.AsyncCompletion(self)

portkey_ai/api_resources/types/complete_type.py

@@ -16,9 +16,9 @@ class CompletionUsage(BaseModel):
 
 class Logprobs(BaseModel):
     text_offset: Optional[List[int]] = None
-    token_logprobs: Optional[List[float]] = None
+    token_logprobs: Optional[List[Optional[float]]] = None
     tokens: Optional[List[str]] = None
-    top_logprobs: Optional[List[Dict[str, float]]] = None
+    top_logprobs: Optional[List[Optional[Dict[str, float]]]] = None
 
 
 class CompletionChoice(BaseModel):

portkey_ai/api_resources/utils.py

@@ -5,7 +5,7 @@
 from typing_extensions import TypedDict, NotRequired
 import httpx
 import portkey_ai
-from pydantic import BaseModel, validator
+from pydantic import BaseModel, field_validator
 
 from portkey_ai.api_resources.types.chat_complete_type import (
     ChatCompletionChunk,
@@ -269,7 +269,7 @@ class Constructs(BaseModel):
 
 
 class LLMOptions(Constructs, ConversationInput, ModelParams):
-    @validator("api_key", "virtual_key", always=False)
+    @field_validator("api_key", "virtual_key")
     @classmethod
     def parse_api_key(cls, api_key, values):
         if api_key is None and values.get("virtual_key") is None:
@@ -282,7 +282,7 @@ def parse_api_key(cls, api_key, values):
 class ProviderOptions(Constructs):
     override_params: Optional[OverrideParams] = None
 
-    @validator("cache_age", always=True)
+    @field_validator("cache_age")
     @classmethod
     def parse_cache_age(cls, cache_age):
         if cache_age is not None:
@@ -404,7 +404,7 @@ class Config(BaseModel):
     mode: Optional[Union[Modes, ModesLiteral, str]] = None
     llms: Optional[Union[List[LLMOptions], LLMOptions]] = None
 
-    @validator("mode", always=True)
+    @field_validator("mode")
     @classmethod
     def check_mode(cls, mode):
         if mode is None:
@@ -413,7 +413,7 @@ def check_mode(cls, mode):
 
         return mode
 
-    @validator("llms", always=True)
+    @field_validator("llms")
     @classmethod
     def parse_llms(cls, llms):
         if isinstance(llms, LLMOptions):