liminal 0.12.2 → 0.13.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # liminal
 
+## 0.13.0
+
+### Minor Changes
+
+- 0e4954e: Rename `L.assistantStruct` to `L.assistantSchema`, is it now supports all schemas, not just struct schemas. Template tag calls are properly dedented and normalized. Additionally, `L.userJson` now uses the optional schema to JSONC-encode with description annotations as comments on corresponding fields.
+
 ## 0.12.1
 
 ### Patch Changes

package/L.ts

@@ -1,7 +1,7 @@
 export * from "./append.ts"
 export * from "./assistant.ts"
+export * from "./assistantSchema.ts"
 export * from "./assistantStream.ts"
-export * from "./assistantStruct.ts"
 export * from "./branch.ts"
 export * from "./clear.ts"
 export * from "./enable.ts"

package/assistantSchema.ts

@@ -0,0 +1,60 @@
+import type { AiError } from "@effect/ai/AiError"
+import { AssistantMessage, TextPart } from "@effect/ai/AiInput"
+import { AiLanguageModel } from "@effect/ai/AiLanguageModel"
+import * as Effect from "effect/Effect"
+import * as Option from "effect/Option"
+import * as Schema from "effect/Schema"
+import * as SchemaAST from "effect/SchemaAST"
+import { append } from "./append.ts"
+import { Strand } from "./Strand.ts"
+import { encodeJsonc, type JsonValue } from "./util/JsonValue.ts"
+
+/** Infer a structured assistant message and append its JSON representation to the conversation. */
+export const assistantSchema: {
+  <F extends Record<string, Schema.Schema.AnyNoContext>>(
+    fields: F,
+  ): Effect.Effect<{ [K in keyof F]: Schema.Schema.Type<F[K]> }, AiError, AiLanguageModel | Strand>
+  <O, I extends JsonValue>(
+    schema: Schema.Schema<O, I, never>,
+  ): Effect.Effect<O, AiError, AiLanguageModel | Strand>
+} = Effect.fnUntraced(function*(schema) {
+  const model = yield* AiLanguageModel
+  const { system, messages } = yield* Strand
+
+  const isSchema = Schema.isSchema(schema)
+  const schema_ = isSchema ? schema : Schema.Struct(schema) as Schema.Schema.AnyNoContext
+  const isObject = !isSchema || isObjectSchema(SchemaAST.encodedAST(schema.ast))
+  const wrapped = isObject ? schema_ : Schema.Struct({ inner: schema_ })
+
+  const value = yield* model.generateObject({
+    system: Option.getOrUndefined(system),
+    schema: wrapped,
+    prompt: messages,
+  }).pipe(
+    Effect.map(({ value }) => isObject ? value : value["inner"]),
+  )
+
+  yield* append(
+    new AssistantMessage({
+      parts: [
+        new TextPart({
+          text: yield* encodeJsonc(schema_)(value),
+        }),
+      ],
+    }),
+  )
+  return value
+})
+
+const isObjectSchema = (ast: SchemaAST.AST): boolean => {
+  switch (ast._tag) {
+    case "TypeLiteral": {
+      return true
+    }
+    case "Refinement":
+    case "Transformation": {
+      return isObjectSchema(ast.from)
+    }
+  }
+  return false
+}

package/dist/L.d.ts

@@ -1,7 +1,7 @@
 export * from "./append.ts";
 export * from "./assistant.ts";
+export * from "./assistantSchema.ts";
 export * from "./assistantStream.ts";
-export * from "./assistantStruct.ts";
 export * from "./branch.ts";
 export * from "./clear.ts";
 export * from "./enable.ts";

package/dist/L.js

@@ -1,7 +1,7 @@
 export * from "./append.js";
 export * from "./assistant.js";
+export * from "./assistantSchema.js";
 export * from "./assistantStream.js";
-export * from "./assistantStruct.js";
 export * from "./branch.js";
 export * from "./clear.js";
 export * from "./enable.js";

package/dist/{assistantStruct.d.ts → assistantSchema.d.ts}

@@ -3,10 +3,11 @@ import { AiLanguageModel } from "@effect/ai/AiLanguageModel";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import { Strand } from "./Strand.ts";
+import { type JsonValue } from "./util/JsonValue.ts";
 /** Infer a structured assistant message and append its JSON representation to the conversation. */
