Merge branch 'main' into feat/oai1.78.0

Author: csgulati09

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Portkey.ai
+Copyright (c) 2025 Portkey.ai
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

portkey_ai/__init__.py

@@ -99,6 +99,10 @@
     InputItems,
     AsyncResponses,
     AsyncInputItems,
+    Labels,
+    AsyncLabels,
+    Collections,
+    AsyncCollections,
     FineTuningCheckpoints,
     AsyncFineTuningCheckpoints,
     Permissions,
@@ -231,6 +235,10 @@
     "InputItems",
     "AsyncResponses",
     "AsyncInputItems",
+    "Labels",
+    "AsyncLabels",
+    "Collections",
+    "AsyncCollections",
     "FineTuningCheckpoints",
     "AsyncFineTuningCheckpoints",
     "Permissions",

portkey_ai/api_resources/__init__.py

@@ -87,6 +87,10 @@
     InputItems,
     AsyncResponses,
     AsyncInputItems,
+    Labels,
+    AsyncLabels,
+    Collections,
+    AsyncCollections,
     FineTuningCheckpoints,
     AsyncFineTuningCheckpoints,
     Permissions,
@@ -223,6 +227,10 @@
     "InputItems",
     "AsyncResponses",
     "AsyncInputItems",
+    "Labels",
+    "AsyncLabels",
+    "Collections",
+    "AsyncCollections",
     "FineTuningCheckpoints",
     "AsyncFineTuningCheckpoints",
     "Permissions",

portkey_ai/api_resources/apis/__init__.py

@@ -123,6 +123,10 @@
 from .virtual_keys import VirtualKeys, AsyncVirtualKeys
 from .logs import Logs, AsyncLogs
 
