@effect/ai 0.4.2 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -157,9 +157,19 @@ exports.make = make;
157
157
  const convertTool = (tool, structured = false) => ({
158
158
  name: tool._tag ?? tool.identifier,
159
159
  description: getDescription(tool.ast),
160
- parameters: JsonSchema.make(tool),
160
+ parameters: makeJsonSchema(tool.ast),
161
161
  structured
162
162
  });
163
+ const makeJsonSchema = ast => {
164
+ const $defs = {};
165
+ const schema = JsonSchema.fromAST(ast, {
166
+ definitions: $defs,
167
+ topLevelReferenceStrategy: "skip"
168
+ });
169
+ if (Object.keys($defs).length === 0) return schema;
170
+ schema.$defs = $defs;
171
+ return schema;
172
+ };
163
173
  const getDescription = ast => {
164
174
  const annotations = ast._tag === "Transformation" ? {
165
175
  ...ast.to.annotations,
@@ -1 +1 @@
1
- {"version":3,"file":"Completions.js","names":["Chunk","_interopRequireWildcard","require","Context","Effect","HashMap","JsonSchema","Option","Schema","AST","Stream","_AiError","AiInput","_AiResponse","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Completions","Tag","exports","constEmptyMap","Map","make","options","map","serviceOption","SystemInstruction","parentSystem","of","create","input","pipe","flatMap","system","orElse","tools","required","withSpan","captureStackTrace","stream","input_","unwrap","structured","opts","schema","decode","decodeUnknown","toolId","_tag","identifier","convertTool","response","findFirst","parts","part","name","match","onNone","fail","AiError","module","method","description","onSome","toolCall","matchEffect","params","onFailure","cause","onSuccess","resolved","succeed","WithResolved","id","encoded","attributes","tool","toolkit","concurrency","inputInput","toolArr","push","resolveParts","toolkitStream","mapEffect","chunk","getDescription","ast","parameters","annotations","to","DescriptionAnnotationId","toolNames","toolParts","filter","isEmpty","annotateCurrentSpan","zipRight","forEach","unsafeGet","handler","handlers","decodeParams","encodeSuccess","encode","success","mapError","tap","value","encodedValue","discard","as"],"sources":["../../src/Completions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"Completions.js","names":["Chunk","_interopRequireWildcard","require","Context","Effect","HashMap","JsonSchema","Option","Schema","AST","Stream","_AiError","AiInput","_AiResponse","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Completions","Tag","exports","constEmptyMap","Map","make","options","map","serviceOption","SystemInstruction","parentSystem","of","create","input","pipe","flatMap","system","orElse","tools","required","withSpan","captureStackTrace","stream","input_","unwrap","structured","opts","schema","decode","decodeUnknown","toolId","_tag","identifier","convertTool","response","findFirst","parts","part","name","match","onNone","fail","AiError","module","method","description","onSome","toolCall","matchEffect","params","onFailure","cause","onSuccess","resolved","succeed","WithResolved","id","encoded","attributes","tool","toolkit","concurrency","inputInput","toolArr","push","resolveParts","toolkitStream","mapEffect","chunk","getDescription","ast","parameters","makeJsonSchema","$defs","fromAST","definitions","topLevelReferenceStrategy","keys","length","annotations","to","DescriptionAnnotationId","toolNames","toolParts","filter","isEmpty","annotateCurrentSpan","zipRight","forEach","unsafeGet","handler","handlers","decodeParams","encodeSuccess","encode","success","mapError","tap","value","encodedValue","discard","as"],"sources":["../../src/Completions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -146,9 +146,19 @@ export const make = options => Effect.map(Effect.serviceOption(AiInput.SystemIns
146
146
  const convertTool = (tool, structured = false) => ({
147
147
  name: tool._tag ?? tool.identifier,
148
148
  description: getDescription(tool.ast),
149
- parameters: JsonSchema.make(tool),
149
+ parameters: makeJsonSchema(tool.ast),
150
150
  structured
151
151
  });
152
+ const makeJsonSchema = ast => {
153
+ const $defs = {};
154
+ const schema = JsonSchema.fromAST(ast, {
155
+ definitions: $defs,
156
+ topLevelReferenceStrategy: "skip"
157
+ });
158
+ if (Object.keys($defs).length === 0) return schema;
159
+ schema.$defs = $defs;
160
+ return schema;
161
+ };
152
162
  const getDescription = ast => {
153
163
  const annotations = ast._tag === "Transformation" ? {
154
164
  ...ast.to.annotations,
@@ -1 +1 @@
1
- {"version":3,"file":"Completions.js","names":["Chunk","Context","Effect","HashMap","JsonSchema","Option","Schema","AST","Stream","AiError","AiInput","WithResolved","Completions","Tag","constEmptyMap","Map","make","options","map","serviceOption","SystemInstruction","parentSystem","of","create","input","pipe","flatMap","system","orElse","tools","required","withSpan","captureStackTrace","stream","input_","unwrap","structured","opts","schema","decode","decodeUnknown","toolId","_tag","identifier","convertTool","response","findFirst","parts","part","name","match","onNone","fail","module","method","description","onSome","toolCall","matchEffect","params","onFailure","cause","onSuccess","resolved","succeed","id","encoded","attributes","tool","toolkit","concurrency","inputInput","toolArr","push","resolveParts","toolkitStream","mapEffect","chunk","getDescription","ast","parameters","annotations","to","DescriptionAnnotationId","toolNames","toolParts","filter","isEmpty","annotateCurrentSpan","zipRight","forEach","unsafeGet","handler","handlers","decodeParams","encodeSuccess","encode","success","mapError","tap","value","encodedValue","set","discard","as"],"sources":["../../src/Completions.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"Completions.js","names":["Chunk","Context","Effect","HashMap","JsonSchema","Option","Schema","AST","Stream","AiError","AiInput","WithResolved","Completions","Tag","constEmptyMap","Map","make","options","map","serviceOption","SystemInstruction","parentSystem","of","create","input","pipe","flatMap","system","orElse","tools","required","withSpan","captureStackTrace","stream","input_","unwrap","structured","opts","schema","decode","decodeUnknown","toolId","_tag","identifier","convertTool","response","findFirst","parts","part","name","match","onNone","fail","module","method","description","onSome","toolCall","matchEffect","params","onFailure","cause","onSuccess","resolved","succeed","id","encoded","attributes","tool","toolkit","concurrency","inputInput","toolArr","push","resolveParts","toolkitStream","mapEffect","chunk","getDescription","ast","parameters","makeJsonSchema","$defs","fromAST","definitions","topLevelReferenceStrategy","Object","keys","length","annotations","to","DescriptionAnnotationId","toolNames","toolParts","filter","isEmpty","annotateCurrentSpan","zipRight","forEach","unsafeGet","handler","handlers","decodeParams","encodeSuccess","encode","success","mapError","tap","value","encodedValue","set","discard","as"],"sources":["../../src/Completions.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,kBAAkB;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,SAASC,OAAO,QAAQ,cAAc;AAEtC,OAAO,KAAKC,OAAO,MAAM,cAAc;AAEvC,SAASC,YAAY,QAAQ,iBAAiB;AAG9C;;;;AAIA,OAAM,MAAOC,WAAY,sBAAQX,OAAO,CAACY,GAAG,CAAC,wBAAwB,CAAC,EAGnE;AAwDH,MAAMC,aAAa,gBAAG,IAAIC,GAAG,EAAgB;AAkB7C;;;;AAIA,OAAO,MAAMC,IAAI,GAAIC,OAuBpB,IACCf,MAAM,CAACgB,GAAG,CAAChB,MAAM,CAACiB,aAAa,CAACT,OAAO,CAACU,iBAAiB,CAAC,EAAGC,YAAY,IAAI;EAC3E,OAAOT,WAAW,CAACU,EAAE,CAAC;IACpBC,MAAMA,CAACC,KAAK;MACV,OAAOtB,MAAM,CAACiB,aAAa,CAACT,OAAO,CAACU,iBAAiB,CAAC,CAACK,IAAI,CACzDvB,MAAM,CAACwB,OAAO,CAAEC,MAAM,IACpBV,OAAO,CAACM,MAAM,CAAC;QACbC,KAAK,EAAEd,OAAO,CAACM,IAAI,CAACQ,KAAK,CAAiC;QAC1DG,MAAM,EAAEtB,MAAM,CAACuB,MAAM,CAACD,MAAM,EAAE,MAAMN,YAAY,CAAC;QACjDQ,KAAK,EAAE,EAAE;QACTC,QAAQ,EAAE;OACX,CAAC,CACH,EACD5B,MAAM,CAAC6B,QAAQ,CAAC,oBAAoB,EAAE;QAAEC,iBAAiB,EAAE;MAAK,CAAE,CAAC,CACpE;IACH,CAAC;IACDC,MAAMA,CAACC,MAAM;MACX,MAAMV,KAAK,GAAGd,OAAO,CAACM,IAAI,CAACkB,MAAM,CAAC;MAClC,OAAOhC,MAAM,CAACiB,aAAa,CAACT,OAAO,CAACU,iBAAiB,CAAC,CAACK,IAAI,CACzDvB,MAAM,CAACgB,GAAG,CAAES,MAAM,IAChBV,OAAO,CAACgB,MAAM,CAAC;QACbT,KAAK,EAAEA,KAAqC;QAC5CG,MAAM,EAAEtB,MAAM,CAACuB,MAAM,CAACD,MAAM,EAAE,MAAMN,YAAY,CAAC;QACjDQ,KAAK,EAAE,EAAE;QACTC,QAAQ,EAAE;OACX,CAAC,CACH,EACDtB,MAAM,CAAC2B,MAAM,EACb3B,MAAM,CAACuB,QAAQ,CAAC,oBAAoB,EAAE;QAAEC,iBAAiB,EAAE;MAAK,CAAE,CAAC,CACpE;IACH,CAAC;IACDI,UAAUA,CAACC,IAAI;MACb,MAAMb,KAAK,GAAGd,OAAO,CAACM,IAAI,CAACqB,IAAI,CAACb,KAAK,CAAC;MACtC,MAAMc,MAAM,GAAGD,IAAI,CAACC,MAAM;MAC1B,MAAMC,MAAM,GAAGjC,MAAM,CAACkC,aAAa,CAACF,MAAM,CAAC;MAC3C,MAAMG,MAAM,GAAGH,MAAM,CAACI,IAAI,IAAIJ,MAAM,CAACK,UAAU;MAC/C,OAAOzC,MAAM,CAACiB,aAAa,CAACT,OAAO,CAACU,iBAAiB,CAAC,CAACK,IAAI,CACzDvB,MAAM,CAACwB,OAAO,CAAEC,MAAM,IACpBV,OAAO,CAACM,MAAM,CAAC;QACbC,KAAK,EAAEA,KAAqC;QAC5CG,MAAM,EAAEtB,MAAM,CAACuB,MAAM,CAACD,MAAM,EAAE,MAAMN,YAAY,CAAC;QACjDQ,KAAK,EAAE,CAACe,WAAW,CAACN,MAAM,EAAE,IAAI,CAAC,CAAC;QAClCR,QAAQ,EAAE;OACX,CAAC,CACH,EACD5B,MAAM,CAACwB,OAAO,CAAEmB,QAAQ,IACtB7C,KAAK,CAAC8C,SAAS,CACbD,QAAQ,CAACE,KAAK,EACbC,IAAI,IAA2BA,IAAI,CAACN,IAAI,KAAK,UAAU,IAAIM,IAAI,CAACC,IAAI,KAAKR,MAAM,CACjF,CAAChB,IAAI,CACJpB,MAAM,CAAC6C,KAAK,CAAC;QACXC,MAAM,EAAEA,CAAA,KACNjD,MAAM,CAACkD,IAAI,CACT,IAAI3C,OAAO,CAAC;UACV4C,MAAM,EAAE,aAAa;UACrBC,MAAM,EAAE,YAAY;UACpBC,WAAW,EAAE,cAAcd,MAAM;SAClC,CAAC,CACH;QACHe,MAAM,EAAGC,QAAQ,IACfvD,MAAM,CAACwD,WAAW,CAACnB,MAAM,CAACkB,QAAQ,CAACE,MAAM,CAAC,EAAE;UAC1CC,SAAS,EAAGC,KAAK,IACf,IAAIpD,OAAO,CAAC;YACV4C,MAAM,EAAE,aAAa;YACrBC,MAAM,EAAE,YAAY;YACpBC,WAAW,EAAE,+BAA+Bd,MAAM,cAAc;YAChEoB;WACD,CAAC;UACJC,SAAS,EAAGC,QAAQ,IAClB7D,MAAM,CAAC8D,OAAO,CACZ,IAAIrD,YAAY,CAAC;YACfkC,QAAQ;YACRkB,QAAQ,EAAE,IAAIhD,GAAG,CAAC,CAAC,CAAC0C,QAAQ,CAACQ,EAAE,EAAEF,QAAQ,CAAC,CAAC,CAAC;YAC5CG,OAAO,EAAE,IAAInD,GAAG,CAAC,CAAC,CAAC0C,QAAQ,CAACQ,EAAE,EAAER,QAAQ,CAACE,MAAM,CAAC,CAAC;WAClD,CAAC;SAEP;OACJ,CAAC,EACFzD,MAAM,CAAC6B,QAAQ,CAAC,wBAAwB,EAAE;QACxCoC,UAAU,EAAE;UAAEC,IAAI,EAAE3B;QAAM,CAAE;QAC5BT,iBAAiB,EAAE;OACpB,CAAC,CACH,CACF,CACF;IACH,CAAC;IACDqC,OAAOA,CAAC;MAAEC,WAAW;MAAE9C,KAAK,EAAE+C,UAAU;MAAEzC,QAAQ,GAAG,KAAK;MAAED;IAAK,CAAE;MACjE,MAAML,KAAK,GAAGd,OAAO,CAACM,IAAI,CAACuD,UAAU,CAAC;MACtC,MAAMC,OAAO,GAKR,EAAE;MACP,KAAK,MAAM,GAAGJ,IAAI,CAAC,IAAIvC,KAAK,CAACwC,OAAO,CAACxC,KAAK,EAAE;QAC1C2C,OAAO,CAACC,IAAI,CAAC7B,WAAW,CAACwB,IAAW,CAAC,CAAC;MACxC;MACA,OAAOlE,MAAM,CAACiB,aAAa,CAACT,OAAO,CAACU,iBAAiB,CAAC,CAACK,IAAI,CACzDvB,MAAM,CAACwB,OAAO,CAAEC,MAAM,IACpBV,OAAO,CAACM,MAAM,CAAC;QACbC,KAAK,EAAEA,KAAqC;QAC5CG,MAAM,EAAEtB,MAAM,CAACuB,MAAM,CAACD,MAAM,EAAE,MAAMN,YAAY,CAAC;QACjDQ,KAAK,EAAE2C,OAAO;QACd1C,QAAQ,EAAEA;OACX,CAAC,CACH,EACD5B,MAAM,CAACwB,OAAO,CAAEmB,QAAQ,IAAK6B,YAAY,CAAC;QAAE7B,QAAQ;QAAEhB,KAAK;QAAEyC,WAAW;QAAEhB,MAAM,EAAE;MAAS,CAAE,CAAC,CAAC,EAC/FpD,MAAM,CAAC6B,QAAQ,CAAC,qBAAqB,EAAE;QACrCC,iBAAiB,EAAE,KAAK;QACxBmC,UAAU,EAAE;UACVG,WAAW;UACXxC;;OAEH,CAAC,CACI;IACV,CAAC;IACD6C,aAAaA,CAAC;MAAEL,WAAW;MAAE9C,KAAK;MAAEM,QAAQ,GAAG,KAAK;MAAED;IAAK,CAAE;MAC3D,MAAM2C,OAAO,GAKR,EAAE;MACP,KAAK,MAAM,GAAGJ,IAAI,CAAC,IAAIvC,KAAK,CAACwC,OAAO,CAACxC,KAAK,EAAE;QAC1C2C,OAAO,CAACC,IAAI,CAAC7B,WAAW,CAACwB,IAAW,CAAC,CAAC;MACxC;MACA,OAAOlE,MAAM,CAACiB,aAAa,CAACT,OAAO,CAACU,iBAAiB,CAAC,CAACK,IAAI,CACzDvB,MAAM,CAACgB,GAAG,CAAES,MAAM,IAChBV,OAAO,CAACgB,MAAM,CAAC;QACbT,KAAK,EAAEd,OAAO,CAACM,IAAI,CAACQ,KAAK,CAAiC;QAC1DG,MAAM,EAAEtB,MAAM,CAACuB,MAAM,CAACD,MAAM,EAAE,MAAMN,YAAY,CAAC;QACjDQ,KAAK,EAAE2C,OAAO;QACd1C,QAAQ,EAAEA;OACX,CAAC,CACH,EACDtB,MAAM,CAAC2B,MAAM,EACb3B,MAAM,CAACoE,SAAS,CACbC,KAAK,IAAKH,YAAY,CAAC;QAAE7B,QAAQ,EAAEgC,KAAK;QAAEhD,KAAK;QAAEyC,WAAW;QAAEhB,MAAM,EAAE;MAAe,CAAE,CAAC,EACzF;QAAEgB,WAAW,EAAE;MAAW,CAAE,CAC7B,EACD9D,MAAM,CAACuB,QAAQ,CAAC,2BAA2B,EAAE;QAC3CC,iBAAiB,EAAE,KAAK;QACxBmC,UAAU,EAAE;UACVG,WAAW;UACXxC;;OAEH,CAAC,CACI;IACV;GACD,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAMc,WAAW,GAAGA,CAAUwB,IAA2C,EAAEhC,UAAU,GAAG,KAAK,MAAM;EACjGa,IAAI,EAAEmB,IAAI,CAAC1B,IAAI,IAAI0B,IAAI,CAACzB,UAAU;EAClCY,WAAW,EAAEuB,cAAc,CAACV,IAAI,CAACW,GAAG,CAAC;EACrCC,UAAU,EAAEC,cAAc,CAACb,IAAI,CAACW,GAAG,CAAC;EACpC3C;CACD,CAAC;AAEF,MAAM6C,cAAc,GAAIF,GAAY,IAA4B;EAC9D,MAAMG,KAAK,GAAG,EAAE;EAChB,MAAM5C,MAAM,GAAGlC,UAAU,CAAC+E,OAAO,CAACJ,GAAG,EAAE;IACrCK,WAAW,EAAEF,KAAK;IAClBG,yBAAyB,EAAE;GAC5B,CAAC;EACF,IAAIC,MAAM,CAACC,IAAI,CAACL,KAAK,CAAC,CAACM,MAAM,KAAK,CAAC,EAAE,OAAOlD,MAAM;EAChDA,MAAc,CAAC4C,KAAK,GAAGA,KAAK;EAC9B,OAAO5C,MAAM;AACf,CAAC;AAED,MAAMwC,cAAc,GAAIC,GAAY,IAAY;EAC9C,MAAMU,WAAW,GAAGV,GAAG,CAACrC,IAAI,KAAK,gBAAgB,GAC/C;IACE,GAAGqC,GAAG,CAACW,EAAE,CAACD,WAAW;IACrB,GAAGV,GAAG,CAACU;GACR,GACDV,GAAG,CAACU,WAAW;EACjB,OAAOlF,GAAG,CAACoF,uBAAuB,IAAIF,WAAW,GAAGA,WAAW,CAAClF,GAAG,CAACoF,uBAAuB,CAAW,GAAG,EAAE;AAC7G,CAAC;AAED,MAAMjB,YAAY,GAChBzD,OAKC,IACC;EACF,MAAM2E,SAAS,GAAkB,EAAE;EACnC,MAAMC,SAAS,GAAG7F,KAAK,CAAC8F,MAAM,CAC5B7E,OAAO,CAAC4B,QAAQ,CAACE,KAAK,EACrBC,IAAI,IAA0B;IAC7B,IAAIA,IAAI,CAACN,IAAI,KAAK,UAAU,EAAE;MAC5BkD,SAAS,CAACnB,IAAI,CAACzB,IAAI,CAACC,IAAI,CAAC;MACzB,OAAO,IAAI;IACb;IACA,OAAO,KAAK;EACd,CAAC,CACF;EACD,IAAIjD,KAAK,CAAC+F,OAAO,CAACF,SAAS,CAAC,EAAE;IAC5B,OAAO3F,MAAM,CAAC8D,OAAO,CACnB,IAAIrD,YAAY,CAAC;MACfkC,QAAQ,EAAE5B,OAAO,CAAC4B,QAAQ;MAC1BkB,QAAQ,EAAEjD,aAAa;MACvBoD,OAAO,EAAEpD;KACV,CAAC,CACH;EACH;EACA,MAAMiD,QAAQ,GAAG,IAAIhD,GAAG,EAA2C;EACnE,MAAMmD,OAAO,GAAG,IAAInD,GAAG,EAAuB;EAC9C,OAAOb,MAAM,CAAC8F,mBAAmB,CAAC,WAAW,EAAEJ,SAAS,CAAC,CAACnE,IAAI,CAC5DvB,MAAM,CAAC+F,QAAQ,CAAC/F,MAAM,CAACgG,OAAO,CAC5BL,SAAS,EACR7C,IAAI,IAAI;IACP,MAAMoB,IAAI,GAAGjE,OAAO,CAACgG,SAAS,CAAClF,OAAO,CAACY,KAAK,CAACwC,OAAO,CAACxC,KAAK,EAAEmB,IAAI,CAACC,IAAI,CAAC;IACtE,MAAMmD,OAAO,GAAGjG,OAAO,CAACgG,SAAS,CAAClF,OAAO,CAACY,KAAK,CAACwE,QAAQ,EAAErD,IAAI,CAACC,IAAI,CAAC;IACpE,MAAMqD,YAAY,GAAGhG,MAAM,CAACkC,aAAa,CAAC4B,IAAW,CAAC;IACtD,MAAMmC,aAAa,GAAGjG,MAAM,CAACkG,MAAM,CAACpC,IAAI,CAACqC,OAAO,CAAC;IACjD,OAAOH,YAAY,CAACtD,IAAI,CAACW,MAAM,CAAC,CAAClC,IAAI,CACnCvB,MAAM,CAACwG,QAAQ,CAAE7C,KAAK,IACpB,IAAIpD,OAAO,CAAC;MACV4C,MAAM,EAAE,aAAa;MACrBC,MAAM,EAAErC,OAAO,CAACqC,MAAM;MACtBC,WAAW,EAAE,+BAA+BP,IAAI,CAACC,IAAI,cAAc;MACnEY;KACD,CAAC,CACH,EACD3D,MAAM,CAACwB,OAAO,CAAC0E,OAAO,CAAC,EACvBlG,MAAM,CAACyG,GAAG,CAAEC,KAAK,IAAI;MACnB,OAAOL,aAAa,CAACK,KAAK,CAAC,CAACnF,IAAI,CAC9BvB,MAAM,CAACwG,QAAQ,CAAE7C,KAAK,IACpB,IAAIpD,OAAO,CAAC;QACV4C,MAAM,EAAE,aAAa;QACrBC,MAAM,EAAErC,OAAO,CAACqC,MAAM;QACtBC,WAAW,EAAE,+BAA+BP,IAAI,CAACC,IAAI,UAAU;QAC/DY;OACD,CAAC,CACH,EACD3D,MAAM,CAACgB,GAAG,CAAE2F,YAAY,IAAI;QAC1B9C,QAAQ,CAAC+C,GAAG,CAAC9D,IAAI,CAACiB,EAAE,EAAE2C,KAAK,CAAC;QAC5B1C,OAAO,CAAC4C,GAAG,CAAC9D,IAAI,CAACiB,EAAE,EAAE4C,YAAY,CAAC;MACpC,CAAC,CAAC,CACH;IACH,CAAC,CAAC,CACH;EACH,CAAC,EACD;IAAEvC,WAAW,EAAErD,OAAO,CAACqD,WAAW;IAAEyC,OAAO,EAAE;EAAI,CAAE,CACpD,CAAC,EACF7G,MAAM,CAAC8G,EAAE,CAAC,IAAIrG,YAAY,CAAC;IAAEkC,QAAQ,EAAE5B,OAAO,CAAC4B,QAAQ;IAAEkB,QAAQ;IAAEG;EAAO,CAAE,CAAC,CAAC,CAC/E;AACH,CAAC","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/ai",
3
- "version": "0.4.2",
3
+ "version": "0.4.3",
4
4
  "description": "Effect modules for working with AI apis",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -11,8 +11,8 @@
11
11
  "sideEffects": [],
12
12
  "dependencies": {},
13
13
  "peerDependencies": {
14
- "@effect/platform": "^0.71.2",
15
- "effect": "^3.11.7"
14
+ "effect": "^3.11.7",
15
+ "@effect/platform": "^0.71.2"
16
16
  },
17
17
  "publishConfig": {
18
18
  "provenance": true
@@ -281,10 +281,21 @@ export const make = (options: {
281
281
  const convertTool = <A, I, R>(tool: Completions.StructuredSchema<A, I, R>, structured = false) => ({
282
282
  name: tool._tag ?? tool.identifier,
283
283
  description: getDescription(tool.ast),
284
- parameters: JsonSchema.make(tool),
284
+ parameters: makeJsonSchema(tool.ast),
285
285
  structured
286
286
  })
287
287
 
288
+ const makeJsonSchema = (ast: AST.AST): JsonSchema.JsonSchema7 => {
289
+ const $defs = {}
290
+ const schema = JsonSchema.fromAST(ast, {
291
+ definitions: $defs,
292
+ topLevelReferenceStrategy: "skip"
293
+ })
294
+ if (Object.keys($defs).length === 0) return schema
295
+ ;(schema as any).$defs = $defs
296
+ return schema
297
+ }
298
+
288
299
  const getDescription = (ast: AST.AST): string => {
289
300
  const annotations = ast._tag === "Transformation" ?
290
301
  {