@patdown/jev 0.4.0 → 0.5.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { JevNoulAnswerSchema, JevNoulQuestionSchema, JevNoulResultSchema, JevUsageSchema, type JevNoulAnswer, type JevNoulResult, } from '#src/jev-noul-schema';
-export { JevRequestFailed, JevSystemOne, JevSystemOneLive } from '#src/jev-system-one';
+export { JevChoiceAnswerSchema, JevChoiceQuestionSchema, JevChoiceResultSchema, type JevChoiceAnswer, type JevChoiceResult, } from '#src/jev-choice-schema';
+export { JevRequestFailed, JevSystemOne, JevSystemOneLive, type JevChoiceCriteria, } from '#src/jev-system-one';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,cAAc,EACd,KAAK,aAAa,EAClB,KAAK,aAAa,GAClB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,cAAc,EACd,KAAK,aAAa,EAClB,KAAK,aAAa,GAClB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACN,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,eAAe,GACpB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EACN,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,KAAK,iBAAiB,GACtB,MAAM,qBAAqB,CAAA"}

package/dist/index.js

@@ -1,2 +1,3 @@
 export { JevNoulAnswerSchema, JevNoulQuestionSchema, JevNoulResultSchema, JevUsageSchema, } from '#src/jev-noul-schema';
-export { JevRequestFailed, JevSystemOne, JevSystemOneLive } from '#src/jev-system-one';
+export { JevChoiceAnswerSchema, JevChoiceQuestionSchema, JevChoiceResultSchema, } from '#src/jev-choice-schema';
+export { JevRequestFailed, JevSystemOne, JevSystemOneLive, } from '#src/jev-system-one';

package/dist/jev-choice-schema.d.ts

@@ -0,0 +1,31 @@
+import { Schema } from 'effect';
+/** Choice question body for POST /v1/systemone. Labels map to descriptions. */
+export declare const JevChoiceQuestionSchema: Schema.Struct<{
+    readonly criteria: Schema.$Record<Schema.String, Schema.NullOr<Schema.String>>;
+    readonly instructions: Schema.optionalKey<Schema.String>;
+    readonly type: Schema.Literal<"choice">;
+}>;
+/** Choice answer from POST /v1/systemone. */
+export declare const JevChoiceAnswerSchema: Schema.Struct<{
+    readonly choice: Schema.String;
+    readonly confidence: Schema.Finite;
+    readonly probabilities: Schema.$Record<Schema.String, Schema.Finite>;
+    readonly type: Schema.Literal<"choice">;
+}>;
+/** System One response when every question is choice. */
+export declare const JevChoiceResultSchema: Schema.Struct<{
+    readonly answers: Schema.$Record<Schema.String, Schema.Struct<{
+        readonly choice: Schema.String;
+        readonly confidence: Schema.Finite;
+        readonly probabilities: Schema.$Record<Schema.String, Schema.Finite>;
+        readonly type: Schema.Literal<"choice">;
+    }>>;
+    readonly model: Schema.String;
+    readonly usage: Schema.Struct<{
+        readonly input_tokens: Schema.Finite;
+        readonly output_tokens: Schema.Finite;
+    }>;
+}>;
+export type JevChoiceAnswer = typeof JevChoiceAnswerSchema.Type;
+export type JevChoiceResult = typeof JevChoiceResultSchema.Type;
+//# sourceMappingURL=jev-choice-schema.d.ts.map

package/dist/jev-choice-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jev-choice-schema.d.ts","sourceRoot":"","sources":["../src/jev-choice-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,+EAA+E;AAC/E,eAAO,MAAM,uBAAuB;;;;EAIlC,CAAA;AAEF,6CAA6C;AAC7C,eAAO,MAAM,qBAAqB;;;;;EAKhC,CAAA;AAEF,yDAAyD;AACzD,eAAO,MAAM,qBAAqB;;;;;;;;;;;;EAOhC,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG,OAAO,qBAAqB,CAAC,IAAI,CAAA;AAE/D,MAAM,MAAM,eAAe,GAAG,OAAO,qBAAqB,CAAC,IAAI,CAAA"}

package/dist/jev-choice-schema.js

@@ -0,0 +1,23 @@
+import { Schema } from 'effect';
+/** Choice question body for POST /v1/systemone. Labels map to descriptions. */
+export const JevChoiceQuestionSchema = Schema.Struct({
+    criteria: Schema.Record(Schema.String, Schema.NullOr(Schema.String)),
+    instructions: Schema.optionalKey(Schema.String),
+    type: Schema.Literal('choice'),
+});
+/** Choice answer from POST /v1/systemone. */
+export const JevChoiceAnswerSchema = Schema.Struct({
+    choice: Schema.String,
+    confidence: Schema.Finite,
+    probabilities: Schema.Record(Schema.String, Schema.Finite),
+    type: Schema.Literal('choice'),
+});
+/** System One response when every question is choice. */
+export const JevChoiceResultSchema = Schema.Struct({
+    answers: Schema.Record(Schema.String, JevChoiceAnswerSchema),
+    model: Schema.String,
+    usage: Schema.Struct({
+        input_tokens: Schema.Finite,
+        output_tokens: Schema.Finite,
+    }),
+});

