Extend reqeust timeout

penut85420 · penut85420 · commit f84e1ae11468 · 2023-03-22T21:12:45.000+08:00
diff --git a/openai/api_requestor.py b/openai/api_requestor.py
@@ -558,15 +558,23 @@ async def arequest_raw(
             url, supplied_headers, method, params, files, request_id
         )
 
-        if isinstance(request_timeout, tuple):
-            timeout = aiohttp.ClientTimeout(
-                connect=request_timeout[0],
-                total=request_timeout[1],
-            )
-        else:
-            timeout = aiohttp.ClientTimeout(
-                total=request_timeout if request_timeout else TIMEOUT_SECS
-            )
+        kwargs = {
+            "total": TIMEOUT_SECS,
+            "connect": None,
+            "sock_read": None,
+            "sock_connect": None,
+        }
+
+        if isinstance(request_timeout, float):
+            request_timeout = (None, request_timeout)
+
+        for i, timeout in enumerate(request_timeout):
+            try:
+                timeout_keys = ["connect", "total", "sock_read", "sock_connect"]
+                kwargs[timeout_keys[i]] = timeout
+            except IndexError:
+                break
+        timeout = aiohttp.ClientTimeout(**kwargs)
 
         if files:
             # TODO: Use `aiohttp.MultipartWriter` to create the multipart form data here.
