triangle-utils 1.4.91 → 1.4.93

package/dist/src/UtilsS3Vectors.d.ts

@@ -18,5 +18,6 @@ export declare class UtilsS3Vectors {
     query(s3_vector_id_prefix: string, coordinates: number[], num_vectors: number, filters?: Record<string, any> | undefined): Promise<{
         s3_vector_id: string;
         distance: number;
+        headers: Record<string, any>;
     }[]>;
 }

package/dist/src/UtilsS3Vectors.js

@@ -19,7 +19,7 @@ export class S3Vector {
     }
 }
 function get_s3vectors_input(s3_vector_id) {
-    const [s3_vector_bucket_name, s3_vector_index_name, s3_vector_key] = (s3_vector_id.match(/^s3vectors:\/\/([^\/]+)\/([^\/]+)\/([^$]*)$/) || []).slice(1, 4);
+    const [s3_vector_bucket_name, s3_vector_index_name, s3_vector_key] = (s3_vector_id.match(/^s3vectors:\/\/([^\/]+)\/([^\/]+)\/?([^$\/]*)$/) || []).slice(1, 4);
     if (s3_vector_bucket_name === undefined || s3_vector_index_name === undefined || s3_vector_key === undefined) {
         throw Error("Bad s3_vector_id: " + s3_vector_id);
     }
@@ -205,15 +205,21 @@ export class UtilsS3Vectors {
                 console.log("Bad s3_vector_key:", s3_vector_key);
                 continue;
             }
-            const s3_vector_id = s3_vector_id_prefix + "/" + s3_vector_key;
+            const s3_vector_id = s3_vector_id_prefix + s3_vector_key;
             const distance = new_vector.distance;
             if (distance === undefined) {
                 console.log("Bad distance:", distance);
                 continue;
             }
+            const headers = new_vector.metadata;
+            if (!(typeof headers === "object" && Object.keys(headers).every((header_id) => typeof header_id === "string"))) {
+                console.log("Bad headers:", headers);
+                continue;
+            }
             results.push({
                 s3_vector_id: s3_vector_id,
-                distance: distance
+                distance: distance,
+                headers: headers
             });
         }
         return results;

package/package.json

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

package/src/UtilsS3Vectors.ts

@@ -31,7 +31,7 @@ interface S3VectorsInput {
 }
 
 function get_s3vectors_input(s3_vector_id : string) : S3VectorsInput {
-    const [s3_vector_bucket_name, s3_vector_index_name, s3_vector_key] = (s3_vector_id.match(/^s3vectors:\/\/([^\/]+)\/([^\/]+)\/([^$]*)$/) || []).slice(1, 4)
+    const [s3_vector_bucket_name, s3_vector_index_name, s3_vector_key] = (s3_vector_id.match(/^s3vectors:\/\/([^\/]+)\/([^\/]+)\/?([^$\/]*)$/) || []).slice(1, 4)
     if (s3_vector_bucket_name === undefined || s3_vector_index_name === undefined || s3_vector_key === undefined) {
         throw Error("Bad s3_vector_id: " + s3_vector_id)
     }
@@ -224,22 +224,28 @@ export class UtilsS3Vectors {
         if (new_vectors === undefined) {
             return []
         }
-        const results : { s3_vector_id : string, distance : number }[] = []
+        const results : { s3_vector_id : string, distance : number, headers : Record<string, any> }[] = []
         for (const new_vector of new_vectors) {
             const s3_vector_key = new_vector.key
             if (s3_vector_key === undefined) {
                 console.log("Bad s3_vector_key:", s3_vector_key)
                 continue
             }
-            const s3_vector_id = s3_vector_id_prefix + "/" + s3_vector_key
+            const s3_vector_id = s3_vector_id_prefix + s3_vector_key
             const distance = new_vector.distance
             if (distance === undefined) {
                 console.log("Bad distance:", distance)
                 continue
             }
+            const headers : any = new_vector.metadata
+            if (!(typeof headers === "object" && Object.keys(headers).every((header_id : any) => typeof header_id === "string"))) {
+                console.log("Bad headers:", headers)
+                continue
+            }
             results.push({
                 s3_vector_id : s3_vector_id,
-                distance : distance
+                distance : distance,
+                headers : headers
             })
         }
         return results