Move counter outside of onFinish()

giselles-ai · Nov 1, 2024 · e4d79a5 · e4d79a5
1 parent 349eb8a
commit e4d79a5
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/app/(playground)/p/[agentId]/beta-proto/artifact/server-actions.ts b/app/(playground)/p/[agentId]/beta-proto/artifact/server-actions.ts
@@ -53,7 +53,7 @@ ${sourcesToText(sources)}
 			input: params.userPrompt,
 			model,
 		});
-		const { partialObjectStream, object } = await streamObject({
+		const { partialObjectStream, object, usage } = await streamObject({
 			model: openai(model),
 			system,
 			prompt: params.userPrompt,
@@ -62,17 +62,6 @@ ${sourcesToText(sources)}
 				isEnabled: true,
 			},
 			onFinish: async (result) => {
-				console.log("onFinish() envirenment: ", process.env.NEXT_RUNTIME);
-				const meter = metrics.getMeter("OpenAI");
-				const tokenCounter = meter.createCounter("token_consumed", {
-					description: "Number of OpenAI API tokens consumed by each request",
-				});
-				const subscriptionId = await getUserSubscriptionId();
-				const isR06User = await isRoute06User();
-				tokenCounter.add(result.usage.totalTokens, {
-					subscriptionId,
-					isR06User,
-				});
 				generation.end({
 					output: result,
 				});
@@ -87,6 +76,18 @@ ${sourcesToText(sources)}
 
 		const result = await object;
 
+		console.log("await object envirenment: ", process.env.NEXT_RUNTIME);
+		const meter = metrics.getMeter("OpenAI");
+		const tokenCounter = meter.createCounter("token_consumed", {
+			description: "Number of OpenAI API tokens consumed by each request",
+		});
+		const subscriptionId = await getUserSubscriptionId();
+		const isR06User = await isRoute06User();
+		tokenCounter.add(await usage.totalTokens, {
+			subscriptionId,
+			isR06User,
+		});
+
 		stream.done();
 	})();