cleanup AiChat

Author: IMax153

packages/ai/ai/src/AiChat.ts

@@ -4,15 +4,16 @@
 import * as Channel from "effect/Channel"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
 import type { ParseError } from "effect/ParseResult"
 import * as Ref from "effect/Ref"
 import * as Schema from "effect/Schema"
 import * as Stream from "effect/Stream"
-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.js"
+import type * as AiTool from "./AiTool.js"
 
 /**
  * @since 1.0.0
@@ -56,9 +57,9 @@ export declare namespace AiChat {
      *
      * Both input and output messages will be added to the chat history.
      */
-    readonly generateText: <
-      Options extends NoExcessProperties<Omit<AiLanguageModel.GenerateTextOptions<any>, "system">, Options>
-    >(options: Options) => Effect.Effect<
+    readonly generateText: <Tools extends AiTool.Any, Options>(
+      options: Options & Omit<AiLanguageModel.GenerateTextOptions<Tools>, "system">
+    ) => Effect.Effect<
       AiLanguageModel.ExtractSuccess<Options>,
       AiLanguageModel.ExtractError<Options>,
       AiLanguageModel.ExtractContext<Options>
@@ -73,9 +74,9 @@ export declare namespace AiChat {
      *
      * Both input and output messages will be added to the chat history.
      */
-    readonly streamText: <
-      Options extends NoExcessProperties<Omit<AiLanguageModel.GenerateTextOptions<any>, "system">, Options>
-    >(options: Options) => Stream.Stream<
+    readonly streamText: <Tools extends AiTool.Any, Options>(
+      options: Options & Omit<AiLanguageModel.GenerateTextOptions<Tools>, "system">
+    ) => Stream.Stream<
       AiLanguageModel.ExtractSuccess<Options>,
       AiLanguageModel.ExtractError<Options>,
       AiLanguageModel.ExtractContext<Options>
@@ -103,7 +104,7 @@ export declare namespace AiChat {
 
 /**
  * @since 1.0.0
- * @category constructors
+ * @category Constructors
  */
 export const fromPrompt = Effect.fnUntraced(function*(options: {
   readonly prompt: AiInput.Raw
@@ -139,7 +140,7 @@ export const fromPrompt = Effect.fnUntraced(function*(options: {
           )
         }),
         semaphore.withPermits(1),
-        Effect.withSpan("AiChat.send", { captureStackTrace: false })
+        Effect.withSpan("AiChat.generateText", { captureStackTrace: false })
       )
     },
     streamText(options) {
@@ -167,7 +168,7 @@ export const fromPrompt = Effect.fnUntraced(function*(options: {
               semaphore.release(1)
             )
         ))
-      }).pipe(Stream.withSpan("AiChat.stream", {
+      }).pipe(Stream.withSpan("AiChat.streamText", {
         captureStackTrace: false
       })) as any
     },
@@ -190,7 +191,7 @@ export const fromPrompt = Effect.fnUntraced(function*(options: {
           )
         }),
         semaphore.withPermits(1),
-        Effect.withSpan("AiChat.structured", {
+        Effect.withSpan("AiChat.generateObject", {
           attributes: {
             toolCallId: "toolCallId" in options
               ? options.toolCallId
@@ -207,15 +208,15 @@ export const fromPrompt = Effect.fnUntraced(function*(options: {
 
 /**
  * @since 1.0.0
- * @category constructors
+ * @category Constructors
  */
 export const empty: Effect.Effect<AiChat.Service, never, AiLanguageModel.AiLanguageModel> = fromPrompt({ prompt: [] })
 
 const decodeUnknown = Schema.decodeUnknown(AiInput.AiInput)
 
 /**
  * @since 1.0.0
- * @category constructors
+ * @category Constructors
  */
 export const fromExport = (data: unknown): Effect.Effect<AiChat.Service, ParseError, AiLanguageModel.AiLanguageModel> =>
   Effect.flatMap(decodeUnknown(data), (prompt) => fromPrompt({ prompt }))
@@ -224,7 +225,7 @@ const decodeJson = Schema.decode(AiInput.FromJson)
 
 /**
  * @since 1.0.0
- * @category constructors
+ * @category Constructors
  */
 export const fromJson = (data: string): Effect.Effect<AiChat.Service, ParseError, AiLanguageModel.AiLanguageModel> =>
   Effect.flatMap(decodeJson(data), (prompt) => fromPrompt({ prompt }))

packages/ai/ai/src/AiInput.ts

@@ -359,7 +359,6 @@ export class ToolCallPart extends Schema.TaggedClass<ToolCallPart>(
   readonly [PartTypeId]: PartTypeId = PartTypeId
 
   constructor(props: any, options?: Schema.MakeOptions) {
-    console.log(props)
     super(props, options)
   }
 }

packages/ai/ai/src/AiLanguageModel.ts

@@ -233,10 +233,10 @@ export declare namespace AiLanguageModel {
      * If a `toolkit` is specified, the large language model will additionally
      * be able to perform tool calls to augment its response.
      */
-    readonly streamText: <
-      Options extends NoExcessProperties<GenerateTextOptions<any>, Options>
-    >(options: Options) => Stream.Stream<
-      AiResponse.AiResponse,
+    readonly streamText: <Tools extends AiTool.Any, Options>(
+      options: Options & GenerateTextOptions<Tools>
+    ) => Stream.Stream<
+      ExtractSuccess<Options>,
       ExtractError<Options>,
       ExtractContext<Options> | Config
     >
@@ -547,9 +547,15 @@ const resolveParts = <Tools extends AiTool.Any>(options: {
  * be able to perform tool calls to augment its response.
  *
  * @since 1.0.0
- * @category functions
+ * @category Functions
  */
-export const generateText = Effect.serviceFunctionEffect(AiLanguageModel, (_) => _.generateText)
+export const generateText: <Tools extends AiTool.Any, Options>(
+  options: Options & GenerateTextOptions<Tools>
+) => Effect.Effect<
+  ExtractSuccess<Options>,
+  ExtractError<Options>,
+  AiLanguageModel | ExtractContext<Options>
+> = Effect.serviceFunctionEffect(AiLanguageModel, (_) => _.generateText)
 
 /**
  * Generate a structured object for the specified prompt and schema using a
@@ -560,9 +566,15 @@ export const generateText = Effect.serviceFunctionEffect(AiLanguageModel, (_) =>
  * output of the model.
  *
  * @since 1.0.0
- * @category functions
+ * @category Functions
  */
-export const generateObject = Effect.serviceFunctionEffect(AiLanguageModel, (_) => _.generateObject)
+export const generateObject: <A, I, R>(
+  options: GenerateObjectOptions<A, I, R> | GenerateObjectWithToolCallIdOptions<A, I, R>
+) => Effect.Effect<
+  AiResponse.WithStructuredOutput<A>,
+  AiError,
+  AiLanguageModel | R
+> = Effect.serviceFunctionEffect(AiLanguageModel, (_) => _.generateObject)
 
 /**
  * Generate text using a large language model for the specified `prompt`,
@@ -572,7 +584,12 @@ export const generateObject = Effect.serviceFunctionEffect(AiLanguageModel, (_)
  * be able to perform tool calls to augment its response.
  *
  * @since 1.0.0
- * @category functions
+ * @category Functions
  */
-export const streamText = <Options extends NoExcessProperties<GenerateTextOptions<any>, Options>>(options: Options) =>
-  Stream.unwrap(AiLanguageModel.pipe(Effect.map((_) => _.streamText(options))))
+export const streamText = <Tools extends AiTool.Any, Options>(
+  options: Options & GenerateTextOptions<Tools>
+): Stream.Stream<
+  ExtractSuccess<Options>,
+  ExtractError<Options>,
+  AiLanguageModel | ExtractContext<Options>
+> => Stream.unwrap(AiLanguageModel.pipe(Effect.map((_) => _.streamText(options))))