Skip to content

armgit / laya

Public Imported from GitHub
0

Non-autoregressive System 1 decision engine. Typed choice, score and yes/no decisions over any text in a single forward pass, in 100+ languages, with a router that picks the right checkpoint per request.

fix(java): reject a non-array anyOf/oneOf as unsupported schema, matching Python

Aashish6df415fdbae2
diff --git a/laya-java/fixtures/structured.json b/laya-java/fixtures/structured.json
index 4a0384da..afc2a3b4 100644
--- a/laya-java/fixtures/structured.json
+++ b/laya-java/fixtures/structured.json
@@ -3204,7 +3204,7 @@
}
}
},
- "error": "properties.x: only 'Optional[...]' unions (one non-null branch) are supported, got 0"
+ "error": "properties.x: unsupported schema {'anyOf': 'abc'}"
},
{
"case": "truthy-non-array-anyof-with-a-oneof-to-shadow",
@@ -3226,7 +3226,7 @@
}
}
},
- "error": "properties.x: only 'Optional[...]' unions (one non-null branch) are supported, got 0"
+ "error": "properties.x: unsupported schema {'anyOf': {'a': 1}, 'oneOf': [{'type': 'boolean'}, {'type': 'null'}]}"
},
{
"case": "top-level-is-null",
diff --git a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Decisions.java b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Decisions.java
index 12747086..3b15b9da 100644
--- a/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Decisions.java
+++ b/laya-java/laya-java/src/main/java/com/convaiinnovations/laya/Decisions.java
@@ -436,32 +436,23 @@ public final class Decisions {
// A FALSY `anyOf` falls through to `oneOf`, because the reference spells this
// `prop.get("anyOf") or prop.get("oneOf")`. Falsy is Python's, not "not a list":
// an empty list, an empty object, an empty string, zero and false are all falsy
- // there and all fall through, while a NON-EMPTY string or object is truthy and does
- // NOT -- it is iterated, yields no mapping branch, and lands on the `got 0` refusal
- // below. Reproducing only the empty-list case sent a truthy `{"anyOf": "abc"}`
- // through to `oneOf` and, with no `oneOf` to find, out to "unsupported schema".
+ // there and all fall through. What survives is handled only when it is an array: the
+ // reference guards with `isinstance(union, list)`, so a truthy `{"anyOf": "abc"}`, a
+ // truthy `{"anyOf": {...}}`, a `{"anyOf": 5}` or a `{"anyOf": true}` is neither
+ // iterated nor unwrapped -- it falls past this block to the terminal "unsupported
+ // schema" below. Iterating them used to reach the `got 0` refusal, which blamed a
+ // union arity the request never had, and a non-iterable leaked a TypeError.
Object union = prop.get("anyOf");
if (!truthy(union)) {
union = prop.get("oneOf");
}
- if (union != null) {
+ if (union instanceof List) {
List<Map<String, Object>> branches = new ArrayList<>();
- if (union instanceof List) {
- for (Object candidate : (List<?>) union) {
- if (candidate instanceof Map
- && !"null".equals(((Map<?, ?>) candidate).get("type"))) {
- branches.add((Map<String, Object>) candidate);
- }
+ for (Object candidate : (List<?>) union) {
+ if (candidate instanceof Map
+ && !"null".equals(((Map<?, ?>) candidate).get("type"))) {
+ branches.add((Map<String, Object>) candidate);
}
- } else if (!(union instanceof String) && !(union instanceof Map)) {
- // A string iterates its characters and an object its keys, so both reach the
- // refusal below with zero branches, which is what the reference raises. A
- // number or a boolean is not iterable at all: the reference raises TypeError
- // there, and this is the one recorded exception to the
- // message-for-message rule -- see the class note.
- throw new SchemaException(path + ": '"
- + (truthy(prop.get("anyOf")) ? "anyOf" : "oneOf")
- + "' must be an array of branches, got " + pythonType(union));
}
if (branches.size() != 1) {
throw new SchemaException(path + ": only 'Optional[...]' unions (one non-null"