lsc 4 days ago
parent
commit
ea99c0ad64
4 changed files with 22 additions and 16 deletions
  1. 10 10
      package-lock.json
  2. 1 1
      package.json
  3. 7 1
      pbl.js
  4. 4 4
      yarn.lock

+ 10 - 10
package-lock.json

@@ -22,7 +22,7 @@
         "pg": "^8.13.1",
         "playwright": "^1.53.0",
         "querystring": "^0.2.1",
-        "r2r-js": "^0.4.34",
+        "r2r-js": "^0.4.43",
         "r2r-webdev-template": "file:",
         "react": "^18",
         "react-dom": "^18",
@@ -3582,9 +3582,9 @@
       }
     },
     "node_modules/r2r-js": {
-      "version": "0.4.34",
-      "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz",
-      "integrity": "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q==",
+      "version": "0.4.43",
+      "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.43.tgz",
+      "integrity": "sha512-3StchsDWdGgyeeLWFrastBPx4CVZUkbrpq1ZjpUjNirgDt+rp/LC5nlmwWf0Yru2EkZnG8XyCzUUlwa35C7/VQ==",
       "dependencies": {
         "@jest/globals": "^29.7.0",
         "@rrweb/types": "2.0.0-alpha.17",
@@ -6822,9 +6822,9 @@
       "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
     },
     "r2r-js": {
-      "version": "0.4.34",
-      "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz",
-      "integrity": "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q==",
+      "version": "0.4.43",
+      "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.43.tgz",
+      "integrity": "sha512-3StchsDWdGgyeeLWFrastBPx4CVZUkbrpq1ZjpUjNirgDt+rp/LC5nlmwWf0Yru2EkZnG8XyCzUUlwa35C7/VQ==",
       "requires": {
         "@jest/globals": "^29.7.0",
         "@rrweb/types": "2.0.0-alpha.17",
@@ -9226,9 +9226,9 @@
           "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
         },
         "r2r-js": {
-          "version": "0.4.34",
-          "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz",
-          "integrity": "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q==",
+          "version": "0.4.43",
+          "resolved": "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.43.tgz",
+          "integrity": "sha512-3StchsDWdGgyeeLWFrastBPx4CVZUkbrpq1ZjpUjNirgDt+rp/LC5nlmwWf0Yru2EkZnG8XyCzUUlwa35C7/VQ==",
           "requires": {
             "@jest/globals": "^29.7.0",
             "@rrweb/types": "2.0.0-alpha.17",

+ 1 - 1
package.json

@@ -24,7 +24,7 @@
     "pg": "^8.13.1",
     "playwright": "^1.53.0",
     "querystring": "^0.2.1",
-    "r2r-js": "^0.4.34",
+    "r2r-js": "^0.4.43",
     "r2r-webdev-template": "file:",
     "react": "^18",
     "react-dom": "^18",

+ 7 - 1
pbl.js

@@ -789,7 +789,13 @@ router.route("/getEntitiesAndRelationships").all(async (req, res, next) => {
 //提取功能
 router.route("/extractFile2").all(async (req, res, next) => {
     try {
-        const response = await client.documents.extract({ id: req.body[0].documentid });
+        let setting = {}
+        if(req.body[0].prompt){
+            setting.graph_extraction_prompt = decodeURIComponent(req.body[0].prompt)
+        }
+        console.log(setting);
+        
+        const response = await client.documents.extract({ id: req.body[0].documentid, setting });
         console.log(response);
 
         res.status(200).json({ result: response.results });

+ 4 - 4
yarn.lock

@@ -2149,10 +2149,10 @@
   "resolved" "https://registry.npmmirror.com/querystring/-/querystring-0.2.1.tgz"
   "version" "0.2.1"
 
-"r2r-js@^0.4.34":
-  "integrity" "sha512-bnbrhea650hcWhjaVrtk1d7kLqiBIhTgp/m/WsduQuDCrVfG3KyAt/teSo0ur/7koNgvkp0kFr1tyk5Tptvq3Q=="
-  "resolved" "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.34.tgz"
-  "version" "0.4.34"
+"r2r-js@^0.4.43":
+  "integrity" "sha512-3StchsDWdGgyeeLWFrastBPx4CVZUkbrpq1ZjpUjNirgDt+rp/LC5nlmwWf0Yru2EkZnG8XyCzUUlwa35C7/VQ=="
+  "resolved" "https://registry.npmjs.org/r2r-js/-/r2r-js-0.4.43.tgz"
+  "version" "0.4.43"
   dependencies:
     "@jest/globals" "^29.7.0"
     "@rrweb/types" "2.0.0-alpha.17"