Skip to content

Commit 56bda22

Browse files
committed
Add log error messages to ObeliskError as well
In things like notebooks, one cannot see the log output, so errors are more useful.
1 parent 8e103a5 commit 56bda22

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/obelisk/asynchronous/consumer.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,13 @@ async def single_chunk(self, datasets: List[str], metrics: Optional[List[str]] =
9797
js = response.json()
9898
return QueryResult.model_validate(js)
9999
except json.JSONDecodeError as e:
100-
self.log.warning(f'Obelisk response is not a JSON object: {e}')
101-
raise ObeliskError
100+
msg = f'Obelisk response is not a JSON object: {e}'
101+
self.log.warning(msg)
102+
raise ObeliskError(msg)
102103
except ValidationError as e:
103-
self.log.warning(f"Response cannot be validated: {e}")
104-
raise ObeliskError
104+
msg = f"Response cannot be validated: {e}"
105+
self.log.warning(msg)
106+
raise ObeliskError(msg)
105107

106108

107109
async def query(self, datasets: List[str], metrics:Optional[List[str]] = None,

src/obelisk/asynchronous/producer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async def send(self, dataset: str, data: List[dict],
4848
response = await self.http_post(f'{self._ingest_url}/{dataset}', data=data,
4949
params=params)
5050
if response.status_code != 204:
51-
self.log.warning('An error occurred during data ingestion')
52-
self.log.warning('[%d]: %s', response.status_code, response.text)
53-
raise ObeliskError
51+
msg = f'An error occured during data ingest. Status {response.status_code}, messasge: {response.text}'
52+
self.log.warning(msg)
53+
raise ObeliskError(msg)
5454
return response

0 commit comments

Comments
 (0)