triangle-utils 1.4.74 → 1.4.76

package/dist/src/UtilsDynamoDB.d.ts

@@ -9,6 +9,7 @@ export declare class UtilsDynamoDB {
         attribute_names?: string[];
         segment_id?: number;
         num_segments?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     get(table: string, key: Record<string, any>, consistent?: boolean): Promise<Record<string, any> | undefined>;
     get_max(table_index_name: string, primary_key: Record<string, string | number>): Promise<Record<string, any> | undefined>;
@@ -20,6 +21,7 @@ export declare class UtilsDynamoDB {
         defined_attribute_names?: string[];
         attribute_names?: string[];
         max_num_items?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     query_prefix(table_index_name: string, primary_key: Record<string, any>, secondary_key_prefix: Record<string, string>, options?: {
         reverse?: boolean;
@@ -29,6 +31,7 @@ export declare class UtilsDynamoDB {
         defined_attribute_names?: string[];
         attribute_names?: string[];
         max_num_items?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     query_range(table_index_name: string, primary_key: Record<string, any>, secondary_key_range: Record<string, (string | number)[]>, options?: {
         reverse?: boolean;
@@ -38,6 +41,7 @@ export declare class UtilsDynamoDB {
         defined_attribute_names?: string[];
         attribute_names?: string[];
         max_num_items?: number;
+        last_key?: Record<string, any>;
     }): Promise<Record<string, any>[]>;
     set(table_name: string, key: Record<string, any>, attributes: Record<string, any>): Promise<void>;
     append(table_name: string, key: Record<string, any>, attributes: Record<string, any[]>): Promise<void>;

package/dist/src/UtilsDynamoDB.js

@@ -64,7 +64,7 @@ function convert_input(input) {
 }
 async function compile_pages(request, f, compile = true) {
     const items = [];
-    let last_eval_key = undefined;
+    let last_eval_key = request.ExclusiveStartKey;
     while (true) {
         const request_page = {
             ...request,
@@ -130,7 +130,8 @@ export class UtilsDynamoDB {
                 FilterExpression: filter_expression.length > 0 ? filter_expression : undefined,
                 ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
                 Segment: i,
-                TotalSegments: num_segments
+                TotalSegments: num_segments,
+                ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
             };
             iterators.push(compile_pages(request, (request) => this.dynamodb.scan(request)));
         }
@@ -228,7 +229,8 @@ export class UtilsDynamoDB {
             ProjectionExpression: projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
             ScanIndexForward: !reverse,
-            Limit: options.max_num_items
+            Limit: options.max_num_items,
+            ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         };
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile);
         // .then(async items => index_name === undefined || !project ? items :
@@ -289,7 +291,8 @@ export class UtilsDynamoDB {
                 ...Object.keys(secondary_key_prefix).map(key => "begins_with(#" + key + ", :" + key + ")")
             ].join(" AND "),
             ScanIndexForward: !reverse,
-            Limit: options.max_num_items
+            Limit: options.max_num_items,
+            ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         };
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile);
         // .then(async items => index_name === undefined || !project ? items :
@@ -353,7 +356,8 @@ export class UtilsDynamoDB {
                 ...Object.keys(secondary_key_range).map(key => "(#" + key + " BETWEEN :" + key + "_min AND :" + key + "_max)")
             ].join(" AND "),
             ScanIndexForward: !reverse,
-            Limit: options.max_num_items
+            Limit: options.max_num_items,
+            ExclusiveStartKey: options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         };
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile);
         // .then(async items => index_name === undefined || !project ? items :

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

@@ -5,6 +5,7 @@ export declare class ApplicationConfig {
     readonly client_dev_url: string;
     readonly api_url: string;
     readonly api_dev_url: string;
+    readonly anthropic_api_key?: string;
     readonly [x: string]: any;
     constructor(application_config: ApplicationConfig);
     static is(application_config: any): application_config is ApplicationConfig;

package/dist/src/types/ApplicationConfig.js

@@ -5,6 +5,7 @@ export class ApplicationConfig {
     client_dev_url;
     api_url;
     api_dev_url;
+    anthropic_api_key;
     constructor(application_config) {
         if (!ApplicationConfig.is(application_config)) {
             throw Error("Invalid input.");
@@ -15,6 +16,7 @@ export class ApplicationConfig {
         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;
+        this.anthropic_api_key = application_config.anthropic_api_key;
     }
     static is(application_config) {
         return (application_config !== undefined &&
@@ -23,6 +25,7 @@ export class ApplicationConfig {
             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");
+            typeof application_config.api_dev_url === "string" &&
+            (application_config.anthropic_api_key === undefined || typeof application_config.anthropic_api_key === "string"));
     }
 }

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

@@ -12,7 +12,6 @@ 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 [x: string]: any;
     constructor(global_config: GlobalConfig);

package/dist/src/types/GlobalConfig.js

@@ -12,7 +12,6 @@ export class GlobalConfig {
     scraping_bee_api_key;
     twitter_api_key;
     youtube_api_key;
-    anthropic_api_key;
     xai_api_key;
     constructor(global_config) {
         if (!GlobalConfig.is(global_config)) {
@@ -31,7 +30,6 @@ 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;
     }
     static is(global_config) {
@@ -49,7 +47,6 @@ 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");
     }
 }

package/package.json

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

package/src/UtilsDynamoDB.ts

@@ -64,7 +64,7 @@ async function compile_pages(
     compile : boolean = true
 ) : Promise<any[]> {
     const items = []
-    let last_eval_key : Record<string, AttributeValue> | undefined = undefined
+    let last_eval_key : Record<string, AttributeValue> | undefined = request.ExclusiveStartKey
     while (true) {
         const request_page : ScanCommandInput|QueryCommandInput = {
             ...request,
@@ -113,7 +113,8 @@ export class UtilsDynamoDB {
             defined_attribute_names? : string[],
             attribute_names? : string[],
             segment_id? : number
-            num_segments? : number
+            num_segments? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]> {
         const table_name : string = table_index_name.split(":")[0]
@@ -151,7 +152,8 @@ export class UtilsDynamoDB {
                 FilterExpression : filter_expression.length > 0 ? filter_expression : undefined,
                 ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
                 Segment : i,
-                TotalSegments : num_segments
+                TotalSegments : num_segments,
+                ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
             }
             iterators.push(compile_pages(request, (request : ScanCommandInput) => this.dynamodb.scan(request)))
         }
@@ -232,7 +234,8 @@ export class UtilsDynamoDB {
             undefined_attribute_names? : string[],
             defined_attribute_names? : string[],
             attribute_names? : string[],
-            max_num_items? : number
+            max_num_items? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]>{
         const table_name : string = table_index_name.split(":")[0]
@@ -277,7 +280,8 @@ export class UtilsDynamoDB {
             ProjectionExpression : projection_expression.length > 0 ? projection_expression : undefined,
             KeyConditionExpression: Object.keys(primary_key).map(key => "#" + key + " = :" + key).join(" AND "),
             ScanIndexForward : !reverse,
-            Limit : options.max_num_items
+            Limit : options.max_num_items,
+            ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         }
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
             // .then(async items => index_name === undefined || !project ? items :
@@ -303,7 +307,8 @@ export class UtilsDynamoDB {
             undefined_attribute_names? : string[],
             defined_attribute_names? : string[],
             attribute_names? : string[],
-            max_num_items? : number
+            max_num_items? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]>{
         const table_name : string = table_index_name.split(":")[0]
@@ -355,7 +360,8 @@ export class UtilsDynamoDB {
                 ...Object.keys(secondary_key_prefix).map(key => "begins_with(#" + key + ", :" + key + ")")
             ].join(" AND "),
             ScanIndexForward : !reverse,
-            Limit : options.max_num_items
+            Limit : options.max_num_items,
+            ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         }
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
             // .then(async items => index_name === undefined || !project ? items :
@@ -381,7 +387,8 @@ export class UtilsDynamoDB {
             undefined_attribute_names? : string[],
             defined_attribute_names? : string[],
             attribute_names? : string[],
-            max_num_items? : number
+            max_num_items? : number,
+            last_key? : Record<string, any>
         } = {}
     ) : Promise<Record<string, any>[]>{
         const table_name : string = table_index_name.split(":")[0]
@@ -436,7 +443,8 @@ export class UtilsDynamoDB {
                 ...Object.keys(secondary_key_range).map(key => "(#" + key + " BETWEEN :" + key + "_min AND :" + key + "_max)")
             ].join(" AND "),
             ScanIndexForward : !reverse,
-            Limit : options.max_num_items
+            Limit : options.max_num_items,
+            ExclusiveStartKey : options.last_key !== undefined ? convert_input(options.last_key)?.M : undefined
         }
         const items = await compile_pages(request, (request) => this.dynamodb.query(request), compile)
             // .then(async items => index_name === undefined || !project ? items :

package/src/types/ApplicationConfig.ts

@@ -6,6 +6,7 @@ export class ApplicationConfig {
     readonly client_dev_url : string
     readonly api_url : string
     readonly api_dev_url : string
+    readonly anthropic_api_key? : string
     readonly [x : string] : any
 
     constructor(application_config : ApplicationConfig) {
@@ -18,6 +19,7 @@ export class ApplicationConfig {
         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
+        this.anthropic_api_key = application_config.anthropic_api_key
     }
     
     static is(application_config : any) : application_config is ApplicationConfig {
@@ -28,7 +30,8 @@ export class ApplicationConfig {
             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"
+            typeof application_config.api_dev_url === "string" &&
+            (application_config.anthropic_api_key === undefined || typeof application_config.anthropic_api_key === "string")
         )
     }
 }

package/src/types/GlobalConfig.ts

@@ -12,7 +12,6 @@ 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 [x : string] : any
 
@@ -33,7 +32,6 @@ 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
     }
     
@@ -53,7 +51,6 @@ 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"
         )
     }