@corbits/system-one 0.3.2 → 0.4.0

package/dist/schemas.js

@@ -88,11 +88,48 @@ export const BooleanQuestion = type({
     },
     "+": "reject",
 }).narrow((q) => nonEmpty(q.instructions));
+// Locates a region in an image. Edges come back as fractions of the image.
+// Callers should set the model to `jev-preview`; the client does not require it.
+export const BoxQuestion = type({
+    id: "string",
+    type: "'box'",
+    instructions: Description,
+    "+": "reject",
+}).narrow((q) => nonEmpty(q.instructions));
+// Keyed decisions questions: choice, noul, score, or box only. Extraction-style
+// helpers are not part of this contract and fail the union.
+export const DecisionQuestion = type({
+    type: "'choice'",
+    instructions: "unknown",
+    criteria: "unknown",
+    "+": "reject",
+})
+    .or(type({
+    type: "'noul'",
+    "instructions?": "unknown",
+    "criteria?": "unknown",
+    "+": "reject",
+}))
+    .or(type({
+    type: "'score'",
+    instructions: "unknown",
+    criteria: "unknown",
+    "+": "reject",
+}))
+    .or(type({
+    type: "'box'",
+    instructions: "unknown",
+    "+": "reject",
+}));
+export const DecisionQuestionRecord = type({
+    "[string]": DecisionQuestion,
+}).narrow((qs) => Object.keys(qs).length >= 1);
 // The question union a caller may ask in one evaluation. `.or` chains keep
 // each branch's literal `type`, so the union still discriminates on it.
 export const Question = ChoiceQuestion.or(ScoreQuestion)
     .or(NoulQuestion)
-    .or(BooleanQuestion);
+    .or(BooleanQuestion)
+    .or(BoxQuestion);
 // A non-empty question list with unique ids: a duplicate would make the
 // backend's per-id echo permanently ambiguous, so it is rejected at the
 // input edge (typed `SystemOneError` / `ProtocolMismatchError`) rather than
@@ -107,10 +144,13 @@ export const QuestionList = Question.array()
 // `gateway` the proxy endpoint, `custom` a caller-supplied URL. `url` only
 // exists on `custom` — a `url` on another kind would be silently ignored,
 // so the schema rejects it instead of accepting misleading config.
+// `auth: "none"` exists only on `custom`: it is the explicit opt-out from
+// the fail-closed key requirement. Official and gateway cannot carry it.
 export const EndpointConfig = type({
     kind: "'custom'",
     url: "string",
     "model?": "string",
+    "auth?": "'none'",
     "+": "reject",
 }).or(type({
     kind: "'official' | 'gateway'",
@@ -146,16 +186,22 @@ export const EvaluateInput = type({
 // `toWireRequest`, never hand-assembled by callers.
 /** One question in wire form: no id (the map key carries it). */
 export const WireQuestion = type({
-    type: "'noul' | 'choice' | 'score'",
+    type: "'noul' | 'choice' | 'score' | 'box'",
     instructions: Description,
     "criteria?": "unknown",
     "+": "reject",
 });
-/** The exact POST body: model + state + id-keyed questions. */
+const WireAsset = type({
+    type: "'image'",
+    part: "string",
+    "+": "reject",
+});
+/** The exact POST body: model + state + id-keyed questions, plus image parts. */
 export const WireRequest = type({
     model: "string",
     state: State,
     questions: { "[string]": WireQuestion },
+    "assets?": { "[string]": WireAsset },
     "+": "reject",
 }).narrow((body) => Object.keys(body.questions).length >= 1);
 /**
@@ -169,8 +215,9 @@ export function toWireQuestions(questions) {
             type: question.type === "boolean" ? "noul" : question.type,
             instructions: question.instructions,
         };
-        if (question.criteria !== undefined)
+        if ("criteria" in question && question.criteria !== undefined) {
             mapped.criteria = question.criteria;
+        }
         wire[question.id] = mapped;
     }
     return wire;
@@ -193,14 +240,36 @@ export const APPROXIMATE_SUM_TOLERANCE = 0.02;
 // `type` must carry. No `"+": "reject"`: the backend may attach per-answer
 // metadata that `toDecision` strips.
 export const WireAnswer = type({
-    type: "'noul' | 'choice' | 'score'",
+    type: "'noul' | 'choice' | 'score' | 'box'",
     "choice?": "string",
     "score?": "number",
     "noul?": Confidence,
     "probabilities?": ProbabilityMap,
-    "confidence?": Confidence,
+    "confidence?": Confidence.or("null"),
     "legend?": { "[string]": "string" },
+    "box?": {
+        top: "number",
+        bottom: "number",
+        left: "number",
+        right: "number",
+    },
 });
+/** Box edges are fractions of the image. Shared by `evaluate` and the adapter. */
+export function boxEdgesOutOfRange(id, box) {
+    for (const edge of ["top", "bottom", "left", "right"]) {
+        const value = box[edge];
+        if (!Number.isFinite(value) || value < 0 || value > 1) {
+            return `answer "${id}" box.${edge} ${String(value)} outside [0, 1]`;
+        }
+    }
+    if (box.top >= box.bottom) {
+        return `answer "${id}" box.top ${String(box.top)} is not below box.bottom ${String(box.bottom)}`;
+    }
+    if (box.left >= box.right) {
+        return `answer "${id}" box.left ${String(box.left)} is not left of box.right ${String(box.right)}`;
+    }
+    return undefined;
+}
 // Token usage reported on the response envelope.
 export const WireUsage = type({
     input_tokens: "number",
@@ -241,6 +310,19 @@ export const Decision = type({
     probabilities: ProbabilityMap,
     confidence: Confidence,
     "+": "reject",
+}))
+    .or(type({
+    id: "string",
+    type: "'box'",
+    box: {
+        top: "number",
+        bottom: "number",
+        left: "number",
+        right: "number",
+        "+": "reject",
+    },
+    confidence: Confidence.or("null"),
+    "+": "reject",
 }));
 /**
  * Builds a caller-facing decision from a wire answer: the kind's contract
@@ -262,6 +344,14 @@ export function toDecision(id, answer) {
             confidence: answer.confidence,
         };
     }
+    else if (answer.type === "box") {
+        candidate = {
+            id,
+            type: "box",
+            box: answer.box,
+            confidence: answer.confidence ?? null,
+        };
+    }
     else {
         candidate = {
             id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corbits/system-one",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Typed-decision evaluation client for System One (Jev-class) models: arktype question/decision schemas, endpoint configuration with gateway override, and timeout/fallback semantics.",
   "keywords": [
     "corbits",
@@ -32,6 +32,16 @@
       "corbits-system-one-src": "./src/index.ts",
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./decisions": {
+      "corbits-system-one-src": "./src/decisions.ts",
+      "types": "./dist/decisions.d.ts",
+      "default": "./dist/decisions.js"
+    },
+    "./extraction": {
+      "corbits-system-one-src": "./src/extraction.ts",
+      "types": "./dist/extraction.d.ts",
+      "default": "./dist/extraction.js"
     }
   },
   "publishConfig": {