Skip to content

Fix Response Info Assignment for Non-Model Return Types (#564) #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdelriolanse wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Response Info Assignment for Non-Model Return Types (#564) #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion pinecone/openapi_support/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import atexit
import io
import json

from typing import Any, TYPE_CHECKING

Expand Down Expand Up @@ -212,9 +213,25 @@ def __call_api(
response_info = extract_response_info(headers)
if isinstance(return_data, dict):
return_data["_response_info"] = response_info
elif isinstance(return_data, str):
if not return_data:
return_data = {"_response_info": response_info}
else:
try:
parsed = json.loads(return_data)
if isinstance(parsed, dict):
parsed["_response_info"] = response_info
return_data = parsed
else:
return_data = {"_response_info": response_info}
except (json.JSONDecodeError, ValueError):
return_data = {"_response_info": response_info}
else:
# Dynamic attribute assignment on OpenAPI models
setattr(return_data, "_response_info", response_info)
try:
setattr(return_data, "_response_info", response_info)
except (TypeError, AttributeError):
pass

if _return_http_data_only:
return return_data
Expand Down
19 changes: 18 additions & 1 deletion pinecone/openapi_support/asyncio_api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from urllib3.fields import RequestField

import orjson
import json
from typing import Any


Expand Down Expand Up @@ -177,9 +178,25 @@ async def __call_api(
response_info = extract_response_info(headers)
if isinstance(return_data, dict):
return_data["_response_info"] = response_info
elif isinstance(return_data, str):
if not return_data:
return_data = {"_response_info": response_info}
else:
try:
parsed = json.loads(return_data)
if isinstance(parsed, dict):
parsed["_response_info"] = response_info
return_data = parsed
else:
return_data = {"_response_info": response_info}
except (json.JSONDecodeError, ValueError):
return_data = {"_response_info": response_info}
else:
# Dynamic attribute assignment on OpenAPI models
setattr(return_data, "_response_info", response_info)
try:
setattr(return_data, "_response_info", response_info)
except (TypeError, AttributeError):
pass

if _return_http_data_only:
return return_data
Expand Down