triangle-utils 1.4.156 → 1.4.158

package/dist/src/UtilsRDS.d.ts

@@ -1,5 +1,8 @@
 export declare class UtilsRDS {
-    private readonly postgres;
+    private readonly rds_host;
+    private readonly rds_username;
+    private readonly rds_password;
+    private postgres?;
     private readonly rds_data;
     private readonly rds_cluster_arn;
     private readonly rds_secret_arn;
@@ -8,7 +11,7 @@ export declare class UtilsRDS {
     disconnect(): Promise<void>;
     query(sql: string, options?: {
         is_verbose?: boolean;
-    }): Promise<any[]>;
+    }): Promise<any[] | undefined>;
     exec(sql: string, options?: {
         is_verbose?: boolean;
         is_forced?: boolean;
@@ -27,7 +30,8 @@ export declare class UtilsRDS {
         is_verbose?: boolean;
         is_forced?: boolean;
     }): Promise<Record<string, any> | undefined>;
-    batch_get(table_id: string, primary_key: Record<string, any[]>, options?: {
+    batch_get(table_id: string, primary_keys: Record<string, any>[], options?: {
+        batch_num_items?: number;
         attribute_names?: string[];
         is_verbose?: boolean;
         is_forced?: boolean;

package/dist/src/UtilsRDS.js

@@ -50,37 +50,56 @@ function convert_rds_output(input) {
     return undefined;
 }
 export class UtilsRDS {
+    rds_host;
+    rds_username;
+    rds_password;
     postgres;
     rds_data;
     rds_cluster_arn;
     rds_secret_arn;
     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_data = new RDSData({ region: region });
+        this.rds_cluster_arn = rds_cluster_arn,
+            this.rds_secret_arn = rds_secret_arn;
+    }
+    async connect() {
+        if (this.postgres !== undefined) {
+            await this.disconnect();
+        }
         this.postgres = new Client({
-            host: rds_host,
-            user: rds_username,
-            password: rds_password,
+            host: this.rds_host,
+            user: this.rds_username,
+            password: this.rds_password,
             database: "triangle",
             port: 5432,
             ssl: {
                 rejectUnauthorized: false
             }
         });
-        this.rds_data = new RDSData({ region: region });
-        this.rds_cluster_arn = rds_cluster_arn,
-            this.rds_secret_arn = rds_secret_arn;
-    }
-    async connect() {
         await this.postgres.connect();
     }
     async disconnect() {
+        if (this.postgres === undefined) {
+            return;
+        }
         await this.postgres.end();
+        this.postgres = undefined;
     }
     async query(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
+        await this.connect();
         if (is_verbose) {
             console.log(sql);
         }
+        if (this.postgres === undefined) {
+            console.log("Failed to connect to Postgres.");
+            return;
+        }
         const response = await this.postgres.query(sql);
+        await this.disconnect();
         return response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
             .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)));
     }
@@ -140,9 +159,15 @@ export class UtilsRDS {
         const item = items[0];
         return item;
     }
-    async batch_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, values]) => key_name + " IN " + "(" + values.map(value => convert_rds_input(value)).join(", ") + ")").join(" AND ");
-        const items = await this.exec(sql, options);
+    async batch_get(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();
+        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 new_items = await this.exec(sql, options);
+            items.push(...new_items);
+        }
         return items;
     }
     async create(table_id, item, options = {}) {

package/dist/src/f.js

@@ -81,5 +81,7 @@ const utils = new TriangleUtils(config);
 //     .then(user => console.log(user))
 // await utils.bedrock.cohere_invoke("cohere.embed-v4", "yyyyyuuuuuurrrrr")
 //     .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.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))
+const scouts = await utils.rds.batch_get("scouts", [], { is_verbose: true })
+    .then(console.log);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.156",
+    "version": "1.4.158",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsRDS.ts

@@ -44,7 +44,10 @@ function convert_rds_output(input : Field) {
 
 export class UtilsRDS {
 
-    private readonly postgres : Client
+    private readonly rds_host : string
+    private readonly rds_username : string
+    private readonly rds_password : string
+    private postgres? : Client
     private readonly rds_data : RDSData
     private readonly rds_cluster_arn : string
     private readonly rds_secret_arn : string
@@ -57,27 +60,37 @@ export class UtilsRDS {
         rds_username : string,
         rds_password : string
     ) {
+        this.rds_host = rds_host
+        this.rds_username = rds_username
+        this.rds_password = rds_password
+        this.rds_data = new RDSData({ region : region })
+        this.rds_cluster_arn = rds_cluster_arn,
+        this.rds_secret_arn = rds_secret_arn
+    }
+
+    async connect() {
+        if (this.postgres !== undefined) {
+            await this.disconnect()
+        }
         this.postgres = new Client({
-            host : rds_host,
-            user : rds_username,
-            password : rds_password,
+            host : this.rds_host,
+            user : this.rds_username,
+            password : this.rds_password,
             database : "triangle",
             port : 5432,
             ssl : {
                 rejectUnauthorized: false
             }
         })
-        this.rds_data = new RDSData({ region : region })
-        this.rds_cluster_arn = rds_cluster_arn,
-        this.rds_secret_arn = rds_secret_arn
-    }
-
-    async connect() {
         await this.postgres.connect()
     }
 
     async disconnect() {
+        if (this.postgres === undefined) {
+            return
+        }
         await this.postgres.end()
+        this.postgres = undefined
     }
 
     async query(
@@ -87,10 +100,16 @@ export class UtilsRDS {
         } = {}
     ) {
         const is_verbose = Boolean(options.is_verbose)
+        await this.connect()
         if (is_verbose) {
             console.log(sql)
         }
+        if (this.postgres === undefined) {
+            console.log("Failed to connect to Postgres.")
+            return
+        }
         const response = await this.postgres.query(sql)
+        await this.disconnect()
         return response.rows.map(item => Object.fromEntries(
             response.fields.map(field => [field.name, field.dataTypeID === 1700 ? Number(item[field.name]) : item[field.name]])
                 .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)
@@ -185,15 +204,22 @@ export class UtilsRDS {
 
     async batch_get(
         table_id : string,
-        primary_key : Record<string, any[]>,
+        primary_keys : Record<string, any>[],
         options : {
+            batch_num_items? : number,
             attribute_names? : string[],
             is_verbose? : boolean,
             is_forced? : boolean
         } = {}
     ) {
-        const sql = "SELECT " + (options.attribute_names === undefined ? "*" : options.attribute_names.join(", ")) + " FROM " + table_id + " WHERE " + Object.entries(primary_key).map(([key_name, values]) => key_name + " IN " + "(" + values.map(value => convert_rds_input(value)).join(", ") + ")").join(" AND ")
-        const items = await this.exec(sql, 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()
+        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 new_items = await this.exec(sql, options)
+            items.push(...new_items)
+        }
         return items
     }
 

package/src/f.ts

@@ -103,5 +103,8 @@ const utils = new TriangleUtils(config)
 // await utils.bedrock.cohere_invoke("cohere.embed-v4", "yyyyyuuuuuurrrrr")
 //     .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.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))
+
+    const scouts = await utils.rds.batch_get("scouts", [], { is_verbose : true })
+        .then(console.log)