triangle-utils 1.4.71 → 1.4.73

package/dist/src/UtilsDynamoDB.js

@@ -197,8 +197,7 @@ export class UtilsDynamoDB {
         const compile = options.compile !== undefined ? options.compile : true;
         // const project = options.project !== undefined ? options.project : false
         const attribute_names = options.attribute_names !== undefined ? options.attribute_names : [];
-        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
-            index_name !== undefined && Object.keys(primary_key).length !== index_name.split(".")[0].split("-").length) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1) {
             return [];
         }
         const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");
@@ -251,8 +250,7 @@ export class UtilsDynamoDB {
         const undefined_attribute_names = options.undefined_attribute_names !== undefined ? options.undefined_attribute_names : [];
         const defined_attribute_names = options.defined_attribute_names !== undefined ? options.defined_attribute_names : [];
         const attribute_names = options.attribute_names !== undefined ? options.attribute_names : [];
-        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
-            index_name !== undefined && Object.keys(primary_key).length !== index_name.split(".")[0].split("-").length) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1) {
             return [];
         }
         const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");
@@ -312,8 +310,7 @@ export class UtilsDynamoDB {
         const undefined_attribute_names = options.undefined_attribute_names !== undefined ? options.undefined_attribute_names : [];
         const defined_attribute_names = options.defined_attribute_names !== undefined ? options.defined_attribute_names : [];
         const attribute_names = options.attribute_names !== undefined ? options.attribute_names : [];
-        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
-            index_name !== undefined && Object.keys(primary_key).length !== index_name.split(".")[0].split("-").length) {
+        if (index_name === undefined && Object.keys(primary_key).length !== 1) {
             return [];
         }
         const projection_expression = attribute_names.map(attribute_name => "#" + attribute_name).join(", ");

package/dist/src/UtilsMisc.d.ts

@@ -1,11 +1,11 @@
-import { TriangleUtilsConfig } from "./types/TriangleUtilsConfig.js";
+import { GlobalConfig } from "./types/GlobalConfig.js";
 interface Encryption {
     iv: string;
     ciphertext: string;
 }
 export declare class UtilsMisc {
-    readonly config: TriangleUtilsConfig;
-    constructor(config: TriangleUtilsConfig);
+    readonly config: GlobalConfig;
+    constructor(config: GlobalConfig);
     safe_run<T>(f: () => Promise<T>): Promise<T | undefined>;
     iterate<T, U>(inputs: T[], f: (input: T, iterator_id: number, index: number) => Promise<U>, num_iterators?: number, print_option?: number | boolean): Promise<(U | undefined)[]>;
     static wait(duration: number): Promise<unknown>;

package/dist/src/f.js

@@ -211,8 +211,10 @@ const utils = new TriangleUtils(config);
 // ]
 // })
 // console.log(JSON.stringify(tweet, undefined, 4))
-const results = await utils.twitter.get_tweets("1603470469608374272", {
-    compile: true,
-    min_twitter_tweet_id: "2061610563679985813"
-});
-console.log(results);
+// const results = await utils.twitter.get_tweets("1603470469608374272", {
+//     compile : true,
+//     min_twitter_tweet_id : "2061610563679985813"
+// })
+// 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);

package/dist/src/index.d.ts

@@ -1,4 +1,3 @@
-import { TriangleUtilsConfig } from "./types/TriangleUtilsConfig.js";
 import { UtilsDynamoDB } from "./UtilsDynamoDB.js";
 import { UtilsS3 } from "./UtilsS3.js";
 import { UtilsBedrock } from "./UtilsBedrock.js";
@@ -11,6 +10,7 @@ import { UtilsYoutube } from "./UtilsYoutube.js";
 import { UtilsXAI } from "./UtilsXAI.js";
 import { UtilsAnthropic } from "./UtilsAnthropic.js";
 import { UtilsTwitter } from "./UtilsTwitter.js";
+import { GlobalConfig } from "./types/GlobalConfig.js";
 export declare class TriangleUtils extends UtilsMisc {
     readonly dynamodb: UtilsDynamoDB;
     readonly s3: UtilsS3;
@@ -23,9 +23,10 @@ export declare class TriangleUtils extends UtilsMisc {
     readonly anthropic: UtilsAnthropic;
     readonly xai: UtilsXAI;
     readonly twitter: UtilsTwitter;
-    constructor(config: TriangleUtilsConfig);
+    constructor(config: GlobalConfig);
 }
-export * from "./types/TriangleUtilsConfig.js";
+export * from "./types/ApplicationConfig.js";
+export * from "./types/GlobalConfig.js";
 export * from "./UtilsMisc.js";
 export * from "./UtilsAnthropic.js";
 export * from "./UtilsDynamoDB.js";

package/dist/src/index.js

@@ -37,7 +37,8 @@ export class TriangleUtils extends UtilsMisc {
         this.twitter = new UtilsTwitter(config.twitter_api_key);
     }
 }
-export * from "./types/TriangleUtilsConfig.js";
+export * from "./types/ApplicationConfig.js";
+export * from "./types/GlobalConfig.js";
 export * from "./UtilsMisc.js";
 export * from "./UtilsAnthropic.js";
 export * from "./UtilsDynamoDB.js";

package/dist/src/types/ApplicationConfig.d.ts

@@ -0,0 +1,11 @@
+export declare class ApplicationConfig {
+    readonly cognito_client_id: string;
+    readonly cognito_client_secret: string;
+    readonly client_url: string;
+    readonly client_dev_url: string;
+    readonly api_url: string;
+    readonly api_dev_url: string;
+    readonly [x: string]: any;
+    constructor(application_config: ApplicationConfig);
+    static is(application_config: any): application_config is ApplicationConfig;
+}

package/dist/src/types/ApplicationConfig.js

@@ -0,0 +1,28 @@
+export class ApplicationConfig {
+    cognito_client_id;
+    cognito_client_secret;
+    client_url;
+    client_dev_url;
+    api_url;
+    api_dev_url;
+    constructor(application_config) {
+        if (!ApplicationConfig.is(application_config)) {
+            throw Error("Invalid input.");
+        }
+        this.cognito_client_id = application_config.cognito_client_id;
+        this.cognito_client_secret = application_config.cognito_client_secret;
+        this.client_url = application_config.client_url;
+        this.client_dev_url = application_config.client_dev_url;
+        this.api_url = application_config.api_url;
+        this.api_dev_url = application_config.api_dev_url;
+    }
+    static is(application_config) {
+        return (application_config !== undefined &&
+            typeof application_config.cognito_client_id === "string" &&
+            typeof application_config.cognito_client_secret === "string" &&
+            typeof application_config.client_url === "string" &&
+            typeof application_config.client_dev_url === "string" &&
+            typeof application_config.api_url === "string" &&
+            typeof application_config.api_dev_url === "string");
+    }
+}

package/dist/src/types/GlobalConfig.d.ts

@@ -0,0 +1,20 @@
+export declare class GlobalConfig {
+    readonly region: string;
+    readonly cognito_user_pool_id: string;
+    readonly secret_key: string;
+    readonly auth_url: string;
+    readonly s3_elections: string;
+    readonly s3_prism: string;
+    readonly s3_triage: string;
+    readonly super_federal_gov_api_keys: string;
+    readonly federal_gov_api_keys: string;
+    readonly federal_lobby_api_key: string;
+    readonly scraping_bee_api_key: string;
+    readonly twitter_api_key: string;
+    readonly youtube_api_key: string;
+    readonly anthropic_api_key: string;
+    readonly xai_api_key: string;
+    readonly [x: string]: any;
+    constructor(global_config: GlobalConfig);
+    static is(global_config: any): global_config is GlobalConfig;
+}

package/dist/src/types/GlobalConfig.js

@@ -0,0 +1,55 @@
+export class GlobalConfig {
+    region;
+    cognito_user_pool_id;
+    secret_key;
+    auth_url;
+    s3_elections;
+    s3_prism;
+    s3_triage;
+    super_federal_gov_api_keys;
+    federal_gov_api_keys;
+    federal_lobby_api_key;
+    scraping_bee_api_key;
+    twitter_api_key;
+    youtube_api_key;
+    anthropic_api_key;
+    xai_api_key;
+    constructor(global_config) {
+        if (!GlobalConfig.is(global_config)) {
+            throw Error("Invalid input.");
+        }
+        this.region = global_config.region;
+        this.cognito_user_pool_id = global_config.cognito_user_pool_id;
+        this.secret_key = global_config.secret_key;
+        this.auth_url = global_config.auth_url;
+        this.s3_elections = global_config.s3_elections;
+        this.s3_prism = global_config.s3_prism;
+        this.s3_triage = global_config.s3_triage;
+        this.super_federal_gov_api_keys = global_config.super_federal_gov_api_keys;
+        this.federal_gov_api_keys = global_config.federal_gov_api_keys;
+        this.federal_lobby_api_key = global_config.federal_lobby_api_key;
+        this.scraping_bee_api_key = global_config.scraping_bee_api_key;
+        this.twitter_api_key = global_config.twitter_api_key;
+        this.youtube_api_key = global_config.youtube_api_key;
+        this.anthropic_api_key = global_config.anthropic_api_key;
+        this.xai_api_key = global_config.xai_api_key;
+    }
+    static is(global_config) {
+        return (global_config !== undefined &&
+            typeof global_config.region === "string" &&
+            typeof global_config.cognito_user_pool_id === "string" &&
+            typeof global_config.secret_key === "string" &&
+            typeof global_config.auth_url === "string" &&
+            typeof global_config.s3_elections === "string" &&
+            typeof global_config.s3_prism === "string" &&
+            typeof global_config.s3_triage === "string" &&
+            typeof global_config.super_federal_gov_api_keys === "string" &&
+            typeof global_config.federal_gov_api_keys === "string" &&
+            typeof global_config.federal_lobby_api_key === "string" &&
+            typeof global_config.scraping_bee_api_key === "string" &&
+            typeof global_config.twitter_api_key === "string" &&
+            typeof global_config.youtube_api_key === "string" &&
+            typeof global_config.anthropic_api_key === "string" &&
+            typeof global_config.xai_api_key === "string");
+    }
+}

package/package.json

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

package/src/UtilsDynamoDB.ts

@@ -244,8 +244,7 @@ export class UtilsDynamoDB {
         // const project = options.project !== undefined ? options.project : false
         const attribute_names : string[] = options.attribute_names !== undefined ? options.attribute_names : []
 
-        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
-            index_name !== undefined && Object.keys(primary_key).length !== index_name.split(".")[0].split("-").length
+        if (index_name === undefined && Object.keys(primary_key).length !== 1
         ) {
             return []
         }
@@ -314,8 +313,7 @@ export class UtilsDynamoDB {
         const defined_attribute_names : string[] = options.defined_attribute_names !== undefined ? options.defined_attribute_names : []
         const attribute_names : string[] = options.attribute_names !== undefined ? options.attribute_names : []
 
-        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
-            index_name !== undefined && Object.keys(primary_key).length !== index_name.split(".")[0].split("-").length
+        if (index_name === undefined && Object.keys(primary_key).length !== 1
         ) {
             return []
         }
@@ -391,8 +389,7 @@ export class UtilsDynamoDB {
         const defined_attribute_names : string[] = options.defined_attribute_names !== undefined ? options.defined_attribute_names : []
         const attribute_names : string[] = options.attribute_names !== undefined ? options.attribute_names : []
 
-        if (index_name === undefined && Object.keys(primary_key).length !== 1 ||
-            index_name !== undefined && Object.keys(primary_key).length !== index_name.split(".")[0].split("-").length
+        if (index_name === undefined && Object.keys(primary_key).length !== 1
         ) {
             return []
         }

package/src/UtilsMisc.ts

@@ -1,6 +1,6 @@
 import * as crypto from "crypto"
 
-import { TriangleUtilsConfig } from "./types/TriangleUtilsConfig"
+import { GlobalConfig } from "./types/GlobalConfig"
 
 interface Encryption {
     iv : string,
@@ -9,9 +9,9 @@ interface Encryption {
 
 export class UtilsMisc {
 
-    readonly config : TriangleUtilsConfig
+    readonly config : GlobalConfig
 
-    constructor(config : TriangleUtilsConfig) {
+    constructor(config : GlobalConfig) {
         this.config = config
     }
 

package/src/f.ts

@@ -243,9 +243,13 @@ const utils = new TriangleUtils(config)
 
 // console.log(JSON.stringify(tweet, undefined, 4))
 
-const results = await utils.twitter.get_tweets("1603470469608374272", {
-    compile : true,
-    min_twitter_tweet_id : "2061610563679985813"
-})
+// const results = await utils.twitter.get_tweets("1603470469608374272", {
+//     compile : true,
+//     min_twitter_tweet_id : "2061610563679985813"
+// })
+
+// 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(results)
+console.log(f)

package/src/index.ts

@@ -1,4 +1,3 @@
-import { TriangleUtilsConfig } from "./types/TriangleUtilsConfig"
 import { UtilsDynamoDB } from "./UtilsDynamoDB"
 import { UtilsS3 } from "./UtilsS3"
 import { UtilsBedrock } from "./UtilsBedrock"
@@ -11,6 +10,7 @@ import { UtilsYoutube } from "./UtilsYoutube"
 import { UtilsXAI } from "./UtilsXAI"
 import { UtilsAnthropic } from "./UtilsAnthropic"
 import { UtilsTwitter } from "./UtilsTwitter"
+import { GlobalConfig } from "./types/GlobalConfig"
 
 
 
@@ -28,7 +28,7 @@ export class TriangleUtils extends UtilsMisc {
     readonly xai : UtilsXAI
     readonly twitter : UtilsTwitter
 
-    constructor(config : TriangleUtilsConfig) {
+    constructor(config : GlobalConfig) {
         super(config)
         this.dynamodb = new UtilsDynamoDB(config.region)
         this.s3 = new UtilsS3(config.region)
@@ -44,7 +44,8 @@ export class TriangleUtils extends UtilsMisc {
     }
 }
 
-export * from "./types/TriangleUtilsConfig"
+export * from "./types/ApplicationConfig"
+export * from "./types/GlobalConfig"
 export * from "./UtilsMisc"
 export * from "./UtilsAnthropic"
 export * from "./UtilsDynamoDB"

package/src/types/ApplicationConfig.ts

@@ -0,0 +1,34 @@
+
+export class ApplicationConfig {
+    readonly cognito_client_id : string
+    readonly cognito_client_secret : string
+    readonly client_url : string
+    readonly client_dev_url : string
+    readonly api_url : string
+    readonly api_dev_url : string
+    readonly [x : string] : any
+
+    constructor(application_config : ApplicationConfig) {
+        if (!ApplicationConfig.is(application_config)) {
+            throw Error("Invalid input.")
+        }
+        this.cognito_client_id = application_config.cognito_client_id
+        this.cognito_client_secret = application_config.cognito_client_secret
+        this.client_url = application_config.client_url
+        this.client_dev_url = application_config.client_dev_url
+        this.api_url = application_config.api_url
+        this.api_dev_url = application_config.api_dev_url
+    }
+    
+    static is(application_config : any) : application_config is ApplicationConfig {
+        return (
+            application_config !== undefined &&
+            typeof application_config.cognito_client_id === "string" &&
+            typeof application_config.cognito_client_secret === "string" &&
+            typeof application_config.client_url === "string" &&
+            typeof application_config.client_dev_url === "string" &&
+            typeof application_config.api_url === "string" &&
+            typeof application_config.api_dev_url === "string"
+        )
+    }
+}

package/src/types/GlobalConfig.ts

@@ -0,0 +1,60 @@
+export class GlobalConfig {
+    readonly region : string
+    readonly cognito_user_pool_id : string
+    readonly secret_key : string
+    readonly auth_url : string
+    readonly s3_elections : string
+    readonly s3_prism : string
+    readonly s3_triage : string
+    readonly super_federal_gov_api_keys : string
+    readonly federal_gov_api_keys : string
+    readonly federal_lobby_api_key : string
+    readonly scraping_bee_api_key : string
+    readonly twitter_api_key : string
+    readonly youtube_api_key : string
+    readonly anthropic_api_key : string
+    readonly xai_api_key : string
+    readonly [x : string] : any
+
+    constructor(global_config : GlobalConfig) {
+        if (!GlobalConfig.is(global_config)) {
+            throw Error("Invalid input.")
+        }
+        this.region = global_config.region
+        this.cognito_user_pool_id = global_config.cognito_user_pool_id
+        this.secret_key = global_config.secret_key
+        this.auth_url = global_config.auth_url
+        this.s3_elections = global_config.s3_elections
+        this.s3_prism = global_config.s3_prism
+        this.s3_triage = global_config.s3_triage
+        this.super_federal_gov_api_keys = global_config.super_federal_gov_api_keys
+        this.federal_gov_api_keys = global_config.federal_gov_api_keys
+        this.federal_lobby_api_key = global_config.federal_lobby_api_key
+        this.scraping_bee_api_key = global_config.scraping_bee_api_key
+        this.twitter_api_key = global_config.twitter_api_key
+        this.youtube_api_key = global_config.youtube_api_key
+        this.anthropic_api_key = global_config.anthropic_api_key
+        this.xai_api_key = global_config.xai_api_key
+    }
+    
+    static is(global_config : any) : global_config is GlobalConfig {
+        return (
+            global_config !== undefined &&
+            typeof global_config.region === "string" &&
+            typeof global_config.cognito_user_pool_id === "string" &&
+            typeof global_config.secret_key === "string" &&
+            typeof global_config.auth_url === "string" &&
+            typeof global_config.s3_elections === "string" &&
+            typeof global_config.s3_prism === "string" &&
+            typeof global_config.s3_triage === "string" &&
+            typeof global_config.super_federal_gov_api_keys === "string" &&
+            typeof global_config.federal_gov_api_keys === "string" &&
+            typeof global_config.federal_lobby_api_key === "string" &&
+            typeof global_config.scraping_bee_api_key === "string" &&
+            typeof global_config.twitter_api_key === "string" &&
+            typeof global_config.youtube_api_key === "string" &&
+            typeof global_config.anthropic_api_key === "string" &&
+            typeof global_config.xai_api_key === "string"
+        )
+    }
+}

package/src/types/TriangleUtilsConfig.ts

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