Updating tests

replit · Feb 6, 2025 · 7275f2e · 7275f2e
1 parent 290e470
commit 7275f2e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/tests/codegen/rpc/generated/test_service/__init__.py b/tests/codegen/rpc/generated/test_service/__init__.py
@@ -9,7 +9,7 @@
 import replit_river as river
 
 
-from .rpc_method import encode_Rpc_MethodInput, Rpc_MethodInput, Rpc_MethodOutput
+from .rpc_method import Rpc_MethodInput, Rpc_MethodOutput, encode_Rpc_MethodInput
 
 
 class Test_ServiceService:

diff --git a/tests/codegen/rpc/generated/test_service/rpc_method.py b/tests/codegen/rpc/generated/test_service/rpc_method.py
@@ -10,15 +10,16 @@
     Literal,
     Optional,
     Mapping,
-    NewType,
     NotRequired,
     Union,
     Tuple,
     TypedDict,
 )
+from typing_extensions import Annotated
 
-from pydantic import BaseModel, Field, TypeAdapter
+from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
+from replit_river.client import RiverUnknownValue, raise_unknown
 
 import replit_river as river
 

diff --git a/tests/codegen/snapshot/snapshots/test_unknown_enum/enumService/needsEnum.py b/tests/codegen/snapshot/snapshots/test_unknown_enum/enumService/needsEnum.py
@@ -10,26 +10,27 @@
     Literal,
     Optional,
     Mapping,
-    NewType,
     NotRequired,
     Union,
     Tuple,
     TypedDict,
 )
+from typing_extensions import Annotated
 
-from pydantic import BaseModel, Field, TypeAdapter
+from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
+from replit_river.client import RiverUnknownValue, raise_unknown
 
 import replit_river as river
 
 
 NeedsenumInput = Literal["in_first"] | Literal["in_second"]
 encode_NeedsenumInput: Callable[["NeedsenumInput"], Any] = lambda x: x
-NeedsenumOutputAnyOf__Unknown = NewType("NeedsenumOutputAnyOf__Unknown", object)
-NeedsenumOutput = (
-    Literal["out_first"] | Literal["out_second"] | NeedsenumOutputAnyOf__Unknown
-)
-NeedsenumErrorsAnyOf__Unknown = NewType("NeedsenumErrorsAnyOf__Unknown", object)
-NeedsenumErrors = (
-    Literal["err_first"] | Literal["err_second"] | NeedsenumErrorsAnyOf__Unknown
-)
+NeedsenumOutput = Annotated[
+    Literal["out_first"] | Literal["out_second"] | RiverUnknownValue,
+    WrapValidator(raise_unknown),
+]
+NeedsenumErrors = Annotated[
+    Literal["err_first"] | Literal["err_second"] | RiverUnknownValue,
+    WrapValidator(raise_unknown),
+]
diff --git a/tests/codegen/snapshot/snapshots/test_unknown_enum/enumService/needsEnumObject.py b/tests/codegen/snapshot/snapshots/test_unknown_enum/enumService/needsEnumObject.py
@@ -10,15 +10,16 @@
     Literal,
     Optional,
     Mapping,
-    NewType,
     NotRequired,
     Union,
     Tuple,
     TypedDict,
 )
+from typing_extensions import Annotated
 
-from pydantic import BaseModel, Field, TypeAdapter
+from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
+from replit_river.client import RiverUnknownValue, raise_unknown
 
 import replit_river as river
 
@@ -90,14 +91,12 @@ class NeedsenumobjectOutputFooOneOf_out_second(BaseModel):
     bar: int
 
 
-NeedsenumobjectOutputFooAnyOf__Unknown = NewType(
-    "NeedsenumobjectOutputFooAnyOf__Unknown", object
-)
-NeedsenumobjectOutputFoo = (
+NeedsenumobjectOutputFoo = Annotated[
     NeedsenumobjectOutputFooOneOf_out_first
     | NeedsenumobjectOutputFooOneOf_out_second
-    | NeedsenumobjectOutputFooAnyOf__Unknown
-)
+    | RiverUnknownValue,
+    WrapValidator(raise_unknown),
+]
 
 
 class NeedsenumobjectOutput(BaseModel):
@@ -112,14 +111,12 @@ class NeedsenumobjectErrorsFooAnyOf_1(RiverError):
     borp: Optional[Literal["err_second"]] = None
 
 
-NeedsenumobjectErrorsFooAnyOf__Unknown = NewType(
-    "NeedsenumobjectErrorsFooAnyOf__Unknown", object
-)
-NeedsenumobjectErrorsFoo = (
+NeedsenumobjectErrorsFoo = Annotated[
     NeedsenumobjectErrorsFooAnyOf_0
     | NeedsenumobjectErrorsFooAnyOf_1
-    | NeedsenumobjectErrorsFooAnyOf__Unknown
-)
+    | RiverUnknownValue,
+    WrapValidator(raise_unknown),
+]
 
 
 class NeedsenumobjectErrors(RiverError):

diff --git a/tests/codegen/stream/generated/test_service/__init__.py b/tests/codegen/stream/generated/test_service/__init__.py
@@ -10,9 +10,9 @@
 
 
 from .stream_method import (
-    encode_Stream_MethodInput,
-    Stream_MethodOutput,
     Stream_MethodInput,
+    Stream_MethodOutput,
+    encode_Stream_MethodInput,
 )
 
 

diff --git a/tests/codegen/stream/generated/test_service/stream_method.py b/tests/codegen/stream/generated/test_service/stream_method.py
@@ -10,15 +10,16 @@
     Literal,
     Optional,
     Mapping,
-    NewType,
     NotRequired,
     Union,
     Tuple,
     TypedDict,
 )
+from typing_extensions import Annotated
 
-from pydantic import BaseModel, Field, TypeAdapter
+from pydantic import BaseModel, Field, TypeAdapter, WrapValidator
 from replit_river.error_schema import RiverError
+from replit_river.client import RiverUnknownValue, raise_unknown
 
 import replit_river as river