replit-river 0.17.13__py3-none-any.whl → 0.17.15__py3-none-any.whl

replit_river/codegen/client.py

@@ -389,7 +389,8 @@ def encode_type(
         type = original_type
         any_of: list[TypeExpression] = []
 
-        typeddict_encoder = []
+        # Collect (type_check, encoder_expr) pairs for building ternary chain
+        encoder_parts: list[tuple[str | None, str]] = []
         for i, t in enumerate(type.anyOf):
             type_name, _, contents, _ = encode_type(
                 t,
@@ -403,34 +404,65 @@ def encode_type(
             chunks.extend(contents)
             if isinstance(t, RiverConcreteType):
                 if t.type == "string":
-                    typeddict_encoder.extend(["x", " if isinstance(x, str) else "])
-                else:
-                    # TODO(dstewart): This structure changed since we were incorrectly
-                    #                 leaking ListTypeExprs into codegen. This generated
-                    #                 code is probably wrong.
+                    encoder_parts.append(("isinstance(x, str)", "x"))
+                elif t.type == "array":
                     match type_name:
-                        case ListTypeExpr(inner_type_name):
-                            typeddict_encoder.append(
-                                f"encode_{render_literal_type(inner_type_name)}(x)"
+                        case ListTypeExpr(inner_type_name) if isinstance(
+                            inner_type_name, TypeName
+                        ):
+                            # Primitives don't need encoding
+                            inner_type_str = render_literal_type(inner_type_name)
+                            if inner_type_str in ("str", "int", "float", "bool", "Any"):
+                                encoder_parts.append(("isinstance(x, list)", "list(x)"))
+                            else:
+                                encoder_parts.append(
+                                    (
+                                        "isinstance(x, list)",
+                                        f"[encode_{inner_type_str}(y) for y in x]",
+                                    )
+                                )
+                        case _:
+                            encoder_parts.append(("isinstance(x, list)", "list(x)"))
+                elif t.type == "object":
+                    match type_name:
+                        case TypeName(value):
+                            encoder_parts.append(
+                                ("isinstance(x, dict)", f"encode_{value}(x)")
                             )
+                        case _:
+                            encoder_parts.append(("isinstance(x, dict)", "dict(x)"))
+                elif t.type in ("number", "integer"):
+                    match type_name:
                         case LiteralTypeExpr(const):
-                            typeddict_encoder.append(repr(const))
+                            encoder_parts.append((f"x == {repr(const)}", repr(const)))
+                        case _:
+                            encoder_parts.append(("isinstance(x, (int, float))", "x"))
+                elif t.type == "boolean":
+                    encoder_parts.append(("isinstance(x, bool)", "x"))
+                elif t.type == "null" or t.type == "undefined":
+                    encoder_parts.append(("x is None", "None"))
+                else:
+                    # Fallback for other types
+                    match type_name:
                         case TypeName(value):
-                            typeddict_encoder.append(f"encode_{value}(x)")
+                            encoder_parts.append((None, f"encode_{value}(x)"))
+                        case LiteralTypeExpr(const):
+                            encoder_parts.append((None, repr(const)))
                         case NoneTypeExpr():
-                            typeddict_encoder.append("None")
-                        case other:
-                            _o2: (
-                                DictTypeExpr
-                                | OpenUnionTypeExpr
-                                | UnionTypeExpr
-                                | LiteralType
-                            ) = other
-                            raise ValueError(
-                                f"What does it mean to have {
-                                    render_type_expr(_o2)
-                                } here?"
-                            )
+                            encoder_parts.append((None, "None"))
+                        case _:
+                            encoder_parts.append((None, "x"))
+
+        # Build the ternary chain from encoder_parts
+        typeddict_encoder = list[str]()
+        for i, (type_check, encoder_expr) in enumerate(encoder_parts):
+            is_last = i == len(encoder_parts) - 1
+            if is_last or type_check is None:
+                # Last item or no type check - just the expression
+                typeddict_encoder.append(encoder_expr)
+            else:
+                # Add expression with type check
+                typeddict_encoder.append(f"{encoder_expr} if {type_check} else")
         if permit_unknown_members:
             union = _make_open_union_type_expr(any_of)
         else:
@@ -603,7 +635,9 @@ def encode_type(
                             f"encode_{render_literal_type(type_name)}"
                         )
                         encoder_names.add(encoder_name)
-                        typeddict_encoder.append(f"{encoder_name}(x[{repr(name)}])")
+                        typeddict_encoder.append(
+                            f"{render_literal_type(encoder_name)}(x[{repr(name)}])"
+                        )
                     elif isinstance(prop, RiverConcreteType):
                         if name == "$kind":
                             safe_name = "kind"

{replit_river-0.17.13.dist-info → replit_river-0.17.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: replit-river
-Version: 0.17.13
+Version: 0.17.15
 Summary: Replit river toolkit for Python
 Author-email: Replit <eng@replit.com>
 License: MIT License

{replit_river-0.17.13.dist-info → replit_river-0.17.15.dist-info}/RECORD

@@ -19,7 +19,7 @@ replit_river/transport_options.py,sha256=Kx3n6_x6sA69WV52EUvm-GzJhDaaewUQzbtcdPl
 replit_river/websocket_wrapper.py,sha256=xrk421A5eXTH2bjAcNeBZN96zTO6xQsl0VS9qcwus6M,814
 replit_river/codegen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 replit_river/codegen/__main__.py,sha256=LyKe1OXIyev0BuUcu43iu6zBLJzeogQ8DocxDkALD-Q,153
-replit_river/codegen/client.py,sha256=LvNwtKd7apQyL7hhOscinhhfY2_IQZEEjRID88ImUSE,61189
+replit_river/codegen/client.py,sha256=7N_C-Cof8PoNBzcTRcE1qO_PgOzRPqCTRcWUwSRI7dE,63040
 replit_river/codegen/format.py,sha256=pLa9nWlw8hTOnjzZjMsMpgcmNYiLaF5VAHNQTwwJ7Zw,285
 replit_river/codegen/run.py,sha256=InJaUDJft80pY7v2l-LoXHr8HYg3Bmb_6XQvlqgvxv4,3170
 replit_river/codegen/schema.py,sha256=y3kzrEPgzW9gKMjqiF2souZk47mE_kuFkHlsxRdD560,5344
@@ -29,7 +29,7 @@ replit_river/v2/__init__.py,sha256=Fi4wP87qHOQwaWQmVbPJOOiGfkiZ6gTWg5bF5J8je5s,1
 replit_river/v2/client.py,sha256=PQ1qz15lFTdMOs0kktBdzMUEYD66OnJJN0loYFVjdn4,7241
 replit_river/v2/client_transport.py,sha256=swtsFoWIX8nnG5cBeHMkZSZsJ5SW-VbdNHBdLtldMgU,3445
 replit_river/v2/session.py,sha256=8EMKw8bevoIrMfQBKMl3oXFlOJ91lzjmuqsm3qZN8Ts,54147
-replit_river-0.17.13.dist-info/METADATA,sha256=qxC6HcTGBxbAXq-HNidfwfZOISeg7V6ZkFDTqVKkLP0,4794
-replit_river-0.17.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-replit_river-0.17.13.dist-info/licenses/LICENSE,sha256=kyZ5E3kOH4dzPet_xD0w6xi04e-0fGT0HRMhKyLyLC0,1063
-replit_river-0.17.13.dist-info/RECORD,,
+replit_river-0.17.15.dist-info/METADATA,sha256=Ji0xKb-X5DoBLLJr48V13DwVAIEZDAcX6dnyITxWp8Y,4794
+replit_river-0.17.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+replit_river-0.17.15.dist-info/licenses/LICENSE,sha256=kyZ5E3kOH4dzPet_xD0w6xi04e-0fGT0HRMhKyLyLC0,1063
+replit_river-0.17.15.dist-info/RECORD,,