rework the AiModel internals

Author: IMax153

eslint.config.mjs

@@ -1,3 +1,4 @@
+import * as effectEslint from "@effect/eslint-plugin"
 import { fixupPluginRules } from "@eslint/compat"
 import { FlatCompat } from "@eslint/eslintrc"
 import js from "@eslint/js"
@@ -24,9 +25,9 @@ export default [
   ...compat.extends(
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:@effect/recommended"
+    "plugin:@typescript-eslint/recommended"
   ),
+  ...effectEslint.configs.dprint,
   {
     plugins: {
       import: fixupPluginRules(_import),
@@ -135,5 +136,20 @@ export default [
     rules: {
       "no-console": "error"
     }
+  },
+  {
+    files: ["packages/*/src/**/*"],
+    rules: {
+      "@effect/no-import-from-barrel-package": [
+        "error",
+        {
+          packageNames: [
+            "effect",
+            "@effect/platform",
+            "@effect/sql"
+          ]
+        }
+      ]
+    }
   }
 ]

package.json

@@ -41,8 +41,8 @@
     "@edge-runtime/vm": "^4.0.0",
     "@effect/build-utils": "^0.7.7",
     "@effect/docgen": "https://pkg.pr.new/Effect-TS/docgen/@effect/docgen@fd06738",
-    "@effect/eslint-plugin": "^0.2.0",
-    "@effect/language-service": "^0.1.0",
+    "@effect/eslint-plugin": "^0.3.2",
+    "@effect/language-service": "^0.9.1",
     "@effect/vitest": "workspace:^",
     "@eslint/compat": "^1.1.1",
     "@eslint/eslintrc": "^3.1.0",

packages/ai/ai/src/AiChat.ts

@@ -12,7 +12,7 @@ import type { NoExcessProperties } from "effect/Types"
 import type { AiError } from "./AiError.js"
 import * as AiInput from "./AiInput.js"
 import * as AiLanguageModel from "./AiLanguageModel.js"
-import * as AiResponse from "./AiResponse_old.js"
+import * as AiResponse from "./AiResponse.js"
 
 /**
  * @since 1.0.0
@@ -21,7 +21,7 @@ import * as AiResponse from "./AiResponse_old.js"
 export class AiChat extends Context.Tag("@effect/ai/AiChat")<
   AiChat,
   AiChat.Service
->() { }
+>() {}
 
 /**
  * @since 1.0.0
@@ -59,7 +59,7 @@ export declare namespace AiChat {
     readonly generateText: <
       Options extends NoExcessProperties<Omit<AiLanguageModel.GenerateTextOptions<any>, "system">, Options>
     >(options: Options) => Effect.Effect<
-      AiResponse.AiResponse,
+      AiLanguageModel.ExtractSuccess<Options>,
       AiLanguageModel.ExtractError<Options>,
       AiLanguageModel.ExtractContext<Options>
     >
@@ -76,7 +76,7 @@ export declare namespace AiChat {
     readonly streamText: <
       Options extends NoExcessProperties<Omit<AiLanguageModel.GenerateTextOptions<any>, "system">, Options>
     >(options: Options) => Stream.Stream<
-      AiResponse.AiResponse,
+      AiLanguageModel.ExtractSuccess<Options>,
       AiLanguageModel.ExtractError<Options>,
       AiLanguageModel.ExtractContext<Options>
     >
@@ -105,107 +105,105 @@ export declare namespace AiChat {
  * @since 1.0.0
  * @category constructors
  */
-export const fromPrompt = Effect.fnUntraced(
-  function*(options: {
-    readonly prompt: AiInput.Raw
-    readonly system?: string
-  }) {
-    const languageModel = yield* AiLanguageModel.AiLanguageModel
-    const history = yield* Ref.make<AiInput.AiInput>(AiInput.make(options.prompt))
-    const semaphore = yield* Effect.makeSemaphore(1)
+export const fromPrompt = Effect.fnUntraced(function*(options: {
+  readonly prompt: AiInput.Raw
+  readonly system?: string
+}) {
+  const languageModel = yield* AiLanguageModel.AiLanguageModel
+  const history = yield* Ref.make<AiInput.AiInput>(AiInput.make(options.prompt))
+  const semaphore = yield* Effect.makeSemaphore(1)
 
-    return AiChat.of({
-      history: Ref.get(history),
-      export: Ref.get(history).pipe(
-        Effect.flatMap(Schema.encode(AiInput.AiInput)),
-        Effect.orDie
-      ),
-      exportJson: Ref.get(history).pipe(
-        Effect.flatMap(Schema.encode(AiInput.AiInputFromJson)),
-        Effect.orDie
-      ),
-      generateText(options) {
-        const newParts = AiInput.make(options.prompt)
-        return Ref.get(history).pipe(
-          Effect.flatMap((parts) => {
-            const allParts = [...parts, ...newParts]
-            return languageModel.generateText({
+  return AiChat.of({
+    history: Ref.get(history),
+    export: Ref.get(history).pipe(
+      Effect.flatMap(Schema.encode(AiInput.AiInput)),
+      Effect.orDie
+    ),
+    exportJson: Ref.get(history).pipe(
+      Effect.flatMap(Schema.encode(AiInput.FromJson)),
+      Effect.orDie
+    ),
+    generateText(options) {
+      const newInput = AiInput.make(options.prompt)
+      return Ref.get(history).pipe(
+        Effect.flatMap((oldInput) => {
+          const input = AiInput.concat(oldInput, newInput)
+          return languageModel.generateText({
+            ...options,
+            prompt: input
+          }).pipe(
+            Effect.tap((response) => {
+              const modelInput = AiInput.make(response)
+              return Ref.set(history, AiInput.concat(input, modelInput))
+            })
+          )
+        }),
+        semaphore.withPermits(1),
+        Effect.withSpan("AiChat.send", { captureStackTrace: false })
+      )
+    },
+    streamText(options) {
+      return Stream.suspend(() => {
+        let combined = AiResponse.empty
+        return Stream.fromChannel(Channel.acquireUseRelease(
+          semaphore.take(1).pipe(
+            Effect.zipRight(Ref.get(history)),
+            Effect.map((history) => AiInput.concat(history, AiInput.make(options.prompt)))
+          ),
+          (parts) =>
+            languageModel.streamText({
               ...options,
-              prompt: allParts
+              prompt: parts
             }).pipe(
-              Effect.tap((response) => {
-                const responseParts = AiInput.make(response)
-                return Ref.set(history, [...allParts, ...responseParts])
-              })
-            )
-          }),
-          semaphore.withPermits(1),
-          Effect.withSpan("AiChat.send", { captureStackTrace: false })
-        )
-      },
-      streamText(options) {
-        return Stream.suspend(() => {
-          let combined = AiResponse.AiResponse.empty
-          return Stream.fromChannel(Channel.acquireUseRelease(
-            semaphore.take(1).pipe(
-              Effect.zipRight(Ref.get(history)),
-              Effect.map((history) => [...history, ...AiInput.make(options.prompt)])
+              Stream.map((chunk) => {
+                combined = AiResponse.merge(combined, chunk)
+                return chunk
+              }),
+              Stream.toChannel
             ),
-            (parts) =>
-              languageModel.streamText({
-                ...options,
-                prompt: parts
-              }).pipe(
-                Stream.map((chunk) => {
-                  combined = combined.merge(chunk)
-                  return chunk
-                }),
-                Stream.toChannel
-              ),
-            (parts) =>
-              Effect.zipRight(
-                Ref.set(history, [...parts, ...AiInput.make(combined)]),
-                semaphore.release(1)
+          (parts) =>
+            Effect.zipRight(
+              Ref.set(history, AiInput.concat(parts, AiInput.make(combined))),
+              semaphore.release(1)
+            )
+        ))
+      }).pipe(Stream.withSpan("AiChat.stream", {
+        captureStackTrace: false
+      })) as any
+    },
+    generateObject(options) {
+      const newInput = AiInput.make(options.prompt)
+      return Ref.get(history).pipe(
+        Effect.flatMap((oldInput) => {
+          const input = AiInput.concat(oldInput, newInput)
+          return languageModel.generateObject({
+            ...options,
+            prompt: input
+          } as any).pipe(
+            Effect.flatMap((response) => {
+              const modelInput = AiInput.make(response)
+              return Effect.as(
+                Ref.set(history, AiInput.concat(input, modelInput)),
+                response.value
               )
-          ))
-        }).pipe(Stream.withSpan("AiChat.stream", {
+            })
+          )
+        }),
+        semaphore.withPermits(1),
+        Effect.withSpan("AiChat.structured", {
+          attributes: {
+            toolCallId: "toolCallId" in options
+              ? options.toolCallId
+              : "_tag" in options.schema
+              ? options.schema._tag
+              : (options.schema as any).identifier
+          },
           captureStackTrace: false
-        }))
-      },
-      generateObject(options) {
-        const newParts = AiInput.make(options.prompt)
-        return Ref.get(history).pipe(
-          Effect.flatMap((parts) => {
-            const allParts = [...parts, ...newParts]
-            return languageModel.generateObject({
-              ...options,
-              prompt: allParts
-            } as any).pipe(
-              Effect.flatMap((response) => {
-                const responseParts = AiInput.make(response)
-                return Effect.as(
-                  Ref.set(history, [...allParts, ...responseParts]),
-                  response.value
-                )
-              })
-            )
-          }),
-          semaphore.withPermits(1),
-          Effect.withSpan("AiChat.structured", {
-            attributes: {
-              toolCallId: "toolCallId" in options
-                ? options.toolCallId
-                : "_tag" in options.schema
-                  ? options.schema._tag
-                  : (options.schema as any).identifier
-            },
-            captureStackTrace: false
-          })
-        ) as any
-      }
-    })
-  }
-)
+        })
+      ) as any
+    }
+  })
+})
 
 /**
  * @since 1.0.0
@@ -222,7 +220,7 @@ const decodeUnknown = Schema.decodeUnknown(AiInput.AiInput)
 export const fromExport = (data: unknown): Effect.Effect<AiChat.Service, ParseError, AiLanguageModel.AiLanguageModel> =>
   Effect.flatMap(decodeUnknown(data), (prompt) => fromPrompt({ prompt }))
 
-const decodeJson = Schema.decode(AiInput.AiInputFromJson)
+const decodeJson = Schema.decode(AiInput.FromJson)
 
 /**
  * @since 1.0.0

packages/ai/ai/src/AiInput.ts

@@ -36,6 +36,12 @@ export class AiInput extends Schema.Class<AiInput>(
   readonly [TypeId]: TypeId = TypeId
 }
 
+/**
+ * @since 1.0.0
+ * @category Models
+ */
+export const FromJson = Schema.parseJson(AiInput)
+
 /**
  * Represents raw input types that can be converted into an `AiInput`.
  *
@@ -46,6 +52,7 @@ export type Raw =
   | string
   | Message
   | Iterable<Message>
+  | AiInput
   | AiResponse.AiResponse
   | AiResponse.WithStructuredOutput<any>
   | AiResponse.WithToolCallResults<any>
@@ -73,7 +80,8 @@ export type MessageTypeId = typeof MessageTypeId
 export class UserMessage extends Schema.TaggedClass<UserMessage>(
   "@effect/ai/AiInput/Message/UserMessage"
 )("UserMessage", {
-  parts: Schema.Array(Schema.suspend(() => UserMessagePart))
+  parts: Schema.Array(Schema.suspend(() => UserMessagePart)),
+  userName: Schema.optional(Schema.String)
 }) {
   /**
    * @since 1.0.0
@@ -87,7 +95,7 @@ export class UserMessage extends Schema.TaggedClass<UserMessage>(
  */
 export class AssistantMessage extends Schema.TaggedClass<AssistantMessage>(
   "@effect/ai/AiInput/Message/AssistantMessage"
-)("UserMessage", {
+)("AssistantMessage", {
   parts: Schema.Array(Schema.suspend(() => AssistantMessagePart))
 }) {
   /**
@@ -349,6 +357,11 @@ export class ToolCallPart extends Schema.TaggedClass<ToolCallPart>(
    * @since 1.0.0
    */
   readonly [PartTypeId]: PartTypeId = PartTypeId
+
+  constructor(props: any, options?: Schema.MakeOptions) {
+    console.log(props)
+    super(props, options)
+  }
 }
 
 /**
@@ -479,6 +492,9 @@ export const make = (input: Raw): AiInput => {
   if (Predicate.isIterable(input)) {
     return new AiInput({ messages: Array.from(input) })
   }
+  if (is(input)) {
+    return input
+  }
   if (AiResponse.isStructured(input)) {
     const assistantMessages = fromResponse(input).messages
     const toolPart = new ToolCallResultPart({
@@ -501,6 +517,7 @@ export const make = (input: Raw): AiInput => {
 }
 
 const EXCLUDED_RESPONSE_PARTS: Array<AiResponse.Part["_tag"]> = [
+  "MetadataPart",
   "ReasoningPart",
   "RedactedReasoningPart",
   "FinishPart"
@@ -535,7 +552,7 @@ const fromResponse = (
  * creating a new `AiInput` with the messages from both.
  *
  * @since 1.0.0
- * @category Concatenation
+ * @category Combination
  */
 export const concat: {
   (other: AiInput): (self: AiInput) => AiInput