triangle-utils 1.0.27 → 1.0.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -1
- package/utils/Utils_Bee.js +1 -1
- package/utils/Utils_S3.js +20 -1
- package/utils/Utils_S3Vectors.js +90 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "triangle-utils",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.29",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "ISC",
|
|
@@ -10,6 +10,8 @@
|
|
|
10
10
|
"@aws-sdk/client-bedrock-runtime": "^3.953.0",
|
|
11
11
|
"@aws-sdk/client-dynamodb": "^3.953.0",
|
|
12
12
|
"@aws-sdk/client-s3": "^3.953.0",
|
|
13
|
+
"@aws-sdk/client-s3vectors": "^3.953.0",
|
|
14
|
+
"@aws-sdk/s3-request-presigner": "^3.953.0",
|
|
13
15
|
"nodemailer": "^7.0.11",
|
|
14
16
|
"scrapingbee": "^1.7.6"
|
|
15
17
|
}
|
package/utils/Utils_Bee.js
CHANGED
|
@@ -19,7 +19,7 @@ export default class Utils_Bee {
|
|
|
19
19
|
console.log("Status", response.status)
|
|
20
20
|
return undefined
|
|
21
21
|
}
|
|
22
|
-
const text = text_decoder.decode(response.data)
|
|
22
|
+
const text = this.text_decoder.decode(response.data)
|
|
23
23
|
return text
|
|
24
24
|
} catch (e) {
|
|
25
25
|
console.log(e.stack)
|
package/utils/Utils_S3.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { S3, NoSuchKey } from "@aws-sdk/client-s3"
|
|
1
|
+
import { S3, NoSuchKey, GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3"
|
|
2
|
+
import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
|
|
2
3
|
|
|
3
4
|
function parse_s3_filename(s3_filename) {
|
|
4
5
|
if (s3_filename.substring(0, 5) !== "s3://") {
|
|
@@ -71,4 +72,22 @@ export default class Utils_S3 {
|
|
|
71
72
|
return await this.s3.deleteObject(s3_key)
|
|
72
73
|
}
|
|
73
74
|
|
|
75
|
+
async generate_download_url(s3_filename) {
|
|
76
|
+
const exists = await this.file_exists(s3_filename)
|
|
77
|
+
if (!exists) {
|
|
78
|
+
return undefined
|
|
79
|
+
}
|
|
80
|
+
const s3_key = parse_s3_filename(s3_filename)
|
|
81
|
+
const command = new GetObjectCommand(s3_key)
|
|
82
|
+
const url = await getSignedUrl(s3, command)
|
|
83
|
+
return url
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
async generate_upload_url(s3_filename) {
|
|
87
|
+
const s3_key = parse_s3_filename(s3_filename)
|
|
88
|
+
const command = new PutObjectCommand(s3_key)
|
|
89
|
+
const url = await getSignedUrl(s3, command)
|
|
90
|
+
return url
|
|
91
|
+
}
|
|
92
|
+
|
|
74
93
|
}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { S3Vectors } from "@aws-sdk/client-s3vectors"
|
|
2
|
+
|
|
3
|
+
export default class Utils_S3Vectors {
|
|
4
|
+
|
|
5
|
+
constructor(config) {
|
|
6
|
+
this.s3vectors = new S3Vectors({ region : config.region })
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
async get_vector(vector_bucket, vector_index, vector_key) {
|
|
10
|
+
const vector = await this.s3vectors.getVectors({
|
|
11
|
+
vectorBucketName : vector_bucket,
|
|
12
|
+
indexName : vector_index,
|
|
13
|
+
keys : [vector_key],
|
|
14
|
+
returnData : true,
|
|
15
|
+
returnMetadata : true
|
|
16
|
+
}).then(response => response.vectors[0])
|
|
17
|
+
if (vector === undefined) {
|
|
18
|
+
return undefined
|
|
19
|
+
}
|
|
20
|
+
return vector
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
async create_vector(vector_bucket, vector_index, vector_key, vector, metadata) {
|
|
24
|
+
await this.s3vectors.putVectors({
|
|
25
|
+
vectorBucketName : vector_bucket,
|
|
26
|
+
indexName : vector_index,
|
|
27
|
+
vectors : [{
|
|
28
|
+
key : vector_key,
|
|
29
|
+
data : {
|
|
30
|
+
float32 : vector
|
|
31
|
+
},
|
|
32
|
+
metadata : metadata
|
|
33
|
+
}]
|
|
34
|
+
})
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
async delete_vector(vector_bucket, vector_index, vector_key) {
|
|
38
|
+
await this.s3vectors.deleteVectors({
|
|
39
|
+
vectorBucketName : vector_bucket,
|
|
40
|
+
indexName : vector_index,
|
|
41
|
+
keys : [vector_key]
|
|
42
|
+
})
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
async query_vectors(vector_bucket, vector_index, vector, num_vectors, filters) {
|
|
46
|
+
const response = await this.s3vectors.queryVectors({
|
|
47
|
+
vectorBucketName : vector_bucket,
|
|
48
|
+
indexName : vector_index,
|
|
49
|
+
queryVector : {
|
|
50
|
+
float32 : vector
|
|
51
|
+
},
|
|
52
|
+
topK : num_vectors,
|
|
53
|
+
returnDistance : true,
|
|
54
|
+
returnMetadata : true,
|
|
55
|
+
filter : filters
|
|
56
|
+
})
|
|
57
|
+
return response.vectors
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
async delete_vector_index(vector_bucket, vector_index) {
|
|
61
|
+
const response = await this.s3vectors.deleteIndex({
|
|
62
|
+
vectorBucketName : vector_bucket,
|
|
63
|
+
indexName : vector_index
|
|
64
|
+
})
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
async scan_vectors(vector_bucket, vector_index) {
|
|
68
|
+
// console.log(vector_bucket, vector_index, vector, num_vectors)
|
|
69
|
+
const vectors = []
|
|
70
|
+
let next_token = undefined
|
|
71
|
+
while (true) {
|
|
72
|
+
const response = (next_token === undefined) ? (await this.s3vectors.listVectors({
|
|
73
|
+
vectorBucketName : vector_bucket,
|
|
74
|
+
indexName : vector_index,
|
|
75
|
+
maxResults : 1000
|
|
76
|
+
})) : (await this.s3vectors.listVectors({
|
|
77
|
+
vectorBucketName : vector_bucket,
|
|
78
|
+
indexName : vector_index,
|
|
79
|
+
maxResults : 1000,
|
|
80
|
+
nextToken : next_token
|
|
81
|
+
}))
|
|
82
|
+
vectors.push(...response.vectors)
|
|
83
|
+
next_token = response.nextToken
|
|
84
|
+
if (next_token === undefined) {
|
|
85
|
+
return vectors
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
}
|