@intuned/browser-dev 0.1.16-dev.1 → 0.1.17-dev.1

package/dist/optimized-extractors/common/extractStructuredDataUsingClaude.js

@@ -8,10 +8,10 @@ var _anthropicModel = require("../models/anthropicModel");
 var _neverthrow = require("neverthrow");
 var Errors = _interopRequireWildcard(require("../types/errors"));
 var _utils = require("./utils");
-var _Logger = require("../../common/Logger");
 var _aiModelsValidations = require("../common/aiModelsValidations");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 async function extractStructuredDataUsingClaude(input) {
+  var _unwrappedResponse$us, _unwrappedResponse$us2;
   const {
     entityName,
     model,
@@ -96,6 +96,9 @@ async function extractStructuredDataUsingClaude(input) {
     return (0, _neverthrow.err)(response.error);
   }
   const unwrappedResponse = response.value.data;
+  const costInCents = (0, _utils.parseCostInCents)(response.value.response.headers.get("x-ai-cost-in-cents"));
+  const totalTokens = (((_unwrappedResponse$us = unwrappedResponse.usage) === null || _unwrappedResponse$us === void 0 ? void 0 : _unwrappedResponse$us.input_tokens) ?? 0) + (((_unwrappedResponse$us2 = unwrappedResponse.usage) === null || _unwrappedResponse$us2 === void 0 ? void 0 : _unwrappedResponse$us2.output_tokens) ?? 0);
+  (0, _utils.logAiCallUsage)(costInCents, totalTokens);
   if (unwrappedResponse.stop_reason === "max_tokens") {
     return (0, _neverthrow.err)(Errors.AiCallFailed("response from ai exceeds model maximum output tokens, try to be more specific with what data you need to extract"));
   }
@@ -117,18 +120,9 @@ async function extractStructuredDataUsingClaude(input) {
     return (0, _neverthrow.err)(Errors.invalidExtractionResult("the model was not able to extract data correctly"));
   }
   const result = (0, _utils.getResultFromOutputSchema)(originalJsonSchema, entityName, tool.input);
-  const callCost = response.value.response.headers.get("x-ai-cost-in-cents");
-  if (input.logAiCallCost) {
-    if (apiKey) {
-      _Logger.logger.info(`extractor ${input.identifier}: AI cost is not calculated (using custom API key)`);
-    } else if (callCost) {
-      const cost = parseFloat(callCost);
-      if (!isNaN(cost)) {
-        _Logger.logger.info(`extractor ${input.identifier}: AI cost is $${cost / 100}`);
-      }
-    }
-  }
   return (0, _neverthrow.ok)({
-    result
+    result,
+    costInCents,
+    totalTokens
   });
 }

package/dist/optimized-extractors/common/extractStructuredDataUsingOpenAi.js

@@ -7,11 +7,10 @@ exports.extractStructuredDataUsingOpenAi = extractStructuredDataUsingOpenAi;
 var _neverthrow = require("neverthrow");
 var Errors = _interopRequireWildcard(require("../types/errors"));
 var _utils = require("./utils");
-var _Logger = require("../../common/Logger");
 var _openaiModel = require("../models/openaiModel");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 async function extractStructuredDataUsingOpenAi(input) {
-  var _completion$value$dat, _completion$value$dat2;
+  var _completion$value$dat, _completion$value$dat2, _completion$value$dat3;
   const {
     entityName,
     model,
@@ -50,13 +49,16 @@ async function extractStructuredDataUsingOpenAi(input) {
     content.push(...imageContent);
   }
   const modelName = input.model;
+  const supportsCustomTemperature = !/^(o\d|gpt-5)/i.test(modelName);
   const toolName = `extract_${entityName}`;
   const openAiInstance = (0, _openaiModel.createOpenAIInstance)({
     apiKey
   });
   const completion = await (0, _neverthrow.fromPromise)(openAiInstance.chat.completions.create({
-    max_tokens: 4000,
-    temperature: 0,
+    max_completion_tokens: 4000,
+    ...(supportsCustomTemperature ? {
+      temperature: 0
+    } : {}),
     model: modelName,
     messages: [{
       role: "system",
@@ -90,14 +92,17 @@ async function extractStructuredDataUsingOpenAi(input) {
   if (completion.isErr()) {
     return (0, _neverthrow.err)(completion.error);
   }
+  const costInCents = (0, _utils.parseCostInCents)(completion.value.response.headers.get("x-ai-cost-in-cents"));
+  const totalTokens = (_completion$value$dat = completion.value.data.usage) === null || _completion$value$dat === void 0 ? void 0 : _completion$value$dat.total_tokens;
+  (0, _utils.logAiCallUsage)(costInCents, totalTokens);
   if (completion.value.data.choices[0].finish_reason === "length") {
     return (0, _neverthrow.err)(Errors.AiCallFailed("response from ai exceeds model maximum output tokens, try to be more specific with what data you need to extract"));
   }
-  const noDataFound = (_completion$value$dat = completion.value.data.choices[0].message.tool_calls) === null || _completion$value$dat === void 0 ? void 0 : _completion$value$dat.some(content => content.type === "function" && content.function.name == "no_data_found");
+  const noDataFound = (_completion$value$dat2 = completion.value.data.choices[0].message.tool_calls) === null || _completion$value$dat2 === void 0 ? void 0 : _completion$value$dat2.some(content => content.type === "function" && content.function.name == "no_data_found");
   if (noDataFound) {
     return (0, _neverthrow.err)(Errors.NoDataFound("data isn't found in the text or images."));
   }
-  let functionCall = (_completion$value$dat2 = completion.value.data.choices[0].message.tool_calls) === null || _completion$value$dat2 === void 0 || (_completion$value$dat2 = _completion$value$dat2.find(t => t.type === "function" && t.function.name === toolName)) === null || _completion$value$dat2 === void 0 ? void 0 : _completion$value$dat2.function;
+  let functionCall = (_completion$value$dat3 = completion.value.data.choices[0].message.tool_calls) === null || _completion$value$dat3 === void 0 || (_completion$value$dat3 = _completion$value$dat3.find(t => t.type === "function" && t.function.name === toolName)) === null || _completion$value$dat3 === void 0 ? void 0 : _completion$value$dat3.function;
   if (!functionCall) {
     functionCall = completion.value.data.choices[0].message.function_call;
     if (!functionCall) {
@@ -114,18 +119,9 @@ async function extractStructuredDataUsingOpenAi(input) {
   }
   const result = (0, _utils.getResultFromOutputSchema)(originalJsonSchema, entityName, parsedData.value);
   const formatted = (0, _utils.cleanupAiResult)(result);
-  const callCost = completion.value.response.headers.get("x-ai-cost-in-cents");
-  if (input.logAiCallCost) {
-    if (apiKey) {
-      _Logger.logger.info(`extractor ${input.identifier}: AI cost is not calculated (using custom API key)`);
-    } else if (callCost) {
-      const cost = parseFloat(callCost);
-      if (!isNaN(cost)) {
-        _Logger.logger.info(`extractor ${input.identifier}: AI cost is $${cost / 100}`);
-      }
-    }
-  }
   return (0, _neverthrow.ok)({
-    result: formatted
+    result: formatted,
+    costInCents,
+    totalTokens
   });
 }

package/dist/optimized-extractors/common/extractStrucutredDataUsingAiInstance.js

@@ -7,11 +7,10 @@ exports.extractStructuredDataUsingAiInstance = extractStructuredDataUsingAiInsta
 var _neverthrow = require("neverthrow");
 var Errors = _interopRequireWildcard(require("../types/errors"));
 var _utils = require("./utils");
-var _Logger = require("../../common/Logger");
 var _ai = require("ai");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 async function extractStructuredDataUsingAiInstance(input) {
-  var _apiResult$value$tool, _apiResult$value$tool2, _apiResult$value$resp;
+  var _apiResult$value$resp, _apiResult$value$usag, _apiResult$value$tool, _apiResult$value$tool2;
   const {
     entityName,
     model,
@@ -20,9 +19,7 @@ async function extractStructuredDataUsingAiInstance(input) {
     text,
     extraUserMessages,
     images,
-    apiKey,
-    apiName,
-    maxTokens
+    apiName
   } = input;
   const processedJsonSchema = (0, _utils.processInputSchema)(originalJsonSchema, entityName);
   const content = [];
@@ -88,6 +85,9 @@ async function extractStructuredDataUsingAiInstance(input) {
   if (apiResult.isErr()) {
     return (0, _neverthrow.err)(apiResult.error);
   }
+  const costInCents = (0, _utils.parseCostInCents)((_apiResult$value$resp = apiResult.value.response.headers) === null || _apiResult$value$resp === void 0 ? void 0 : _apiResult$value$resp["x-ai-cost-in-cents"]);
+  const totalTokens = (_apiResult$value$usag = apiResult.value.usage) === null || _apiResult$value$usag === void 0 ? void 0 : _apiResult$value$usag.totalTokens;
+  (0, _utils.logAiCallUsage)(costInCents, totalTokens);
   if (apiResult.value.finishReason === "length") {
     return (0, _neverthrow.err)(Errors.AiCallFailed("response from ai exceeds model maximum output tokens, try to be more specific with what data you need to extract"));
   }
@@ -105,18 +105,9 @@ async function extractStructuredDataUsingAiInstance(input) {
   }
   const result = (0, _utils.getResultFromOutputSchema)(originalJsonSchema, entityName, extractedData);
   const formatted = (0, _utils.cleanupAiResult)(result);
-  const callCost = (_apiResult$value$resp = apiResult.value.response.headers) === null || _apiResult$value$resp === void 0 ? void 0 : _apiResult$value$resp["x-ai-cost-in-cents"];
-  if (input.logAiCallCost) {
-    if (apiKey) {
-      _Logger.logger.info(`extractor ${input.identifier}: AI cost is not calculated (using custom API key)`);
-    } else if (callCost) {
-      const cost = parseFloat(callCost);
-      if (!isNaN(cost)) {
-        _Logger.logger.info(`extractor ${input.identifier}: AI cost is $${cost / 100}`);
-      }
-    }
-  }
   return (0, _neverthrow.ok)({
-    result: formatted
+    result: formatted,
+    costInCents,
+    totalTokens
   });
 }

package/dist/optimized-extractors/common/index.js

@@ -47,9 +47,13 @@ async function extractStructuredDataUsingAi(input) {
     return (0, _neverthrow.err)(extractionResult.error);
   }
   const {
-    result
+    result,
+    costInCents,
+    totalTokens
   } = extractionResult.value;
   return (0, _neverthrow.ok)({
-    result: (0, _utils.cleanupAiResult)(result)
+    result: (0, _utils.cleanupAiResult)(result),
+    costInCents,
+    totalTokens
   });
 }

package/dist/optimized-extractors/common/utils.js

@@ -6,11 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.cleanupAiResult = cleanupAiResult;
 exports.getRandomItems = getRandomItems;
 exports.getResultFromOutputSchema = getResultFromOutputSchema;
+exports.logAiCallUsage = logAiCallUsage;
+exports.parseCostInCents = parseCostInCents;
 exports.processInputSchema = processInputSchema;
+var _Logger = require("../../common/Logger");
 function getRandomItems(arr, numItems) {
   const shuffled = arr.sort(() => 0.5 - Math.random());
   return shuffled.slice(0, numItems);
 }
+function parseCostInCents(headerValue) {
+  if (!headerValue) return undefined;
+  const cost = parseFloat(headerValue);
+  return isNaN(cost) ? undefined : cost;
+}
+function logAiCallUsage(costInCents, totalTokens) {
+  if (costInCents !== undefined) {
+    _Logger.logger.info(`Total LLM Cost In Cents: ${costInCents}`);
+  } else if (totalTokens !== undefined) {
+    _Logger.logger.info(`Total LLM Tokens: ${totalTokens}`);
+  }
+}
 function processInputSchema(originalJsonSchema, entityName) {
   const internalSchema = structuredClone(originalJsonSchema);
   delete internalSchema.description;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/browser-dev",
-  "version": "0.1.16-dev.1",
+  "version": "0.1.17-dev.1",
   "description": "runner package for intuned functions",
   "types": "./dist/index.d.ts",
   "typesVersions": {