Skip to content

Moving JSON_OUTPUT_FORMAT outside of _api_request #196

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

Merged
merged 1 commit into from
Aug 19, 2022
Merged

Moving JSON_OUTPUT_FORMAT outside of _api_request #196

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
18 changes: 5 additions & 13 deletions src/firebolt/async_db/cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,6 @@ async def _api_request(
JSON_OUTPUT_FORMAT will be used.
path (str): endpoint suffix, for example "cancel" or "status"
"""
if not parameters:
parameters = {"output_format": JSON_OUTPUT_FORMAT}
elif "output_format" not in parameters:
parameters["output_format"] = JSON_OUTPUT_FORMAT
elif parameters["output_format"] == "":
# In the case that output_format should be missing, send in "";
# we remove it here so the API endpoint string won't be malformed.
del parameters["output_format"]
if use_set_parameters:
parameters = {**self._set_parameters, **parameters}
return await self._client.request(
Expand All @@ -377,7 +369,7 @@ async def _validate_set_parameter(self, parameter: SetParameter) -> None:
"executemany() function."
)
resp = await self._api_request(
"select 1", {parameter.name: parameter.value, "output_format": ""}
"select 1", {parameter.name: parameter.value}
)
# Handle invalid set parameter
if resp.status_code == codes.BAD_REQUEST:
Expand Down Expand Up @@ -456,7 +448,7 @@ async def _do_execute(
async_execution,
)
response = await self._api_request(
query, {"async_execution": 1, "advanced_mode": 1}
query, {"async_execution": 1, "advanced_mode": 1, "output_format": JSON_OUTPUT_FORMAT}
)
await self._raise_if_error(response)
if response.headers.get("content-length", "") == "0":
Expand All @@ -468,7 +460,7 @@ async def _do_execute(
)
self._query_id = resp["query_id"]
else:
resp = await self._api_request(query)
resp = await self._api_request(query, {"output_format": JSON_OUTPUT_FORMAT})
await self._raise_if_error(resp)
row_set = self._row_set_from_response(resp)

Expand Down Expand Up @@ -633,7 +625,7 @@ def setoutputsize(self, size: int, column: Optional[int] = None) -> None:
async def cancel(self, query_id: str) -> None:
"""Cancel a server-side async query."""
await self._api_request(
parameters={"query_id": query_id, "output_format": ""},
parameters={"query_id": query_id},
path="cancel",
use_set_parameters=False,
)
Expand All @@ -645,7 +637,7 @@ async def get_status(self, query_id: str) -> QueryStatus:
resp = await self._api_request(
# output_format must be empty for status to work correctly.
# And set parameters will cause 400 errors.
parameters={"query_id": query_id, "output_format": ""},
parameters={"query_id": query_id},
path="status",
use_set_parameters=False,
)
Expand Down