package/dist/jev-system-one.d.ts

@@ -1,5 +1,6 @@
 import { Context, Effect, Layer } from 'effect';
 import { HttpClient } from 'effect/unstable/http';
+import { type JevChoiceAnswer } from '#src/jev-choice-schema';
 import { type JevNoulAnswer } from '#src/jev-noul-schema';
 declare const JevRequestFailed_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "JevRequestFailed";
@@ -12,8 +13,11 @@ export declare class JevRequestFailed extends JevRequestFailed_base<{
     readonly requestId?: string | undefined;
 }> {
 }
+/** Labels for a Choice question. Values are short descriptions shown to the model. */
+export type JevChoiceCriteria = Readonly<Record<string, string | null>>;
 declare const JevSystemOne_base: Context.ServiceClass<JevSystemOne, "@patdown/jev/JevSystemOne", {
     readonly askNoul: (instructions: string, state: string) => Effect.Effect<JevNoulAnswer, JevRequestFailed, HttpClient.HttpClient>;
+    readonly askChoice: (instructions: string, state: string, criteria: JevChoiceCriteria) => Effect.Effect<JevChoiceAnswer, JevRequestFailed, HttpClient.HttpClient>;
 }>;
 /**
  * Client for TypeSafe System One (Jev). Implemented with Effect HttpClient so a Decision-based

package/dist/jev-system-one.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jev-system-one.d.ts","sourceRoot":"","sources":["../src/jev-system-one.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAoB,MAAM,QAAQ,CAAA;AAE/E,OAAO,EAAE,UAAU,EAAyC,MAAM,sBAAsB,CAAA;AAExF,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;;;;AAQ9E,kGAAkG;AAClG,qBAAa,gBAAiB,SAAQ,sBAAqC;IAC1E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACvC,CAAC;CAAG;;sBASe,CACjB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,gBAAgB,EAAE,UAAU,CAAC,UAAU,CAAC;;AAV5E;;;GAGG;AACH,qBAAa,YAAa,SAAQ,iBAQF;CAAG;AAqKnC,qEAAqE;AACrE,eAAO,MAAM,gBAAgB,yCAE3B,CAAA"}
+{"version":3,"file":"jev-system-one.d.ts","sourceRoot":"","sources":["../src/jev-system-one.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAoB,MAAM,QAAQ,CAAA;AAE/E,OAAO,EAAE,UAAU,EAAyC,MAAM,sBAAsB,CAAA;AAExF,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACpF,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;;;;AAU9E,kGAAkG;AAClG,qBAAa,gBAAiB,SAAQ,sBAAqC;IAC1E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACvC,CAAC;CAAG;AAEL,sFAAsF;AACtF,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAA;;sBASnD,CACjB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,KACT,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,gBAAgB,EAAE,UAAU,CAAC,UAAU,CAAC;wBACtD,CACnB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,iBAAiB,KACvB,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,gBAAgB,EAAE,UAAU,CAAC,UAAU,CAAC;;AAf9E;;;GAGG;AACH,qBAAa,YAAa,SAAQ,iBAaF;CAAG;AA8QnC,qEAAqE;AACrE,eAAO,MAAM,gBAAgB,yCAG3B,CAAA"}

package/dist/jev-system-one.js

@@ -1,9 +1,11 @@
 import { Config, Context, Data, Effect, Layer, Redacted, Schema } from 'effect';
 import { HttpClient, HttpClientRequest, HttpClientResponse } from 'effect/unstable/http';
+import { JevChoiceResultSchema } from '#src/jev-choice-schema';
 import { JevNoulResultSchema } from '#src/jev-noul-schema';
 const defaultJevBaseUrl = 'https://api.typesafe.ai';
 const defaultJevModel = 'jev-latest';
 const defaultNoulQuestionName = 'noul';
+const defaultChoiceQuestionName = 'choice';
 /** Jev / System One HTTP or config failure. Swap this service later for Effect's Decision API. */
 export class JevRequestFailed extends Data.TaggedError('JevRequestFailed') {
 }
@@ -33,6 +35,15 @@ function noulAnswerFromResult(result, questionName) {
     }
     return Effect.succeed(answer);
 }
+function choiceAnswerFromResult(result, questionName) {
+    const answer = result.answers[questionName];
+    if (answer === undefined) {
+        return Effect.fail(new JevRequestFailed({
+            message: `jev: response missing choice answer ${questionName}`,
+        }));
+    }
+    return Effect.succeed(answer);
+}
 function encodeJevNoulBody(prepared, model, instructions, state) {
     return HttpClientRequest.bodyJson(prepared, {
         model,
@@ -51,6 +62,27 @@ function encodeJevNoulBody(prepared, model, instructions, state) {
         message: 'jev: failed to encode System One request body',
     })));
 }
