triangle-utils 1.4.86 → 1.4.88

package/dist/src/UtilsBedrock.d.ts

@@ -13,6 +13,7 @@ export declare class UtilsBedrock {
         system_prompt?: string;
         max_tokens?: number;
         print_usage?: boolean;
+        print_content?: boolean;
         json_format?: Record<string, any>;
         web?: boolean;
         cache_period?: "5m" | "1h";

package/dist/src/UtilsBedrock.js

@@ -44,6 +44,9 @@ export class UtilsBedrock {
             if (options.print_usage !== undefined && options.print_usage) {
                 console.log(usage);
             }
+            if (options.print_content !== undefined && options.print_content) {
+                console.log(response.content);
+            }
             const text = response.content.filter(content => content.type === "text")[0].text;
             return text;
         }

package/dist/src/UtilsS3.js

@@ -103,21 +103,27 @@ export class UtilsS3 {
         const s3_ids = [];
         let last_token = undefined;
         while (true) {
-            const response = await this.s3.listObjectsV2({
+            const request = {
                 Bucket: s3_key.Bucket,
                 Delimiter: "/",
                 Prefix: s3_key.Key,
                 ContinuationToken: last_token
-            });
-            if (response.Contents === undefined) {
-                return [];
-            }
-            const new_s3_ids = response.Contents
+            };
+            const response = await this.s3.listObjectsV2(request);
+            const new_s3_ids = (response.Contents || [])
                 .map(content => content.Key)
                 .filter(key => key !== undefined)
                 .filter(key => key.substring(key.length - 1) !== "/")
                 .map(key => "s3://" + s3_key.Bucket + "/" + key);
             s3_ids.push(...new_s3_ids);
+            const sub_s3_id_prefixes = (response.CommonPrefixes || [])
+                .map(prefix => prefix.Prefix)
+                .filter(prefix => prefix !== undefined)
+                .map(prefix => "s3://" + s3_key.Bucket + "/" + prefix);
+            for (const sub_s3_id_prefix of sub_s3_id_prefixes) {
+                const new_sub_s3_ids = await this.query_prefix(sub_s3_id_prefix);
+                s3_ids.push(...new_sub_s3_ids);
+            }
             if (response.NextContinuationToken === undefined || !compile) {
                 return s3_ids;
             }

package/dist/src/UtilsS3Vectors.js

@@ -1,4 +1,11 @@
 import { S3Vectors } from "@aws-sdk/client-s3vectors";
+function get_vector_key(vector_id) {
+    const [vector_bucket_name, vector_index_name, vector_key] = (vector_id.match(/^s3vectors\:\/\/([^\/]+)\/([^\/]+)\/([^$]+)$/) || []).slice(1, 4);
+    if (vector_bucket_name === undefined || vector_index_name === undefined || vector_key === undefined) {
+        return undefined;
+    }
+    return { vector_bucket_name: vector_bucket_name, vector_index_name: vector_index_name, vector_key: vector_key };
+}
 export class UtilsS3Vectors {
     s3vectors;
     constructor(region) {

package/dist/src/f.js

@@ -1,7 +1,7 @@
 import { SecretsManager } from "@aws-sdk/client-secrets-manager";
 import { TriangleUtils } from "./index.js";
 console.log("Starting triangle-utils!");
-const secret_name = "elections_config";
+const secret_name = "global_config";
 const secrets_manager = new SecretsManager({ region: "us-east-1" });
 const secret = await secrets_manager.getSecretValue({
     SecretId: secret_name
@@ -15,6 +15,9 @@ const config = {
 };
 console.log(config);
 const utils = new TriangleUtils(config);
+const raw_s3_id_prefix = config.s3_scout + "/raw_scout_documents/57523929653b604e/";
+const raw_s3_ids = await utils.s3.query_prefix(raw_s3_id_prefix, { compile: true });
+console.log(raw_s3_ids);
 // const text = await utils.xai.grok_simple_query("grok-4.3", "Find the X username corresponding to the candidate of the committee \"Darializa for Congress\"", {
 //     print_usage : true,
 //     json_format : {
@@ -218,10 +221,14 @@ const utils = new TriangleUtils(config);
 // console.log(results)
 // const f = await utils.dynamodb.query_range("federal_election_donations:donor_address_state_id.federal_election_committee_id-receipt_date-federal_election_donation_id", { donor_address_state_id : "NH", federal_election_committee_id : "C00694323" }, { receipt_date : ["2021", "2023"] }, { compile : false })
 // console.log(f)
-console.log("YERP");
-const response = await utils.bedrock.claude_converse("anthropic.claude-opus-4-8", [
-    { role: "user", text: "Hi" }
-], {
-    print_usage: true
-});
-console.log(response);
+// console.log("YERP")
+// const response = await utils.bedrock.claude_converse(
+//     "anthropic.claude-opus-4-8",
+//     [
+//         { role : "user", text : "Hi" }
+//     ],
+//     {
+//         print_usage : true
+//     }
+// )
+// console.log(response)

package/package.json

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

package/src/UtilsBedrock.ts

@@ -29,6 +29,7 @@ export class UtilsBedrock {
             system_prompt? : string,
             max_tokens? : number,
             print_usage? : boolean,
+            print_content? : boolean,
             json_format? : Record<string, any>,
             web? : boolean,
             cache_period? : "5m" | "1h"
@@ -65,6 +66,9 @@ export class UtilsBedrock {
             if (options.print_usage !== undefined && options.print_usage) {
                 console.log(usage)
             }
+            if (options.print_content !== undefined && options.print_content) {
+                console.log(response.content)
+            }
             const text = response.content.filter(content => content.type === "text")[0].text
             return text
         } catch (error) {

package/src/UtilsS3.ts

@@ -1,4 +1,4 @@
-import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand, ListObjectsV2CommandOutput } from "@aws-sdk/client-s3"
+import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand, ListObjectsV2CommandOutput, ListObjectsV2CommandInput } from "@aws-sdk/client-s3"
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
 import { Readable } from "stream"
 
@@ -110,24 +110,30 @@ export class UtilsS3 {
         if (s3_key === undefined) {
             return []
         }
-        const s3_ids = []
+        const s3_ids : string[] = []
         let last_token : string | undefined = undefined
         while (true) {
-            const response : ListObjectsV2CommandOutput = await this.s3.listObjectsV2({
+            const request : ListObjectsV2CommandInput = {
                 Bucket : s3_key.Bucket,
                 Delimiter : "/",
                 Prefix : s3_key.Key,
                 ContinuationToken : last_token
-            })
-            if (response.Contents === undefined) {
-                return []
             }
-            const new_s3_ids = response.Contents
+            const response : ListObjectsV2CommandOutput = await this.s3.listObjectsV2(request)
+            const new_s3_ids = (response.Contents || [])
                 .map(content => content.Key)
                 .filter(key => key !== undefined)
                 .filter(key => key.substring(key.length - 1) !== "/")
                 .map(key => "s3://" + s3_key.Bucket + "/" + key)
             s3_ids.push(...new_s3_ids)
+            const sub_s3_id_prefixes = (response.CommonPrefixes || [])
+                .map(prefix => prefix.Prefix)
+                .filter(prefix => prefix !== undefined)
+                .map(prefix => "s3://" + s3_key.Bucket + "/" + prefix)
+            for (const sub_s3_id_prefix of sub_s3_id_prefixes) {
+                const new_sub_s3_ids = await this.query_prefix(sub_s3_id_prefix)
+                s3_ids.push(...new_sub_s3_ids)
+            }
             if (response.NextContinuationToken === undefined || !compile) {
                 return s3_ids
             }

package/src/UtilsS3Vectors.ts

@@ -1,6 +1,21 @@
 import { ListVectorsCommandInput, S3Vectors } from "@aws-sdk/client-s3vectors"
 
+interface VectorKey {
+    vector_bucket_name : string,
+    vector_index_name : string,
+    vector_key : string
+}
+
+function get_vector_key(vector_id : string) : VectorKey | undefined {
+    const [vector_bucket_name, vector_index_name, vector_key] = (vector_id.match(/^s3vectors\:\/\/([^\/]+)\/([^\/]+)\/([^$]+)$/) || []).slice(1, 4)
+    if (vector_bucket_name === undefined || vector_index_name === undefined || vector_key === undefined) {
+        return undefined
+    }
+    return { vector_bucket_name : vector_bucket_name, vector_index_name : vector_index_name, vector_key : vector_key }
+}
+
 export interface Vector {
+    
     key : string,
     data : number[],
     metadata : any

package/src/UtilsXAI.ts

@@ -90,7 +90,7 @@ export class UtilsXAI {
                 "Authorization" : "Bearer " + this.xai_api_key
             }
         })
-        const output = await response.json()
+        const output : any = await response.json()
         if (options.print_usage !== undefined && options.print_usage) {
             console.log(output.usage)
         }

package/src/f.ts

@@ -3,7 +3,7 @@ import { TriangleUtils } from "."
 
 console.log("Starting triangle-utils!")
 
-const secret_name = "elections_config"
+const secret_name = "global_config"
 
 const secrets_manager = new SecretsManager({ region: "us-east-1" })
 
@@ -24,6 +24,11 @@ console.log(config)
 
 const utils = new TriangleUtils(config)
 
+const raw_s3_id_prefix = config.s3_scout + "/raw_scout_documents/57523929653b604e/"
+const raw_s3_ids = await utils.s3.query_prefix(raw_s3_id_prefix, { compile : true })
+
+console.log(raw_s3_ids)
+
 // const text = await utils.xai.grok_simple_query("grok-4.3", "Find the X username corresponding to the candidate of the committee \"Darializa for Congress\"", {
 //     print_usage : true,
 //     json_format : {
@@ -253,14 +258,14 @@ const utils = new TriangleUtils(config)
 // const f = await utils.dynamodb.query_range("federal_election_donations:donor_address_state_id.federal_election_committee_id-receipt_date-federal_election_donation_id", { donor_address_state_id : "NH", federal_election_committee_id : "C00694323" }, { receipt_date : ["2021", "2023"] }, { compile : false })
 
 // console.log(f)
-console.log("YERP")
-const response = await utils.bedrock.claude_converse(
-    "anthropic.claude-opus-4-8",
-    [
-        { role : "user", text : "Hi" }
-    ],
-    {
-        print_usage : true
-    }
-)
-console.log(response)
+// console.log("YERP")
+// const response = await utils.bedrock.claude_converse(
+//     "anthropic.claude-opus-4-8",
+//     [
+//         { role : "user", text : "Hi" }
+//     ],
+//     {
+//         print_usage : true
+//     }
+// )
+// console.log(response)