liminal 0.6.0 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # liminal
 
+## 0.8.0
+
+### Minor Changes
+
+- bf980fb: Major redesign of the Liminal API to be more effect-idiomatic.
+
+## 0.7.0
+
+### Minor Changes
+
+- d6fe173: Remove approach to passing handlers to strands.
+
 ## 0.6.0
 
 ### Minor Changes

package/L.ts

@@ -1,4 +1,74 @@
-export * from "./assistant.ts"
-export * from "./messages.ts"
-export * from "./set.ts"
-export * from "./user.ts"
+import * as AiError from "@effect/ai/AiError"
+import * as AiInput from "@effect/ai/AiInput"
+import * as AiLanguageModel from "@effect/ai/AiLanguageModel"
+import * as AiToolkit from "@effect/ai/AiToolkit"
+import * as Effect from "effect/Effect"
+import * as Schema from "effect/Schema"
+import * as Strand from "./Strand.ts"
+import { isTemplateStringsArray } from "./util/isTemplateStringsArray.ts"
+
+export const user: {
+  (template: TemplateStringsArray, ...substitutions: Array<unknown>): Effect.Effect<void, never, Strand.Strand>
+  (message: string): Effect.Effect<void, never, Strand.Strand>
+  (a0: TemplateStringsArray | string, ...aRest: Array<unknown>): Effect.Effect<void, never, Strand.Strand>
+} = Effect.fnUntraced(function*(a0, ...aRest) {
+  const { messages, onMessage } = yield* Strand.Strand
+  const text = isTemplateStringsArray(a0) ? String.raw({ raw: a0 }, ...aRest) : a0
+  const message = new AiInput.UserMessage({
+    parts: [new AiInput.TextPart({ text })],
+  })
+  yield* onMessage(message)
+  messages.push(message)
+})
+
+export const messages: Effect.Effect<Array<AiInput.Message>, never, Strand.Strand> = Effect.map(
+  Strand.Strand,
+  ({ messages }) => messages,
+)
+
+export const setMessages: (
+  messages: Iterable<AiInput.Message>,
+) => Effect.Effect<Array<AiInput.Message>, never, Strand.Strand> = Effect.fnUntraced(
+  function*(messages: Iterable<AiInput.Message>) {
+    const strand = yield* Strand.Strand
+    const { messages: prev } = strand
+    strand.messages = [...messages]
+    return prev
+  },
+)
+
+export const assistant: {
+  (): Effect.Effect<string, AiError.AiError, AiLanguageModel.AiLanguageModel | Strand.Strand>
+  <O, I>(
+    schema: Schema.Schema<O, I, never>,
+  ): Effect.Effect<O, AiError.AiError, AiLanguageModel.AiLanguageModel | Strand.Strand>
+} = Effect.fn(function*(schema?: Schema.Schema<any>) {
+  const model = yield* AiLanguageModel.AiLanguageModel
+  const { system, messages, tools, onMessage } = yield* Strand.Strand
+  if (schema) {
+    const response = yield* model.generateObject({
+      system,
+      schema,
+      prompt: messages,
+    })
+    const { value, text } = response
+    yield* appendMessage(text)
+    return value
+  }
+  const response = yield* model.generateText({
+    system,
+    prompt: messages,
+    toolkit: AiToolkit.make(...tools ?? []) as never,
+  })
+  const { text } = response
+  yield* appendMessage(text)
+  return text
+
+  function* appendMessage(text: string) {
+    const message = new AiInput.AssistantMessage({
+      parts: [new AiInput.TextPart({ text })],
+    })
+    yield* onMessage(message)
+    messages.push(message)
+  }
+})

package/Strand.ts

