triangle-utils 1.4.172 → 1.4.174

package/dist/src/UtilsBedrock.js

@@ -252,34 +252,36 @@ export class UtilsBedrock {
         return undefined;
     }
     async cohere_invoke(model_id, text, options = {}) {
-        try {
-            const output = await this.bedrock_runtime.invokeModel({
-                modelId: model_id,
-                body: JSON.stringify({
-                    input_type: options.input_type_id || "search_document",
-                    inputs: [
-                        {
-                            content: [
-                                { type: "text", text: text }
-                            ]
-                        }
-                    ],
-                    output_dimension: 1024,
-                    truncate: "RIGHT",
-                    max_tokens: 128000
-                }),
-                contentType: "application/json"
-            });
-            const response = JSON.parse(this.text_decoder.decode(output.body));
-            const coordinates = response.embeddings.float[0];
-            if (coordinates !== undefined && Array.isArray(coordinates) && coordinates.every((i) => typeof i === "number")) {
-                return coordinates;
+        for (let i = 0; i < 3; i++) {
+            try {
+                const output = await this.bedrock_runtime.invokeModel({
+                    modelId: model_id,
+                    body: JSON.stringify({
+                        input_type: options.input_type_id || "search_document",
+                        inputs: [
+                            {
+                                content: [
+                                    { type: "text", text: text }
+                                ]
+                            }
+                        ],
+                        output_dimension: 1024,
+                        truncate: "RIGHT",
+                        max_tokens: 128000
+                    }),
+                    contentType: "application/json"
+                });
+                const response = JSON.parse(this.text_decoder.decode(output.body));
+                const coordinates = response.embeddings.float[0];
+                if (coordinates !== undefined && Array.isArray(coordinates) && coordinates.every((i) => typeof i === "number")) {
+                    return coordinates;
+                }
+            }
+            catch (error) {
+                console.log(error.stack);
+                console.log("Failed to get from Bedrock.");
             }
         }
-        catch (error) {
-            console.log(error.stack);
-            console.log("Failed to get from Bedrock.");
-        }
-        return undefined;
+        throw new Error();
     }
 }

package/dist/src/UtilsRDS.js

@@ -124,7 +124,7 @@ export class UtilsRDS {
         const attribute_names = Array.from(new Set(primary_keys.map(primary_key => Object.keys(primary_key)).flat())).sort();
         const items = [];
         for (let i = 0; i < primary_keys.length; i += batch_num_items) {
-            const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + "(" + attribute_names.join(", ") + ")" + " IN " + "(" + primary_keys.map(primary_key => "(" + attribute_names.map(attribute_name => convert_postgres_input(primary_key[attribute_name])).join(", ") + ")").join(", ") + ")";
+            const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + "(" + attribute_names.join(", ") + ")" + " IN " + "(" + primary_keys.slice(i, i + batch_num_items).map(primary_key => "(" + attribute_names.map(attribute_name => convert_postgres_input(primary_key[attribute_name])).join(", ") + ")").join(", ") + ")";
             const new_items = await this.exec(sql, options);
             items.push(...new_items);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.172",
+    "version": "1.4.174",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {
@@ -36,8 +36,7 @@
         "googleapis": "^170.0.0",
         "jsdom": "^29.0.1",
         "pg": "^8.23.0",
-        "scrapingbee": "^1.8.2",
-        "triangle-types": "^1.0.259"
+        "scrapingbee": "^1.8.2"
     },
     "devDependencies": {
         "@eslint/js": "^9.39.2",

package/src/UtilsBedrock.ts

@@ -284,34 +284,36 @@ export class UtilsBedrock {
     }
 
     async cohere_invoke(model_id : string, text : string, options : { input_type_id? : string } = {}) : Promise<number[] | undefined> {
-        try {
-            const output = await this.bedrock_runtime.invokeModel({
-                modelId : model_id,
-                body : JSON.stringify({
-                    input_type: options.input_type_id || "search_document",
-                    inputs: [
-                        {
-                            content: [
-                                { type : "text", text : text }
-                            ]
-                        }
-                    ],
-                    output_dimension: 1024,
-                    truncate: "RIGHT",
-                    max_tokens: 128000
-                }),
-                contentType : "application/json"
-            })
-            const response = JSON.parse(this.text_decoder.decode(output.body))
-            const coordinates = response.embeddings.float[0]
-            if (coordinates !== undefined && Array.isArray(coordinates) && coordinates.every((i : any) => typeof i === "number")) {
-                return coordinates
+        for (let i = 0; i < 3; i++) {
+            try {
+                const output = await this.bedrock_runtime.invokeModel({
+                    modelId : model_id,
+                    body : JSON.stringify({
+                        input_type: options.input_type_id || "search_document",
+                        inputs: [
+                            {
+                                content: [
+                                    { type : "text", text : text }
+                                ]
+                            }
+                        ],
+                        output_dimension: 1024,
+                        truncate: "RIGHT",
+                        max_tokens: 128000
+                    }),
+                    contentType : "application/json"
+                })
+                const response = JSON.parse(this.text_decoder.decode(output.body))
+                const coordinates = response.embeddings.float[0]
+                if (coordinates !== undefined && Array.isArray(coordinates) && coordinates.every((i : any) => typeof i === "number")) {
+                    return coordinates
+                }
+            } catch (error : any) {
+                console.log(error.stack)
+                console.log("Failed to get from Bedrock.")
             }
-        } catch (error : any) {
-            console.log(error.stack)
-            console.log("Failed to get from Bedrock.")
         }
-        return undefined
+        throw new Error()
     }
 
 }

package/src/UtilsRDS.ts

@@ -174,7 +174,7 @@ export class UtilsRDS {
         const attribute_names = Array.from(new Set(primary_keys.map(primary_key => Object.keys(primary_key)).flat())).sort()
         const items = []
         for (let i = 0; i < primary_keys.length; i += batch_num_items) {
-            const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + "(" + attribute_names.join(", ") + ")" + " IN " + "(" + primary_keys.map(primary_key => "(" + attribute_names.map(attribute_name => convert_postgres_input(primary_key[attribute_name])).join(", ") + ")" ).join(", ") + ")"
+            const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + "(" + attribute_names.join(", ") + ")" + " IN " + "(" + primary_keys.slice(i, i + batch_num_items).map(primary_key => "(" + attribute_names.map(attribute_name => convert_postgres_input(primary_key[attribute_name])).join(", ") + ")" ).join(", ") + ")"
             const new_items = await this.exec(sql, options)
             items.push(...new_items)
         }