[Vendoring] OpenAI SDK to 2.30.0

examples/hello_world_portkey_adk.py

@@ -43,9 +43,10 @@ async def main() -> None:
     final_text: List[str] = []
     async for resp in llm.generate_content_async(req, stream=False):
         if resp.content and getattr(resp.content, "parts", None):
-            for p in resp.content.parts:
-                if getattr(p, "text", None):
-                    final_text.append(p.text)
+            for p in resp.content.parts or []:
+                text = getattr(p, "text", None)
+                if text:
+                    final_text.append(text)
     print("".join(final_text))
 
 

examples/hello_world_portkey_strands.py

@@ -31,7 +31,7 @@ async def main() -> None:
     ]
 
     print(f"Streaming with model: {model_id}")
-    async for event in model.stream(messages=messages):
+    async for event in model.stream(messages=messages):  # type: ignore[arg-type]
         # Events follow the Strands stream event shape produced by our adapter.
         if isinstance(event, dict) and "contentBlockDelta" in event:
             delta = event["contentBlockDelta"].get("delta", {})

portkey_ai/__init__.py

@@ -147,6 +147,14 @@
     AsyncConversationsItems,
     Videos,
     AsyncVideos,
+    Skills,
+    AsyncSkills,
+    SkillsContent,
+    AsyncSkillsContent,
+    SkillsVersions,
+    AsyncSkillsVersions,
+    SkillsVersionsContent,
+    AsyncSkillsVersionsContent,
     ChatKit,
     AsyncChatKit,
     ChatKitSessions,
@@ -347,6 +355,14 @@
     "AsyncConversationsItems",
     "Videos",
     "AsyncVideos",
+    "Skills",
+    "AsyncSkills",
+    "SkillsContent",
+    "AsyncSkillsContent",
+    "SkillsVersions",
+    "AsyncSkillsVersions",
+    "SkillsVersionsContent",
+    "AsyncSkillsVersionsContent",
     "ChatKit",
     "AsyncChatKit",
     "ChatKitSessions",

portkey_ai/_vendor/openai-2.16.0.dist-info/METADATA → portkey_ai/_vendor/openai-2.30.0.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openai
-Version: 2.16.0
+Version: 2.30.0
 Summary: The official Python library for the openai API
 Project-URL: Homepage, https://github.com/openai/openai-python
 Project-URL: Repository, https://github.com/openai/openai-python
@@ -29,7 +29,7 @@ Requires-Dist: jiter<1,>=0.10.0
 Requires-Dist: pydantic<3,>=1.9.0
 Requires-Dist: sniffio
 Requires-Dist: tqdm>4
-Requires-Dist: typing-extensions<5,>=4.11
+Requires-Dist: typing-extensions<5,>=4.14
 Provides-Extra: aiohttp
 Requires-Dist: aiohttp; extra == 'aiohttp'
 Requires-Dist: httpx-aiohttp>=0.1.9; extra == 'aiohttp'

portkey_ai/_vendor/openai/__init__.py

@@ -379,6 +379,7 @@ def _reset_client() -> None:  # type: ignore[reportUnusedFunction]
     files as files,
     images as images,
     models as models,
+    skills as skills,
     videos as videos,
     batches as batches,
     uploads as uploads,

portkey_ai/_vendor/openai/_base_client.py

@@ -86,6 +86,7 @@
     APIConnectionError,
     APIResponseValidationError,
 )
+from ._utils._json import openapi_dumps
 from ._legacy_response import LegacyAPIResponse
 
 log: logging.Logger = logging.getLogger(__name__)
@@ -556,8 +557,10 @@ def _build_request(
                 kwargs["content"] = options.content
             elif isinstance(json_data, bytes):
                 kwargs["content"] = json_data
-            else:
-                kwargs["json"] = json_data if is_given(json_data) else None
+            elif not files:
+                # Don't set content when JSON is sent as multipart/form-data,
+                # since httpx's content param overrides other body arguments
+                kwargs["content"] = openapi_dumps(json_data) if is_given(json_data) and json_data is not None else None
             kwargs["files"] = files
         else:
             headers.pop("Content-Type", None)
@@ -784,6 +787,9 @@ def _should_retry(self, response: httpx.Response) -> bool:
 
         return True
 
+        log.debug("Not retrying")
+        return False
+
     def _idempotency_key(self) -> str:
         return f"stainless-python-retry-{uuid.uuid4()}"
 
@@ -1963,6 +1969,7 @@ def make_request_options(
     idempotency_key: str | None = None,
     timeout: float | httpx.Timeout | None | NotGiven = not_given,
     post_parser: PostParser | NotGiven = not_given,
+    synthesize_event_and_data: bool | None = None,
 ) -> RequestOptions:
     """Create a dict of type RequestOptions without keys of NotGiven values."""
     options: RequestOptions = {}
@@ -1988,6 +1995,9 @@ def make_request_options(
         # internal
         options["post_parser"] = post_parser  # type: ignore
 
+    if synthesize_event_and_data is not None:
+        options["synthesize_event_and_data"] = synthesize_event_and_data
+
     return options