@ejfdelgado/ejflab-back 1.20.1 → 1.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.20.1",
+  "version": "1.20.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"
@@ -18,7 +18,7 @@
   "license": "ISC",
   "private": false,
   "dependencies": {
-    "@ejfdelgado/ejflab-common": "1.12.1",
+    "@ejfdelgado/ejflab-common": "1.12.3",
     "@google-cloud/compute": "^4.7.0",
     "@google-cloud/firestore": "^7.9.0",
     "@google-cloud/storage": "^7.11.3",

package/srv/MilvusSrv.mjs

@@ -1,7 +1,10 @@
+import fs from "fs";
 import { MilvusClient, DataType } from "@zilliz/milvus2-sdk-node";
 import { encode, decode } from "@msgpack/msgpack";
 import { General } from "./common/General.mjs";
 import { CommandMilvus } from "@ejfdelgado/ejflab-common/src/flowchart/steps/CommandMilvus.js";
+import { SimpleObj } from "@ejfdelgado/ejflab-common/src/SimpleObj.js";
+import { MyError } from "./MyError.mjs";
 
 export class MilvusSrv {
     // MilvusSrv.checkErrors(res);
@@ -64,7 +67,7 @@ export class MilvusSrv {
             for (let j = 0; j < data.length; j++) {
                 const collection = data[j];
                 console.log(`    - Collection: ${collection.name}`);
-                myDb.collections.push(collection.name);
+                myDb.collections.push({ name: collection.name });
             }
         }
         return response;
@@ -80,6 +83,21 @@ export class MilvusSrv {
             }
         }
     }
+
+    static async describeCollectionOfDatabase(client, db_name, collection_name) {
+        const resUseDatabase1 = await client.useDatabase({ db_name: db_name });
+        MilvusSrv.checkErrors(resUseDatabase1);
+        const description = await client.describeCollection({ collection_name: collection_name });
+        return description;
+    }
+
+    static async dropCollectionOfDatabase(client, db_name, collection_name) {
+        const resUseDatabase1 = await client.useDatabase({ db_name: db_name });
+        MilvusSrv.checkErrors(resUseDatabase1);
+        await MilvusSrv.dropCollection(client, collection_name);
+        return true;
+    }
+
     static async dropCollection(client, collection_name) {
         console.log(`Drop collection ${collection_name}...`);
         const resHasCollection = await client.hasCollection({ collection_name });
@@ -135,6 +153,7 @@ export class MilvusSrv {
         // Translate data types
         const myCopy = JSON.parse(JSON.stringify(myJson));
         const collection_name = myCopy.collection_name;
+        console.log(`createCollectionWithSchema... ${collection_name}`);
         const exists = await this.existsCollection(client, collection_name);
         if (exists) {
             if (recreate) {
@@ -159,6 +178,7 @@ export class MilvusSrv {
     database.create
     database.recreate
     collection.create
+    collection.destroy
     introspect
     database.destroy
     database.destroy_temp
@@ -172,7 +192,10 @@ export class MilvusSrv {
                         return MilvusSrv;
                     }
                 };
-            }
+            },
+            data: {
+                configuration: {}
+            },
         };
         const id = '';
         const commandName = 'milvus';
@@ -180,7 +203,17 @@ export class MilvusSrv {
         const command = new CommandMilvus(context, id, commandName, argsTxt);
         const action = General.readParam(req, "action", null);
         const db = General.readParam(req, "db", null);
-        const collection = General.readParam(req, "collection", null);
+        let collection = General.readParam(req, "collection", null);
+        if (action == "collection.create") {
+            // Read configuration file...
+            const json = General.readParam(req, "json", null);
+            const jsonTxt = fs.readFileSync(json, { encoding: "utf8" });
+            const jsonParsed = JSON.parse(jsonTxt);
+            const path = General.readParam(req, "path", null);
+            const configuration = SimpleObj.getValue(jsonParsed, path, null);
+            context.data.configuration = configuration;
+            collection = "configuration";
+        }
         command.args = [action, db, collection];
         const answer = await command.computation();
         const response = {
@@ -250,35 +283,50 @@ export class MilvusSrv {
             const buffer = req.body;
             const decoded = decode(buffer);
             // Connect to database
-            const {
+            let {
                 db_name,
                 collection_name,
                 embeed,
-                paging
+                paging,
+                search_params,
+                output_fields,
+                consistency_level,
             } = decoded;
             console.log(`Using database ${db_name}`);
             await MilvusSrv.useDatabase(client, db_name, false);
-            const search_params = {
-                "metric_type": "IP",
-                "topk": paging['limit'],
-                "params": JSON.stringify({ nprobe: 1024 }),
-            };
-            const results = await client.search({
+            if (!search_params) {
+                search_params = {
+                    "metric_type": "IP",
+                    "topk": paging['limit'],// here is redundant!
+                    "params": JSON.stringify({ nprobe: 1024 }),
+                };
+            }
+            if (!output_fields) {
+                output_fields = ['id', 'document_id', 'face_path', 'millis', 'x1', 'y1', 'x2', 'y2', 'ref_id'];
+            }
+            if (!consistency_level) {
+                consistency_level = "Strong";
+            }
+            const searchPayload = {
                 collection_name: collection_name,
-                data: [embeed],
+                data: [embeed],//??
                 limit: paging['limit'],
                 offset: paging['offset'],
-                consistency_level: "Strong",
+                consistency_level: consistency_level,
                 search_params: search_params,
-                output_fields: ['id', 'document_id', 'face_path', 'millis', 'x1', 'y1', 'x2', 'y2', 'ref_id']
-            });
-            response.results = results.results.map((entity) => {
+                output_fields: output_fields
+            };
+            const results = await client.search(searchPayload);
+            if (results.status.code != 0) {
+                throw new MyError(results.status.error_code+". "+results.status.reason)
+            }
+            response.results = [results.results.map((entity) => {
                 return {
                     id: entity.id,
                     distance: 0,
                     entity
                 };
-            });
+            })];
         } catch (err) {
             console.log(err);
             code = 500;