Skip to content

Show error messages in response #351

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
TheCommCraft merged 6 commits into from
Feb 26, 2025
Merged

Show error messages in response #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
493b813
Update cloud_requests.py
uukelele-scratch Feb 24, 2025
fcafb58
feat: added debug mode
uukelele-scratch Feb 26, 2025
c14ca27
fix: added debug to cloud class request() function
uukelele-scratch Feb 26, 2025
4b5d218
default debug to False
TheCommCraft Feb 26, 2025
42a2a6a
Use format_exc() instead of format_exception()
TheCommCraft Feb 26, 2025
ce9a449
Update cloud_requests.py
TheCommCraft Feb 26, 2025
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
4 changes: 2 additions & 2 deletions scratchattach/cloud/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ def events(self) -> CloudEvents:
return CloudEvents(self)

def requests(self, *, no_packet_loss: bool = False, used_cloud_vars: list[str] = ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
respond_order="receive") -> CloudRequests:
respond_order="receive", debug: bool = False) -> CloudRequests:
return CloudRequests(self, used_cloud_vars=used_cloud_vars, no_packet_loss=no_packet_loss,
respond_order=respond_order)
respond_order=respond_order, debug=debug)

def storage(self, *, no_packet_loss: bool = False, used_cloud_vars: list[str] = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]) -> CloudStorage:
return CloudStorage(self, used_cloud_vars=used_cloud_vars, no_packet_loss=no_packet_loss)
Expand Down
11 changes: 9 additions & 2 deletions scratchattach/eventhandlers/cloud_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ class Request:
Saves a request added to the request handler
"""

def __init__(self, request_name, *, on_call, cloud_requests, thread=True, enabled=True, response_priority=0):
def __init__(self, request_name, *, on_call, cloud_requests, thread=True, enabled=True, response_priority=0, debug=False):
self.name = request_name
self.on_call = on_call
self.thread = thread
self.enabled = enabled
self.response_priority = response_priority
self.cloud_requests = cloud_requests # the corresponding CloudRequests object
self.debug = debug

def __call__(self, received_request):
if not self.enabled:
Expand All @@ -44,7 +45,13 @@ def __call__(self, received_request):
else:
print(f"Exception in request '{self.name}':")
raise(e)
self.cloud_requests.request_outputs.append({"receive":received_request.timestamp, "request_id":received_request.request_id, "output":[f"Error in request {self.name}","Check the Python console"], "priority":self.response_priority})
if self.debug:
traceback_full = traceback.format_exc().splitlines()
output = [f"Error in request {self.name}", "Traceback: "]
output.extend(traceback_full)
self.cloud_requests.request_outputs.append({"receive":received_request.timestamp, "request_id":received_request.request_id, "output":output, "priority":self.response_priority})
else:
self.cloud_requests.request_outputs.append({"receive":received_request.timestamp, "request_id":received_request.request_id, "output":[f"Error in request {self.name}","Check the Python console"], "priority":self.response_priority})
self.cloud_requests.responder_event.set() # Activate the .cloud_requests._responder process so it sends back the data to Scratch

class ReceivedRequest:
Expand Down