@dxos/assistant 0.8.1 → 0.8.2-main.10c050d

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.
Files changed (277) hide show
  1. package/dist/lib/browser/index.mjs +1830 -228
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node/index.cjs +1825 -229
  5. package/dist/lib/node/index.cjs.map +4 -4
  6. package/dist/lib/node/meta.json +1 -1
  7. package/dist/lib/node-esm/index.mjs +1831 -228
  8. package/dist/lib/node-esm/index.mjs.map +4 -4
  9. package/dist/lib/node-esm/meta.json +1 -1
  10. package/dist/types/{src/bin → bin}/chat.d.ts.map +1 -1
  11. package/dist/types/src/blueprint/blueprint.d.ts +79 -0
  12. package/dist/types/src/blueprint/blueprint.d.ts.map +1 -0
  13. package/dist/types/src/blueprint/blueprint.test.d.ts +2 -0
  14. package/dist/types/src/blueprint/blueprint.test.d.ts.map +1 -0
  15. package/dist/types/src/blueprint/index.d.ts +4 -0
  16. package/dist/types/src/blueprint/index.d.ts.map +1 -0
  17. package/dist/types/src/blueprint/logger.d.ts +3 -0
  18. package/dist/types/src/blueprint/logger.d.ts.map +1 -0
  19. package/dist/types/src/blueprint/machine.d.ts +113 -0
  20. package/dist/types/src/blueprint/machine.d.ts.map +1 -0
  21. package/dist/types/src/blueprint/test-data.d.ts +3 -0
  22. package/dist/types/src/blueprint/test-data.d.ts.map +1 -0
  23. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.d.ts +4 -0
  24. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.d.ts.map +1 -0
  25. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.test.d.ts +2 -0
  26. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.test.d.ts.map +1 -0
  27. package/dist/types/src/extraction/extraction-llm-function/index.d.ts +2 -0
  28. package/dist/types/src/extraction/extraction-llm-function/index.d.ts.map +1 -0
  29. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts +210 -0
  30. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts.map +1 -0
  31. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.test.d.ts +2 -0
  32. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.test.d.ts.map +1 -0
  33. package/dist/types/src/extraction/extraction-ner-function/index.d.ts +3 -0
  34. package/dist/types/src/extraction/extraction-ner-function/index.d.ts.map +1 -0
  35. package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.d.ts +14 -0
  36. package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.d.ts.map +1 -0
  37. package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.test.d.ts +2 -0
  38. package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.test.d.ts.map +1 -0
  39. package/dist/types/src/extraction/extraction.d.ts +242 -0
  40. package/dist/types/src/extraction/extraction.d.ts.map +1 -0
  41. package/dist/types/src/extraction/index.d.ts +5 -0
  42. package/dist/types/src/extraction/index.d.ts.map +1 -0
  43. package/dist/types/src/extraction/quotes.d.ts +15 -0
  44. package/dist/types/src/extraction/quotes.d.ts.map +1 -0
  45. package/dist/types/src/extraction/quotes.test.d.ts +2 -0
  46. package/dist/types/src/extraction/quotes.test.d.ts.map +1 -0
  47. package/dist/types/src/index.d.ts +4 -3
  48. package/dist/types/src/index.d.ts.map +1 -1
  49. package/dist/types/src/research/exa.d.ts +7 -0
  50. package/dist/types/src/research/exa.d.ts.map +1 -0
  51. package/dist/types/src/research/graph.d.ts +39 -0
  52. package/dist/types/src/research/graph.d.ts.map +1 -0
  53. package/dist/types/src/research/graph.test.d.ts +2 -0
  54. package/dist/types/src/research/graph.test.d.ts.map +1 -0
  55. package/dist/types/src/research/index.d.ts +4 -0
  56. package/dist/types/src/research/index.d.ts.map +1 -0
  57. package/dist/types/src/research/research.d.ts +10 -0
  58. package/dist/types/src/research/research.d.ts.map +1 -0
  59. package/dist/types/src/research/research.test.d.ts +2 -0
  60. package/dist/types/src/research/research.test.d.ts.map +1 -0
  61. package/dist/types/src/session/index.d.ts +1 -0
  62. package/dist/types/src/session/index.d.ts.map +1 -1
  63. package/dist/types/src/session/session.d.ts +80 -35
  64. package/dist/types/src/session/session.d.ts.map +1 -1
  65. package/dist/types/src/session/version-pin.d.ts +21 -0
  66. package/dist/types/src/session/version-pin.d.ts.map +1 -0
  67. package/dist/types/src/session/version-pin.test.d.ts +2 -0
  68. package/dist/types/src/session/version-pin.test.d.ts.map +1 -0
  69. package/dist/types/src/summarization/summarization.test.d.ts +2 -0
  70. package/dist/types/src/summarization/summarization.test.d.ts.map +1 -0
  71. package/dist/types/src/testing/exa-search-1748337321991.d.ts +38 -0
  72. package/dist/types/src/testing/exa-search-1748337321991.d.ts.map +1 -0
  73. package/dist/types/src/testing/exa-search-1748337331526.d.ts +37 -0
  74. package/dist/types/src/testing/exa-search-1748337331526.d.ts.map +1 -0
  75. package/dist/types/src/testing/exa-search-1748337344119.d.ts +58 -0
  76. package/dist/types/src/testing/exa-search-1748337344119.d.ts.map +1 -0
  77. package/dist/types/src/testing/index.d.ts +2 -6
  78. package/dist/types/src/testing/index.d.ts.map +1 -1
  79. package/dist/types/src/types.d.ts +3 -0
  80. package/dist/types/src/types.d.ts.map +1 -0
  81. package/dist/types/tsconfig.tsbuildinfo +1 -1
  82. package/package.json +25 -35
  83. package/src/blueprint/blueprint.test.ts +142 -0
  84. package/src/blueprint/blueprint.ts +95 -0
  85. package/src/blueprint/index.ts +7 -0
  86. package/src/blueprint/logger.ts +66 -0
  87. package/src/blueprint/machine.ts +208 -0
  88. package/src/blueprint/test-data.ts +55 -0
  89. package/src/extraction/extraction-llm-function/extraction-llm-function.test.ts +95 -0
  90. package/src/extraction/extraction-llm-function/extraction-llm-function.ts +64 -0
  91. package/src/extraction/extraction-llm-function/index.ts +5 -0
  92. package/src/extraction/extraction-llm-function/instructions.tpl +28 -0
  93. package/src/extraction/extraction-ner-function/extraction-ner-function.test.ts +115 -0
  94. package/src/extraction/extraction-ner-function/extraction-ner-function.ts +54 -0
  95. package/src/extraction/extraction-ner-function/index.ts +6 -0
  96. package/src/extraction/extraction-ner-function/named-entity-recognition.test.ts +94 -0
  97. package/src/extraction/extraction-ner-function/named-entity-recognition.ts +97 -0
  98. package/src/extraction/extraction.ts +75 -0
  99. package/src/extraction/index.ts +8 -0
  100. package/src/extraction/quotes.test.ts +27 -0
  101. package/src/extraction/quotes.ts +57 -0
  102. package/src/index.ts +4 -3
  103. package/src/research/exa.ts +100 -0
  104. package/src/research/graph.test.ts +15 -0
  105. package/src/research/graph.ts +291 -0
  106. package/src/research/index.ts +7 -0
  107. package/src/research/instructions-research.tpl +97 -0
  108. package/src/research/research.test.ts +189 -0
  109. package/src/research/research.ts +89 -0
  110. package/src/session/index.ts +1 -0
  111. package/src/session/session.test.ts +39 -67
  112. package/src/session/session.ts +328 -155
  113. package/src/session/version-pin.test.ts +26 -0
  114. package/src/session/version-pin.ts +48 -0
  115. package/src/summarization/summarization.test.ts +216 -0
  116. package/src/testing/exa-search-1748337321991.ts +131 -0
  117. package/src/testing/exa-search-1748337331526.ts +144 -0
  118. package/src/testing/exa-search-1748337344119.ts +133 -0
  119. package/src/testing/index.ts +8 -7
  120. package/src/typedefs.d.ts +8 -0
  121. package/src/types.ts +8 -0
  122. package/src/typings.d.ts +8 -0
  123. package/dist/lib/browser/chunk-PND5VR6D.mjs +0 -2315
  124. package/dist/lib/browser/chunk-PND5VR6D.mjs.map +0 -7
  125. package/dist/lib/browser/testing/index.mjs +0 -621
  126. package/dist/lib/browser/testing/index.mjs.map +0 -7
  127. package/dist/lib/node/chunk-IBOBRBDF.cjs +0 -2326
  128. package/dist/lib/node/chunk-IBOBRBDF.cjs.map +0 -7
  129. package/dist/lib/node/testing/index.cjs +0 -637
  130. package/dist/lib/node/testing/index.cjs.map +0 -7
  131. package/dist/lib/node-esm/chunk-DCQJOLSR.mjs +0 -2317
  132. package/dist/lib/node-esm/chunk-DCQJOLSR.mjs.map +0 -7
  133. package/dist/lib/node-esm/testing/index.mjs +0 -622
  134. package/dist/lib/node-esm/testing/index.mjs.map +0 -7
  135. package/dist/types/src/ai-service/client.test.d.ts +0 -2
  136. package/dist/types/src/ai-service/client.test.d.ts.map +0 -1
  137. package/dist/types/src/ai-service/defs.d.ts +0 -9
  138. package/dist/types/src/ai-service/defs.d.ts.map +0 -1
  139. package/dist/types/src/ai-service/edge-client.d.ts +0 -19
  140. package/dist/types/src/ai-service/edge-client.d.ts.map +0 -1
  141. package/dist/types/src/ai-service/index.d.ts +0 -10
  142. package/dist/types/src/ai-service/index.d.ts.map +0 -1
  143. package/dist/types/src/ai-service/message-collector.d.ts +0 -88
  144. package/dist/types/src/ai-service/message-collector.d.ts.map +0 -1
  145. package/dist/types/src/ai-service/ollama-client.d.ts +0 -39
  146. package/dist/types/src/ai-service/ollama-client.d.ts.map +0 -1
  147. package/dist/types/src/ai-service/parser.d.ts +0 -138
  148. package/dist/types/src/ai-service/parser.d.ts.map +0 -1
  149. package/dist/types/src/ai-service/service.d.ts +0 -9
  150. package/dist/types/src/ai-service/service.d.ts.map +0 -1
  151. package/dist/types/src/ai-service/stream.d.ts +0 -40
  152. package/dist/types/src/ai-service/stream.d.ts.map +0 -1
  153. package/dist/types/src/ai-service/stream.test.d.ts +0 -2
  154. package/dist/types/src/ai-service/stream.test.d.ts.map +0 -1
  155. package/dist/types/src/ai-service/testing/index.d.ts +0 -3
  156. package/dist/types/src/ai-service/testing/index.d.ts.map +0 -1
  157. package/dist/types/src/ai-service/testing/mock.d.ts +0 -7
  158. package/dist/types/src/ai-service/testing/mock.d.ts.map +0 -1
  159. package/dist/types/src/ai-service/testing/test-stream.d.ts +0 -7
  160. package/dist/types/src/ai-service/testing/test-stream.d.ts.map +0 -1
  161. package/dist/types/src/ai-service/transform.d.ts +0 -27
  162. package/dist/types/src/ai-service/transform.d.ts.map +0 -1
  163. package/dist/types/src/ai-service/types.d.ts +0 -167
  164. package/dist/types/src/ai-service/types.d.ts.map +0 -1
  165. package/dist/types/src/ai-service/util/index.d.ts +0 -2
  166. package/dist/types/src/ai-service/util/index.d.ts.map +0 -1
  167. package/dist/types/src/ai-service/util/sse.d.ts +0 -39
  168. package/dist/types/src/ai-service/util/sse.d.ts.map +0 -1
  169. package/dist/types/src/conversation/conversation.d.ts +0 -80
  170. package/dist/types/src/conversation/conversation.d.ts.map +0 -1
  171. package/dist/types/src/conversation/conversation.test.d.ts +0 -2
  172. package/dist/types/src/conversation/conversation.test.d.ts.map +0 -1
  173. package/dist/types/src/conversation/index.d.ts +0 -2
  174. package/dist/types/src/conversation/index.d.ts.map +0 -1
  175. package/dist/types/src/conversation/types.d.ts +0 -79
  176. package/dist/types/src/conversation/types.d.ts.map +0 -1
  177. package/dist/types/src/cypher/ast.d.ts +0 -56
  178. package/dist/types/src/cypher/ast.d.ts.map +0 -1
  179. package/dist/types/src/cypher/combinators.d.ts +0 -14
  180. package/dist/types/src/cypher/combinators.d.ts.map +0 -1
  181. package/dist/types/src/cypher/combinators.test.d.ts +0 -2
  182. package/dist/types/src/cypher/combinators.test.d.ts.map +0 -1
  183. package/dist/types/src/cypher/echo-data-source.d.ts +0 -16
  184. package/dist/types/src/cypher/echo-data-source.d.ts.map +0 -1
  185. package/dist/types/src/cypher/execution-plan.d.ts +0 -49
  186. package/dist/types/src/cypher/execution-plan.d.ts.map +0 -1
  187. package/dist/types/src/cypher/execution-plan.test.d.ts +0 -2
  188. package/dist/types/src/cypher/execution-plan.test.d.ts.map +0 -1
  189. package/dist/types/src/cypher/index.d.ts +0 -5
  190. package/dist/types/src/cypher/index.d.ts.map +0 -1
  191. package/dist/types/src/cypher/parjs.d.ts +0 -4
  192. package/dist/types/src/cypher/parjs.d.ts.map +0 -1
  193. package/dist/types/src/cypher/parser.d.ts +0 -6
  194. package/dist/types/src/cypher/parser.d.ts.map +0 -1
  195. package/dist/types/src/cypher/query-executor.d.ts +0 -26
  196. package/dist/types/src/cypher/query-executor.d.ts.map +0 -1
  197. package/dist/types/src/cypher/query-executor.test.d.ts +0 -2
  198. package/dist/types/src/cypher/query-executor.test.d.ts.map +0 -1
  199. package/dist/types/src/cypher/schema.d.ts +0 -12
  200. package/dist/types/src/cypher/schema.d.ts.map +0 -1
  201. package/dist/types/src/cypher/schema.test.d.ts +0 -2
  202. package/dist/types/src/cypher/schema.test.d.ts.map +0 -1
  203. package/dist/types/src/testing/artifacts.test.d.ts +0 -1
  204. package/dist/types/src/testing/artifacts.test.d.ts.map +0 -1
  205. package/dist/types/src/testing/data.d.ts +0 -2
  206. package/dist/types/src/testing/data.d.ts.map +0 -1
  207. package/dist/types/src/testing/defs.d.ts +0 -5
  208. package/dist/types/src/testing/defs.d.ts.map +0 -1
  209. package/dist/types/src/testing/logger.d.ts +0 -12
  210. package/dist/types/src/testing/logger.d.ts.map +0 -1
  211. package/dist/types/src/testing/object-extraction.test.d.ts +0 -1
  212. package/dist/types/src/testing/object-extraction.test.d.ts.map +0 -1
  213. package/dist/types/src/testing/ollama.d.ts +0 -6
  214. package/dist/types/src/testing/ollama.d.ts.map +0 -1
  215. package/dist/types/src/testing/query-promts.d.ts +0 -5
  216. package/dist/types/src/testing/query-promts.d.ts.map +0 -1
  217. package/dist/types/src/testing/query.test.d.ts +0 -2
  218. package/dist/types/src/testing/query.test.d.ts.map +0 -1
  219. package/dist/types/src/testing/test-data.d.ts +0 -29
  220. package/dist/types/src/testing/test-data.d.ts.map +0 -1
  221. package/dist/types/src/testing/test-schema.d.ts +0 -50
  222. package/dist/types/src/testing/test-schema.d.ts.map +0 -1
  223. package/dist/types/src/util/index.d.ts +0 -2
  224. package/dist/types/src/util/index.d.ts.map +0 -1
  225. package/dist/types/src/util/trim.d.ts +0 -5
  226. package/dist/types/src/util/trim.d.ts.map +0 -1
  227. package/src/ai-service/client.test.ts +0 -265
  228. package/src/ai-service/defs.ts +0 -39
  229. package/src/ai-service/edge-client.ts +0 -67
  230. package/src/ai-service/index.ts +0 -13
  231. package/src/ai-service/message-collector.ts +0 -84
  232. package/src/ai-service/ollama-client.ts +0 -499
  233. package/src/ai-service/parser.ts +0 -358
  234. package/src/ai-service/service.ts +0 -15
  235. package/src/ai-service/stream.test.ts +0 -125
  236. package/src/ai-service/stream.ts +0 -118
  237. package/src/ai-service/testing/index.ts +0 -6
  238. package/src/ai-service/testing/mock.ts +0 -22
  239. package/src/ai-service/testing/test-stream.ts +0 -93
  240. package/src/ai-service/transform.ts +0 -121
  241. package/src/ai-service/types.ts +0 -103
  242. package/src/ai-service/util/index.ts +0 -5
  243. package/src/ai-service/util/sse.ts +0 -341
  244. package/src/bin/chat.ts +0 -79
  245. package/src/conversation/conversation.test.ts +0 -73
  246. package/src/conversation/conversation.ts +0 -257
  247. package/src/conversation/index.ts +0 -5
  248. package/src/conversation/types.ts +0 -129
  249. package/src/cypher/ast.ts +0 -75
  250. package/src/cypher/combinators.test.ts +0 -137
  251. package/src/cypher/combinators.ts +0 -148
  252. package/src/cypher/echo-data-source.ts +0 -105
  253. package/src/cypher/execution-plan.test.ts +0 -44
  254. package/src/cypher/execution-plan.ts +0 -208
  255. package/src/cypher/index.ts +0 -8
  256. package/src/cypher/parjs-shims.d.ts +0 -10
  257. package/src/cypher/parjs.ts +0 -10
  258. package/src/cypher/parser.ts +0 -19
  259. package/src/cypher/query-executor.test.ts +0 -47
  260. package/src/cypher/query-executor.ts +0 -145
  261. package/src/cypher/schema.test.ts +0 -17
  262. package/src/cypher/schema.ts +0 -86
  263. package/src/testing/artifacts.test.ts +0 -182
  264. package/src/testing/data.ts +0 -13
  265. package/src/testing/defs.ts +0 -9
  266. package/src/testing/logger.ts +0 -129
  267. package/src/testing/object-extraction.test.ts +0 -71
  268. package/src/testing/ollama.ts +0 -15
  269. package/src/testing/query-promts.ts +0 -75
  270. package/src/testing/query.test.ts +0 -91
  271. package/src/testing/test-data.ts +0 -372
  272. package/src/testing/test-schema.ts +0 -80
  273. package/src/util/index.ts +0 -5
  274. package/src/util/trim.ts +0 -15
  275. package/vendor/parjs-browser.mjs +0 -4
  276. package/vendor/parjs-default.mjs +0 -8
  277. /package/dist/types/{src/bin → bin}/chat.d.ts +0 -0
