mirror of
https://github.com/wassname/openrouter-python-sdk-retry-errors.git
synced 2026-07-30 12:20:57 +08:00
docs: Mintlify MDX docs + docs.json; bump Speakeasy to 1.787.0 (#382)
This commit is contained in:
Matt Apperson
+68
-46
@@ -7,8 +7,14 @@ from openrouter._hooks import (
|
||||
AfterErrorContext,
|
||||
AfterSuccessContext,
|
||||
BeforeRequestContext,
|
||||
HookContext,
|
||||
)
|
||||
from openrouter.utils import (
|
||||
RetryConfig,
|
||||
SerializedRequestBody,
|
||||
get_body_content,
|
||||
run_sync_in_thread,
|
||||
)
|
||||
from openrouter.utils import RetryConfig, SerializedRequestBody, get_body_content
|
||||
from typing import Callable, List, Mapping, Optional, Tuple
|
||||
from urllib.parse import parse_qs, urlparse
|
||||
|
||||
@@ -61,6 +67,7 @@ class BaseSDK:
|
||||
url_override: Optional[str] = None,
|
||||
http_headers: Optional[Mapping[str, str]] = None,
|
||||
allow_empty_value: Optional[List[str]] = None,
|
||||
allowed_fields: Optional[List[str]] = None,
|
||||
) -> httpx.Request:
|
||||
client = self.sdk_configuration.async_client
|
||||
return self._build_request_with_client(
|
||||
@@ -82,6 +89,7 @@ class BaseSDK:
|
||||
url_override,
|
||||
http_headers,
|
||||
allow_empty_value,
|
||||
allowed_fields,
|
||||
)
|
||||
|
||||
def _build_request(
|
||||
@@ -105,6 +113,7 @@ class BaseSDK:
|
||||
url_override: Optional[str] = None,
|
||||
http_headers: Optional[Mapping[str, str]] = None,
|
||||
allow_empty_value: Optional[List[str]] = None,
|
||||
allowed_fields: Optional[List[str]] = None,
|
||||
) -> httpx.Request:
|
||||
client = self.sdk_configuration.client
|
||||
return self._build_request_with_client(
|
||||
@@ -126,6 +135,7 @@ class BaseSDK:
|
||||
url_override,
|
||||
http_headers,
|
||||
allow_empty_value,
|
||||
allowed_fields,
|
||||
)
|
||||
|
||||
def _build_request_with_client(
|
||||
@@ -150,6 +160,7 @@ class BaseSDK:
|
||||
url_override: Optional[str] = None,
|
||||
http_headers: Optional[Mapping[str, str]] = None,
|
||||
allow_empty_value: Optional[List[str]] = None,
|
||||
allowed_fields: Optional[List[str]] = None,
|
||||
) -> httpx.Request:
|
||||
query_params = {}
|
||||
|
||||
@@ -183,7 +194,9 @@ class BaseSDK:
|
||||
security = security()
|
||||
security = utils.get_security_from_env(security, components.Security)
|
||||
if security is not None:
|
||||
security_headers, security_query_params = utils.get_security(security)
|
||||
security_headers, security_query_params = utils.get_security(
|
||||
security, allowed_fields
|
||||
)
|
||||
headers = {**headers, **security_headers}
|
||||
query_params = {**query_params, **security_query_params}
|
||||
|
||||
@@ -220,15 +233,15 @@ class BaseSDK:
|
||||
data=serialized_request_body.data,
|
||||
files=serialized_request_body.files,
|
||||
headers=headers,
|
||||
timeout=timeout,
|
||||
timeout=timeout if timeout is not None else httpx.USE_CLIENT_DEFAULT,
|
||||
)
|
||||
|
||||
def do_request(
|
||||
self,
|
||||
hook_ctx,
|
||||
request,
|
||||
error_status_codes,
|
||||
stream=False,
|
||||
hook_ctx: HookContext,
|
||||
request: httpx.Request,
|
||||
is_error_status_code: Callable[[int], bool],
|
||||
stream: bool = False,
|
||||
retry_config: Optional[Tuple[RetryConfig, List[str]]] = None,
|
||||
) -> httpx.Response:
|
||||
client = self.sdk_configuration.client
|
||||
@@ -240,6 +253,8 @@ class BaseSDK:
|
||||
http_res = None
|
||||
try:
|
||||
req = hooks.before_request(BeforeRequestContext(hook_ctx), request)
|
||||
if "timeout" in request.extensions and "timeout" not in req.extensions:
|
||||
req.extensions["timeout"] = request.extensions["timeout"]
|
||||
logger.debug(
|
||||
"Request:\nMethod: %s\nURL: %s\nHeaders: %s\nBody: %s",
|
||||
req.method,
|
||||
@@ -270,21 +285,6 @@ class BaseSDK:
|
||||
"<streaming response>" if stream else http_res.text,
|
||||
)
|
||||
|
||||
if utils.match_status_codes(error_status_codes, http_res.status_code):
|
||||
result, err = hooks.after_error(
|
||||
AfterErrorContext(hook_ctx), http_res, None
|
||||
)
|
||||
if err is not None:
|
||||
logger.debug("Request Exception", exc_info=True)
|
||||
raise err
|
||||
if result is not None:
|
||||
http_res = result
|
||||
else:
|
||||
logger.debug("Raising unexpected SDK error")
|
||||
raise errors.OpenRouterDefaultError(
|
||||
"Unexpected error occurred", http_res
|
||||
)
|
||||
|
||||
return http_res
|
||||
|
||||
if retry_config is not None:
|
||||
@@ -292,17 +292,29 @@ class BaseSDK:
|
||||
else:
|
||||
http_res = do()
|
||||
|
||||
if not utils.match_status_codes(error_status_codes, http_res.status_code):
|
||||
if is_error_status_code(http_res.status_code):
|
||||
result, err = hooks.after_error(AfterErrorContext(hook_ctx), http_res, None)
|
||||
if err is not None:
|
||||
logger.debug("Request Exception", exc_info=True)
|
||||
raise err
|
||||
if result is not None:
|
||||
http_res = result
|
||||
else:
|
||||
logger.debug("Raising unexpected SDK error")
|
||||
raise errors.OpenRouterDefaultError(
|
||||
"Unexpected error occurred", http_res
|
||||
)
|
||||
else:
|
||||
http_res = hooks.after_success(AfterSuccessContext(hook_ctx), http_res)
|
||||
|
||||
return http_res
|
||||
|
||||
async def do_request_async(
|
||||
self,
|
||||
hook_ctx,
|
||||
request,
|
||||
error_status_codes,
|
||||
stream=False,
|
||||
hook_ctx: HookContext,
|
||||
request: httpx.Request,
|
||||
is_error_status_code: Callable[[int], bool],
|
||||
stream: bool = False,
|
||||
retry_config: Optional[Tuple[RetryConfig, List[str]]] = None,
|
||||
) -> httpx.Response:
|
||||
client = self.sdk_configuration.async_client
|
||||
@@ -313,7 +325,12 @@ class BaseSDK:
|
||||
async def do():
|
||||
http_res = None
|
||||
try:
|
||||
req = hooks.before_request(BeforeRequestContext(hook_ctx), request)
|
||||
req = await run_sync_in_thread(
|
||||
hooks.before_request, BeforeRequestContext(hook_ctx), request
|
||||
)
|
||||
|
||||
if "timeout" in request.extensions and "timeout" not in req.extensions:
|
||||
req.extensions["timeout"] = request.extensions["timeout"]
|
||||
logger.debug(
|
||||
"Request:\nMethod: %s\nURL: %s\nHeaders: %s\nBody: %s",
|
||||
req.method,
|
||||
@@ -327,7 +344,10 @@ class BaseSDK:
|
||||
|
||||
http_res = await client.send(req, stream=stream)
|
||||
except Exception as e:
|
||||
_, e = hooks.after_error(AfterErrorContext(hook_ctx), None, e)
|
||||
_, e = await run_sync_in_thread(
|
||||
hooks.after_error, AfterErrorContext(hook_ctx), None, e
|
||||
)
|
||||
|
||||
if e is not None:
|
||||
logger.debug("Request Exception", exc_info=True)
|
||||
raise e
|
||||
@@ -344,21 +364,6 @@ class BaseSDK:
|
||||
"<streaming response>" if stream else http_res.text,
|
||||
)
|
||||
|
||||
if utils.match_status_codes(error_status_codes, http_res.status_code):
|
||||
result, err = hooks.after_error(
|
||||
AfterErrorContext(hook_ctx), http_res, None
|
||||
)
|
||||
if err is not None:
|
||||
logger.debug("Request Exception", exc_info=True)
|
||||
raise err
|
||||
if result is not None:
|
||||
http_res = result
|
||||
else:
|
||||
logger.debug("Raising unexpected SDK error")
|
||||
raise errors.OpenRouterDefaultError(
|
||||
"Unexpected error occurred", http_res
|
||||
)
|
||||
|
||||
return http_res
|
||||
|
||||
if retry_config is not None:
|
||||
@@ -368,7 +373,24 @@ class BaseSDK:
|
||||
else:
|
||||
http_res = await do()
|
||||
|
||||
if not utils.match_status_codes(error_status_codes, http_res.status_code):
|
||||
http_res = hooks.after_success(AfterSuccessContext(hook_ctx), http_res)
|
||||
if is_error_status_code(http_res.status_code):
|
||||
result, err = await run_sync_in_thread(
|
||||
hooks.after_error, AfterErrorContext(hook_ctx), http_res, None
|
||||
)
|
||||
|
||||
if err is not None:
|
||||
logger.debug("Request Exception", exc_info=True)
|
||||
raise err
|
||||
if result is not None:
|
||||
http_res = result
|
||||
else:
|
||||
logger.debug("Raising unexpected SDK error")
|
||||
raise errors.OpenRouterDefaultError(
|
||||
"Unexpected error occurred", http_res
|
||||
)
|
||||
else:
|
||||
http_res = await run_sync_in_thread(
|
||||
hooks.after_success, AfterSuccessContext(hook_ctx), http_res
|
||||
)
|
||||
|
||||
return http_res
|
||||
|
||||
Reference in New Issue
Block a user