Skip to content
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

fix: Simplify raise_response_error logic #122

Merged
merged 1 commit into from
Sep 9, 2024
Merged

fix: Simplify raise_response_error logic #122

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: 1 addition & 18 deletions axiom/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""Client provides an easy-to use client library to connect to Axiom."""

import ndjson
import dacite
import gzip
import ujson
import os
Expand All @@ -13,7 +12,6 @@
from dataclasses import dataclass, field, asdict
from datetime import datetime
from requests_toolbelt.sessions import BaseUrlSession
from requests_toolbelt.utils.dump import dump_response
from requests.adapters import HTTPAdapter, Retry
from .datasets import DatasetsClient
from .query import QueryLegacy, QueryResult, QueryOptions, QueryLegacyResult, QueryKind
Expand Down Expand Up @@ -114,23 +112,8 @@ class AplOptions:

def raise_response_error(r):
if r.status_code >= 400:
print("==== Response Debugging ====")
print("##Request Headers", r.request.headers)

# extract content type
ct = r.headers["content-type"].split(";")[0]
if ct == ContentType.JSON.value:
dump = dump_response(r)
print(dump)
print("##Response:", dump.decode("UTF-8"))
err = dacite.from_dict(data_class=Error, data=r.json())
print(err)
elif ct == ContentType.NDJSON.value:
decoded = ndjson.loads(r.text)
print("##Response:", decoded)

r.raise_for_status()
# TODO: Decode JSON https://github.com/axiomhq/axiom-go/blob/610cfbd235d3df17f96a4bb156c50385cfbd9edd/axiom/error.go#L35-L50
r.raise_for_status()


class Client: # pylint: disable=R0903
Expand Down