triangle-utils 1.4.178 → 1.4.179

package/dist/src/index.d.ts

@@ -12,7 +12,6 @@ import { UtilsAnthropic } from "./UtilsAnthropic.js";
 import { UtilsTwitter } from "./UtilsTwitter.js";
 import { GlobalConfig } from "./types/GlobalConfig.js";
 import { UtilsRDS } from "./UtilsRDS.js";
-import { ApplicationConfig } from "./types/ApplicationConfig.js";
 import { UtilsTextract } from "./UtilsTextract.js";
 import { UtilsBrave } from "./UtilsBrave.js";
 export declare class TriangleUtils extends UtilsMisc {
@@ -30,9 +29,8 @@ export declare class TriangleUtils extends UtilsMisc {
     readonly anthropic: UtilsAnthropic;
     readonly xai: UtilsXAI;
     readonly twitter: UtilsTwitter;
-    constructor(config: ApplicationConfig & GlobalConfig);
+    constructor(config: GlobalConfig);
 }
-export * from "./types/ApplicationConfig.js";
 export * from "./types/GlobalConfig.js";
 export * from "./UtilsAnthropic.js";
 export * from "./UtilsDynamoDB.js";

package/dist/src/index.js

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

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

@@ -1,6 +1,8 @@
 export declare class GlobalConfig {
     readonly region: string;
     readonly cognito_user_pool_id: string;
+    readonly cognito_client_id: string;
+    readonly cognito_client_secret: string;
     readonly secret_key: string;
     readonly auth_url: string;
     readonly s3_triangle: string;
@@ -20,6 +22,7 @@ export declare class GlobalConfig {
     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 ballotpedia_api_key: string;
     readonly brave_api_key: string;

package/dist/src/types/GlobalConfig.js

@@ -1,6 +1,8 @@
 export class GlobalConfig {
     region;
     cognito_user_pool_id;
+    cognito_client_id;
+    cognito_client_secret;
     secret_key;
     auth_url;
     s3_triangle;
@@ -20,6 +22,7 @@ export class GlobalConfig {
     scraping_bee_api_key;
     twitter_api_key;
     youtube_api_key;
+    anthropic_api_key;
     xai_api_key;
     ballotpedia_api_key;
     brave_api_key;
@@ -29,6 +32,8 @@ export class GlobalConfig {
         }
         this.region = global_config.region;
         this.cognito_user_pool_id = global_config.cognito_user_pool_id;
+        this.cognito_client_id = global_config.cognito_client_id;
+        this.cognito_client_secret = global_config.cognito_client_secret;
         this.secret_key = global_config.secret_key;
         this.auth_url = global_config.auth_url;
         this.s3_triangle = global_config.s3_triangle;
@@ -48,6 +53,7 @@ export class GlobalConfig {
         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;
         this.ballotpedia_api_key = global_config.ballotpedia_api_key;
         this.brave_api_key = global_config.brave_api_key;
@@ -56,6 +62,8 @@ export class GlobalConfig {
         return (global_config !== undefined &&
             typeof global_config.region === "string" &&
             typeof global_config.cognito_user_pool_id === "string" &&
+            typeof global_config.cognito_client_id === "string" &&
+            typeof global_config.cognito_client_secret === "string" &&
             typeof global_config.secret_key === "string" &&
             typeof global_config.auth_url === "string" &&
             typeof global_config.s3_triangle === "string" &&
@@ -75,6 +83,7 @@ export class GlobalConfig {
             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" &&
             typeof global_config.ballotpedia_api_key === "string" &&
             typeof global_config.brave_api_key === "string");

package/package.json

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

package/src/index.ts

@@ -12,7 +12,6 @@ import { UtilsAnthropic } from "./UtilsAnthropic"
 import { UtilsTwitter } from "./UtilsTwitter"
 import { GlobalConfig } from "./types/GlobalConfig"
 import { UtilsRDS } from "./UtilsRDS"
-import { ApplicationConfig } from "./types/ApplicationConfig"
 import { UtilsTextract } from "./UtilsTextract"
 import { UtilsBrave } from "./UtilsBrave"
 
@@ -35,7 +34,7 @@ export class TriangleUtils extends UtilsMisc {
     readonly xai : UtilsXAI
     readonly twitter : UtilsTwitter
 
-    constructor(config : ApplicationConfig & GlobalConfig) {
+    constructor(config : GlobalConfig) {
         super(config)
         this.dynamodb = new UtilsDynamoDB(config.region)
         this.rds = new UtilsRDS(config.region, config.rds_cluster_arn, config.rds_secret_arn, config.rds_host, config.rds_username, config.rds_password)
@@ -54,7 +53,6 @@ export class TriangleUtils extends UtilsMisc {
     }
 }
 
-export * from "./types/ApplicationConfig"
 export * from "./types/GlobalConfig"
 export * from "./UtilsAnthropic"
 export * from "./UtilsDynamoDB"

package/src/types/GlobalConfig.ts

@@ -1,6 +1,8 @@
 export class GlobalConfig {
     readonly region : string
     readonly cognito_user_pool_id : string
+    readonly cognito_client_id : string
+    readonly cognito_client_secret : string
     readonly secret_key : string
     readonly auth_url : string
     readonly s3_triangle : string
@@ -20,6 +22,7 @@ export class GlobalConfig {
     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 ballotpedia_api_key : string
     readonly brave_api_key : string
@@ -31,6 +34,8 @@ export class GlobalConfig {
         }
         this.region = global_config.region
         this.cognito_user_pool_id = global_config.cognito_user_pool_id
+        this.cognito_client_id = global_config.cognito_client_id
+        this.cognito_client_secret = global_config.cognito_client_secret
         this.secret_key = global_config.secret_key
         this.auth_url = global_config.auth_url
         this.s3_triangle = global_config.s3_triangle
@@ -50,6 +55,7 @@ export class GlobalConfig {
         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
         this.ballotpedia_api_key = global_config.ballotpedia_api_key
         this.brave_api_key = global_config.brave_api_key
@@ -60,6 +66,8 @@ export class GlobalConfig {
             global_config !== undefined &&
             typeof global_config.region === "string" &&
             typeof global_config.cognito_user_pool_id === "string" &&
+            typeof global_config.cognito_client_id === "string" &&
+            typeof global_config.cognito_client_secret === "string" &&
             typeof global_config.secret_key === "string" &&
             typeof global_config.auth_url === "string" &&
             typeof global_config.s3_triangle === "string" &&
@@ -79,6 +87,7 @@ export class GlobalConfig {
             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" &&
             typeof global_config.ballotpedia_api_key === "string" &&
             typeof global_config.brave_api_key === "string"

package/src/types/ApplicationConfig.ts

@@ -1,25 +0,0 @@
-
-export class ApplicationConfig {
-    readonly cognito_client_id : string
-    readonly cognito_client_secret : string
-    readonly anthropic_api_key? : 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.anthropic_api_key = application_config.anthropic_api_key
-    }
-    
-    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" &&
-            (application_config.anthropic_api_key === undefined || typeof application_config.anthropic_api_key === "string")
-        )
-    }
-}