@effect/ai 0.10.4 → 0.10.6

package/dist/cjs/internal/aiPlan.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withFallback = exports.fromModel = exports.concatSteps = exports.TypeId = exports.PlanPrototype = void 0;
-var Cause = _interopRequireWildcard(require("effect/Cause"));
 var Context = _interopRequireWildcard(require("effect/Context"));
 var Effect = _interopRequireWildcard(require("effect/Effect"));
 var _Effectable = require("effect/Effectable");
-var Exit = _interopRequireWildcard(require("effect/Exit"));
+var Either = _interopRequireWildcard(require("effect/Either"));
 var _Function = require("effect/Function");
 var Option = _interopRequireWildcard(require("effect/Option"));
 var _Pipeable = require("effect/Pipeable");
@@ -38,20 +37,22 @@ const makePlan = steps => {
 };
 const buildPlan = plan => Effect.map(Effect.context(), context => {
   const models = Context.get(context, _AiModels.AiModels);
-  return Effect.fnUntraced(function* (effect) {
-    let exit = undefined;
-    for (const step of plan.steps) {
-      if (exit !== undefined && Exit.isFailure(exit) && Option.isSome(step.check)) {
-        const check = step.check.value(Cause.squash(exit.cause));
-        const isFatalError = !(Effect.isEffect(check) ? yield* check : check);
-        if (isFatalError) break;
+  return {
+    provide: Effect.fnUntraced(function* (effect) {
+      let result = undefined;
+      for (const step of plan.steps) {
+        if (result !== undefined && Either.isLeft(result) && Option.isSome(step.check)) {
+          const check = step.check.value(result.left);
+          const isFatalError = !(Effect.isEffect(check) ? yield* check : check);
+          if (isFatalError) break;
+        }
+        const retryOptions = getRetryOptions(step);
+        result = yield* Effect.scopedWith(scope => models.build(step.model, context).pipe(Scope.extend(scope), Effect.flatMap(context => effect.pipe(Option.isSome(retryOptions) ? Effect.retry(retryOptions.value) : _Function.identity, Effect.provide(context))), Effect.either));
+        if (Either.isRight(result)) break;
       }
-      const retryOptions = getRetryOptions(step);
-      exit = yield* Effect.scopedWith(scope => models.build(step.model, context).pipe(Scope.extend(scope), Effect.flatMap(context => effect.pipe(Option.isSome(retryOptions) ? Effect.retry(retryOptions.value) : _Function.identity, Effect.provide(context))), Effect.exit));
-      if (Exit.isSuccess(exit)) break;
-    }
-    return yield* exit;
-  });
+      return yield* result;
+    })
+  };
 });
 const getRetryOptions = step => {
   if (Option.isNone(step.schedule) && Option.isNone(step.check)) {

package/dist/cjs/internal/aiPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"aiPlan.js","names":["Cause","_interopRequireWildcard","require","Context","Effect","_Effectable","Exit","_Function","Option","_Pipeable","Predicate","Schedule","Scope","_AiModels","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","PlanPrototype","CommitPrototype","commit","buildPlan","pipe","pipeArguments","arguments","makePlan","steps","self","create","plan","map","context","models","AiModels","fnUntraced","effect","exit","undefined","step","isFailure","isSome","check","value","squash","cause","isFatalError","isEffect","retryOptions","getRetryOptions","scopedWith","scope","build","model","extend","flatMap","retry","identity","provide","isSuccess","isNone","schedule","none","some","getOrUndefined","while","fromModel","options","fromNullable","resolveSchedule","withFallback","dual","isUndefined","attempts","forever","isNotUndefined","intersect","recurs","concatSteps","other"],"sources":["../../../src/internal/aiPlan.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"aiPlan.js","names":["Context","_interopRequireWildcard","require","Effect","_Effectable","Either","_Function","Option","_Pipeable","Predicate","Schedule","Scope","_AiModels","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","PlanPrototype","CommitPrototype","commit","buildPlan","pipe","pipeArguments","arguments","makePlan","steps","self","create","plan","map","context","models","AiModels","provide","fnUntraced","effect","result","undefined","step","isLeft","isSome","check","value","left","isFatalError","isEffect","retryOptions","getRetryOptions","scopedWith","scope","build","model","extend","flatMap","retry","identity","either","isRight","isNone","schedule","none","some","getOrUndefined","while","fromModel","options","fromNullable","resolveSchedule","withFallback","dual","isUndefined","attempts","forever","isNotUndefined","intersect","recurs","concatSteps","other"],"sources":["../../../src/internal/aiPlan.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAF,uBAAA,CAAAC,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAJ,uBAAA,CAAAC,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAN,uBAAA,CAAAC,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,SAAA,GAAAR,uBAAA,CAAAC,OAAA;AACA,IAAAQ,QAAA,GAAAT,uBAAA,CAAAC,OAAA;AACA,IAAAS,KAAA,GAAAV,uBAAA,CAAAC,OAAA;AAEA,IAAAU,SAAA,GAAAV,OAAA;AAAyC,SAAAW,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAb,wBAAAa,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAGzC;AACO,MAAMW,MAAM,GAAAC,OAAA,CAAAD,MAAA,gBAAkBE,MAAM,CAACC,GAAG,CAAC,mBAAmB,CAAkB;AAErF;AACO,MAAMC,aAAa,GAAAH,OAAA,CAAAG,aAAA,GAAG;EAC3B,GAAGC,2BAAe;EAClB,CAACL,MAAM,GAAGA,MAAM;EAChBM,MAAMA,CAAA;IACJ,OAAOC,SAAS,CAAC,IAAI,CAAC;EACxB,CAAC;EACDC,IAAIA,CAAA;IACF,OAAO,IAAAC,uBAAa,EAAC,IAAI,EAAEC,SAAS,CAAC;EACvC;CACM;AAER,MAAMC,QAAQ,GAEZC,KAAY,IAAkC;EAC9C,MAAMC,IAAI,GAAGrB,MAAM,CAACsB,MAAM,CAACV,aAAa,CAAC;EACzCS,IAAI,CAACD,KAAK,GAAGA,KAAK;EAClB,OAAOC,IAAI;AACb,CAAC;AAED,MAAMN,SAAS,GACbQ,IAA8C,IAM9C7C,MAAM,CAAC8C,GAAG,CAAC9C,MAAM,CAAC+C,OAAO,EAAuB,EAAGA,OAAO,IAAI;EAC5D,MAAMC,MAAM,GAAGnD,OAAO,CAACqB,GAAG,CAAC6B,OAAO,EAAEE,kBAAQ,CAAC;EAC7C,OAAO;IACLC,OAAO,EAAElD,MAAM,CAACmD,UAAU,CAAC,WAAmBC,MAA8B;MAC1E,IAAIC,MAAM,GAAoCC,SAAS;MACvD,KAAK,MAAMC,IAAI,IAAIV,IAAI,CAACH,KAAK,EAAE;QAC7B,IAAIW,MAAM,KAAKC,SAAS,IAAIpD,MAAM,CAACsD,MAAM,CAACH,MAAM,CAAC,IAAIjD,MAAM,CAACqD,MAAM,CAACF,IAAI,CAACG,KAAK,CAAC,EAAE;UAC9E,MAAMA,KAAK,GAAGH,IAAI,CAACG,KAAK,CAACC,KAAK,CAACN,MAAM,CAACO,IAAW,CAAC;UAClD,MAAMC,YAAY,GAAG,EAAE7D,MAAM,CAAC8D,QAAQ,CAACJ,KAAK,CAAC,GAAG,OAAOA,KAAK,GAAGA,KAAK,CAAC;UACrE,IAAIG,YAAY,EAAE;QACpB;QACA,MAAME,YAAY,GAAGC,eAAe,CAACT,IAAI,CAAC;QAC1CF,MAAM,GAAG,OAAOrD,MAAM,CAACiE,UAAU,CAAEC,KAAK,IACtClB,MAAM,CAACmB,KAAK,CAACZ,IAAI,CAACa,KAAK,EAAErB,OAAO,CAAC,CAACT,IAAI,CACpC9B,KAAK,CAAC6D,MAAM,CAACH,KAAK,CAAC,EACnBlE,MAAM,CAACsE,OAAO,CAAEvB,OAAO,IACrBK,MAAM,CAACd,IAAI,CACTlC,MAAM,CAACqD,MAAM,CAACM,YAAY,CAAC,GACvB/D,MAAM,CAACuE,KAAK,CAACR,YAAY,CAACJ,KAAK,CAAC,GAChCa,kBAAQ,EACZxE,MAAM,CAACkD,OAAO,CAACH,OAAO,CAAC,CACxB,CACF,EACD/C,MAAM,CAACyE,MAAM,CACd,CACF;QACD,IAAIvE,MAAM,CAACwE,OAAO,CAACrB,MAAM,CAAC,EAAE;MAC9B;MACA,OAAO,OAAOA,MAAO;IACvB,CAAC;GACF;AACH,CAAC,CAAC;AAEJ,MAAMW,eAAe,GACnBT,IAAmD,IACP;EAC5C,IAAInD,MAAM,CAACuE,MAAM,CAACpB,IAAI,CAACqB,QAAQ,CAAC,IAAIxE,MAAM,CAACuE,MAAM,CAACpB,IAAI,CAACG,KAAK,CAAC,EAAE;IAC7D,OAAOtD,MAAM,CAACyE,IAAI,EAAE;EACtB;EACA,OAAOzE,MAAM,CAAC0E,IAAI,CAAC;IACjBF,QAAQ,EAAExE,MAAM,CAAC2E,cAAc,CAACxB,IAAI,CAACqB,QAAQ,CAAC;IAC9CI,KAAK,EAAE5E,MAAM,CAAC2E,cAAc,CAACxB,IAAI,CAACG,KAAK;GACxC,CAAC;AACJ,CAAC;AAED;AACO,MAAMuB,SAAS,GAAGA,CACvBb,KAA0C,EAC1Cc,OAIC,KAEDzC,QAAQ,CAAC,CAAC;EACR2B,KAAK;EACLV,KAAK,EAAEtD,MAAM,CAAC+E,YAAY,CAACD,OAAO,EAAEF,KAAK,CAAQ;EACjDJ,QAAQ,EAAEQ,eAAe,CAACF,OAAO,IAAI,EAAE;CACxC,CAAC,CAAC;AAEL;AAAAnD,OAAA,CAAAkD,SAAA,GAAAA,SAAA;AACO,MAAMI,YAAY,GAAAtD,OAAA,CAAAsD,YAAA,gBAAG,IAAAC,cAAI,EAAC,CAAC,EAAE,CAYlC3C,IAA0C,EAC1CuC,OAKC,KAEDzC,QAAQ,CAAC,CACP,GAAGE,IAAI,CAACD,KAAK,EACb;EACE0B,KAAK,EAAEc,OAAO,CAACd,KAAK;EACpBV,KAAK,EAAEtD,MAAM,CAAC+E,YAAY,CAACD,OAAO,CAACF,KAAK,CAAQ;EAChDJ,QAAQ,EAAEQ,eAAe,CAACF,OAAO;CAClC,CACF,CAAC,CAAC;AAEL,MAAME,eAAe,GAAmBF,OAGvC,IAAsD;EACrD,IACE5E,SAAS,CAACiF,WAAW,CAACL,OAAO,CAACM,QAAQ,CAAC,IACvClF,SAAS,CAACiF,WAAW,CAACL,OAAO,CAACN,QAAQ,CAAC,EACvC,OAAOxE,MAAM,CAACyE,IAAI,EAAE;EACtB,IAAID,QAAQ,GAAIM,OAAO,CAACN,QAAQ,IAAIrE,QAAQ,CAACkF,OAA6C;EAC1F,IAAInF,SAAS,CAACoF,cAAc,CAACR,OAAO,CAACM,QAAQ,CAAC,EAAE;IAC9C;IACA;IACA;IACAZ,QAAQ,GAAGrE,QAAQ,CAACoF,SAAS,CAACf,QAAQ,EAAErE,QAAQ,CAACqF,MAAM,CAACV,OAAO,CAACM,QAAQ,GAAG,CAAC,CAAC,CAAC;EAChF;EACA,OAAOpF,MAAM,CAAC0E,IAAI,CAACF,QAAQ,CAAC;AAC9B,CAAC;AAED;AACO,MAAMiB,WAAW,GAAA9D,OAAA,CAAA8D,WAAA,gBAAG,IAAAP,cAAI,EAU7B,CAAC,EAAE,CAAC3C,IAAI,EAAEmD,KAAK,KAAKrD,QAAQ,CAAC,CAAC,GAAGE,IAAI,CAACD,KAAK,EAAE,GAAGoD,KAAK,CAACpD,KAAK,CAAC,CAAC,CAAC","ignoreList":[]}

package/dist/esm/internal/aiPlan.js

@@ -1,8 +1,7 @@
-import * as Cause from "effect/Cause";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import { CommitPrototype } from "effect/Effectable";
-import * as Exit from "effect/Exit";
+import * as Either from "effect/Either";
 import { dual, identity } from "effect/Function";
 import * as Option from "effect/Option";
 import { pipeArguments } from "effect/Pipeable";
@@ -30,20 +29,22 @@ const makePlan = steps => {
 };
 const buildPlan = plan => Effect.map(Effect.context(), context => {
   const models = Context.get(context, AiModels);
-  return Effect.fnUntraced(function* (effect) {
-    let exit = undefined;
-    for (const step of plan.steps) {
-      if (exit !== undefined && Exit.isFailure(exit) && Option.isSome(step.check)) {
-        const check = step.check.value(Cause.squash(exit.cause));
-        const isFatalError = !(Effect.isEffect(check) ? yield* check : check);
-        if (isFatalError) break;
+  return {
+    provide: Effect.fnUntraced(function* (effect) {
+      let result = undefined;
+      for (const step of plan.steps) {
+        if (result !== undefined && Either.isLeft(result) && Option.isSome(step.check)) {
+          const check = step.check.value(result.left);
+          const isFatalError = !(Effect.isEffect(check) ? yield* check : check);
+          if (isFatalError) break;
+        }
+        const retryOptions = getRetryOptions(step);
+        result = yield* Effect.scopedWith(scope => models.build(step.model, context).pipe(Scope.extend(scope), Effect.flatMap(context => effect.pipe(Option.isSome(retryOptions) ? Effect.retry(retryOptions.value) : identity, Effect.provide(context))), Effect.either));
+        if (Either.isRight(result)) break;
       }
-      const retryOptions = getRetryOptions(step);
-      exit = yield* Effect.scopedWith(scope => models.build(step.model, context).pipe(Scope.extend(scope), Effect.flatMap(context => effect.pipe(Option.isSome(retryOptions) ? Effect.retry(retryOptions.value) : identity, Effect.provide(context))), Effect.exit));
-      if (Exit.isSuccess(exit)) break;
-    }
-    return yield* exit;
-  });
+      return yield* result;
+    })
+  };
 });
 const getRetryOptions = step => {
   if (Option.isNone(step.schedule) && Option.isNone(step.check)) {

package/dist/esm/internal/aiPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"aiPlan.js","names":["Cause","Context","Effect","CommitPrototype","Exit","dual","identity","Option","pipeArguments","Predicate","Schedule","Scope","AiModels","TypeId","Symbol","for","PlanPrototype","commit","buildPlan","pipe","arguments","makePlan","steps","self","Object","create","plan","map","context","models","get","fnUntraced","effect","exit","undefined","step","isFailure","isSome","check","value","squash","cause","isFatalError","isEffect","retryOptions","getRetryOptions","scopedWith","scope","build","model","extend","flatMap","retry","provide","isSuccess","isNone","schedule","none","some","getOrUndefined","while","fromModel","options","fromNullable","resolveSchedule","withFallback","isUndefined","attempts","forever","isNotUndefined","intersect","recurs","concatSteps","other"],"sources":["../../../src/internal/aiPlan.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"aiPlan.js","names":["Context","Effect","CommitPrototype","Either","dual","identity","Option","pipeArguments","Predicate","Schedule","Scope","AiModels","TypeId","Symbol","for","PlanPrototype","commit","buildPlan","pipe","arguments","makePlan","steps","self","Object","create","plan","map","context","models","get","provide","fnUntraced","effect","result","undefined","step","isLeft","isSome","check","value","left","isFatalError","isEffect","retryOptions","getRetryOptions","scopedWith","scope","build","model","extend","flatMap","retry","either","isRight","isNone","schedule","none","some","getOrUndefined","while","fromModel","options","fromNullable","resolveSchedule","withFallback","isUndefined","attempts","forever","isNotUndefined","intersect","recurs","concatSteps","other"],"sources":["../../../src/internal/aiPlan.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/ai",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "Effect modules for working with AI apis",
   "license": "MIT",
   "repository": {
@@ -11,9 +11,9 @@
   "sideEffects": [],
   "dependencies": {},
   "peerDependencies": {
-    "@effect/experimental": "^0.41.4",
-    "effect": "^3.13.4",
-    "@effect/platform": "^0.77.4"
+    "@effect/experimental": "^0.41.6",
+    "@effect/platform": "^0.77.6",
+    "effect": "^3.13.6"
   },
   "publishConfig": {
     "provenance": true

package/src/internal/aiPlan.ts

@@ -1,8 +1,7 @@
-import * as Cause from "effect/Cause"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import { CommitPrototype } from "effect/Effectable"
-import * as Exit from "effect/Exit"
+import * as Either from "effect/Either"
 import { dual, identity } from "effect/Function"
 import * as Option from "effect/Option"
 import { pipeArguments } from "effect/Pipeable"
@@ -39,39 +38,41 @@ const makePlan = <
 const buildPlan = <Error, Provides, Requires>(
   plan: AiPlan.AiPlan<Error, Provides, Requires>
 ): Effect.Effect<
-  <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, Provides>>,
+  AiPlan.AiPlan.Provider<Provides>,
   never,
   Requires | AiModels
 > =>
   Effect.map(Effect.context<AiModels | Requires>(), (context) => {
     const models = Context.get(context, AiModels)
-    return Effect.fnUntraced(function*<A, E, R>(effect: Effect.Effect<A, E, R>) {
-      let exit: Exit.Exit<A, E> | undefined = undefined
-      for (const step of plan.steps) {
-        if (exit !== undefined && Exit.isFailure(exit) && Option.isSome(step.check)) {
-          const check = step.check.value(Cause.squash(exit.cause) as Error)
-          const isFatalError = !(Effect.isEffect(check) ? yield* check : check)
-          if (isFatalError) break
-        }
-        const retryOptions = getRetryOptions(step)
-        exit = yield* Effect.scopedWith((scope) =>
-          models.build(step.model, context).pipe(
-            Scope.extend(scope),
-            Effect.flatMap((context) =>
-              effect.pipe(
-                Option.isSome(retryOptions)
-                  ? Effect.retry(retryOptions.value)
-                  : identity,
-                Effect.provide(context)
-              )
-            ),
-            Effect.exit
+    return {
+      provide: Effect.fnUntraced(function*<A, E, R>(effect: Effect.Effect<A, E, R>) {
+        let result: Either.Either<A, E> | undefined = undefined
+        for (const step of plan.steps) {
+          if (result !== undefined && Either.isLeft(result) && Option.isSome(step.check)) {
+            const check = step.check.value(result.left as any)
+            const isFatalError = !(Effect.isEffect(check) ? yield* check : check)
+            if (isFatalError) break
+          }
+          const retryOptions = getRetryOptions(step)
+          result = yield* Effect.scopedWith((scope) =>
+            models.build(step.model, context).pipe(
+              Scope.extend(scope),
+              Effect.flatMap((context) =>
+                effect.pipe(
+                  Option.isSome(retryOptions)
+                    ? Effect.retry(retryOptions.value)
+                    : identity,
+                  Effect.provide(context)
+                )
+              ),
+              Effect.either
+            )
           )
-        )
-        if (Exit.isSuccess(exit)) break
-      }
-      return yield* exit!
-    })
+          if (Either.isRight(result)) break
+        }
+        return yield* result!
+      })
+    }
   })
 
 const getRetryOptions = <Error, Provides, Requires>(