+function encodeJevChoiceBody(prepared, options) {
+    const labels = Object.keys(options.criteria);
+    if (labels.length < 2) {
+        return Effect.fail(new JevRequestFailed({
+            message: 'jev: choice criteria need at least two labels',
+        }));
+    }
+    return HttpClientRequest.bodyJson(prepared, {
+        model: options.model,
+        questions: {
+            [defaultChoiceQuestionName]: {
+                criteria: options.criteria,
+                instructions: options.instructions,
+                type: 'choice',
+            },
+        },
+        state: options.state,
+    }).pipe(Effect.mapError(() => new JevRequestFailed({
+        message: 'jev: failed to encode System One choice request body',
+    })));
+}
 const JevErrorBodySchema = Schema.Struct({
     detail: Schema.Struct({ error_type: Schema.String }),
 });
@@ -88,21 +120,29 @@ function jevHttpFailure(response, state) {
         });
     });
 }
-function askJevNoul(instructions, state) {
+function prepareJevSystemOneRequest(baseUrl, apiKey) {
+    return HttpClientRequest.post(`${baseUrl}/v1/systemone`).pipe(HttpClientRequest.bearerToken(apiKey), HttpClientRequest.acceptJson);
+}
+function executeJevSystemOneRequest(request, state) {
     return Effect.gen(function* () {
-        const apiKey = yield* readJevApiKey();
-        const baseUrl = yield* Effect.orDie(readJevBaseUrl());
-        const model = yield* Effect.orDie(readJevModel());
         const client = yield* HttpClient.HttpClient;
-        const prepared = HttpClientRequest.post(`${baseUrl}/v1/systemone`).pipe(HttpClientRequest.bearerToken(apiKey), HttpClientRequest.acceptJson);
-        const request = yield* encodeJevNoulBody(prepared, model, instructions, state);
         const response = yield* client.execute(request).pipe(Effect.mapError((error) => new JevRequestFailed({
             message: `jev: System One transport/request failure (${error.reason._tag}); no usable HTTP response`,
         })));
         if (response.status < 200 || response.status >= 300) {
-            const error = yield* jevHttpFailure(response, state);
-            return yield* error;
+            return yield* Effect.fail(yield* jevHttpFailure(response, state));
         }
+        return response;
+    });
+}
+function askJevNoul(instructions, state) {
+    return Effect.gen(function* () {
+        const apiKey = yield* readJevApiKey();
+        const baseUrl = yield* Effect.orDie(readJevBaseUrl());
+        const model = yield* Effect.orDie(readJevModel());
+        const prepared = prepareJevSystemOneRequest(baseUrl, apiKey);
+        const request = yield* encodeJevNoulBody(prepared, model, instructions, state);
+        const response = yield* executeJevSystemOneRequest(request, state);
         const result = yield* HttpClientResponse.schemaBodyJson(JevNoulResultSchema)(response).pipe(Effect.mapError(() => new JevRequestFailed({
             message: `jev: System One HTTP ${String(response.status)} response could not be decoded as the expected noul result`,
             status: response.status,
@@ -111,7 +151,29 @@ function askJevNoul(instructions, state) {
         return yield* noulAnswerFromResult(result, defaultNoulQuestionName);
     });
 }
+function askJevChoice(instructions, state, criteria) {
+    return Effect.gen(function* () {
+        const apiKey = yield* readJevApiKey();
+        const baseUrl = yield* Effect.orDie(readJevBaseUrl());
+        const model = yield* Effect.orDie(readJevModel());
+        const prepared = prepareJevSystemOneRequest(baseUrl, apiKey);
+        const request = yield* encodeJevChoiceBody(prepared, {
+            model,
+            instructions,
+            state,
+            criteria,
+        });
+        const response = yield* executeJevSystemOneRequest(request, state);
+        const result = yield* HttpClientResponse.schemaBodyJson(JevChoiceResultSchema)(response).pipe(Effect.mapError(() => new JevRequestFailed({
+            message: `jev: System One HTTP ${String(response.status)} response could not be decoded as the expected choice result`,
+            status: response.status,
+            requestId: safeJevErrorIdentifier(response.headers['x-typesafe-request-id']),
+        })));
+        return yield* choiceAnswerFromResult(result, defaultChoiceQuestionName);
+    });
+}
 /** Live Jev client using Effect HttpClient and TYPESAFE_* config. */
 export const JevSystemOneLive = Layer.succeed(JevSystemOne, {
     askNoul: askJevNoul,
+    askChoice: askJevChoice,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patdown/jev",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Effect HttpClient for TypeSafe System One (Jev)",
   "homepage": "https://github.com/tyler-dot-earth/patdown",
   "bugs": {