update

package-lock.json

@@ -20,7 +20,7 @@
         "mysql": "^2.18.1",
         "pg": "^8.13.1",
         "querystring": "^0.2.1",
-        "r2r-js": "^0.4.24",
+        "r2r-js": "^0.4.34",
         "r2r-webdev-template": "file:",
         "react": "^18",
         "react-dom": "^18",
@@ -947,10 +947,9 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.9.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
-      "license": "MIT",
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -1744,7 +1743,7 @@
     },
     "node_modules/File": {
       "version": "0.10.2",
-      "resolved": "https://registry.npmmirror.com/File/-/File-0.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/File/-/File-0.10.2.tgz",
       "integrity": "sha512-gomQVTq/10wIR399uhGTWtYcYneTXbfe3p2RO/NR0MPrLkIyOaE9DCEPXihAm+72epLtXaplitwfJ/wkmj88dg==",
       "dependencies": {
         "mime": ">= 0.0.0"
@@ -2604,7 +2603,7 @@
     },
     "node_modules/mime": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmmirror.com/mime/-/mime-4.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.6.tgz",
       "integrity": "sha512-4rGt7rvQHBbaSOF9POGkk1ocRP16Md1x36Xma8sz8h8/vfCUI2OtEIeCqe4Ofes853x4xDoPiFLIT47J5fI/7A==",
       "funding": [
         "https://github.com/sponsors/broofa"
@@ -3289,14 +3288,13 @@
       }
     },
     "node_modules/r2r-js": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmmirror.com/r2r-js/-/r2r-js-0.4.24.tgz",
-      "integrity": "sha512-WxiwYo10p9jxjDdWxWFc/S8qvT6AT6wzPIKxfyq2x5CLlGIjBfkIrzCUq8FF57bmxcQ823G/eSeo5nen3W8zPw==",
-      "license": "ISC",
+      "version": "0.4.34",
+      "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz",
+      "integrity": "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q==",
       "dependencies": {
         "@jest/globals": "^29.7.0",
         "@rrweb/types": "2.0.0-alpha.17",
-        "axios": "^1.7.9",
+        "axios": "^1.8.4",
         "form-data": "^4.0.1",
         "rrweb-snapshot": "2.0.0-alpha.4",
         "uuid": "^10.0.0"
@@ -4756,9 +4754,9 @@
       "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="
     },
     "axios": {
-      "version": "1.7.9",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.9.tgz",
-      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
       "requires": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -5287,7 +5285,7 @@
     },
     "File": {
       "version": "0.10.2",
-      "resolved": "https://registry.npmmirror.com/File/-/File-0.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/File/-/File-0.10.2.tgz",
       "integrity": "sha512-gomQVTq/10wIR399uhGTWtYcYneTXbfe3p2RO/NR0MPrLkIyOaE9DCEPXihAm+72epLtXaplitwfJ/wkmj88dg==",
       "requires": {
         "mime": ">= 0.0.0"
@@ -5871,7 +5869,7 @@
     },
     "mime": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmmirror.com/mime/-/mime-4.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.6.tgz",
       "integrity": "sha512-4rGt7rvQHBbaSOF9POGkk1ocRP16Md1x36Xma8sz8h8/vfCUI2OtEIeCqe4Ofes853x4xDoPiFLIT47J5fI/7A=="
     },
     "mime-db": {
@@ -6290,13 +6288,13 @@
       "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
     },
     "r2r-js": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmmirror.com/r2r-js/-/r2r-js-0.4.24.tgz",
