Merge branch 'main' into feat/langchainCallbackHandler

Portkey-AI · Jun 22, 2024 · 7ebd68b · 7ebd68b
2 parents 244b7fe + c06ded6
commit 7ebd68b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/portkey_ai/api_resources/base_client.py b/portkey_ai/api_resources/base_client.py
@@ -73,6 +73,7 @@ def __init__(
         azure_deployment_id: Optional[str] = None,
         azure_api_version: Optional[str] = None,
         http_client: Optional[httpx.Client] = None,
+        request_timeout: Optional[int] = None,
         **kwargs,
     ) -> None:
         self.api_key = api_key or default_api_key()
@@ -99,6 +100,7 @@ def __init__(
         self.azure_deployment_id = azure_deployment_id
         self.azure_api_version = azure_api_version
         self.cache_namespace = cache_namespace
+        self.request_timeout = request_timeout
         self.kwargs = kwargs
 
         self.custom_headers = createHeaders(
@@ -125,6 +127,7 @@ def __init__(
             azure_deployment_id=azure_deployment_id,
             azure_api_version=azure_api_version,
             cache_namespace=cache_namespace,
+            request_timeout=request_timeout,
             **kwargs,
         )
 
@@ -544,6 +547,7 @@ def __init__(
         azure_deployment_id: Optional[str] = None,
         azure_api_version: Optional[str] = None,
         http_client: Optional[httpx.AsyncClient] = None,
+        request_timeout: Optional[int] = None,
         **kwargs,
     ) -> None:
         self.api_key = api_key or default_api_key()
@@ -570,6 +574,7 @@ def __init__(
         self.azure_deployment_id = azure_deployment_id
         self.azure_api_version = azure_api_version
         self.cache_namespace = cache_namespace
+        self.request_timeout = request_timeout
         self.kwargs = kwargs
 
         self.custom_headers = createHeaders(
@@ -596,6 +601,7 @@ def __init__(
             azure_deployment_id=azure_deployment_id,
             azure_api_version=azure_api_version,
             cache_namespace=cache_namespace,
+            request_timeout=request_timeout,
             **kwargs,
         )
 

diff --git a/portkey_ai/api_resources/client.py b/portkey_ai/api_resources/client.py
@@ -64,6 +64,7 @@ def __init__(
         azure_deployment_id: Optional[str] = None,
         azure_api_version: Optional[str] = None,
         http_client: Optional[httpx.Client] = None,
+        request_timeout: Optional[int] = None,
         **kwargs,
     ) -> None:
         super().__init__(
@@ -92,6 +93,7 @@ def __init__(
             azure_api_version=azure_api_version,
             cache_namespace=cache_namespace,
             http_client=http_client,
+            request_timeout=request_timeout,
             **kwargs,
         )
 
@@ -145,6 +147,7 @@ def copy(
         azure_deployment_id: Optional[str] = None,
         azure_api_version: Optional[str] = None,
         http_client: Optional[httpx.Client] = None,
+        request_timeout: Optional[int] = None,
         **kwargs,
     ) -> Portkey:
         return self.__class__(
@@ -173,6 +176,7 @@ def copy(
             azure_api_version=azure_api_version or self.azure_api_version,
             cache_namespace=cache_namespace or self.cache_namespace,
             http_client=http_client or self._client,
+            request_timeout=request_timeout or self.request_timeout,
             **self.kwargs,
             **kwargs,
         )
@@ -236,6 +240,7 @@ def __init__(
         azure_deployment_id: Optional[str] = None,
         azure_api_version: Optional[str] = None,
         http_client: Optional[httpx.AsyncClient] = None,
+        request_timeout: Optional[int] = None,
         **kwargs,
     ) -> None:
         super().__init__(
@@ -263,6 +268,8 @@ def __init__(
             azure_deployment_id=azure_deployment_id,
             azure_api_version=azure_api_version,
             cache_namespace=cache_namespace,
+            http_client=http_client,
+            request_timeout=request_timeout,
             **kwargs,
         )
 
@@ -316,6 +323,7 @@ def copy(
         azure_deployment_id: Optional[str] = None,
         azure_api_version: Optional[str] = None,
         http_client: Optional[httpx.AsyncClient] = None,
+        request_timeout: Optional[int] = None,
         **kwargs,
     ) -> AsyncPortkey:
         return self.__class__(
@@ -344,6 +352,7 @@ def copy(
             azure_api_version=azure_api_version or self.azure_api_version,
             cache_namespace=cache_namespace or self.cache_namespace,
             http_client=http_client or self._client,
+            request_timeout=request_timeout or self.request_timeout,
             **self.kwargs,
             **kwargs,
         )

diff --git a/portkey_ai/api_resources/utils.py b/portkey_ai/api_resources/utils.py
@@ -265,6 +265,7 @@ class Constructs(BaseModel):
     azure_deployment_id: Optional[str] = None
     azure_api_version: Optional[str] = None
     cache_namespace: Optional[str] = None
+    request_timeout: Optional[int] = None
 
 
 class LLMOptions(Constructs, ConversationInput, ModelParams):