-export declare const assistantStruct: {
+export declare const assistantSchema: {
     <F extends Record<string, Schema.Schema.AnyNoContext>>(fields: F): Effect.Effect<{
         [K in keyof F]: Schema.Schema.Type<F[K]>;
     }, AiError, AiLanguageModel | Strand>;
-    <O, I extends Record<string, unknown>>(schema: Schema.Schema<O, I, never>): Effect.Effect<O, AiError, AiLanguageModel | Strand>;
+    <O, I extends JsonValue>(schema: Schema.Schema<O, I, never>): Effect.Effect<O, AiError, AiLanguageModel | Strand>;
 };

package/dist/assistantSchema.js

@@ -0,0 +1,44 @@
+import { AssistantMessage, TextPart } from "@effect/ai/AiInput";
+import { AiLanguageModel } from "@effect/ai/AiLanguageModel";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
+import { append } from "./append.js";
+import { Strand } from "./Strand.js";
+import { encodeJsonc } from "./util/JsonValue.js";
+/** Infer a structured assistant message and append its JSON representation to the conversation. */
+export const assistantSchema = Effect.fnUntraced(function* (schema) {
+    const model = yield* AiLanguageModel;
+    const { system, messages } = yield* Strand;
+    const isSchema = Schema.isSchema(schema);
+    const schema_ = isSchema ? schema : Schema.Struct(schema);
+    const isObject = !isSchema || isObjectSchema(SchemaAST.encodedAST(schema.ast));
+    const wrapped = isObject ? schema_ : Schema.Struct({ inner: schema_ });
+    const value = yield* model.generateObject({
+        system: Option.getOrUndefined(system),
+        schema: wrapped,
+        prompt: messages,
+    }).pipe(Effect.map(({ value }) => isObject ? value : value["inner"]));
+    yield* append(new AssistantMessage({
+        parts: [
+            new TextPart({
+                text: yield* encodeJsonc(schema_)(value),
+            }),
+        ],
+    }));
+    return value;
+});
+const isObjectSchema = (ast) => {
+    switch (ast._tag) {
+        case "TypeLiteral": {
+            return true;
+        }
+        case "Refinement":
+        case "Transformation": {
+            return isObjectSchema(ast.from);
+        }
+    }
+    return false;
+};
+//# sourceMappingURL=assistantSchema.js.map

package/dist/assistantSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assistantSchema.js","sourceRoot":"","sources":["../assistantSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,WAAW,EAAkB,MAAM,qBAAqB,CAAA;AAEjE,mGAAmG;AACnG,MAAM,CAAC,MAAM,eAAe,GAOxB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,MAAM;IACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IACpC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAA;IAE1C,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAA+B,CAAA;IACvF,MAAM,QAAQ,GAAG,CAAC,QAAQ,IAAI,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9E,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;IAEtE,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;QACxC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC;QACrC,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAC7D,CAAA;IAED,KAAK,CAAC,CAAC,MAAM,CACX,IAAI,gBAAgB,CAAC;QACnB,KAAK,EAAE;YACL,IAAI,QAAQ,CAAC;gBACX,IAAI,EAAE,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;aACzC,CAAC;SACH;KACF,CAAC,CACH,CAAA;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAC,CAAA;AAEF,MAAM,cAAc,GAAG,CAAC,GAAkB,EAAW,EAAE;IACrD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,KAAK,YAAY,CAAC;QAClB,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACtB,OAAO,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/handle.d.ts

@@ -4,4 +4,4 @@ import * as Scope from "effect/Scope";
 import type { LEvent } from "./LEvent.ts";
 import { Strand } from "./Strand.ts";
 /** Attach an event handler to process the events of the current strand. */
-export declare const handle: <A, E, R>(f: (event: LEvent) => Effect.Effect<A, E, R>) => Effect.Effect<RuntimeFiber<void, E>, never, Strand | R | Scope.Scope>;
+export declare const listen: <A, E, R>(f: (event: LEvent) => Effect.Effect<A, E, R>) => Effect.Effect<RuntimeFiber<void, E>, never, Strand | R | Scope.Scope>;

package/dist/handle.js

@@ -3,7 +3,7 @@ import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import { Strand } from "./Strand.js";
 /** Attach an event handler to process the events of the current strand. */
-export const handle = Effect.fnUntraced(function* (f) {
+export const listen = Effect.fnUntraced(function* (f) {
     const latch = yield* Effect.makeLatch(false);
     const { events } = yield* Strand;
     const dequeue = yield* events.subscribe;