@@ -0,0 +1,46 @@
+import * as AiInput from "@effect/ai/AiInput"
+import * as AiTool from "@effect/ai/AiTool"
+import * as Context from "effect/Context"
+import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
+
+export interface StrandConfig<E, R> {
+  /** The system prompt. */
+  system?: string | undefined
+  /** The initial list of AI input messages. */
+  messages?: Array<AiInput.Message> | undefined
+  /** Handler to be execute when messages are appended. */
+  onMessage?: (message: AiInput.Message) => Effect.Effect<void, E, R>
+}
+
+export class Strand extends Context.Tag("liminal/Strand")<Strand, {
+  system?: string | undefined
+  messages: Array<AiInput.Message>
+  tools?: Array<AiTool.AiTool<any>>
+  onMessage: (message: AiInput.Message) => Effect.Effect<void>
+}>() {}
+
+/** Create an isolated clone of the current conversation to provide for an effect. */
+export const make: <E = never, R = never>(
+  config?: StrandConfig<E, R>,
+) => Effect.Effect<Strand["Type"], E, R> = (config) =>
+  Effect.map(
+    Effect.serviceOption(Strand),
+    Option.match({
+      onSome: ({ system, messages, tools, onMessage }) => ({
+        system: config ? config?.system : system,
+        messages: [...config ? config?.messages ?? [] : messages],
+        tools: [...tools ?? []],
+        onMessage: onMessage ?? (() => Effect.succeed(undefined)),
+      }),
+      onNone: () => ({
+        system: config?.system,
+        messages: config?.messages ?? [],
+        onMessage: (config?.onMessage ?? (() => Effect.succeed(undefined))) as never,
+      }),
+    }),
+  )
+
+export const layer: <E = never, R = never>(config?: StrandConfig<E, R>) => Layer.Layer<Strand, E, R> = (config) =>
+  Layer.effect(Strand, make(config))

package/dist/L.d.ts

@@ -1,4 +1,17 @@
-export * from "./assistant.ts";
-export * from "./messages.ts";
-export * from "./set.ts";
-export * from "./user.ts";
+import * as AiError from "@effect/ai/AiError";
+import * as AiInput from "@effect/ai/AiInput";
+import * as AiLanguageModel from "@effect/ai/AiLanguageModel";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as Strand from "./Strand.ts";
+export declare const user: {
+    (template: TemplateStringsArray, ...substitutions: Array<unknown>): Effect.Effect<void, never, Strand.Strand>;
+    (message: string): Effect.Effect<void, never, Strand.Strand>;
+    (a0: TemplateStringsArray | string, ...aRest: Array<unknown>): Effect.Effect<void, never, Strand.Strand>;
+};
+export declare const messages: Effect.Effect<Array<AiInput.Message>, never, Strand.Strand>;
+export declare const setMessages: (messages: Iterable<AiInput.Message>) => Effect.Effect<Array<AiInput.Message>, never, Strand.Strand>;
+export declare const assistant: {
+    (): Effect.Effect<string, AiError.AiError, AiLanguageModel.AiLanguageModel | Strand.Strand>;
+    <O, I>(schema: Schema.Schema<O, I, never>): Effect.Effect<O, AiError.AiError, AiLanguageModel.AiLanguageModel | Strand.Strand>;
+};

package/dist/L.js

@@ -1,5 +1,54 @@
-export * from "./assistant.js";
-export * from "./messages.js";
-export * from "./set.js";
-export * from "./user.js";
+import * as AiError from "@effect/ai/AiError";
+import * as AiInput from "@effect/ai/AiInput";
+import * as AiLanguageModel from "@effect/ai/AiLanguageModel";
+import * as AiToolkit from "@effect/ai/AiToolkit";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as Strand from "./Strand.js";
+import { isTemplateStringsArray } from "./util/isTemplateStringsArray.js";
+export const user = Effect.fnUntraced(function* (a0, ...aRest) {
+    const { messages, onMessage } = yield* Strand.Strand;
+    const text = isTemplateStringsArray(a0) ? String.raw({ raw: a0 }, ...aRest) : a0;
+    const message = new AiInput.UserMessage({
+        parts: [new AiInput.TextPart({ text })],
+    });
+    yield* onMessage(message);
+    messages.push(message);
+});
+export const messages = Effect.map(Strand.Strand, ({ messages }) => messages);
+export const setMessages = Effect.fnUntraced(function* (messages) {
+    const strand = yield* Strand.Strand;
+    const { messages: prev } = strand;
+    strand.messages = [...messages];
+    return prev;
+});
+export const assistant = Effect.fn(function* (schema) {
+    const model = yield* AiLanguageModel.AiLanguageModel;
+    const { system, messages, tools, onMessage } = yield* Strand.Strand;
+    if (schema) {
+        const response = yield* model.generateObject({
+            system,
+            schema,
+            prompt: messages,
+        });
+        const { value, text } = response;
+        yield* appendMessage(text);
+        return value;
+    }
+    const response = yield* model.generateText({
+        system,
+        prompt: messages,
+        toolkit: AiToolkit.make(...tools ?? []),
+    });
+    const { text } = response;
+    yield* appendMessage(text);
+    return text;
+    function* appendMessage(text) {
+        const message = new AiInput.AssistantMessage({
+            parts: [new AiInput.TextPart({ text })],
+        });
+        yield* onMessage(message);
+        messages.push(message);
+    }
+});
 //# sourceMappingURL=L.js.map

