Skip to content

Commit 96f130d

Browse files
committed
Add url to receivedError signal
1 parent 9edfbbd commit 96f130d

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/chatgpt_gui/gui/app.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ def _connect_events(self) -> None:
226226
self.updateTranslations.connect(self._translate_http_code_map)
227227

228228
self.client.receivedError.connect(
229-
lambda code: self.show_dialog('errors.client_http_error',
230-
title_args=(http_code_map[code][0],),
231-
description_args=(code, http_code_map[code][1])))
229+
lambda url, code: self.show_dialog('errors.client_http_error',
230+
title_args=(http_code_map[code][0],),
231+
description_args=(url, code, http_code_map[code][1])))
232232

233233
self.client.authenticationRequired.connect(
234234
lambda: self.show_dialog('warnings.empty_token'))

src/chatgpt_gui/gui/widgets/conversation_view.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ def toggle_multiline():
114114

115115
app().client.receivedMessage.connect(self.receive_message)
116116
app().client.receivedError.connect(DistributedCallable((
117-
lambda _: setattr(self, 'is_waiting', False),
118-
lambda _: self.send_button.setDisabled(False)
117+
lambda *_: setattr(self, 'is_waiting', False),
118+
lambda *_: self.send_button.setDisabled(False)
119119
)))
120120

121121
def append_to_view(self, text: str) -> None:

src/chatgpt_gui/network/client/chatgpt.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Client(QObject):
3737
"""Asynchronous HTTP REST Client that interfaces with ChatGPT."""
3838

3939
authenticationRequired = Signal()
40-
receivedError = Signal(int)
40+
receivedError = Signal(str, int)
4141
receivedMessage = Signal(Message, Conversation)
4242
signedOut = Signal()
4343

@@ -276,7 +276,7 @@ def _get(self, path: str, update_auth_on_401: bool = True, **kwargs) -> Response
276276
# Refresh auth failed, ask user to re-authenticate.
277277
self.authenticationRequired.emit()
278278
elif response.code != 401:
279-
self.receivedError.emit(response.code)
279+
self.receivedError.emit(response.url.toDisplayString(), response.code)
280280

281281
return response
282282

@@ -361,7 +361,7 @@ def send_message(self, message_text: str, conversation: Conversation) -> None:
361361

362362
response: Response = request.send(self.session, wait_until_finished=True)
363363
if not response.ok:
364-
self.receivedError.emit(response.code)
364+
self.receivedError.emit(response.url.toDisplayString(), response.code)
365365
return
366366

367367
# Get the finished stream from the text/event-stream

src/chatgpt_gui/resources/lang/en.default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"warnings.empty_token.title": "No Session",
2929
"errors.authentication_failed.description": "Failed to login to <b>%s</b>.<br><br>Error: %s",
3030
"errors.authentication_failed.title": "Authentication Failed",
31-
"errors.client_http_error.description": "Error %i: %s",
31+
"errors.client_http_error.description": "Error when attempting to access %s (%i):\n%s",
3232
"errors.client_http_error.title": "Client HTTP Error: %s",
3333
"errors.missing_package.cancel": "Cancel",
3434
"errors.missing_package.description": "The action \"%s\" requires the \"{0}\" package, which is not currently installed.\n\nPressing \"{errors.missing_package.install}\" will install it using the following command:\n\n\"%s -m pip install {0}\"",

0 commit comments

Comments
 (0)