+from .labels import Labels, AsyncLabels
+
+from .collections import Collections, AsyncCollections
+
 sys.modules["openai"] = vendored_openai  # For pydantic v1 and v2 compatibility
 
 __all__ = [
@@ -217,6 +221,10 @@
     "InputItems",
     "AsyncResponses",
     "AsyncInputItems",
+    "Labels",
+    "AsyncLabels",
+    "Collections",
+    "AsyncCollections",
     "FineTuningCheckpoints",
     "AsyncFineTuningCheckpoints",
     "Permissions",

portkey_ai/api_resources/apis/api_keys.py

@@ -28,6 +28,8 @@ def create(
         usage_limits: Optional[Dict[str, Any]] = None,
         scopes: List[str],
         defaults: Optional[Dict[str, Any]] = None,
+        expires_at: Optional[Any] = None,
+        **kwargs: Any,
     ) -> ApiKeyAddResponse:
         body = {
             "type": type,
@@ -40,6 +42,8 @@ def create(
             "usage_limits": usage_limits,
             "scopes": scopes,
             "defaults": defaults,
+            "expires_at": expires_at,
+            **kwargs,
         }
         return self._post(
             f"{PortkeyApiPaths.API_KEYS_API}/{type}/{sub_type}",
@@ -96,6 +100,8 @@ def update(
         usage_limits: Optional[Dict[str, Any]] = None,
         scopes: Optional[List[str]] = None,
         defaults: Optional[Dict[str, Any]] = None,
+        expires_at: Optional[Any] = None,
+        **kwargs: Any,
     ) -> Any:
         body = {
             "id": id,
@@ -105,6 +111,8 @@ def update(
             "usage_limits": usage_limits,
             "scopes": scopes,
             "defaults": defaults,
+            "expires_at": expires_at,
+            **kwargs,
         }
         return self._put(
             f"{PortkeyApiPaths.API_KEYS_API}/{id}",
@@ -149,6 +157,8 @@ async def create(
         usage_limits: Optional[Dict[str, Any]] = None,
         scopes: List[str],
         defaults: Optional[Dict[str, Any]] = None,
+        expires_at: Optional[Any] = None,
+        **kwargs: Any,
     ) -> ApiKeyAddResponse:
         body = {
             "type": type,
@@ -161,6 +171,8 @@ async def create(
             "usage_limits": usage_limits,
             "scopes": scopes,
             "defaults": defaults,
+            "expires_at": expires_at,
+            **kwargs,
         }
         return await self._post(
             f"{PortkeyApiPaths.API_KEYS_API}/{type}/{sub_type}",
@@ -217,6 +229,8 @@ async def update(
         usage_limits: Optional[Dict[str, Any]] = None,
         scopes: Optional[List[str]] = None,
         defaults: Optional[Dict[str, Any]] = None,
+        expires_at: Optional[Any] = None,
+        **kwargs: Any,
     ) -> Any:
         body = {
             "id": id,
@@ -226,6 +240,8 @@ async def update(
             "usage_limits": usage_limits,
             "scopes": scopes,
             "defaults": defaults,
+            "expires_at": expires_at,
+            **kwargs,
         }
         return await self._put(
             f"{PortkeyApiPaths.API_KEYS_API}/{id}",

portkey_ai/api_resources/apis/audio.py

@@ -1,6 +1,8 @@
 import json
 from typing import Any, List, Union
 from portkey_ai.api_resources.apis.api_resource import APIResource, AsyncAPIResource
+from portkey_ai.api_resources.global_constants import AUDIO_FILE_DURATION_HEADER
+from portkey_ai.api_resources.get_audio_duration import get_audio_file_duration
 from ..._vendor.openai._types import NotGiven, NOT_GIVEN, FileTypes
 from portkey_ai.api_resources.client import AsyncPortkey, Portkey
 import typing
@@ -39,9 +41,13 @@ def create(
         temperature: Union[float, NotGiven] = NOT_GIVEN,
         timestamp_granularities: Union[List[str], NotGiven] = NOT_GIVEN,
         stream: Union[bool, NotGiven] = NOT_GIVEN,
-        **kwargs
+        **kwargs,
     ) -> Union[Transcription, TranscriptionVerbose, str]:
         extra_headers = kwargs.pop("extra_headers", {})
+        if file.name and self._client.calculate_audio_duration:
+            duration = get_audio_file_duration(file.name)
+            if duration is not None:
+                extra_headers[AUDIO_FILE_DURATION_HEADER] = duration
         if stream:
             return self.openai_client.audio.transcriptions.create(
                 file=file,
@@ -93,9 +99,13 @@ def create(
         model: str,
         prompt: Union[str, NotGiven] = NOT_GIVEN,
         temperature: Union[float, NotGiven] = NOT_GIVEN,
-        **kwargs
+        **kwargs,
     ) -> Union[Translation, TranslationVerbose, str]:
         extra_headers = kwargs.pop("extra_headers", {})
+        if file.name and self._client.calculate_audio_duration:  # type: ignore[union-attr]
+            duration = get_audio_file_duration(file.name)  # type: ignore[union-attr]
+            if duration is not None:
+                extra_headers[AUDIO_FILE_DURATION_HEADER] = duration
         response = self.openai_client.with_raw_response.audio.translations.create(
             file=file,
             model=model,
@@ -125,7 +135,7 @@ def create(
         response_format: Union[str, NotGiven] = NOT_GIVEN,
         speed: Union[float, NotGiven] = NOT_GIVEN,
         stream: Union[bool, NotGiven] = NOT_GIVEN,
-        **kwargs
+        **kwargs,
     ) -> Any:
         if stream is True:
             self.openai_client = self.openai_client.with_streaming_response
@@ -169,9 +179,13 @@ async def create(
         temperature: Union[float, NotGiven] = NOT_GIVEN,
         timestamp_granularities: Union[List[str], NotGiven] = NOT_GIVEN,
         stream: Union[bool, NotGiven] = NOT_GIVEN,
-        **kwargs
+        **kwargs,
     ) -> Union[Transcription, TranscriptionVerbose, str]:
         extra_headers = kwargs.pop("extra_headers", {})
+        if file.name and self._client.calculate_audio_duration:
+            duration = get_audio_file_duration(file.name)
+            if duration is not None:
+                extra_headers[AUDIO_FILE_DURATION_HEADER] = duration
         if stream:
             return await self.openai_client.audio.transcriptions.create(
                 file=file,
@@ -225,9 +239,13 @@ async def create(
         model: str,
         prompt: Union[str, NotGiven] = NOT_GIVEN,
         temperature: Union[float, NotGiven] = NOT_GIVEN,
-        **kwargs
+        **kwargs,
     ) -> Union[Translation, TranslationVerbose, str]:
         extra_headers = kwargs.pop("extra_headers", {})
+        if file.name and self._client.calculate_audio_duration:  # type: ignore[union-attr]
+            duration = get_audio_file_duration(file.name)  # type: ignore[union-attr]
+            if duration is not None:
+                extra_headers[AUDIO_FILE_DURATION_HEADER] = duration
         response = await self.openai_client.with_raw_response.audio.translations.create(
             file=file,
             model=model,
@@ -257,7 +275,7 @@ async def create(
         response_format: Union[str, NotGiven] = NOT_GIVEN,
         speed: Union[float, NotGiven] = NOT_GIVEN,
         stream: Union[bool, NotGiven] = NOT_GIVEN,
-        **kwargs
+        **kwargs,
     ) -> Any:
         if stream is True:
             self.openai_client = await self.openai_client.with_streaming_response