package/dist/L.js.map

@@ -1 +1 @@
-{"version":3,"file":"L.js","sourceRoot":"","sources":["../L.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"L.js","sourceRoot":"","sources":["../L.ts"],"names":[],"mappings":"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"}

package/dist/Strand.d.ts

@@ -0,0 +1,25 @@
+import * as AiInput from "@effect/ai/AiInput";
+import * as AiTool from "@effect/ai/AiTool";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+export interface StrandConfig<E, R> {
+    /** The system prompt. */
+    system?: string | undefined;
+    /** The initial list of AI input messages. */
+    messages?: Array<AiInput.Message> | undefined;
+    /** Handler to be execute when messages are appended. */
+    onMessage?: (message: AiInput.Message) => Effect.Effect<void, E, R>;
+}
+declare const Strand_base: Context.TagClass<Strand, "liminal/Strand", {
+    system?: string | undefined;
+    messages: Array<AiInput.Message>;
+    tools?: Array<AiTool.AiTool<any>>;
+    onMessage: (message: AiInput.Message) => Effect.Effect<void>;
+}>;
+export declare class Strand extends Strand_base {
+}
+/** Create an isolated clone of the current conversation to provide for an effect. */
+export declare const make: <E = never, R = never>(config?: StrandConfig<E, R>) => Effect.Effect<Strand["Type"], E, R>;
+export declare const layer: <E = never, R = never>(config?: StrandConfig<E, R>) => Layer.Layer<Strand, E, R>;
+export {};

package/dist/Strand.js

@@ -0,0 +1,24 @@
+import * as AiInput from "@effect/ai/AiInput";
+import * as AiTool from "@effect/ai/AiTool";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+export class Strand extends Context.Tag("liminal/Strand")() {
+}
+/** Create an isolated clone of the current conversation to provide for an effect. */
+export const make = (config) => Effect.map(Effect.serviceOption(Strand), Option.match({
+    onSome: ({ system, messages, tools, onMessage }) => ({
+        system: config ? config?.system : system,
+        messages: [...config ? config?.messages ?? [] : messages],
+        tools: [...tools ?? []],
+        onMessage: onMessage ?? (() => Effect.succeed(undefined)),
+    }),
+    onNone: () => ({
+        system: config?.system,
+        messages: config?.messages ?? [],
+        onMessage: (config?.onMessage ?? (() => Effect.succeed(undefined))),
+    }),
+}));
+export const layer = (config) => Layer.effect(Strand, make(config));
+//# sourceMappingURL=Strand.js.map

package/dist/Strand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Strand.js","sourceRoot":"","sources":["../Strand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAWvC,MAAM,OAAO,MAAO,SAAQ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAKrD;CAAG;AAEP,qFAAqF;AACrF,MAAM,CAAC,MAAM,IAAI,GAE0B,CAAC,MAAM,EAAE,EAAE,CACpD,MAAM,CAAC,GAAG,CACR,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAC5B,MAAM,CAAC,KAAK,CAAC;IACX,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM;QACxC,QAAQ,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QACzD,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;QACvB,SAAS,EAAE,SAAS,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;KAC1D,CAAC;IACF,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACb,MAAM,EAAE,MAAM,EAAE,MAAM;QACtB,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE;QAChC,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAU;KAC7E,CAAC;CACH,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,KAAK,GAAqF,CAAC,MAAM,EAAE,EAAE,CAChH,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA"}

package/dist/index.d.ts

@@ -1,4 +1,2 @@
-export * from "./Context.ts";
 export * as L from "./L.ts";
-export * from "./LEvent.ts";
-export * from "./strand.ts";
+export * as Strand from "./Strand.ts";

package/dist/index.js

@@ -1,5 +1,3 @@
-export * from "./Context.js";
 export * as L from "./L.js";
-export * from "./LEvent.js";
-export * from "./strand.js";
+export * as Strand from "./Strand.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAA;AAC3B,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA"}