github_mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2025-02-02 14:18:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

dev: get token counts on all services

Browse Source
This commit is contained in:
KernelDeimos 2024-11-26 15:23:00 -05:00
parent f3d270ccbc
commit 2dd9417234
9 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -3412,9 +3412,9 @@
}
},
"node_modules/@mistralai/mistralai": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/@mistralai/mistralai/-/mistralai-1.0.3.tgz",
"integrity": "sha512-161lmlaMrQvQeC97LG3GVpQi+LKKmGb6VweEFq6otc4J4kEVaJu6RzmH5UuLCt2eSes1Q5faY6YAPTkGOo0atw==",
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/@mistralai/mistralai/-/mistralai-1.3.4.tgz",
"integrity": "sha512-db5UhCXqH0N05XbXMR/2bSiGKIFUzS6p0sI9Nl2XDmJuDZIm+WRGTlsq60ALwhvKpHcQKzN5L58HIneksRrn9g==",
"peerDependencies": {
"zod": ">= 3"
}
@ -13728,10 +13728,9 @@
}
},
"node_modules/openai": {
"version": "4.52.3",
"resolved": "https://registry.npmjs.org/openai/-/openai-4.52.3.tgz",
"integrity": "sha512-IyQLYKGYoEEkUCEm2frPzwHDJ3Ym663KtivnY6pWCzuoi6/HgSIMMxpcuTRS81GH6tiULPYGmTxIvzXdmPIWOw==",
"license": "Apache-2.0",
"version": "4.73.1",
"resolved": "https://registry.npmjs.org/openai/-/openai-4.73.1.tgz",
"integrity": "sha512-nWImDJBcUsqrhy7yJScXB4+iqjzbUEgzfA3un/6UnHFdwWhjX24oztj69Ped/njABfOdLcO/F7CeWTI5dt8Xmg==",
"dependencies": {
"@types/node": "^18.11.18",
"@types/node-fetch": "^2.6.4",
@ -13739,11 +13738,18 @@
"agentkeepalive": "^4.2.1",
"form-data-encoder": "1.7.2",
"formdata-node": "^4.3.2",
"node-fetch": "^2.6.7",
"web-streams-polyfill": "^3.2.1"
"node-fetch": "^2.6.7"
},
"bin": {
"openai": "bin/cli"
},
"peerDependencies": {
"zod": "^3.23.8"
},
"peerDependenciesMeta": {
"zod": {
"optional": true
}
}
},
"node_modules/openai/node_modules/@types/node": {
@ -17320,7 +17326,7 @@
"@heyputer/kv.js": "^0.1.3",
"@heyputer/multest": "^0.0.2",
"@heyputer/putility": "^1.0.0",
"@mistralai/mistralai": "^1.0.3",
"@mistralai/mistralai": "^1.3.4",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/auto-instrumentations-node": "^0.43.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.40.0",
@ -17365,7 +17371,7 @@
"murmurhash": "^2.0.1",
"nodemailer": "^6.9.3",
"on-finished": "^2.4.1",
"openai": "^4.20.1",
"openai": "^4.73.1",
"otpauth": "9.2.4",
"prompt-sync": "^4.2.0",
"recursive-readdir": "^2.2.3",

4
src/backend/package.json
View File

@ -13,7 +13,7 @@
"@heyputer/kv.js": "^0.1.3",
"@heyputer/multest": "^0.0.2",
"@heyputer/putility": "^1.0.0",
"@mistralai/mistralai": "^1.0.3",
"@mistralai/mistralai": "^1.3.4",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/auto-instrumentations-node": "^0.43.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.40.0",
@ -58,7 +58,7 @@
"murmurhash": "^2.0.1",
"nodemailer": "^6.9.3",
"on-finished": "^2.4.1",
"openai": "^4.20.1",
"openai": "^4.73.1",
"otpauth": "9.2.4",
"prompt-sync": "^4.2.0",
"recursive-readdir": "^2.2.3",

6
src/backend/src/modules/puterai/AIChatService.js
View File

@ -150,6 +150,7 @@ class AIChatService extends BaseService {
const svc_driver = this.services.get('driver');
let ret, error, errors = [];
let service_used = intended_service;
let model_used = this.get_model_from_request(parameters);
try {
ret = await svc_driver.call_new_({
actor: Context.get('actor'),
@ -160,7 +161,7 @@ class AIChatService extends BaseService {
});
} catch (e) {
const tried = [];
let model = this.get_model_from_request(parameters);
let model = model_used;
// TODO: if conflict models exist, add service name
tried.push(model);
@ -205,6 +206,7 @@ class AIChatService extends BaseService {
});
error = null;
service_used = fallback_service_name;
model_used = fallback_model_name;
response_metadata.fallback = {
service: fallback_service_name,
model: fallback_model_name,
@ -233,6 +235,8 @@ class AIChatService extends BaseService {
intended_service,
parameters,
result: ret.result,
model_used,
service_used,
});
return ret.result;

1
src/backend/src/modules/puterai/ClaudeService.js
View File

@ -141,6 +141,7 @@ class ClaudeService extends BaseService {
});
return {
message: msg,
usage: msg.usage,
finish_reason: 'stop'
};
}

7
src/backend/src/modules/puterai/GroqAIService.js
View File

@ -74,7 +74,12 @@ class GroqAIService extends BaseService {
return retval;
}
return completion.choices[0];
const ret = completion.choices[0];
ret.usage = {
input_tokens: completion.usage.prompt_tokens,
output_tokens: completion.usage.completion_tokens,
};
return ret;
}
}
};

27
src/backend/src/modules/puterai/MistralAIService.js
View File

@ -180,22 +180,17 @@ class MistralAIService extends BaseService {
return retval;
}
try {
const completion = await this.client.chat.complete({
model: model ?? this.get_default_model(),
messages,
});
// Expected case when mistralai/client-ts#23 is fixed
return completion.choices[0];
} catch (e) {
if ( ! e?.rawValue?.choices[0] ) {
throw e;
}
// The SDK attempts to validate APIs response and throws
// an exception, even if the response was successful
// https://github.com/mistralai/client-ts/issues/23
return e.rawValue.choices[0];
}
const completion = await this.client.chat.complete({
model: model ?? this.get_default_model(),
messages,
});
// Expected case when mistralai/client-ts#23 is fixed
const ret = completion.choices[0];
ret.usage = {
input_tokens: completion.usage.promptTokens,
output_tokens: completion.usage.completionTokens,
};
return ret;
}
}
}

7
src/backend/src/modules/puterai/OpenAICompletionService.js
View File

@ -361,7 +361,12 @@ class OpenAICompletionService extends BaseService {
}
}
return completion.choices[0];
const ret = completion.choices[0];
ret.usage = {
input_tokens: completion.usage.prompt_tokens,
output_tokens: completion.usage.completion_tokens,
};
return ret;
}
}

8
src/backend/src/modules/puterai/TogetherAIService.js
View File

@ -76,7 +76,13 @@ class TogetherAIService extends BaseService {
return retval;
}
return completion.choices[0];
// return completion.choices[0];
const ret = completion.choices[0];
ret.usage = {
input_tokens: completion.usage.prompt_tokens,
output_tokens: completion.usage.completion_tokens,
};
return ret;
}
}
}

1
src/backend/src/modules/puterai/XAIService.js
View File

@ -135,6 +135,7 @@ class XAIService extends BaseService {
});
return {
message: msg,
usage: msg.usage,
finish_reason: 'stop'
};
}