gencode-ai 0.1.3 → 0.2.0
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.
- package/README.md +2 -1
- package/dist/agent/agent.d.ts +35 -0
- package/dist/agent/agent.d.ts.map +1 -1
- package/dist/agent/agent.js +93 -3
- package/dist/agent/agent.js.map +1 -1
- package/dist/agent/types.d.ts +6 -0
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/checkpointing/checkpoint-manager.d.ts +87 -0
- package/dist/checkpointing/checkpoint-manager.d.ts.map +1 -0
- package/dist/checkpointing/checkpoint-manager.js +281 -0
- package/dist/checkpointing/checkpoint-manager.js.map +1 -0
- package/dist/checkpointing/index.d.ts +29 -0
- package/dist/checkpointing/index.d.ts.map +1 -0
- package/dist/checkpointing/index.js +29 -0
- package/dist/checkpointing/index.js.map +1 -0
- package/dist/checkpointing/types.d.ts +98 -0
- package/dist/checkpointing/types.d.ts.map +1 -0
- package/dist/checkpointing/types.js +7 -0
- package/dist/checkpointing/types.js.map +1 -0
- package/dist/cli/components/App.d.ts.map +1 -1
- package/dist/cli/components/App.js +157 -6
- package/dist/cli/components/App.js.map +1 -1
- package/dist/cli/components/CommandSuggestions.d.ts.map +1 -1
- package/dist/cli/components/CommandSuggestions.js +5 -0
- package/dist/cli/components/CommandSuggestions.js.map +1 -1
- package/dist/cli/components/Messages.d.ts +7 -1
- package/dist/cli/components/Messages.d.ts.map +1 -1
- package/dist/cli/components/Messages.js +11 -2
- package/dist/cli/components/Messages.js.map +1 -1
- package/dist/cli/components/ModeIndicator.d.ts +42 -0
- package/dist/cli/components/ModeIndicator.d.ts.map +1 -0
- package/dist/cli/components/ModeIndicator.js +52 -0
- package/dist/cli/components/ModeIndicator.js.map +1 -0
- package/dist/cli/components/PlanApproval.d.ts +36 -0
- package/dist/cli/components/PlanApproval.d.ts.map +1 -0
- package/dist/cli/components/PlanApproval.js +154 -0
- package/dist/cli/components/PlanApproval.js.map +1 -0
- package/dist/cli/components/theme.d.ts +2 -0
- package/dist/cli/components/theme.d.ts.map +1 -1
- package/dist/cli/components/theme.js +3 -0
- package/dist/cli/components/theme.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/planning/index.d.ts +13 -0
- package/dist/planning/index.d.ts.map +1 -0
- package/dist/planning/index.js +15 -0
- package/dist/planning/index.js.map +1 -0
- package/dist/planning/plan-file.d.ts +59 -0
- package/dist/planning/plan-file.d.ts.map +1 -0
- package/dist/planning/plan-file.js +278 -0
- package/dist/planning/plan-file.js.map +1 -0
- package/dist/planning/state.d.ts +127 -0
- package/dist/planning/state.d.ts.map +1 -0
- package/dist/planning/state.js +261 -0
- package/dist/planning/state.js.map +1 -0
- package/dist/planning/tools/enter-plan-mode.d.ts +25 -0
- package/dist/planning/tools/enter-plan-mode.d.ts.map +1 -0
- package/dist/planning/tools/enter-plan-mode.js +98 -0
- package/dist/planning/tools/enter-plan-mode.js.map +1 -0
- package/dist/planning/tools/exit-plan-mode.d.ts +24 -0
- package/dist/planning/tools/exit-plan-mode.d.ts.map +1 -0
- package/dist/planning/tools/exit-plan-mode.js +149 -0
- package/dist/planning/tools/exit-plan-mode.js.map +1 -0
- package/dist/planning/types.d.ts +100 -0
- package/dist/planning/types.d.ts.map +1 -0
- package/dist/planning/types.js +28 -0
- package/dist/planning/types.js.map +1 -0
- package/dist/pricing/calculator.d.ts +21 -0
- package/dist/pricing/calculator.d.ts.map +1 -0
- package/dist/pricing/calculator.js +59 -0
- package/dist/pricing/calculator.js.map +1 -0
- package/dist/pricing/index.d.ts +7 -0
- package/dist/pricing/index.d.ts.map +1 -0
- package/dist/pricing/index.js +7 -0
- package/dist/pricing/index.js.map +1 -0
- package/dist/pricing/models.d.ts +20 -0
- package/dist/pricing/models.d.ts.map +1 -0
- package/dist/pricing/models.js +322 -0
- package/dist/pricing/models.js.map +1 -0
- package/dist/pricing/types.d.ts +30 -0
- package/dist/pricing/types.d.ts.map +1 -0
- package/dist/pricing/types.js +5 -0
- package/dist/pricing/types.js.map +1 -0
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +17 -10
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +21 -14
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +12 -8
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/types.d.ts +2 -0
- package/dist/providers/types.d.ts.map +1 -1
- package/dist/providers/vertex-ai.d.ts.map +1 -1
- package/dist/providers/vertex-ai.js +17 -10
- package/dist/providers/vertex-ai.js.map +1 -1
- package/dist/session/manager.d.ts +4 -0
- package/dist/session/manager.d.ts.map +1 -1
- package/dist/session/manager.js +8 -0
- package/dist/session/manager.js.map +1 -1
- package/dist/tools/index.d.ts +7 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +7 -0
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/registry.d.ts +13 -0
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +79 -2
- package/dist/tools/registry.js.map +1 -1
- package/docs/cost-tracking-comparison.md +904 -0
- package/docs/operating-modes.md +96 -0
- package/docs/proposals/0025-cost-tracking.md +60 -2
- package/docs/proposals/README.md +1 -1
- package/examples/test-checkpointing.ts +121 -0
- package/examples/test-cost-tracking.ts +77 -0
- package/examples/test-interrupt-cleanup.ts +94 -0
- package/package.json +1 -1
- package/src/agent/agent.ts +110 -3
- package/src/agent/types.ts +6 -0
- package/src/checkpointing/checkpoint-manager.ts +327 -0
- package/src/checkpointing/index.ts +45 -0
- package/src/checkpointing/types.ts +104 -0
- package/src/cli/components/App.tsx +204 -5
- package/src/cli/components/CommandSuggestions.tsx +5 -0
- package/src/cli/components/Messages.tsx +23 -4
- package/src/cli/components/ModeIndicator.tsx +174 -0
- package/src/cli/components/PlanApproval.tsx +327 -0
- package/src/cli/components/theme.ts +3 -0
- package/src/index.ts +15 -0
- package/src/planning/index.ts +53 -0
- package/src/planning/plan-file.ts +326 -0
- package/src/planning/state.ts +305 -0
- package/src/planning/tools/enter-plan-mode.ts +111 -0
- package/src/planning/tools/exit-plan-mode.ts +170 -0
- package/src/planning/types.ts +150 -0
- package/src/pricing/calculator.ts +71 -0
- package/src/pricing/index.ts +7 -0
- package/src/pricing/models.ts +334 -0
- package/src/pricing/types.ts +32 -0
- package/src/providers/anthropic.ts +21 -10
- package/src/providers/gemini.ts +25 -14
- package/src/providers/openai.ts +17 -8
- package/src/providers/types.ts +3 -0
- package/src/providers/vertex-ai.ts +21 -10
- package/src/session/manager.ts +9 -0
- package/src/tools/index.ts +8 -0
- package/src/tools/registry.ts +95 -2
- package/.gencode/settings.local.json +0 -7
- package/CLAUDE.md +0 -86
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Model pricing database
|
|
3
|
+
* Prices are per 1M tokens in USD
|
|
4
|
+
* Updated: January 2025
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Pricing data for all supported models
|
|
8
|
+
* Source: Official provider pricing pages as of January 2025
|
|
9
|
+
*/
|
|
10
|
+
export const MODEL_PRICING = [
|
|
11
|
+
// Anthropic Claude Models
|
|
12
|
+
{
|
|
13
|
+
provider: 'anthropic',
|
|
14
|
+
model: 'claude-opus-4-5',
|
|
15
|
+
inputPer1M: 15.0,
|
|
16
|
+
outputPer1M: 75.0,
|
|
17
|
+
effectiveDate: '2025-01-01',
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
provider: 'anthropic',
|
|
21
|
+
model: 'claude-opus-4',
|
|
22
|
+
inputPer1M: 15.0,
|
|
23
|
+
outputPer1M: 75.0,
|
|
24
|
+
effectiveDate: '2024-11-01',
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
provider: 'anthropic',
|
|
28
|
+
model: 'claude-sonnet-4-5',
|
|
29
|
+
inputPer1M: 3.0,
|
|
30
|
+
outputPer1M: 15.0,
|
|
31
|
+
effectiveDate: '2025-01-01',
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
provider: 'anthropic',
|
|
35
|
+
model: 'claude-sonnet-4',
|
|
36
|
+
inputPer1M: 3.0,
|
|
37
|
+
outputPer1M: 15.0,
|
|
38
|
+
effectiveDate: '2024-10-22',
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
provider: 'anthropic',
|
|
42
|
+
model: 'claude-3-5-sonnet-20241022',
|
|
43
|
+
inputPer1M: 3.0,
|
|
44
|
+
outputPer1M: 15.0,
|
|
45
|
+
effectiveDate: '2024-10-22',
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
provider: 'anthropic',
|
|
49
|
+
model: 'claude-3-5-sonnet-20240620',
|
|
50
|
+
inputPer1M: 3.0,
|
|
51
|
+
outputPer1M: 15.0,
|
|
52
|
+
effectiveDate: '2024-06-20',
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
provider: 'anthropic',
|
|
56
|
+
model: 'claude-haiku-3-5',
|
|
57
|
+
inputPer1M: 0.8,
|
|
58
|
+
outputPer1M: 4.0,
|
|
59
|
+
effectiveDate: '2024-11-01',
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
provider: 'anthropic',
|
|
63
|
+
model: 'claude-3-5-haiku-20241022',
|
|
64
|
+
inputPer1M: 0.8,
|
|
65
|
+
outputPer1M: 4.0,
|
|
66
|
+
effectiveDate: '2024-10-22',
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
provider: 'anthropic',
|
|
70
|
+
model: 'claude-3-haiku-20240307',
|
|
71
|
+
inputPer1M: 0.25,
|
|
72
|
+
outputPer1M: 1.25,
|
|
73
|
+
effectiveDate: '2024-03-07',
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
provider: 'anthropic',
|
|
77
|
+
model: 'claude-3-opus-20240229',
|
|
78
|
+
inputPer1M: 15.0,
|
|
79
|
+
outputPer1M: 75.0,
|
|
80
|
+
effectiveDate: '2024-02-29',
|
|
81
|
+
},
|
|
82
|
+
// OpenAI Models
|
|
83
|
+
{
|
|
84
|
+
provider: 'openai',
|
|
85
|
+
model: 'gpt-4o',
|
|
86
|
+
inputPer1M: 2.5,
|
|
87
|
+
outputPer1M: 10.0,
|
|
88
|
+
effectiveDate: '2024-08-06',
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
provider: 'openai',
|
|
92
|
+
model: 'gpt-4o-2024-11-20',
|
|
93
|
+
inputPer1M: 2.5,
|
|
94
|
+
outputPer1M: 10.0,
|
|
95
|
+
effectiveDate: '2024-11-20',
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
provider: 'openai',
|
|
99
|
+
model: 'gpt-4o-2024-08-06',
|
|
100
|
+
inputPer1M: 2.5,
|
|
101
|
+
outputPer1M: 10.0,
|
|
102
|
+
effectiveDate: '2024-08-06',
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
provider: 'openai',
|
|
106
|
+
model: 'gpt-4o-2024-05-13',
|
|
107
|
+
inputPer1M: 5.0,
|
|
108
|
+
outputPer1M: 15.0,
|
|
109
|
+
effectiveDate: '2024-05-13',
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
provider: 'openai',
|
|
113
|
+
model: 'gpt-4o-mini',
|
|
114
|
+
inputPer1M: 0.15,
|
|
115
|
+
outputPer1M: 0.6,
|
|
116
|
+
effectiveDate: '2024-07-18',
|
|
117
|
+
},
|
|
118
|
+
{
|
|
119
|
+
provider: 'openai',
|
|
120
|
+
model: 'gpt-4o-mini-2024-07-18',
|
|
121
|
+
inputPer1M: 0.15,
|
|
122
|
+
outputPer1M: 0.6,
|
|
123
|
+
effectiveDate: '2024-07-18',
|
|
124
|
+
},
|
|
125
|
+
{
|
|
126
|
+
provider: 'openai',
|
|
127
|
+
model: 'gpt-4-turbo',
|
|
128
|
+
inputPer1M: 10.0,
|
|
129
|
+
outputPer1M: 30.0,
|
|
130
|
+
effectiveDate: '2024-04-09',
|
|
131
|
+
},
|
|
132
|
+
{
|
|
133
|
+
provider: 'openai',
|
|
134
|
+
model: 'gpt-4-turbo-2024-04-09',
|
|
135
|
+
inputPer1M: 10.0,
|
|
136
|
+
outputPer1M: 30.0,
|
|
137
|
+
effectiveDate: '2024-04-09',
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
provider: 'openai',
|
|
141
|
+
model: 'gpt-4',
|
|
142
|
+
inputPer1M: 30.0,
|
|
143
|
+
outputPer1M: 60.0,
|
|
144
|
+
effectiveDate: '2023-03-14',
|
|
145
|
+
},
|
|
146
|
+
{
|
|
147
|
+
provider: 'openai',
|
|
148
|
+
model: 'gpt-3.5-turbo',
|
|
149
|
+
inputPer1M: 0.5,
|
|
150
|
+
outputPer1M: 1.5,
|
|
151
|
+
effectiveDate: '2023-11-06',
|
|
152
|
+
},
|
|
153
|
+
{
|
|
154
|
+
provider: 'openai',
|
|
155
|
+
model: 'o1',
|
|
156
|
+
inputPer1M: 15.0,
|
|
157
|
+
outputPer1M: 60.0,
|
|
158
|
+
effectiveDate: '2024-12-17',
|
|
159
|
+
},
|
|
160
|
+
{
|
|
161
|
+
provider: 'openai',
|
|
162
|
+
model: 'o1-2024-12-17',
|
|
163
|
+
inputPer1M: 15.0,
|
|
164
|
+
outputPer1M: 60.0,
|
|
165
|
+
effectiveDate: '2024-12-17',
|
|
166
|
+
},
|
|
167
|
+
{
|
|
168
|
+
provider: 'openai',
|
|
169
|
+
model: 'o1-preview',
|
|
170
|
+
inputPer1M: 15.0,
|
|
171
|
+
outputPer1M: 60.0,
|
|
172
|
+
effectiveDate: '2024-09-12',
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
provider: 'openai',
|
|
176
|
+
model: 'o1-preview-2024-09-12',
|
|
177
|
+
inputPer1M: 15.0,
|
|
178
|
+
outputPer1M: 60.0,
|
|
179
|
+
effectiveDate: '2024-09-12',
|
|
180
|
+
},
|
|
181
|
+
{
|
|
182
|
+
provider: 'openai',
|
|
183
|
+
model: 'o1-mini',
|
|
184
|
+
inputPer1M: 3.0,
|
|
185
|
+
outputPer1M: 12.0,
|
|
186
|
+
effectiveDate: '2024-09-12',
|
|
187
|
+
},
|
|
188
|
+
{
|
|
189
|
+
provider: 'openai',
|
|
190
|
+
model: 'o1-mini-2024-09-12',
|
|
191
|
+
inputPer1M: 3.0,
|
|
192
|
+
outputPer1M: 12.0,
|
|
193
|
+
effectiveDate: '2024-09-12',
|
|
194
|
+
},
|
|
195
|
+
// Google Gemini Models
|
|
196
|
+
{
|
|
197
|
+
provider: 'gemini',
|
|
198
|
+
model: 'gemini-2.0-flash-exp',
|
|
199
|
+
inputPer1M: 0.0,
|
|
200
|
+
outputPer1M: 0.0,
|
|
201
|
+
effectiveDate: '2024-12-11',
|
|
202
|
+
},
|
|
203
|
+
{
|
|
204
|
+
provider: 'gemini',
|
|
205
|
+
model: 'gemini-2.0-flash',
|
|
206
|
+
inputPer1M: 0.075,
|
|
207
|
+
outputPer1M: 0.3,
|
|
208
|
+
effectiveDate: '2025-01-01',
|
|
209
|
+
},
|
|
210
|
+
{
|
|
211
|
+
provider: 'gemini',
|
|
212
|
+
model: 'gemini-exp-1206',
|
|
213
|
+
inputPer1M: 0.0,
|
|
214
|
+
outputPer1M: 0.0,
|
|
215
|
+
effectiveDate: '2024-12-06',
|
|
216
|
+
},
|
|
217
|
+
{
|
|
218
|
+
provider: 'gemini',
|
|
219
|
+
model: 'gemini-1.5-pro',
|
|
220
|
+
inputPer1M: 1.25,
|
|
221
|
+
outputPer1M: 5.0,
|
|
222
|
+
effectiveDate: '2024-05-14',
|
|
223
|
+
},
|
|
224
|
+
{
|
|
225
|
+
provider: 'gemini',
|
|
226
|
+
model: 'gemini-1.5-pro-002',
|
|
227
|
+
inputPer1M: 1.25,
|
|
228
|
+
outputPer1M: 5.0,
|
|
229
|
+
effectiveDate: '2024-09-24',
|
|
230
|
+
},
|
|
231
|
+
{
|
|
232
|
+
provider: 'gemini',
|
|
233
|
+
model: 'gemini-1.5-flash',
|
|
234
|
+
inputPer1M: 0.075,
|
|
235
|
+
outputPer1M: 0.3,
|
|
236
|
+
effectiveDate: '2024-05-14',
|
|
237
|
+
},
|
|
238
|
+
{
|
|
239
|
+
provider: 'gemini',
|
|
240
|
+
model: 'gemini-1.5-flash-002',
|
|
241
|
+
inputPer1M: 0.075,
|
|
242
|
+
outputPer1M: 0.3,
|
|
243
|
+
effectiveDate: '2024-09-24',
|
|
244
|
+
},
|
|
245
|
+
{
|
|
246
|
+
provider: 'gemini',
|
|
247
|
+
model: 'gemini-1.5-flash-8b',
|
|
248
|
+
inputPer1M: 0.0375,
|
|
249
|
+
outputPer1M: 0.15,
|
|
250
|
+
effectiveDate: '2024-10-03',
|
|
251
|
+
},
|
|
252
|
+
// Google Vertex AI (same pricing as Gemini)
|
|
253
|
+
{
|
|
254
|
+
provider: 'vertex-ai',
|
|
255
|
+
model: 'gemini-2.0-flash-exp',
|
|
256
|
+
inputPer1M: 0.0,
|
|
257
|
+
outputPer1M: 0.0,
|
|
258
|
+
effectiveDate: '2024-12-11',
|
|
259
|
+
},
|
|
260
|
+
{
|
|
261
|
+
provider: 'vertex-ai',
|
|
262
|
+
model: 'gemini-2.0-flash',
|
|
263
|
+
inputPer1M: 0.075,
|
|
264
|
+
outputPer1M: 0.3,
|
|
265
|
+
effectiveDate: '2025-01-01',
|
|
266
|
+
},
|
|
267
|
+
{
|
|
268
|
+
provider: 'vertex-ai',
|
|
269
|
+
model: 'gemini-exp-1206',
|
|
270
|
+
inputPer1M: 0.0,
|
|
271
|
+
outputPer1M: 0.0,
|
|
272
|
+
effectiveDate: '2024-12-06',
|
|
273
|
+
},
|
|
274
|
+
{
|
|
275
|
+
provider: 'vertex-ai',
|
|
276
|
+
model: 'gemini-1.5-pro',
|
|
277
|
+
inputPer1M: 1.25,
|
|
278
|
+
outputPer1M: 5.0,
|
|
279
|
+
effectiveDate: '2024-05-14',
|
|
280
|
+
},
|
|
281
|
+
{
|
|
282
|
+
provider: 'vertex-ai',
|
|
283
|
+
model: 'gemini-1.5-pro-002',
|
|
284
|
+
inputPer1M: 1.25,
|
|
285
|
+
outputPer1M: 5.0,
|
|
286
|
+
effectiveDate: '2024-09-24',
|
|
287
|
+
},
|
|
288
|
+
{
|
|
289
|
+
provider: 'vertex-ai',
|
|
290
|
+
model: 'gemini-1.5-flash',
|
|
291
|
+
inputPer1M: 0.075,
|
|
292
|
+
outputPer1M: 0.3,
|
|
293
|
+
effectiveDate: '2024-05-14',
|
|
294
|
+
},
|
|
295
|
+
{
|
|
296
|
+
provider: 'vertex-ai',
|
|
297
|
+
model: 'gemini-1.5-flash-002',
|
|
298
|
+
inputPer1M: 0.075,
|
|
299
|
+
outputPer1M: 0.3,
|
|
300
|
+
effectiveDate: '2024-09-24',
|
|
301
|
+
},
|
|
302
|
+
{
|
|
303
|
+
provider: 'vertex-ai',
|
|
304
|
+
model: 'gemini-1.5-flash-8b',
|
|
305
|
+
inputPer1M: 0.0375,
|
|
306
|
+
outputPer1M: 0.15,
|
|
307
|
+
effectiveDate: '2024-10-03',
|
|
308
|
+
},
|
|
309
|
+
];
|
|
310
|
+
/**
|
|
311
|
+
* Get pricing for a specific model
|
|
312
|
+
*/
|
|
313
|
+
export function getModelPricing(provider, model) {
|
|
314
|
+
return MODEL_PRICING.find((p) => p.provider === provider && p.model === model);
|
|
315
|
+
}
|
|
316
|
+
/**
|
|
317
|
+
* Get all pricing for a provider
|
|
318
|
+
*/
|
|
319
|
+
export function getProviderPricing(provider) {
|
|
320
|
+
return MODEL_PRICING.filter((p) => p.provider === provider);
|
|
321
|
+
}
|
|
322
|
+
//# sourceMappingURL=models.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/pricing/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pricing and cost tracking types
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Token usage information
|
|
6
|
+
*/
|
|
7
|
+
export interface TokenUsage {
|
|
8
|
+
inputTokens: number;
|
|
9
|
+
outputTokens: number;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* Cost estimate in USD
|
|
13
|
+
*/
|
|
14
|
+
export interface CostEstimate {
|
|
15
|
+
inputCost: number;
|
|
16
|
+
outputCost: number;
|
|
17
|
+
totalCost: number;
|
|
18
|
+
currency: string;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Model pricing per 1M tokens (USD)
|
|
22
|
+
*/
|
|
23
|
+
export interface ModelPricing {
|
|
24
|
+
provider: string;
|
|
25
|
+
model: string;
|
|
26
|
+
inputPer1M: number;
|
|
27
|
+
outputPer1M: number;
|
|
28
|
+
effectiveDate?: string;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/pricing/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/pricing/types.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EAKX,eAAe,EACf,SAAS,EACV,MAAM,YAAY,CAAC;AAMpB,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,IAAI,eAAe;IAC5B,OAAO,CAAC,MAAM,CAAY;gBAEd,MAAM,GAAE,eAAoB;IAOlC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAgBhE,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC;IAgErF,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,yBAAyB;IAiCjC,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,iBAAiB;IAcnB,UAAU,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;CAUzC"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Supports Claude 3.5 Sonnet, Claude 3 Opus, Claude 3 Haiku, etc.
|
|
4
4
|
*/
|
|
5
5
|
import Anthropic from '@anthropic-ai/sdk';
|
|
6
|
+
import { calculateCost } from '../pricing/calculator.js';
|
|
6
7
|
export class AnthropicProvider {
|
|
7
8
|
name = 'anthropic';
|
|
8
9
|
client;
|
|
@@ -23,7 +24,7 @@ export class AnthropicProvider {
|
|
|
23
24
|
max_tokens: options.maxTokens ?? 4096,
|
|
24
25
|
temperature: options.temperature,
|
|
25
26
|
});
|
|
26
|
-
return this.convertResponse(response);
|
|
27
|
+
return this.convertResponse(response, options.model);
|
|
27
28
|
}
|
|
28
29
|
async *stream(options) {
|
|
29
30
|
const messages = this.convertMessages(options.messages);
|
|
@@ -66,15 +67,18 @@ export class AnthropicProvider {
|
|
|
66
67
|
// Get final message
|
|
67
68
|
const finalMessage = await stream.finalMessage();
|
|
68
69
|
const content = this.convertContent(finalMessage.content);
|
|
70
|
+
const usage = {
|
|
71
|
+
inputTokens: finalMessage.usage.input_tokens,
|
|
72
|
+
outputTokens: finalMessage.usage.output_tokens,
|
|
73
|
+
};
|
|
74
|
+
const cost = calculateCost(this.name, options.model, usage);
|
|
69
75
|
yield {
|
|
70
76
|
type: 'done',
|
|
71
77
|
response: {
|
|
72
78
|
content,
|
|
73
79
|
stopReason: this.convertStopReason(finalMessage.stop_reason),
|
|
74
|
-
usage
|
|
75
|
-
|
|
76
|
-
outputTokens: finalMessage.usage.output_tokens,
|
|
77
|
-
},
|
|
80
|
+
usage,
|
|
81
|
+
cost,
|
|
78
82
|
},
|
|
79
83
|
};
|
|
80
84
|
}
|
|
@@ -131,14 +135,17 @@ export class AnthropicProvider {
|
|
|
131
135
|
input_schema: tool.parameters,
|
|
132
136
|
}));
|
|
133
137
|
}
|
|
134
|
-
convertResponse(response) {
|
|
138
|
+
convertResponse(response, model) {
|
|
139
|
+
const usage = {
|
|
140
|
+
inputTokens: response.usage.input_tokens,
|
|
141
|
+
outputTokens: response.usage.output_tokens,
|
|
142
|
+
};
|
|
143
|
+
const cost = calculateCost(this.name, model, usage);
|
|
135
144
|
return {
|
|
136
145
|
content: this.convertContent(response.content),
|
|
137
146
|
stopReason: this.convertStopReason(response.stop_reason),
|
|
138
|
-
usage
|
|
139
|
-
|
|
140
|
-
outputTokens: response.usage.output_tokens,
|
|
141
|
-
},
|
|
147
|
+
usage,
|
|
148
|
+
cost,
|
|
142
149
|
};
|
|
143
150
|
}
|
|
144
151
|
convertContent(content) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAkBzD,MAAM,OAAO,iBAAiB;IACnB,IAAI,GAAG,WAAW,CAAC;IACpB,MAAM,CAAY;IAE1B,YAAY,SAA0B,EAAE;QACtC,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC;YAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACtD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAA0B;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE3E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACjD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ;YACR,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,UAAU,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;YACrC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAA0B;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE3E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACzC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ;YACR,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,UAAU,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;YACrC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAA6D,IAAI,GAAG,EAAE,CAAC;QAE7F,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC;gBAElC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC9B,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE;wBAChC,EAAE,EAAE,KAAK,CAAC,EAAE;wBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,KAAK,EAAE,EAAE;qBACV,CAAC,CAAC;oBACH,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC/D,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBAChD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAE1B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAChC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC3C,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;oBAC7C,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACjD,IAAI,MAAM,EAAE,CAAC;wBACX,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,CAAC;wBACnC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;oBACzE,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE1D,MAAM,KAAK,GAAG;YACZ,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,YAAY;YAC5C,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,aAAa;SAC/C,CAAC;QAEF,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE5D,MAAM;YACJ,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE;gBACR,OAAO;gBACP,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC;gBAC5D,KAAK;gBACL,IAAI;aACL;SACF,CAAC;IACJ,CAAC;IAEO,eAAe,CAAC,QAAmB;QACzC,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,4CAA4C;YAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1B,SAAS;YACX,CAAC;YAED,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBACpE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACpC,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBACzE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,yBAAyB,CAC/B,OAAkC,EAClC,IAA0B;QAE1B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACzB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACjD,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC5D,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,KAAK,EAAE,IAAI,CAAC,KAAK;iBAClB,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,aAAa;oBACnB,WAAW,EAAE,IAAI,CAAC,SAAS;oBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,QAAQ,EAAE,IAAI,CAAC,OAAO;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,CAAC;IAEO,YAAY,CAAC,KAAuB;QAC1C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,IAAI,CAAC,UAAwC;SAC5D,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,QAA2B,EAAE,KAAa;QAChE,MAAM,KAAK,GAAG;YACZ,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,YAAY;YACxC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,aAAa;SAC3C,CAAC;QAEF,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAEpD,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC9C,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC;YACxD,KAAK;YACL,IAAI;SACL,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,OAAiC;QACtD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC1B,OAAO,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACrD,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACrC,OAAO;oBACL,IAAI,EAAE,UAAmB;oBACzB,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,KAAK,EAAE,KAAK,CAAC,KAAgC;iBAC9C,CAAC;YACJ,CAAC;YACD,6BAA6B;YAC7B,OAAO,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,MAAwC;QAChE,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,UAAU;gBACb,OAAO,UAAU,CAAC;YACpB,KAAK,YAAY;gBACf,OAAO,YAAY,CAAC;YACtB,KAAK,eAAe;gBAClB,OAAO,eAAe,CAAC;YACzB,KAAK,UAAU,CAAC;YAChB;gBACE,OAAO,UAAU,CAAC;QACtB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC;gBACV,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,EAAE;aACrC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EAKX,YAAY,EAEZ,SAAS,EACV,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,YAAY;IACzB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,GAAE,YAAiB;IAS/B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAiBhE,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC;IAqFrF,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,cAAc;IAoCtB,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,aAAa;IAsCrB,OAAO,CAAC,eAAe;IAyCvB,OAAO,CAAC,aAAa;IAef,UAAU,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;CAoBzC"}
|
package/dist/providers/gemini.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Supports Gemini 1.5 Pro, Gemini 1.5 Flash, Gemini 2.0, etc.
|
|
4
4
|
*/
|
|
5
5
|
import { GoogleGenerativeAI, SchemaType } from '@google/generative-ai';
|
|
6
|
+
import { calculateCost } from '../pricing/calculator.js';
|
|
6
7
|
export class GeminiProvider {
|
|
7
8
|
name = 'gemini';
|
|
8
9
|
client;
|
|
@@ -27,7 +28,7 @@ export class GeminiProvider {
|
|
|
27
28
|
});
|
|
28
29
|
const contents = this.convertMessages(options.messages);
|
|
29
30
|
const result = await model.generateContent({ contents });
|
|
30
|
-
return this.convertResponse(result);
|
|
31
|
+
return this.convertResponse(result, options.model);
|
|
31
32
|
}
|
|
32
33
|
async *stream(options) {
|
|
33
34
|
const model = this.client.getGenerativeModel({
|
|
@@ -83,17 +84,20 @@ export class GeminiProvider {
|
|
|
83
84
|
}
|
|
84
85
|
const finalResponse = await result.response;
|
|
85
86
|
const stopReason = this.getStopReason(finalResponse, functionCalls.length > 0);
|
|
87
|
+
const usage = finalResponse.usageMetadata
|
|
88
|
+
? {
|
|
89
|
+
inputTokens: finalResponse.usageMetadata.promptTokenCount ?? 0,
|
|
90
|
+
outputTokens: finalResponse.usageMetadata.candidatesTokenCount ?? 0,
|
|
91
|
+
}
|
|
92
|
+
: undefined;
|
|
93
|
+
const cost = usage ? calculateCost(this.name, options.model, usage) : undefined;
|
|
86
94
|
yield {
|
|
87
95
|
type: 'done',
|
|
88
96
|
response: {
|
|
89
97
|
content,
|
|
90
98
|
stopReason,
|
|
91
|
-
usage
|
|
92
|
-
|
|
93
|
-
inputTokens: finalResponse.usageMetadata.promptTokenCount ?? 0,
|
|
94
|
-
outputTokens: finalResponse.usageMetadata.candidatesTokenCount ?? 0,
|
|
95
|
-
}
|
|
96
|
-
: undefined,
|
|
99
|
+
usage,
|
|
100
|
+
cost,
|
|
97
101
|
},
|
|
98
102
|
};
|
|
99
103
|
}
|
|
@@ -191,7 +195,7 @@ export class GeminiProvider {
|
|
|
191
195
|
}
|
|
192
196
|
return result;
|
|
193
197
|
}
|
|
194
|
-
convertResponse(result) {
|
|
198
|
+
convertResponse(result, model) {
|
|
195
199
|
const response = result.response;
|
|
196
200
|
const parts = response.candidates?.[0]?.content?.parts ?? [];
|
|
197
201
|
const content = [];
|
|
@@ -213,15 +217,18 @@ export class GeminiProvider {
|
|
|
213
217
|
}
|
|
214
218
|
}
|
|
215
219
|
const hasFunctionCalls = parts.some((p) => 'functionCall' in p);
|
|
220
|
+
const usage = response.usageMetadata
|
|
221
|
+
? {
|
|
222
|
+
inputTokens: response.usageMetadata.promptTokenCount ?? 0,
|
|
223
|
+
outputTokens: response.usageMetadata.candidatesTokenCount ?? 0,
|
|
224
|
+
}
|
|
225
|
+
: undefined;
|
|
226
|
+
const cost = usage ? calculateCost(this.name, model, usage) : undefined;
|
|
216
227
|
return {
|
|
217
228
|
content,
|
|
218
229
|
stopReason: this.getStopReason(response, hasFunctionCalls),
|
|
219
|
-
usage
|
|
220
|
-
|
|
221
|
-
inputTokens: response.usageMetadata.promptTokenCount ?? 0,
|
|
222
|
-
outputTokens: response.usageMetadata.candidatesTokenCount ?? 0,
|
|
223
|
-
}
|
|
224
|
-
: undefined,
|
|
230
|
+
usage,
|
|
231
|
+
cost,
|
|
225
232
|
};
|
|
226
233
|
}
|
|
227
234
|
getStopReason(response, hasFunctionCalls) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EAKX,YAAY,EACZ,SAAS,EACV,MAAM,YAAY,CAAC;AAKpB,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,IAAI,YAAY;IACzB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,GAAE,YAAiB;IAQ/B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAehE,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC;IAwErF,OAAO,CAAC,eAAe;IAiEvB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,eAAe;IAyCvB,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,cAAc;IAUhB,UAAU,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;CAQzC"}
|
package/dist/providers/openai.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Supports GPT-4, GPT-4o, GPT-3.5-turbo, and other OpenAI models
|
|
4
4
|
*/
|
|
5
5
|
import OpenAI from 'openai';
|
|
6
|
+
import { calculateCost } from '../pricing/calculator.js';
|
|
6
7
|
export class OpenAIProvider {
|
|
7
8
|
name = 'openai';
|
|
8
9
|
client;
|
|
@@ -23,7 +24,7 @@ export class OpenAIProvider {
|
|
|
23
24
|
max_tokens: options.maxTokens,
|
|
24
25
|
temperature: options.temperature,
|
|
25
26
|
});
|
|
26
|
-
return this.convertResponse(response);
|
|
27
|
+
return this.convertResponse(response, options.model);
|
|
27
28
|
}
|
|
28
29
|
async *stream(options) {
|
|
29
30
|
const messages = this.convertMessages(options.messages, options.systemPrompt);
|
|
@@ -160,7 +161,7 @@ export class OpenAIProvider {
|
|
|
160
161
|
},
|
|
161
162
|
}));
|
|
162
163
|
}
|
|
163
|
-
convertResponse(response) {
|
|
164
|
+
convertResponse(response, model) {
|
|
164
165
|
const choice = response.choices[0];
|
|
165
166
|
const content = [];
|
|
166
167
|
if (choice.message.content) {
|
|
@@ -178,15 +179,18 @@ export class OpenAIProvider {
|
|
|
178
179
|
}
|
|
179
180
|
}
|
|
180
181
|
}
|
|
182
|
+
const usage = response.usage
|
|
183
|
+
? {
|
|
184
|
+
inputTokens: response.usage.prompt_tokens,
|
|
185
|
+
outputTokens: response.usage.completion_tokens,
|
|
186
|
+
}
|
|
187
|
+
: undefined;
|
|
188
|
+
const cost = usage ? calculateCost(this.name, model, usage) : undefined;
|
|
181
189
|
return {
|
|
182
190
|
content,
|
|
183
191
|
stopReason: this.convertStopReason(choice.finish_reason),
|
|
184
|
-
usage
|
|
185
|
-
|
|
186
|
-
inputTokens: response.usage.prompt_tokens,
|
|
187
|
-
outputTokens: response.usage.completion_tokens,
|
|
188
|
-
}
|
|
189
|
-
: undefined,
|
|
192
|
+
usage,
|
|
193
|
+
cost,
|
|
190
194
|
};
|
|
191
195
|
}
|
|
192
196
|
convertStopReason(reason) {
|