@@ -1,84 +0,0 @@
1
- //
2
- // Copyright 2025 DXOS.org
3
- //
4
-
5
- import type { Message } from '@dxos/artifact';
6
-
7
- import type { GenerationStreamEvent } from './types';
8
-
9
- export class MessageCollector {
10
- private _messages: Message[] = [];
11
- private _pendingMessage?: Message = undefined;
12
-
13
- public get messages() {
14
- return this._messages;
15
- }
16
-
17
- public get pendingMessage() {
18
- return this._pendingMessage;
19
- }
20
-
21
- push(event: GenerationStreamEvent) {
22
- switch (event.type) {
23
- case 'message_start':
24
- this._pendingMessage = event.message;
25
- break;
26
-
27
- case 'message_stop':
28
- if (this._pendingMessage) {
29
- this._messages.push(this._pendingMessage);
30
- this._pendingMessage = undefined;
31
- }
32
- break;
33
-
34
- case 'content_block_start':
35
- if (this._pendingMessage) {
36
- // Ensure the content array exists
37
- this._pendingMessage.content = this._pendingMessage.content || [];
38
- // Add the new content block at the specified index
39
- this._pendingMessage.content[event.index] = event.content;
40
- }
41
- break;
42
-
43
- case 'content_block_delta':
44
- if (this._pendingMessage && this._pendingMessage.content) {
45
- const block = this._pendingMessage.content[event.index];
46
- if (block && event.delta.type === 'text_delta' && block.type === 'text') {
47
- block.text = (block.text || '') + event.delta.text;
48
- }
49
- }
50
- break;
51
-
52
- case 'content_block_stop':
53
- // Mark the block as no longer pending if needed
54
- if (this._pendingMessage && this._pendingMessage.content) {
55
- const block = this._pendingMessage.content[event.index];
56
- if (block) {
57
- block.pending = false;
58
- }
59
- }
60
- break;
61
-
62
- case 'message_delta':
63
- // Apply any delta updates to the message
64
- if (this._pendingMessage && event.delta) {
65
- Object.assign(this._pendingMessage, event.delta);
66
- }
67
- break;
68
- }
69
- }
70
-
71
- pushMessage(message: Message) {
72
- this._messages.push(message);
73
- }
74
- }
75
-
76
- export function* emitMessageAsEvents(message: Message): Iterable<GenerationStreamEvent> {
77
- yield {
78
- type: 'message_start',
79
- message,
80
- };
81
- yield {
82
- type: 'message_stop',
83
- };
84
- }
@@ -1,499 +0,0 @@
1
- //
2
- // Copyright 2025 DXOS.org
3
- //
4
-
5
- import { Schema as S } from 'effect';
6
-
7
- import { type MessageContentBlock, defineTool, type Tool, ToolResult } from '@dxos/artifact';
8
- import { ObjectId } from '@dxos/echo-schema';
9
- import { invariant } from '@dxos/invariant';
10
- import { log } from '@dxos/log';
11
-
12
- import { DEFAULT_OLLAMA_ENDPOINT } from './defs';
13
- import { MessageCollector, emitMessageAsEvents } from './message-collector';
14
- import { type AIServiceClient, type GenerationStream } from './service';
15
- import { GenerationStreamImpl } from './stream';
16
- import { ToolTypes, type GenerateRequest, type GenerationStreamEvent } from './types';
17
- import { isToolUse, runTools } from '../conversation';
18
-
19
- export type OllamaClientParams = {
20
- endpoint?: string;
21
-
22
- /**
23
- * Tools that are executed within the client.
24
- */
25
- tools?: Tool[];
26
-
27
- /**
28
- * Override generation parameters.
29
- */
30
- // TODO(burdon): Why not just options?
31
- overrides?: {
32
- model?: string;
33
- temperature?: number;
34
- };
35
-
36
- /**
37
- * Maximum number of tool invocations in a single request that is allowed to run.
38
- * @default 3
39
- */
40
- maxToolInvocations?: number;
41
- };
42
-
43
- export class OllamaClient implements AIServiceClient {
44
- /**
45
- * Check if Ollama server is running and accessible.
46
- * @returns Promise that resolves to true if Ollama is running, false otherwise.
47
- */
48
- static async isRunning(): Promise<boolean> {
49
- try {
50
- const response = await fetch(`${DEFAULT_OLLAMA_ENDPOINT}/api/version`, {
51
- method: 'GET',
52
- headers: {
53
- 'Content-Type': 'application/json',
54
- },
55
- signal: AbortSignal.timeout(100),
56
- });
57
-
58
- return response.ok;
59
- } catch (error) {
60
- return false;
61
- }
62
- }
63
-
64
- private readonly _endpoint: string;
65
- private readonly _tools: Tool[];
66
- private readonly _modelOverride?: string;
67
- private readonly _temperatureOverride?: number;
68
- private readonly _maxToolInvocations: number;
69
-
70
- constructor({ endpoint, tools, overrides, maxToolInvocations }: OllamaClientParams = {}) {
71
- this._endpoint = endpoint ?? DEFAULT_OLLAMA_ENDPOINT;
72
- this._tools = tools ?? [];
73
- this._modelOverride = overrides?.model;
74
- this._temperatureOverride = overrides?.temperature;
75
- this._maxToolInvocations = maxToolInvocations ?? 3;
76
- }
77
-
78
- private _getEmbededTools(clientTools: Tool[]) {
79
- return [
80
- ...this._tools,
81
- ...clientTools
82
- .filter((tool) => tool.type !== undefined && WELL_KNOWN_TOOLS[tool.type])
83
- .map((tool) => WELL_KNOWN_TOOLS[tool.type!]),
84
- ];
85
- }
86
-
87
- private async *_generateStream(request: GenerateRequest, signal?: AbortSignal): AsyncIterable<GenerationStreamEvent> {
88
- invariant(request.prompt === undefined, 'Prompt must be in history');
89
-
90
- // Map DXOS request to Ollama API format.
91
- const ollamaRequest: OllamaRequest = {
92
- model: this._modelOverride ?? request.model ?? 'llama3',
93
- messages: [],
94
- stream: true,
95
- options: {
96
- temperature: this._temperatureOverride,
97
- },
98
- };
99
-
100
- // Add system message if provided.
101
- if (request.systemPrompt) {
102
- ollamaRequest.messages.push({
103
- role: 'system',
104
- content: request.systemPrompt,
105
- });
106
- }
107
-
108
- // Add history if provided.
109
- if (request.history?.length) {
110
- for (const message of request.history) {
111
- const role = message.role === 'assistant' ? 'assistant' : 'user';
112
-
113
- // Process message content.
114
- if (message.content.length === 0) {
115
- // Skip empty messages
116
- continue;
117
- }
118
-
119
- for (const content of message.content) {
120
- switch (content.type) {
121
- case 'text': {
122
- ollamaRequest.messages.push({
123
- role,
124
- content: content.text,
125
- });
126
- break;
127
- }
128
- case 'tool_use': {
129
- ollamaRequest.messages.push({
130
- role: 'assistant',
131
- content: '',
132
- tool_calls: [
133
- {
134
- function: {
135
- name: content.name,
136
- arguments: content.input as any,
137
- },
138
- },
139
- ],
140
- });
141
- break;
142
- }
143
- case 'tool_result': {
144
- ollamaRequest.messages.push({
145
- role: 'tool',
146
- content: JSON.stringify({
147
- type: 'tool_result',
148
- toolUseId: content.toolUseId,
149
- content: content.content,
150
- }),
151
- });
152
- break;
153
- }
154
- }
155
- }
156
- }
157
- }
158
-
159
- // Add tools if provided.
160
- if (request.tools?.length || this._tools.length) {
161
- const allTools = [...(request.tools ?? []), ...this._tools];
162
- const withWellKnownTools = allTools.map((tool) =>
163
- tool.type !== undefined && WELL_KNOWN_TOOLS[tool.type] ? WELL_KNOWN_TOOLS[tool.type] : tool,
164
- );
165
-
166
- if (withWellKnownTools.length > 0) {
167
- ollamaRequest.tools = withWellKnownTools.map((tool) => ({
168
- type: 'function',
169
- function: {
170
- name: tool.name,
171
- description: tool.description,
172
- parameters: {
173
- type: 'object',
174
- properties: tool.parameters?.properties,
175
- required: tool.parameters?.required,
176
- },
177
- },
178
- }));
179
- }
180
- }
181
-
182
- log('generate request', { history: request.history, prompt: request.prompt, ollamaRequest });
183
-
184
- const response = await fetch(`${this._endpoint}/api/chat`, {
185
- method: 'POST',
186
- headers: {
187
- 'Content-Type': 'application/json',
188
- },
189
- body: JSON.stringify(ollamaRequest),
190
- signal,
191
- });
192
-
193
- // TODO(burdon): Test if model is not found.
194
- if (!response.ok) {
195
- throw await parseErrorResponse(response);
196
- }
197
-
198
- if (!response.body) {
199
- throw new Error('Ollama API returned no response body');
200
- }
201
-
202
- // Create the stream
203
- const reader = response
204
- .body!.pipeThrough(new TextDecoderStream())
205
- .pipeThrough(new OllamaDecoderStream())
206
- .getReader();
207
-
208
- try {
209
- // Create a message ID.
210
- const messageId = ObjectId.random();
211
-
212
- // Send message_start event with proper message structure.
213
- yield {
214
- type: 'message_start',
215
- message: {
216
- id: messageId,
217
- role: 'assistant',
218
- content: [],
219
- },
220
- } as GenerationStreamEvent;
221
-
222
- // Initialize text content block.
223
- const textBlock: MessageContentBlock = {
224
- type: 'text',
225
- text: '',
226
- };
227
-
228
- let currentBlockIndex = 0;
229
-
230
- // Send content_block_start event.
231
- yield {
232
- type: 'content_block_start',
233
- index: currentBlockIndex,
234
- content: textBlock,
235
- } as GenerationStreamEvent;
236
-
237
- while (true) {
238
- const { done, value: data } = await reader.read();
239
-
240
- if (done) {
241
- break;
242
- }
243
-
244
- log('ollama data', { data });
245
-
246
- // Ollama sends chunks of text, we convert them to our event format.
247
- if (data.message?.content) {
248
- yield {
249
- type: 'content_block_delta',
250
- index: 0,
251
- delta: {
252
- type: 'text_delta',
253
- text: data.message.content,
254
- },
255
- } as GenerationStreamEvent;
256
- }
257
-
258
- // If tool usage is detected.
259
- if (data.message?.tool_calls && data.message?.tool_calls?.length > 0) {
260
- if (data.message.tool_calls.length > 1) {
261
- log.warn('Ollama returned multiple tool calls. Only the first one will be used.');
262
- }
263
-
264
- yield {
265
- type: 'content_block_stop',
266
- index: currentBlockIndex++,
267
- } as GenerationStreamEvent;
268
-
269
- yield {
270
- type: 'content_block_start',
271
- index: currentBlockIndex,
272
- content: {
273
- type: 'tool_use',
274
- id: ObjectId.random(),
275
- name: data.message.tool_calls[0].function.name,
276
- input: sanitizeToolArguments(data.message.tool_calls[0].function.arguments),
277
- },
278
- } as GenerationStreamEvent;
279
-
280
- yield {
281
- type: 'message_delta',
282
- delta: {
283
- stopReason: 'tool_use',
284
- },
285
- } as GenerationStreamEvent;
286
- }
287
- }
288
-
289
- // Send content_block_stop and message_stop events.
290
- yield {
291
- type: 'content_block_stop',
292
- index: currentBlockIndex,
293
- } as GenerationStreamEvent;
294
-
295
- yield {
296
- type: 'message_stop',
297
- } as GenerationStreamEvent;
298
- } finally {
299
- reader.releaseLock();
300
- }
301
- }
302
-
303
- async exec(request: GenerateRequest): Promise<GenerationStream> {
304
- const controller = new AbortController();
305
-
306
- try {
307
- return new GenerationStreamImpl(
308
- controller,
309
- async function* (this: OllamaClient) {
310
- const collector = new MessageCollector();
311
-
312
- // Loop while running tools.
313
- let toolInvocations = 0;
314
- while (true) {
315
- for await (const event of this._generateStream(
316
- {
317
- ...request,
318
- history: [
319
- ...(request.history ?? []),
320
- ...(request.prompt ? [request.prompt] : []),
321
- ...collector.messages,
322
- ],
323
- prompt: undefined,
324
- },
325
- controller.signal,
326
- )) {
327
- collector.push(event);
328
- yield event;
329
- }
330
-
331
- if (
332
- collector.messages.length > 0 &&
333
- !isToolUse(collector.messages.at(-1)!, {
334
- onlyToolNames: this._getEmbededTools(request.tools ?? []).map((tool) => tool.name),
335
- })
336
- ) {
337
- break;
338
- }
339
-
340
- if (++toolInvocations > this._maxToolInvocations) {
341
- throw new Error('Maximum number of tool invocations reached');
342
- }
343
-
344
- const result = await runTools({
345
- message: collector.messages.at(-1)!,
346
- tools: this._getEmbededTools(request.tools ?? []),
347
- });
348
-
349
- switch (result.type) {
350
- case 'continue': {
351
- collector.pushMessage(result.message);
352
- yield* emitMessageAsEvents(result.message);
353
- break;
354
- }
355
- case 'break': {
356
- throw new Error('Tool use breaks not allowed');
357
- }
358
- }
359
- }
360
- }.bind(this),
361
- );
362
- } catch (error) {
363
- controller.abort();
364
- throw error;
365
- }
366
- }
367
- }
368
-
369
- const sanitizeToolArguments = (args: any) => {
370
- // TODO(dmaretskyi): Workaround for model bug.
371
- if (args.type === 'object' && typeof args.properties === 'object' && Array.isArray(args.required)) {
372
- return args.properties;
373
- }
374
-
375
- return args;
376
- };
377
-
378
- const SAMPLE_IMAGE_URL = 'https://images.nightcafe.studio/jobs/BNmcRhHCM1JRKoUtqSei/BNmcRhHCM1JRKoUtqSei--1--5b9rv.jpg';
379
-
380
- const WELL_KNOWN_TOOLS: Record<string, Tool> = {
381
- [ToolTypes.TextToImage]: defineTool('system', {
382
- name: 'text-to-image',
383
- description: 'Generate an image from a text prompt',
384
- schema: S.Struct({
385
- prompt: S.String.annotations({ description: 'The text prompt describing the image to generate' }),
386
- }),
387
- execute: async ({ prompt }) => {
388
- const image = await fetch(SAMPLE_IMAGE_URL).then(async (res) => Buffer.from(await res.arrayBuffer()));
389
-
390
- const imageBase64 = image.toString('base64');
391
- const id = ObjectId.random();
392
-
393
- return ToolResult.Success(`The generation was successful. Image ID: ${id} Prompt: ${prompt}`, [
394
- {
395
- type: 'image',
396
- id,
397
- source: {
398
- type: 'base64',
399
- mediaType: 'image/jpeg',
400
- data: imageBase64,
401
- },
402
- },
403
- ]);
404
- },
405
- }),
406
- };
407
-
408
- type OllamaMessage = {
409
- role: 'system' | 'user' | 'assistant' | 'tool';
410
- content: string;
411
- tool_calls?: Array<{
412
- function: {
413
- name: string;
414
- arguments: string;
415
- };
416
- }>;
417
- };
418
-
419
- type OllamaRequest = {
420
- model: string;
421
- messages: Array<OllamaMessage>;
422
- stream: boolean;
423
- options?: {
424
- temperature?: number;
425
- };
426
- tools?: Array<{
427
- type: 'function';
428
- function: {
429
- name: string;
430
- description?: string;
431
- parameters?: any;
432
- };
433
- }>;
434
- };
435
-
436
- type OllamaResponseData = {
437
- message?: OllamaMessage;
438
- };
439
-
440
- class OllamaDecoderStream extends TransformStream<string, OllamaResponseData> {
441
- private _buffer = '';
442
-
443
- constructor() {
444
- super({
445
- transform: (chunk, controller) => {
446
- this._buffer += chunk;
447
- const lines = this._buffer.split('\n');
448
- this._buffer = lines.pop() || '';
449
- for (const line of lines) {
450
- controller.enqueue(JSON.parse(line.trim()));
451
- }
452
- },
453
- flush: (controller) => {
454
- this._buffer = this._buffer.trim();
455
- if (this._buffer.length > 0) {
456
- controller.enqueue(JSON.parse(this._buffer));
457
- }
458
- },
459
- });
460
- }
461
- }
462
-
463
- class ModelDoesNotSupportToolsError extends S.TaggedError<ModelDoesNotSupportToolsError>()(
464
- 'ModelDoesNotSupportToolsError',
465
- {
466
- model: S.String,
467
- },
468
- ) {}
469
-
470
- class ModelNotFoundError extends S.TaggedError<ModelNotFoundError>()('ModelNotFoundError', {
471
- model: S.String,
472
- }) {}
473
-
474
- const parseOllamaError = (error: string): Error => {
475
- {
476
- const match = error.match(/^([^']+) does not support tools$/);
477
- if (match) {
478
- return new ModelDoesNotSupportToolsError({ model: match[1] });
479
- }
480
- }
481
-
482
- {
483
- const match = error.match(/^model "([^"]+)" not found, try pulling it first$/);
484
- if (match) {
485
- return new ModelNotFoundError({ model: match[1] });
486
- }
487
- }
488
-
489
- throw new Error(`Ollama API error: ${error}`);
490
- };
491
-
492
- const parseErrorResponse = async (response: Response): Promise<Error> => {
493
- if (response.headers.get('content-type')?.includes('application/json')) {
494
- const body = await response.json();
495
- return parseOllamaError(body.error);
496
- }
497
-
498
- throw new Error(`Ollama API error: ${response.status} ${response.statusText} ${await response.text()}`);
499
- };