Skip to content

Peter/river exceptions not excepting #161

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
peter-zhong-replit merged 3 commits into from
Jul 17, 2025
Merged

Peter/river exceptions not excepting #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d12ec79
useless code gen
peter-zhong-replit Jul 14, 2025
52cc7aa
thread through errors
peter-zhong-replit Jul 17, 2025
c66d45c
giMerge branch 'main' into peter/river-exceptions-not-excepting
peter-zhong-replit Jul 17, 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
12 changes: 10 additions & 2 deletions src/replit_river/client_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,11 @@ async def send_rpc(
except Exception as e:
raise RiverException("error_deserializer", str(e)) from e
raise exception_from_message(error.code)(
error.code, error.message, service_name, procedure_name
error.code,
error.message,
service_name,
procedure_name,
underlying_error=error,
)
return response_deserializer(response["payload"])
except RiverException as e:
Expand Down Expand Up @@ -338,7 +342,11 @@ async def send_upload(
except Exception as e:
raise RiverException("error_deserializer", str(e)) from e
raise exception_from_message(error.code)(
error.code, error.message, service_name, procedure_name
error.code,
error.message,
service_name,
procedure_name,
underlying_error=error,
)

return response_deserializer(response["payload"])
Expand Down
8 changes: 7 additions & 1 deletion src/replit_river/error_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,18 @@ class RiverServiceException(RiverException):
"""Exception raised by river as a result of a fault in the service running river."""

def __init__(
self, code: str, message: str, service: str | None, procedure: str | None
self,
code: str,
message: str,
service: str | None,
procedure: str | None,
underlying_error: RiverError | None = None,
) -> None:
self.code = code
self.message = message
self.service = service
self.procedure = procedure
self.underlying_error = underlying_error
service = service or "N/A"
procedure = procedure or "N/A"
msg = (
Expand Down
12 changes: 10 additions & 2 deletions src/replit_river/v2/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,11 @@ async def send_rpc[R, A](
except Exception as e:
raise RiverException("error_deserializer", str(e)) from e
raise exception_from_message(error.code)(
error.code, error.message, service_name, procedure_name
error.code,
error.message,
service_name,
procedure_name,
underlying_error=error,
)

return response_deserializer(result["payload"])
Expand Down Expand Up @@ -899,7 +903,11 @@ async def send_upload[I, R, A](
except Exception as e:
raise RiverException("error_deserializer", str(e)) from e
raise exception_from_message(error.code)(
error.code, error.message, service_name, procedure_name
error.code,
error.message,
service_name,
procedure_name,
underlying_error=error,
)

return response_deserializer(result["payload"])
Expand Down
Loading