-      "integrity": "sha512-WxiwYo10p9jxjDdWxWFc/S8qvT6AT6wzPIKxfyq2x5CLlGIjBfkIrzCUq8FF57bmxcQ823G/eSeo5nen3W8zPw==",
+      "version": "0.4.34",
+      "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz",
+      "integrity": "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q==",
       "requires": {
         "@jest/globals": "^29.7.0",
         "@rrweb/types": "2.0.0-alpha.17",
-        "axios": "^1.7.9",
+        "axios": "^1.8.4",
         "form-data": "^4.0.1",
         "rrweb-snapshot": "2.0.0-alpha.4",
         "uuid": "^10.0.0"
@@ -6318,7 +6316,7 @@
         "pg": "^8.13.1",
         "prettier": "^3.3.3",
         "querystring": "^0.2.1",
-        "r2r-js": "^0.4.24",
+        "r2r-js": "^0.4.34",
         "r2r-webdev-template": "file:",
         "react": "^18",
         "react-dom": "^18",
@@ -6964,9 +6962,9 @@
           "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="
         },
         "axios": {
-          "version": "1.7.9",
-          "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.9.tgz",
-          "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
+          "version": "1.8.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+          "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
           "requires": {
             "follow-redirects": "^1.15.6",
             "form-data": "^4.0.0",
@@ -7495,7 +7493,7 @@
         },
         "File": {
           "version": "0.10.2",
-          "resolved": "https://registry.npmmirror.com/File/-/File-0.10.2.tgz",
+          "resolved": "https://registry.npmjs.org/File/-/File-0.10.2.tgz",
           "integrity": "sha512-gomQVTq/10wIR399uhGTWtYcYneTXbfe3p2RO/NR0MPrLkIyOaE9DCEPXihAm+72epLtXaplitwfJ/wkmj88dg==",
           "requires": {
             "mime": ">= 0.0.0"
@@ -8079,7 +8077,7 @@
         },
         "mime": {
           "version": "4.0.6",
-          "resolved": "https://registry.npmmirror.com/mime/-/mime-4.0.6.tgz",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.6.tgz",
           "integrity": "sha512-4rGt7rvQHBbaSOF9POGkk1ocRP16Md1x36Xma8sz8h8/vfCUI2OtEIeCqe4Ofes853x4xDoPiFLIT47J5fI/7A=="
         },
         "mime-db": {
@@ -8498,13 +8496,13 @@
           "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
         },
         "r2r-js": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmmirror.com/r2r-js/-/r2r-js-0.4.24.tgz",
-          "integrity": "sha512-WxiwYo10p9jxjDdWxWFc/S8qvT6AT6wzPIKxfyq2x5CLlGIjBfkIrzCUq8FF57bmxcQ823G/eSeo5nen3W8zPw==",
+          "version": "0.4.34",
+          "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz",
+          "integrity": "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q==",
           "requires": {
             "@jest/globals": "^29.7.0",
             "@rrweb/types": "2.0.0-alpha.17",
-            "axios": "^1.7.9",
+            "axios": "^1.8.4",
             "form-data": "^4.0.1",
             "rrweb-snapshot": "2.0.0-alpha.4",
             "uuid": "^10.0.0"

package.json

@@ -10,12 +10,12 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "File": "^0.10.2",
     "axios": "^1.7.9",
     "bcryptjs": "^2.4.3",
     "crypto": "^1.0.1",
     "express": "^4.18.2",
     "file": "^0.2.2",
+    "File": "^0.10.2",
     "https": "^1.0.0",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",

pbl.js

@@ -776,6 +776,84 @@ router.route("/downloadFile2").all(async (req, res, next) => {
     }
 });
 
+//召回测试
+router.route("/ragFolder").all(async (req, res, next) => {
+    let reqJson = req.body[0]
+    if (reqJson) {
+        try {
+            let filters = {}
+            if (reqJson.type == 1) {
+                filters = { "document_id": { "$in": reqJson.ids.split(",") } }
+            } else if (reqJson.type == 2) {
+                filters = { "collection_ids": { "$in": reqJson.ids.split(",") } }
+            } else if (reqJson.type == 3) {
+                filters = { "collection_ids": { "$eq": reqJson.ids } }
+            }
+
+            console.log(111);
+            
+            const response = await client.retrieval.search({
+                query: reqJson.query,
+                // searchMode: reqJson.useType == 1 ? 'basic' : reqJson.useType == 2 ? 'custom' : 'advanced',
+                // searchMode: 'basic',
+                searchSettings: {
+                    useHybridSearch: reqJson.useType == 3,
+                    useSemanticSearch: reqJson.useType == 1 || reqJson.useType == 2 || reqJson.useType == 3,
+                    useFullTextSearch: reqJson.useType == 2 || reqJson.useType == 3,
+                    hybrid_settings: {
+                        fullTextWeight: reqJson.fullTextWeight ? reqJson.fullTextWeight : 1,
+                        semanticWeight: reqJson.semanticWeight ? reqJson.semanticWeight : 5,
+                    },
+                    filters: filters,
+                    limit: reqJson.limit ? reqJson.limit : 100,
+                },
+                ragGenerationConfig: {
+                    stream: false,
+                    temperature: reqJson.temperature ? reqJson.temperature : 0,
+                    maxTokens: reqJson.tokens ? reqJson.tokens : 5000
+                }
+            });
+            // res.status(200).json({ result: response.results });
+            
+            p = [reqJson.userid, reqJson.ids, JSON.stringify(reqJson), JSON.stringify(response.results)];
+            p.unshift(_mysqlLabor[0], _mysqlLabor[1], "addRagData");
+            mysql.usselect(p, async function (ret) {
+                res.status(200).json({ result: response.results });
+            });
+        } catch (error) {
+            console.log(error);
+            
+            res.status(500).json({ error: error instanceof Error ? error.message : "An error occurred" });
+        }
+
+    }
+});
+
+//获取召回测试数据
+router.route("/getRagData").all(async (req, res, next) => {
+    //mode的处理
+    if (req.body[0]) {
+        p = Object.values(req.body[0]);
+        p.unshift(_mysqlLabor[0], _mysqlLabor[1], "getRagData");
+        mysql.usselect(p, async function (ret) {
+            res.status(200).json(ret);
+        });
+    }
+});
+
+//删除召回测试数据
+router.route("/delRagData").all(async (req, res, next) => {
+    //mode的处理
+    if (req.body[0]) {
+        p = Object.values(req.body[0]);
+        p.unshift(_mysqlLabor[0], _mysqlLabor[1], "delRagData");
+        mysql.usselect(p, async function (ret) {
+            res.status(200).json(ret);
+        });
+    }
+});
+
+
 function generateAPIKey(username) {
     let timeStamp = new Date().getTime();