utilitas 1995.2.5 → 1995.2.7

package/lib/hal.mjs

@@ -13,7 +13,10 @@ const li = (id, text, url) => `\n${id}. ` + (url ? link(text, url) : text);
 const cardReg = /^\[\d*\]:\ ([^\ ]*)\ "(.*)"$/ig;
 // https://help.openai.com/en/articles/4936856-what-are-tokens-and-how-to-count-them
 const countTokens = txt => Math.ceil(txt.split(/[^a-z0-9]/i).length * 100 / 75);
-const MAX_CONTEXT_TOKENS = 8192;
+// Keep this for GPT4 {
+// const MAX_CONTEXT_TOKENS = 8192;
+// }
+const MAX_CONTEXT_TOKENS = 4096;
 const MAX_PROMPT_TOKENS = Math.floor(MAX_CONTEXT_TOKENS * 0.6);
 const MAX_RESPONSE_TOKENS = MAX_CONTEXT_TOKENS - MAX_PROMPT_TOKENS;
 
@@ -35,10 +38,15 @@ const init = async options => {
             engine = (await import('@waylaidwanderer/chatgpt-api')).ChatGPTClient;
             client = new engine(options?.clientOptions?.apiKey, {
                 keepNecessaryMessagesOnly: true,
-                maxContextTokens: MAX_CONTEXT_TOKENS,
+                // Keep this for GPT4 {
+                // maxContextTokens: MAX_CONTEXT_TOKENS,
+                // }
                 modelOptions: {
-                    model: options?.model || 'gpt-4',
-                    max_tokens: MAX_RESPONSE_TOKENS,
+                    model: options?.model || 'gpt-3.5-turbo',
+                    // Keep this for GPT4 {
+                    // model: options?.model || 'gpt-4',
+                    // max_tokens: MAX_RESPONSE_TOKENS,
+                    // }
                     ...options?.clientOptions?.modelOptions || {}
                 }, ...options?.clientOptions || {},
             }, options?.cacheOptions);

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.5",
+    "version": "1995.2.7",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/vision.mjs

@@ -6,7 +6,7 @@ import {
 } from './storage.mjs';
 
 import {
-    ensureArray, ignoreErrFunc, log as _log, need, throwError, trim, timeout,
+    ensureArray, ignoreErrFunc, log as _log, need, throwError, trim,
 } from './utilitas.mjs';
 
 const _NEED = ['@google-cloud/vision', 'tesseract.js'];
@@ -14,6 +14,10 @@ const [BASE64, BUFFER, FILE, DEFAULT_LANG] = ['BASE64', 'BUFFER', 'FILE', 'eng']
 const ceil = num => num.toFixed(4);
 const errorMessage = 'Invalid image data.';
 const getTextFromBatch = bt => bt.responses.map(p => p.fullTextAnnotation.text);
+const DOCUMENT_TEXT_DETECTION = 'DOCUMENT_TEXT_DETECTION';
+const features = [{ type: DOCUMENT_TEXT_DETECTION }];
+const mimeType = 'application/pdf';
+const pages = [1, 2, 3, 4, 5]; // max 5 pages limit for batchAnnotateFiles API
 const log = content => _log(content, import.meta.url);
 
 let client;
@@ -128,11 +132,7 @@ const read = async (image, options) => {
         input: options?.input, expected: BASE64, errorMessage,
     });
     let result = await client.batchAnnotateFiles({
-        requests: [{
-            inputConfig: { mimeType: 'application/pdf', content },
-            features: [{ type: 'DOCUMENT_TEXT_DETECTION' }],
-            pages: [1, 2, 3, 4, 5], // max 5 pages
-        }],
+        requests: [{ inputConfig: { mimeType, content }, features, pages }],
     });
     return options?.raw ? result : getTextFromBatch(result[0].responses[0]);
 };
@@ -149,9 +149,8 @@ const readAll = async (image, options) => {
     result.clear = await deleteOnCloud(resultId);
     result.submit = await client.asyncBatchAnnotateFiles({
         requests: [{
-            inputConfig: { mimeType: 'application/pdf', gcsSource: { uri } },
-            outputConfig: { gcsDestination: { uri: destination } },
-            features: [{ type: 'DOCUMENT_TEXT_DETECTION' }],
+            inputConfig: { mimeType, gcsSource: { uri } },
+            outputConfig: { gcsDestination: { uri: destination } }, features,
         }],
     });
     result.response = await result.submit[0].promise();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.2.5",
+    "version": "1995.2.7",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",