Stricter error types

src/replit_river/client.py

@@ -13,7 +13,7 @@
 )
 
 from replit_river.client_transport import ClientTransport
-from replit_river.error_schema import RiverError, RiverException
+from replit_river.error_schema import ERROR_CODE_UNKNOWN, RiverError, RiverException
 from replit_river.transport_options import (
     HandshakeMetadataType,
     TransportOptions,
@@ -37,6 +37,10 @@ class RiverUnknownValue(BaseModel):
     value: Any
 
 
+class RiverUnknownError(RiverError):
+    pass
+
+
 def translate_unknown_value(
     value: Any, handler: Callable[[Any], Any], info: ValidationInfo
 ) -> Any | RiverUnknownValue:
@@ -46,6 +50,15 @@ def translate_unknown_value(
         return RiverUnknownValue(tag="RiverUnknownValue", value=value)
 
 
+def translate_unknown_error(
+    value: Any, handler: Callable[[Any], Any], info: ValidationInfo
+) -> Any | RiverUnknownError:
+    try:
+        return handler(value)
+    except Exception:
+        return RiverUnknownError(code=ERROR_CODE_UNKNOWN, message="Unknown error")
+
+
 class Client(Generic[HandshakeMetadataType]):
     def __init__(
         self,

src/replit_river/codegen/client.py

@@ -93,7 +93,7 @@
 
 from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
-from replit_river.client import RiverUnknownValue, translate_unknown_value
+from replit_river.client import RiverUnknownError, translate_unknown_error
 
 import replit_river as river
 
@@ -769,17 +769,18 @@ def _type_adapter_definition(
         _type: TypeExpression,
         module_info: list[ModuleName],
     ) -> tuple[list[TypeName], list[ModuleName], list[FileContents]]:
+        varname = render_type_expr(type_adapter_name)
         rendered_type_expr = render_type_expr(_type)
         return (
             [type_adapter_name],
             module_info,
             [
                 FileContents(
                     dedent(f"""
-                    {render_type_expr(type_adapter_name)}: TypeAdapter[Any] = (
-                        TypeAdapter({rendered_type_expr})
-                    )
-                """)
+                {varname}: TypeAdapter[{rendered_type_expr}] = (
+                    TypeAdapter({rendered_type_expr})
+                )
+            """)
                 )
             ],
         )

src/replit_river/codegen/typing.py

@@ -87,8 +87,8 @@ def render_type_expr(value: TypeExpression) -> str:
         case OpenUnionTypeExpr(inner):
             return (
                 "Annotated["
-                f"{render_type_expr(inner)} | RiverUnknownValue,"
-                "WrapValidator(translate_unknown_value)"
+                f"{render_type_expr(inner)} | RiverUnknownError,"
+                "WrapValidator(translate_unknown_error)"
                 "]"
             )
         case TypeName(name):

src/replit_river/error_schema.py

@@ -17,6 +17,9 @@
 # ERROR_CODE_CANCEL is the code used when either server or client cancels the stream.
 ERROR_CODE_CANCEL = "CANCEL"
 
+# ERROR_CODE_UNKNOWN is the code for the RiverUnknownError
+ERROR_CODE_UNKNOWN = "UNKNOWN"
+
 
 class RiverError(BaseModel):
     """Error message from the server."""

tests/codegen/rpc/generated/test_service/rpc_method.py

@@ -19,7 +19,7 @@
 
 from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
-from replit_river.client import RiverUnknownValue, translate_unknown_value
+from replit_river.client import RiverUnknownError, translate_unknown_error
 
 import replit_river as river
 
@@ -39,11 +39,13 @@ class Rpc_MethodInput(TypedDict):
     data: str
 
 
-Rpc_MethodInputTypeAdapter: TypeAdapter[Any] = TypeAdapter(Rpc_MethodInput)
+Rpc_MethodInputTypeAdapter: TypeAdapter[Rpc_MethodInput] = TypeAdapter(Rpc_MethodInput)
 
 
 class Rpc_MethodOutput(BaseModel):
     data: str
 
 
-Rpc_MethodOutputTypeAdapter: TypeAdapter[Any] = TypeAdapter(Rpc_MethodOutput)
+Rpc_MethodOutputTypeAdapter: TypeAdapter[Rpc_MethodOutput] = TypeAdapter(
+    Rpc_MethodOutput
+)

tests/codegen/snapshot/snapshots/test_unknown_enum/enumService/needsEnum.py

@@ -19,26 +19,40 @@
 
 from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
-from replit_river.client import RiverUnknownValue, translate_unknown_value
+from replit_river.client import RiverUnknownError, translate_unknown_error
 
 import replit_river as river
 
 
 NeedsenumInput = Literal["in_first"] | Literal["in_second"]
 encode_NeedsenumInput: Callable[["NeedsenumInput"], Any] = lambda x: x
 
-NeedsenumInputTypeAdapter: TypeAdapter[Any] = TypeAdapter(NeedsenumInput)
+NeedsenumInputTypeAdapter: TypeAdapter[NeedsenumInput] = TypeAdapter(NeedsenumInput)
 
 NeedsenumOutput = Annotated[
-    Literal["out_first"] | Literal["out_second"] | RiverUnknownValue,
-    WrapValidator(translate_unknown_value),
+    Literal["out_first"] | Literal["out_second"] | RiverUnknownError,
+    WrapValidator(translate_unknown_error),
 ]
 
-NeedsenumOutputTypeAdapter: TypeAdapter[Any] = TypeAdapter(NeedsenumOutput)
+NeedsenumOutputTypeAdapter: TypeAdapter[NeedsenumOutput] = TypeAdapter(NeedsenumOutput)
+
+
+class NeedsenumErrorsOneOf_err_first(RiverError):
+    code: Literal["err_first"]
+    message: str
+
+
+class NeedsenumErrorsOneOf_err_second(RiverError):
+    code: Literal["err_second"]
+    message: str
+
 
 NeedsenumErrors = Annotated[
-    Literal["err_first"] | Literal["err_second"] | RiverUnknownValue,
-    WrapValidator(translate_unknown_value),
+    NeedsenumErrorsOneOf_err_first
+    | NeedsenumErrorsOneOf_err_second
+    | RiverUnknownError,
+    WrapValidator(translate_unknown_error),
 ]
 
-NeedsenumErrorsTypeAdapter: TypeAdapter[Any] = TypeAdapter(NeedsenumErrors)
+
+NeedsenumErrorsTypeAdapter: TypeAdapter[NeedsenumErrors] = TypeAdapter(NeedsenumErrors)

tests/codegen/snapshot/snapshots/test_unknown_enum/enumService/needsEnumObject.py

@@ -19,7 +19,7 @@
 
 from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
-from replit_river.client import RiverUnknownValue, translate_unknown_value
+from replit_river.client import RiverUnknownError, translate_unknown_error
 
 import replit_river as river
 
@@ -72,7 +72,9 @@ class NeedsenumobjectInputOneOf_in_second(TypedDict):
     else encode_NeedsenumobjectInputOneOf_in_second(x)
 )
 
-NeedsenumobjectInputTypeAdapter: TypeAdapter[Any] = TypeAdapter(NeedsenumobjectInput)
+NeedsenumobjectInputTypeAdapter: TypeAdapter[NeedsenumobjectInput] = TypeAdapter(
+    NeedsenumobjectInput
+)
 
 
 class NeedsenumobjectOutputFooOneOf_out_first(BaseModel):
@@ -96,16 +98,18 @@ class NeedsenumobjectOutputFooOneOf_out_second(BaseModel):
 NeedsenumobjectOutputFoo = Annotated[
     NeedsenumobjectOutputFooOneOf_out_first
     | NeedsenumobjectOutputFooOneOf_out_second
-    | RiverUnknownValue,
-    WrapValidator(translate_unknown_value),
+    | RiverUnknownError,
+    WrapValidator(translate_unknown_error),
 ]
 
 
 class NeedsenumobjectOutput(BaseModel):
     foo: Optional[NeedsenumobjectOutputFoo] = None
 
 
-NeedsenumobjectOutputTypeAdapter: TypeAdapter[Any] = TypeAdapter(NeedsenumobjectOutput)
+NeedsenumobjectOutputTypeAdapter: TypeAdapter[NeedsenumobjectOutput] = TypeAdapter(
+    NeedsenumobjectOutput
+)
 
 
 class NeedsenumobjectErrorsFooAnyOf_0(RiverError):
@@ -119,13 +123,15 @@ class NeedsenumobjectErrorsFooAnyOf_1(RiverError):
 NeedsenumobjectErrorsFoo = Annotated[
     NeedsenumobjectErrorsFooAnyOf_0
     | NeedsenumobjectErrorsFooAnyOf_1
-    | RiverUnknownValue,
-    WrapValidator(translate_unknown_value),
+    | RiverUnknownError,
+    WrapValidator(translate_unknown_error),
 ]
 
 
 class NeedsenumobjectErrors(RiverError):
     foo: Optional[NeedsenumobjectErrorsFoo] = None
 
 
-NeedsenumobjectErrorsTypeAdapter: TypeAdapter[Any] = TypeAdapter(NeedsenumobjectErrors)
+NeedsenumobjectErrorsTypeAdapter: TypeAdapter[NeedsenumobjectErrors] = TypeAdapter(
+    NeedsenumobjectErrors
+)

tests/codegen/snapshot/test_enum.py

@@ -40,12 +40,30 @@
           "errors": {
             "anyOf": [
               {
-                "type": "string",
-                "const": "err_first"
+                "type": "object",
+                "properties": {
+                  "code": {
+                    "const": "err_first",
+                    "type": "string"
+                  },
+                  "message": {
+                    "type": "string"
+                  }
+                },
+                "required": ["code", "message"]
               },
               {
-                "type": "string",
-                "const": "err_second"
+                "type": "object",
+                "properties": {
+                  "code": {
+                    "const": "err_second",
+                    "type": "string"
+                  },
+                  "message": {
+                    "type": "string"
+                  }
+                },
+                "required": ["code", "message"]
               }
             ]
           }

tests/codegen/stream/generated/test_service/stream_method.py

@@ -19,7 +19,7 @@
 
 from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
-from replit_river.client import RiverUnknownValue, translate_unknown_value
+from replit_river.client import RiverUnknownError, translate_unknown_error
 
 import replit_river as river
 
@@ -39,11 +39,15 @@ class Stream_MethodInput(TypedDict):
     data: str
 
 
-Stream_MethodInputTypeAdapter: TypeAdapter[Any] = TypeAdapter(Stream_MethodInput)
+Stream_MethodInputTypeAdapter: TypeAdapter[Stream_MethodInput] = TypeAdapter(
+    Stream_MethodInput
+)
 
 
 class Stream_MethodOutput(BaseModel):
     data: str
 
 
-Stream_MethodOutputTypeAdapter: TypeAdapter[Any] = TypeAdapter(Stream_MethodOutput)
+Stream_MethodOutputTypeAdapter: TypeAdapter[Stream_MethodOutput] = TypeAdapter(
+    Stream_MethodOutput
+)