npm - triangle-utils - Versions diffs - 1.4.170 → 1.4.172 - Mend

triangle-utils 1.4.170 → 1.4.172

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/src/UtilsMisc.d.ts +5 -0
package/dist/src/UtilsMisc.js +20 -0
package/dist/src/UtilsRDS.d.ts +1 -15
package/dist/src/UtilsRDS.js +46 -67
package/dist/src/f.js +2 -18
package/package.json +3 -5
package/src/UtilsMisc.ts +21 -0
package/src/UtilsRDS.ts +56 -84
package/src/f.ts +2 -21
package/dist/src/UtilsNitter.d.ts +0 -24
package/dist/src/UtilsNitter.js +0 -172
package/dist/src/types/TriangleUtilsConfig.d.ts +0 -6
package/dist/src/types/TriangleUtilsConfig.js +0 -1

package/dist/src/UtilsMisc.d.ts CHANGED Viewed

@@ -31,5 +31,10 @@ export declare class UtilsMisc {
         batch_num_items: number;
         max_num_items?: number;
     }): Promise<void>;
+    static get_line_fragments(fragment_max_size: number, text: string): {
+        min_index: number;
+        max_index: number;
+        fragment_text: string;
+    }[];
 }
 export {};

package/dist/src/UtilsMisc.js CHANGED Viewed

@@ -146,4 +146,24 @@ export class UtilsMisc {
             });
         });
     }
+    static get_line_fragments(fragment_max_size, text) {
+        const text_lines = text.split("\n");
+        const fragments = [];
+        for (let index = 0; index < text_lines.length; index += 1) {
+            const line = text_lines[index];
+            const last_fragment = fragments.at(-1);
+            if (last_fragment === undefined || last_fragment.fragment_text.length + 1 + line.length > fragment_max_size) {
+                fragments.push({
+                    min_index: index,
+                    max_index: index + 1,
+                    fragment_text: line
+                });
+            }
+            else {
+                fragments[fragments.length - 1].fragment_text = fragments[fragments.length - 1].fragment_text + "\n" + line;
+                fragments[fragments.length - 1].max_index += 1;
+            }
+        }
+        return fragments;
+    }
 }

package/dist/src/UtilsRDS.d.ts CHANGED Viewed

@@ -2,17 +2,13 @@ export declare class UtilsRDS {
     private readonly rds_host;
     private readonly rds_username;
     private readonly rds_password;
-    private readonly rds_pool;
-    private readonly rds_data;
-    private readonly rds_cluster_arn;
-    private readonly rds_secret_arn;
+    private readonly pool;
     constructor(region: string, rds_cluster_arn: string, rds_secret_arn: string, rds_host: string, rds_username: string, rds_password: string);
     query(sql: string, options?: {
         is_verbose?: boolean;
     }): Promise<any[]>;
     exec(sql: string, options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[]>;
     scan(table_id: string, options?: {
         filters?: Record<string, any>;
@@ -21,48 +17,38 @@ export declare class UtilsRDS {
         attribute_names?: string[];
         max_num_items?: number;
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[]>;
     get(table_id: string, primary_key: Record<string, any>, options?: {
         attribute_names?: string[];
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<Record<string, any> | undefined>;
     batch_get(table_id: string, primary_keys: Record<string, any>[], options?: {
         batch_num_items?: number;
         attribute_names?: string[];
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[]>;
     create(table_id: string, item: Record<string, any>, options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[] | undefined>;
     batch_create(table_id: string, items: Record<string, any>[], options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
         batch_num_items?: number;
     }): Promise<void>;
     put(table_id: string, item: Record<string, any>, options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[] | undefined>;
     batch_put(table_id: string, items: Record<string, any>[], options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
         batch_num_items?: number;
     }): Promise<void>;
     delete(table_id: string, primary_key: Record<string, any>, options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[]>;
     batch_delete(table_id: string, primary_keys: Record<string, any>[], options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
         batch_num_items?: number;
     }): Promise<void>;
     set(table_id: string, primary_key: Record<string, any>, attributes: Record<string, any>, options?: {
         is_verbose?: boolean;
-        is_forced?: boolean;
     }): Promise<any[]>;
 }

package/dist/src/UtilsRDS.js CHANGED Viewed

@@ -1,6 +1,5 @@
-import { RDSData } from "@aws-sdk/client-rds-data";
 import { Pool } from "pg";
-function convert_rds_input(input) {
+function convert_postgres_input(input) {
     if (input === undefined) {
         return "NULL";
     }
@@ -14,7 +13,7 @@ function convert_rds_input(input) {
         return input.toString().toUpperCase();
     }
     else if (Array.isArray(input)) {
-        return "ARRAY[" + input.map(a => convert_rds_input(a)).join(", ") + "]";
+        return "ARRAY[" + input.map(a => convert_postgres_input(a)).join(", ") + "]";
     }
     else if (typeof input === "object") {
         if (input.expression !== undefined) {
@@ -23,45 +22,46 @@ function convert_rds_input(input) {
     }
     return "NULL";
 }
-function convert_rds_output(input) {
-    if (input.isNull) {
-        return undefined;
-    }
-    else if (input.stringValue !== undefined) {
-        return input.stringValue;
-    }
-    else if (input.doubleValue !== undefined) {
-        return input.doubleValue;
-    }
-    else if (input.longValue !== undefined) {
-        return input.longValue;
-    }
-    else if (input.booleanValue !== undefined) {
-        return input.booleanValue;
-    }
-    else if (input.arrayValue !== undefined) {
-        return [
-            ...(input.arrayValue.stringValues || []),
-            ...(input.arrayValue.longValues || []),
-            ...(input.arrayValue.booleanValues || [])
-        ]
-            .filter(value => value !== null);
-    }
-    return undefined;
+// function convert_rds_output(output : Field) {
+//     if (output.isNull) {
+//         return undefined
+//     } else if (output.stringValue !== undefined) {
+//         return output.stringValue
+//     } else if (output.doubleValue !== undefined) {
+//         return output.doubleValue
+//     } else if (output.longValue !== undefined) {
+//         return output.longValue
+//     } else if (output.booleanValue !== undefined) {
+//         return output.booleanValue
+//     } else if (output.arrayValue !== undefined) {
+//         return [
+//             ...(output.arrayValue.stringValues || []),
+//             ...(output.arrayValue.longValues || []),
+//             ...(output.arrayValue.booleanValues || [])
+//         ]
+//             .filter(value => value !== null)
+//     }
+//     return undefined
+// }
+function convert_postgres_output(output, field) {
+    if (field.dataTypeID === 1700) {
+        return Number(output[field.name]);
+    }
+    if (field.dataTypeID === 712048) {
+        return JSON.parse(output[field.name]);
+    }
+    return output[field.name];
 }
 export class UtilsRDS {
     rds_host;
     rds_username;
     rds_password;
-    rds_pool;
-    rds_data;
-    rds_cluster_arn;
-    rds_secret_arn;
+    pool;
     constructor(region, rds_cluster_arn, rds_secret_arn, rds_host, rds_username, rds_password) {
         this.rds_host = rds_host;
         this.rds_username = rds_username;
         this.rds_password = rds_password;
-        this.rds_pool = new Pool({
+        this.pool = new Pool({
             host: this.rds_host,
             user: this.rds_username,
             password: this.rds_password,
@@ -71,43 +71,22 @@ export class UtilsRDS {
                 rejectUnauthorized: false
             }
         });
-        this.rds_data = new RDSData({ region: region });
-        this.rds_cluster_arn = rds_cluster_arn,
-            this.rds_secret_arn = rds_secret_arn;
     }
     async query(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
         if (is_verbose) {
             console.log(sql);
         }
-        const response = await this.rds_pool.query(sql);
-        return response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
+        const response = await this.pool.query(sql);
+        return response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, convert_postgres_output(item, field)])
             .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)));
     }
     async exec(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
-        const is_forced = Boolean(options.is_forced);
         if (is_verbose) {
             console.log(sql);
         }
-        const items = (sql.length <= 60000 && !is_forced) ?
-            await this.rds_data.executeStatement({
-                resourceArn: this.rds_cluster_arn,
-                secretArn: this.rds_secret_arn,
-                database: "triangle",
-                sql: sql,
-                includeResultMetadata: true
-            })
-                // .then(response => {
-                //     console.log(JSON.stringify(response, undefined, 4))
-                //     return response
-                // })
-                .then(response => (response.records || [])
-                .map((item) => Object.fromEntries((response.columnMetadata || [])
-                .map((column, i) => [column.name || "", column.typeName === "numeric" ? Number(convert_rds_output(item[i])) : convert_rds_output(item[i])])
-                .filter(([key, value]) => value !== null))))
-            :
-                await this.query(sql, options);
+        const items = await this.query(sql, options);
         if (!Array.isArray(items)) {
             if (is_verbose) {
                 console.log("Bad items:", items);
@@ -121,7 +100,7 @@ export class UtilsRDS {
         const defined_attribute_names = options.defined_attribute_names || [];
         const filters = options.filters || {};
         const clauses_where = [
-            ...Object.entries(filters).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)),
+            ...Object.entries(filters).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)),
             ...undefined_attribute_names.map(undefined_attribute_name => undefined_attribute_name + " IS NULL"),
             ...defined_attribute_names.map(undefined_attribute_name => undefined_attribute_name + " IS NOT NULL")
         ];
@@ -135,7 +114,7 @@ export class UtilsRDS {
         return items;
     }
     async get(table_id, primary_key, options = {}) {
-        const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ");
+        const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)).join(" AND ");
         const items = await this.exec(sql, options);
         const item = items[0];
         return item;
@@ -145,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_rds_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.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);
         }
@@ -153,7 +132,7 @@ export class UtilsRDS {
     }
     async create(table_id, item, options = {}) {
         const attribute_names = Object.keys(item).sort();
-        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;";
+        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;";
         try {
             const items = await this.exec(sql, options);
             return items;
@@ -173,7 +152,7 @@ export class UtilsRDS {
         const attribute_names = Array.from(new Set(items.map(item => Object.keys(item)).flat())).sort();
         const batch_num_items = options.batch_num_items || 100;
         for (let i = 0; i < items.length; i += batch_num_items) {
-            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;";
+            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;";
             try {
                 await this.exec(sql, options);
             }
@@ -188,7 +167,7 @@ export class UtilsRDS {
     }
     async put(table_id, item, options = {}) {
         const attribute_names = Object.keys(item).sort();
-        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";";
+        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";";
         try {
             const items = await this.exec(sql, options);
             return items;
@@ -208,7 +187,7 @@ export class UtilsRDS {
         const attribute_names = Array.from(new Set(items.map(item => Object.keys(item)).flat())).sort();
         const batch_num_items = options.batch_num_items || 100;
         for (let i = 0; i < items.length; i += batch_num_items) {
-            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";";
+            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";";
             try {
                 await this.exec(sql, options);
             }
@@ -222,20 +201,20 @@ export class UtilsRDS {
         }
     }
     async delete(table_id, primary_key, options = {}) {
-        const sql = "DELETE FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ");
+        const sql = "DELETE FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)).join(" AND ");
         return await this.exec(sql, options);
     }
     async batch_delete(table_id, primary_keys, options = {}) {
         const batch_num_items = options.batch_num_items || 100;
         const attribute_names = Array.from(new Set(primary_keys.map(primary_key => Object.keys(primary_key)).flat())).sort();
         for (let i = 0; i < primary_keys.length; i += batch_num_items) {
-            const sql = "DELETE FROM " + table_id + " WHERE " + "(" + attribute_names.join(", ") + ")" + " IN " + "(" + primary_keys.map(primary_key => "(" + attribute_names.map(attribute_name => convert_rds_input(primary_key[attribute_name])).join(", ") + ")").join(", ") + ")";
+            const sql = "DELETE 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(", ") + ")";
             await this.exec(sql, options);
         }
     }
     async set(table_id, primary_key, attributes, options = {}) {
         const attribute_names = Object.keys(attributes).sort();
-        const sql = "UPDATE " + table_id + " SET " + attribute_names.map(attribute_name => attribute_name + " = " + convert_rds_input(attributes[attribute_name])).join(", ") + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ");
+        const sql = "UPDATE " + table_id + " SET " + attribute_names.map(attribute_name => attribute_name + " = " + convert_postgres_input(attributes[attribute_name])).join(", ") + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)).join(" AND ");
         return await this.exec(sql, options);
     }
 }

package/dist/src/f.js CHANGED Viewed

@@ -83,21 +83,5 @@ const utils = new TriangleUtils(config);
 //     .then(response => console.log(response))
 // await utils.s3.get_download_url("s3://triangle-675045717295-us-east-1-an/tenant_documents/a3a9627f-a94d-4d47-a110-307a6f5563af/a146d789-da40-4e3c-a132-8b7110f3f7df.pdf", { name : "hye.pdf" })
 //     .then(response => console.log(response))
-await utils.bedrock.claude_invoke("global.anthropic.claude-haiku-4-5-20251001-v1:0", [
-    {
-        role: "user",
-        text: "ayo"
-    }
-], {
-    json_format: {
-        type: "object",
-        properties: {
-            relevance: {
-                type: "string"
-            }
-        },
-        required: ["relevance"],
-        additionalProperties: false
-    },
-    verbosity: 5
-});
+await utils.rds.query("SELECT * FROM twitter_tweets LIMIT 10")
+    .then(console.log);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.170",
+    "version": "1.4.172",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {
@@ -15,13 +15,11 @@
     "description": "",
     "type": "module",
     "dependencies": {
-        "@anthropic-ai/bedrock-sdk": "^0.32.0",
-        "@anthropic-ai/sdk": "^0.109.1",
+        "@anthropic-ai/bedrock-sdk": "^0.33.4",
+        "@anthropic-ai/sdk": "^0.124.0",
         "@aws-sdk/client-bedrock-runtime": "^3.953.0",
         "@aws-sdk/client-cognito-identity-provider": "^3.1004.0",
         "@aws-sdk/client-dynamodb": "^3.953.0",
-        "@aws-sdk/client-rds": "^3.1111.0",
-        "@aws-sdk/client-rds-data": "^3.1111.0",
         "@aws-sdk/client-s3": "^3.1106.0",
         "@aws-sdk/client-s3vectors": "^3.953.0",
         "@aws-sdk/client-secrets-manager": "^3.965.0",

package/src/UtilsMisc.ts CHANGED Viewed

@@ -174,4 +174,25 @@ export class UtilsMisc {
         })
     }
+    static get_line_fragments(fragment_max_size : number, text : string) {
+        const text_lines = text.split("\n")
+        const fragments : { min_index : number, max_index : number, fragment_text : string }[] = []
+        for (let index = 0; index < text_lines.length; index += 1) {
+            const line = text_lines[index]
+            const last_fragment = fragments.at(-1)
+            if (last_fragment === undefined || last_fragment.fragment_text.length + 1 + line.length > fragment_max_size) {
+                fragments.push({
+                    min_index : index,
+                    max_index : index + 1,
+                    fragment_text : line
+                })
+            } else {
+                fragments[fragments.length - 1].fragment_text = fragments[fragments.length - 1].fragment_text + "\n" + line
+                fragments[fragments.length - 1].max_index += 1
+            }
+        }
+        return fragments
+    }
 }

package/src/UtilsRDS.ts CHANGED Viewed

@@ -1,7 +1,6 @@
-import { Field, RDSData } from "@aws-sdk/client-rds-data"
-import { Client, Pool } from "pg"
+import { FieldDef, Pool } from "pg"
-function convert_rds_input(input : string | boolean | number | any[] | Record<string, any> | undefined) : string {
+function convert_postgres_input(input : string | boolean | number | any[] | Record<string, any> | undefined) : string {
     if (input === undefined) {
         return "NULL"
     } else if (typeof input === "string") {
@@ -11,7 +10,7 @@ function convert_rds_input(input : string | boolean | number | any[] | Record<st
     } else if (typeof input === "boolean") {
         return input.toString().toUpperCase()
     } else if (Array.isArray(input)) {
-        return "ARRAY[" + input.map(a => convert_rds_input(a)).join(", ") + "]"
+        return "ARRAY[" + input.map(a => convert_postgres_input(a)).join(", ") + "]"
     } else if (typeof input === "object") {
         if (input.expression !== undefined) {
             return input.expression
@@ -20,26 +19,36 @@ function convert_rds_input(input : string | boolean | number | any[] | Record<st
     return "NULL"
 }
-function convert_rds_output(input : Field) {
-    if (input.isNull) {
-        return undefined
-    } else if (input.stringValue !== undefined) {
-        return input.stringValue
-    } else if (input.doubleValue !== undefined) {
-        return input.doubleValue
-    } else if (input.longValue !== undefined) {
-        return input.longValue
-    } else if (input.booleanValue !== undefined) {
-        return input.booleanValue
-    } else if (input.arrayValue !== undefined) {
-        return [
-            ...(input.arrayValue.stringValues || []),
-            ...(input.arrayValue.longValues || []),
-            ...(input.arrayValue.booleanValues || [])
-        ]
-            .filter(value => value !== null)
+// function convert_rds_output(output : Field) {
+//     if (output.isNull) {
+//         return undefined
+//     } else if (output.stringValue !== undefined) {
+//         return output.stringValue
+//     } else if (output.doubleValue !== undefined) {
+//         return output.doubleValue
+//     } else if (output.longValue !== undefined) {
+//         return output.longValue
+//     } else if (output.booleanValue !== undefined) {
+//         return output.booleanValue
+//     } else if (output.arrayValue !== undefined) {
+//         return [
+//             ...(output.arrayValue.stringValues || []),
+//             ...(output.arrayValue.longValues || []),
+//             ...(output.arrayValue.booleanValues || [])
+//         ]
+//             .filter(value => value !== null)
+//     }
+//     return undefined
+// }
+function convert_postgres_output(output : any, field : FieldDef) {
+    if (field.dataTypeID === 1700) {
+        return Number(output[field.name])
+    }
+    if (field.dataTypeID === 712048) {
+        return JSON.parse(output[field.name])
     }
-    return undefined
+    return output[field.name]
 }
 export class UtilsRDS {
@@ -47,10 +56,7 @@ export class UtilsRDS {
     private readonly rds_host : string
     private readonly rds_username : string
     private readonly rds_password : string
-    private readonly rds_pool : Pool
-    private readonly rds_data : RDSData
-    private readonly rds_cluster_arn : string
-    private readonly rds_secret_arn : string
+    private readonly pool : Pool
     constructor(
         region : string,
@@ -63,7 +69,7 @@ export class UtilsRDS {
         this.rds_host = rds_host
         this.rds_username = rds_username
         this.rds_password = rds_password
-        this.rds_pool = new Pool({
+        this.pool = new Pool({
             host : this.rds_host,
             user : this.rds_username,
             password : this.rds_password,
@@ -73,9 +79,6 @@ export class UtilsRDS {
                 rejectUnauthorized: false
             }
         })
-        this.rds_data = new RDSData({ region : region })
-        this.rds_cluster_arn = rds_cluster_arn,
-        this.rds_secret_arn = rds_secret_arn
     }
     async query(
@@ -88,9 +91,9 @@ export class UtilsRDS {
         if (is_verbose) {
             console.log(sql)
         }
-        const response = await this.rds_pool.query(sql)
+        const response = await this.pool.query(sql)
         return response.rows.map(item => Object.fromEntries(
-            response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
+            response.fields.map(field => [field.name, convert_postgres_output(item, field)])
                 .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)
         ))
     }
@@ -98,35 +101,14 @@ export class UtilsRDS {
     async exec(
         sql : string,
         options : {
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
         const is_verbose = Boolean(options.is_verbose)
-        const is_forced = Boolean(options.is_forced)
         if (is_verbose) {
             console.log(sql)
         }
-        const items = (sql.length <= 60000 && !is_forced) ?
-            await this.rds_data.executeStatement({
-                resourceArn : this.rds_cluster_arn,
-                secretArn : this.rds_secret_arn,
-                database : "triangle",
-                sql : sql,
-                includeResultMetadata : true
-            })
-                // .then(response => {
-                //     console.log(JSON.stringify(response, undefined, 4))
-                //     return response
-                // })
-                .then(response => (response.records || [])
-                    .map((item : any) => Object.fromEntries((response.columnMetadata || [])
-                        .map((column, i) => [column.name || "", column.typeName === "numeric" ? Number(convert_rds_output(item[i])) : convert_rds_output(item[i])])
-                        .filter(([key, value]) => value !== null)
-                    ))
-                )
-        :
-            await this.query(sql, options)
+        const items = await this.query(sql, options)
         if (!Array.isArray(items)) {
             if (is_verbose) {
                 console.log("Bad items:", items)
@@ -144,15 +126,14 @@ export class UtilsRDS {
             defined_attribute_names? : string[],
             attribute_names? : string[],
             max_num_items? : number,
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
         const undefined_attribute_names = options.undefined_attribute_names || []
         const defined_attribute_names = options.defined_attribute_names || []
         const filters = options.filters || {}
         const clauses_where = [
-            ...Object.entries(filters).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)),
+            ...Object.entries(filters).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)),
             ...undefined_attribute_names.map(undefined_attribute_name => undefined_attribute_name + " IS NULL"),
             ...defined_attribute_names.map(undefined_attribute_name => undefined_attribute_name + " IS NOT NULL")
         ]
@@ -171,11 +152,10 @@ export class UtilsRDS {
         primary_key : Record<string, any>,
         options : {
             attribute_names? : string[],
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
-        const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ")
+        const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)).join(" AND ")
         const items = await this.exec(sql, options)
         const item : Record<string, any> | undefined = items[0]
         return item
@@ -187,15 +167,14 @@ export class UtilsRDS {
         options : {
             batch_num_items? : number,
             attribute_names? : string[],
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
         const batch_num_items = options.batch_num_items || 100
         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_rds_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.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)
         }
@@ -206,12 +185,11 @@ export class UtilsRDS {
         table_id : string,
         item : Record<string, any>,
         options : {
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
         const attribute_names = Object.keys(item).sort()
-        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;"
+        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;"
         try {
             const items = await this.exec(sql, options)
             return items
@@ -228,8 +206,7 @@ export class UtilsRDS {
         table_id : string,
         items : Record<string, any>[],
         options : {
-            is_verbose? : boolean,
-            is_forced? : boolean,
+            is_verbose? : boolean
             batch_num_items? : number
         } = {}
     ) {
@@ -239,7 +216,7 @@ export class UtilsRDS {
         const attribute_names = Array.from(new Set(items.map(item => Object.keys(item)).flat())).sort()
         const batch_num_items = options.batch_num_items || 100
         for (let i = 0; i < items.length; i += batch_num_items) {
-            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;"
+            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO NOTHING;"
             try {
                 await this.exec(sql, options)
             } catch (error : any) {
@@ -256,12 +233,11 @@ export class UtilsRDS {
         table_id : string,
         item : Record<string, any>,
         options : {
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
         const attribute_names = Object.keys(item).sort()
-        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";"
+        const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")" + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";"
         try {
             const items = await this.exec(sql, options)
             return items
@@ -279,7 +255,6 @@ export class UtilsRDS {
         items : Record<string, any>[],
         options : {
             is_verbose? : boolean,
-            is_forced? : boolean,
             batch_num_items? : number
         } = {}
     ) {
@@ -289,7 +264,7 @@ export class UtilsRDS {
         const attribute_names = Array.from(new Set(items.map(item => Object.keys(item)).flat())).sort()
         const batch_num_items = options.batch_num_items || 100
         for (let i = 0; i < items.length; i += batch_num_items) {
-            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_rds_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";"
+            const sql = "INSERT INTO " + table_id + " (" + attribute_names.join(", ") + ")" + " VALUES " + items.slice(i, i + batch_num_items).map(item => "(" + attribute_names.map(attribute_name => convert_postgres_input(item[attribute_name])).join(", ") + ")").join(", ") + " ON CONFLICT ON CONSTRAINT " + table_id + "_pkey DO UPDATE SET " + attribute_names.map(attribute_name => attribute_name + " = " + "EXCLUDED." + attribute_name).join(", ") + ";"
             try {
                 await this.exec(sql, options)
             } catch (error : any) {
@@ -306,11 +281,10 @@ export class UtilsRDS {
         table_id : string,
         primary_key : Record<string, any>,
         options : {
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
-        const sql = "DELETE FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ")
+        const sql = "DELETE FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)).join(" AND ")
         return await this.exec(sql, options)
     }
@@ -319,14 +293,13 @@ export class UtilsRDS {
         primary_keys : Record<string, any>[],
         options : {
             is_verbose? : boolean,
-            is_forced? : boolean,
             batch_num_items? : number
         } = {}
     ) {
         const batch_num_items = options.batch_num_items || 100
         const attribute_names = Array.from(new Set(primary_keys.map(primary_key => Object.keys(primary_key)).flat())).sort()
         for (let i = 0; i < primary_keys.length; i += batch_num_items) {
-            const sql = "DELETE FROM " + table_id + " WHERE " + "(" + attribute_names.join(", ") + ")" + " IN " + "(" + primary_keys.map(primary_key => "(" + attribute_names.map(attribute_name => convert_rds_input(primary_key[attribute_name])).join(", ") + ")" ).join(", ") + ")"
+            const sql = "DELETE 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(", ") + ")"
             await this.exec(sql, options)
         }
     }
@@ -336,12 +309,11 @@ export class UtilsRDS {
         primary_key : Record<string, any>,
         attributes : Record<string, any>,
         options : {
-            is_verbose? : boolean,
-            is_forced? : boolean
+            is_verbose? : boolean
         } = {}
     ) {
         const attribute_names = Object.keys(attributes).sort()
-        const sql = "UPDATE " + table_id + " SET " + attribute_names.map(attribute_name => attribute_name + " = " + convert_rds_input(attributes[attribute_name])).join(", ") + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_rds_input(value)).join(" AND ")
+        const sql = "UPDATE " + table_id + " SET " + attribute_names.map(attribute_name => attribute_name + " = " + convert_postgres_input(attributes[attribute_name])).join(", ") + " WHERE " + Object.entries(primary_key).map(([key_name, value]) => key_name + " = " + convert_postgres_input(value)).join(" AND ")
         return await this.exec(sql, options)
     }

package/src/f.ts CHANGED Viewed

@@ -107,24 +107,5 @@ const utils = new TriangleUtils(config)
 //     .then(response => console.log(response))
-await utils.bedrock.claude_invoke("global.anthropic.claude-haiku-4-5-20251001-v1:0",
-    [
-        {
-            role : "user",
-            text : "ayo"
-        }
-    ],
-    {
-        json_format : {
-            type : "object",
-            properties : {
-                relevance : {
-                    type : "string"
-                }
-            },
-            required : ["relevance"],
-            additionalProperties : false
-        },
-        verbosity : 5
-    }
-)
+await utils.rds.query("SELECT * FROM twitter_tweets LIMIT 10")
+    .then(console.log)

package/dist/src/UtilsNitter.d.ts DELETED Viewed

@@ -1,24 +0,0 @@
-import { UtilsBee } from "./UtilsBee.js";
-export declare class Tweet {
-    readonly tweet_id: string;
-    readonly username: string;
-    readonly url: string;
-    readonly tweet_time: string;
-    readonly tweet_content: string;
-    readonly quote?: string;
-    readonly html: string;
-    readonly text: string;
-    constructor(tweet: any);
-    static is(tweet: any): tweet is Tweet;
-}
-export declare class UtilsNitter extends UtilsBee {
-    constructor(scraping_bee_api_key: string | undefined);
-    get_tweets(username: string, options?: {
-        min_tweet_id?: string;
-        min_tweet_time?: string;
-    }): Promise<Tweet[]>;
-    search(query: string, options?: {
-        min_tweet_id?: string;
-        min_tweet_time?: string;
-    }): Promise<Tweet[]>;
-}

package/dist/src/UtilsNitter.js DELETED Viewed

@@ -1,172 +0,0 @@
-import { JSDOM } from "jsdom";
-import { UtilsBee } from "./UtilsBee.js";
-import { UtilsMisc } from "./UtilsMisc.js";
-export class Tweet {
-    tweet_id;
-    username;
-    url;
-    tweet_time;
-    tweet_content;
-    quote;
-    html;
-    text;
-    constructor(tweet) {
-        if (!Tweet.is(tweet)) {
-            throw Error("Invalid input.");
-        }
-        this.tweet_id = tweet.tweet_id;
-        this.username = tweet.username;
-        this.url = tweet.url;
-        this.tweet_time = tweet.tweet_time;
-        this.tweet_content = tweet.tweet_content;
-        this.quote = tweet.quote;
-        this.html = tweet.html;
-        this.text = tweet.text;
-    }
-    static is(tweet) {
-        return (tweet !== undefined &&
-            typeof tweet.tweet_id === "string" &&
-            typeof tweet.username === "string" &&
-            typeof tweet.url === "string" &&
-            typeof tweet.tweet_time === "string" &&
-            typeof tweet.tweet_content === "string" &&
-            (tweet.quote === undefined || typeof tweet.quote === "string") &&
-            (typeof tweet.html === "string") &&
-            (typeof tweet.text === "string"));
-    }
-}
-function parse_tweet_element(tweet_element) {
-    if (tweet_element.className.includes("show-more")) {
-        return undefined;
-    }
-    const tweet_link = tweet_element.querySelector(".tweet-link");
-    if (tweet_link === null) {
-        return undefined;
-    }
-    const url_element = tweet_link.getAttribute("href");
-    const url = url_element !== null ? url_element.replace("#m", "") : undefined;
-    if (url === undefined) {
-        return undefined;
-    }
-    const username = url.split("/")[1];
-    const tweet_number = url.split("/")[3].padStart(20, "0");
-    const tweet_date = tweet_element.querySelector(".tweet-date")?.querySelector("a")?.getAttribute("title")?.replace(" · ", " ");
-    if (tweet_date === undefined) {
-        return undefined;
-    }
-    const tweet_time = (new Date(tweet_date)).toISOString();
-    const tweet_id = tweet_time.substring(0, 16) + "|" + tweet_number;
-    const tweet_content = tweet_element.querySelector(".tweet-content")?.innerHTML?.replaceAll(/\<[^\>]+\>/g, "");
-    if (tweet_content === undefined) {
-        return undefined;
-    }
-    const tweet_quote = tweet_element.querySelector(".quote-big");
-    const quote = tweet_quote !== null ?
-        tweet_quote.innerHTML
-            .replaceAll(/\<[^\>]+\>/g, "")
-            .replaceAll(/[^\n\S\r]+/g, " ").split("\n").map(line => line.trim()).filter(line => line !== "").join("\n")
-        :
-            undefined;
-    const text = "Tweet from @" + username + " on " + tweet_time + ":\n\n" +
-        tweet_content +
-        (quote !== undefined ? ("\n\nQuote:\n\n" + quote) : "");
-    const html = tweet_element.innerHTML;
-    const tweet = {
-        tweet_id: tweet_id,
-        username: username,
-        url: url,
-        tweet_time: tweet_time,
-        tweet_content: tweet_content,
-        quote: quote,
-        html: html,
-        text: text
-    };
-    return tweet;
-}
-function parse_nitter_html(nitter_html) {
-    const dom = new JSDOM(nitter_html);
-    const root = dom.window.document.body;
-    const tweet_elements = root.querySelectorAll(".timeline-item");
-    const tweets = Array.from(tweet_elements).map(parse_tweet_element).filter(tweet => tweet !== undefined);
-    const next_button = root.querySelector(".show-more:not(.timeline-item)");
-    const next_button_link = next_button !== null ? next_button.querySelector("a") : null;
-    const next_nitter_query = (next_button_link !== null ? next_button_link.getAttribute("href") : null) || undefined;
-    return { tweets: tweets, next_nitter_query: next_nitter_query };
-}
-export class UtilsNitter extends UtilsBee {
-    constructor(scraping_bee_api_key) {
-        super(scraping_bee_api_key);
-    }
-    async get_tweets(username, options) {
-        const min_tweet_id = options !== undefined ? options.min_tweet_id : undefined;
-        const min_tweet_time = options !== undefined ? options.min_tweet_time : undefined;
-        console.log("Querying Twitter: @" + username, "min_tweet_id:", min_tweet_id, "min_tweet_time:", min_tweet_time);
-        let nitter_query = "";
-        const tweets = [];
-        while (nitter_query !== undefined) {
-            const nitter_url = "https://nitter.net/" + username + nitter_query;
-            console.log(nitter_url);
-            let nitter_html = undefined;
-            for (let i = 0; i < 10; i++) {
-                nitter_html = await this.get(nitter_url, { render_js: false });
-                if (nitter_html !== undefined && nitter_html !== "" && !(nitter_html instanceof Error)) {
-                    break;
-                }
-                console.log("Failed to query Nitter, trying again.");
-                await UtilsMisc.wait((2 + 2 * i) * 1000);
-            }
-            if (nitter_html === undefined || nitter_html === "" || nitter_html instanceof Error) {
-                console.log("Nitter failed for url", nitter_url);
-                return [];
-            }
-            const nitter_data = parse_nitter_html(nitter_html);
-            nitter_query = nitter_data.next_nitter_query;
-            for (const tweet of nitter_data.tweets) {
-                if (min_tweet_id !== undefined && tweet.tweet_id.localeCompare(min_tweet_id) < 0) {
-                    nitter_query = undefined;
-                }
-                if (min_tweet_time !== undefined && tweet.tweet_time.localeCompare(min_tweet_time) < 0) {
-                    nitter_query = undefined;
-                }
-                tweets.push(tweet);
-            }
-        }
-        return tweets;
-    }
-    async search(query, options) {
-        const min_tweet_id = options !== undefined ? options.min_tweet_id : undefined;
-        const min_tweet_time = options !== undefined ? options.min_tweet_time : undefined;
-        console.log("Querying Twitter:", query, "min_tweet_id:", min_tweet_id, "min_tweet_time:", min_tweet_time);
-        let nitter_query = "?f=tweets&q=" + query + "&e-nativeretweets=on";
-        const tweets = [];
-        while (nitter_query !== undefined) {
-            const nitter_url = "https://nitter.net/search" + nitter_query;
-            console.log(nitter_url);
-            let nitter_html = undefined;
-            for (let i = 0; i < 10; i++) {
-                nitter_html = await this.get(nitter_url, { render_js: false });
-                if (nitter_html !== undefined && nitter_html !== "" && !(nitter_html instanceof Error)) {
-                    break;
-                }
-                console.log("Failed to query Nitter, trying again.");
-                await UtilsMisc.wait((2 + 2 * i) * 1000);
-            }
-            if (nitter_html === undefined || nitter_html === "" || nitter_html instanceof Error) {
-                console.log("Nitter failed for url", nitter_url);
-                return [];
-            }
-            const nitter_data = parse_nitter_html(nitter_html);
-            nitter_query = nitter_data.next_nitter_query;
-            for (const tweet of nitter_data.tweets) {
-                if (min_tweet_id !== undefined && tweet.tweet_id.localeCompare(min_tweet_id) < 0) {
-                    nitter_query = undefined;
-                }
-                if (min_tweet_time !== undefined && tweet.tweet_time.localeCompare(min_tweet_time) < 0) {
-                    nitter_query = undefined;
-                }
-                tweets.push(tweet);
-            }
-        }
-        return tweets;
-    }
-}

package/dist/src/types/TriangleUtilsConfig.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-export interface TriangleUtilsConfig {
-    region: string;
-    scraping_bee_api_key?: string;
-    youtube_api_key?: string;
-    [key: string]: any;
-}

package/dist/src/types/TriangleUtilsConfig.js DELETED Viewed

	@@ -1 +0,0 @@
1	- export {};