Commit 3b439c4b authored by pengxin's avatar pengxin

Merge branch 'master' of http://192.168.0.35:3000/lmp/lmp_server

parents ea371e58 c69e0f3e
...@@ -33,6 +33,10 @@ public class KnowledgeConfig { ...@@ -33,6 +33,10 @@ public class KnowledgeConfig {
*/ */
private String listFiles; private String listFiles;
/**
* 获取知识库内的切片列表
*/
private String listDocs;
/** /**
* 搜索知识库 * 搜索知识库
*/ */
......
...@@ -267,13 +267,20 @@ public class KnowledgeManageController { ...@@ -267,13 +267,20 @@ public class KnowledgeManageController {
if (MyCommonUtil.existBlankArgument(requestBody)) { if (MyCommonUtil.existBlankArgument(requestBody)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST); return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
} }
String data = null; String result = null;
try { try {
data = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getSearchDocs(), requestBody); result = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getSearchDocs(), requestBody);
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) {
return ResponseResult.success(data);
}
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return ResponseResult.success(data);
} }
/** /**
...@@ -287,13 +294,20 @@ public class KnowledgeManageController { ...@@ -287,13 +294,20 @@ public class KnowledgeManageController {
if (MyCommonUtil.existBlankArgument(requestBody)) { if (MyCommonUtil.existBlankArgument(requestBody)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST); return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
} }
String data = null; String result = null;
try { try {
data = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getUpdateDocsById(), requestBody); result = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getUpdateDocsById(), requestBody);
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) {
return ResponseResult.success(data);
}
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return ResponseResult.success(data);
} }
/** /**
...@@ -307,13 +321,20 @@ public class KnowledgeManageController { ...@@ -307,13 +321,20 @@ public class KnowledgeManageController {
if (MyCommonUtil.existBlankArgument(requestBody)) { if (MyCommonUtil.existBlankArgument(requestBody)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST); return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
} }
String data = null; String result = null;
try { try {
data = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getDeleteDocsById(), requestBody); result = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getDeleteDocsById(), requestBody);
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) {
return ResponseResult.success(data);
}
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return ResponseResult.success(data);
} }
/** /**
...@@ -336,9 +357,8 @@ public class KnowledgeManageController { ...@@ -336,9 +357,8 @@ public class KnowledgeManageController {
String data = jo.getString("data"); String data = jo.getString("data");
if (code != null && code == 200) { if (code != null && code == 200) {
return ResponseResult.success(data); return ResponseResult.success(data);
} else {
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} }
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -364,9 +384,8 @@ public class KnowledgeManageController { ...@@ -364,9 +384,8 @@ public class KnowledgeManageController {
String data = jo.getString("data"); String data = jo.getString("data");
if (code != null && code == 200) { if (code != null && code == 200) {
return ResponseResult.success(data); return ResponseResult.success(data);
} else {
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} }
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -390,6 +409,33 @@ public class KnowledgeManageController { ...@@ -390,6 +409,33 @@ public class KnowledgeManageController {
Integer code = jo.getIntValue("code"); Integer code = jo.getIntValue("code");
String msg = jo.getString("msg"); String msg = jo.getString("msg");
String data = jo.getString("data"); String data = jo.getString("data");
if (code != null && code == 200) {
return ResponseResult.success(data);
}
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
/**
* 获取知识库指定源文件的分段切片文档
*
* @param requestBody 请求对象。
* @return 应答结果对象。
*/
@PostMapping("/listDocs")
public ResponseResult<String> listDocs(@RequestBody String requestBody) {
if (MyCommonUtil.existBlankArgument(requestBody)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
String result = null;
try {
result = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getListDocs(), requestBody);
JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) { if (code != null && code == 200) {
return ResponseResult.success(data); return ResponseResult.success(data);
} else { } else {
...@@ -399,7 +445,6 @@ public class KnowledgeManageController { ...@@ -399,7 +445,6 @@ public class KnowledgeManageController {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
/** /**
* 根据content中文档重建向量库,流式输出处理进度。 * 根据content中文档重建向量库,流式输出处理进度。
* *
...@@ -413,7 +458,14 @@ public class KnowledgeManageController { ...@@ -413,7 +458,14 @@ public class KnowledgeManageController {
} }
try { try {
String result = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getRecreate(), requestBody); String result = this.proxyPythonService.predictPost(this.knowledgeConfig.getKnowledgeInterface() + knowledgeConfig.getRecreate(), requestBody);
return ResponseResult.success(result); JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code");
String msg = jo.getString("msg");
String data = jo.getString("data");
if (code != null && code == 200) {
return ResponseResult.success(data);
}
return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -527,30 +579,22 @@ public class KnowledgeManageController { ...@@ -527,30 +579,22 @@ public class KnowledgeManageController {
* @param knowledgeName 知识库名称。 * @param knowledgeName 知识库名称。
*/ */
@GetMapping("/listFiles") @GetMapping("/listFiles")
public ResponseResult<String[]> listFiles(@RequestParam String knowledgeName) { public ResponseResult<String> listFiles(@RequestParam String knowledgeName) {
String result = null; String result = null;
String requestBody = "?knowledge_base_name=" + knowledgeName; String requestBody = "?knowledge_base_name=" + knowledgeName;
try { try {
result = this.proxyPythonService.predictGet(this.knowledgeConfig.getKnowledgeInterface() + this.knowledgeConfig.getListFiles(), requestBody); result = this.proxyPythonService.predictGet(this.knowledgeConfig.getKnowledgeInterface() + this.knowledgeConfig.getListFiles(), requestBody);
} catch (IOException e) {
throw new RuntimeException(e);
}
JSONObject jo = JSON.parseObject(result); JSONObject jo = JSON.parseObject(result);
Integer code = jo.getIntValue("code"); Integer code = jo.getIntValue("code");
String msg = jo.getString("msg"); String msg = jo.getString("msg");
JSONArray jsonArray = jo.getJSONArray("data"); String data = jo.getString("data");
if (code != null && code == 200) { if (code != null && code == 200) {
String[] stringArray = new String[jsonArray.size()]; return ResponseResult.success(data);
for (int i = 0; i < jsonArray.size(); i++) {
try {
stringArray[i] = jsonArray.getString(i);
} catch (JSONException e) {
e.printStackTrace();
}
} }
return ResponseResult.success(stringArray); return ResponseResult.create(ErrorCodeEnum.SERVER_INTERNAL_ERROR, msg, data);
} catch (IOException e) {
throw new RuntimeException(e);
} }
return ResponseResult.success(null);
} }
private ResponseResult<String> doDelete(Long knowledgeId) { private ResponseResult<String> doDelete(Long knowledgeId) {
......
...@@ -108,6 +108,8 @@ knowledge: ...@@ -108,6 +108,8 @@ knowledge:
delete: delete_knowledge_base delete: delete_knowledge_base
#获取知识库内的文件列表 #获取知识库内的文件列表
listFiles: list_files listFiles: list_files
#获取知识库切片列表
listDocs: list_docs
#搜索知识库 #搜索知识库
searchDocs: search_docs searchDocs: search_docs
#直接更新知识库文档 #直接更新知识库文档
...@@ -125,6 +127,7 @@ knowledge: ...@@ -125,6 +127,7 @@ knowledge:
#根据content中文档重建向量库,流式输出处理进度 #根据content中文档重建向量库,流式输出处理进度
recreate: recreate_vector_store recreate: recreate_vector_store
#获取知识库内的文件列表 #获取知识库内的文件列表
# 这里仅仅是一个第三方配置的示例,如果没有接入斯三方系统, # 这里仅仅是一个第三方配置的示例,如果没有接入斯三方系统,
# 这里的配置项也不会影响到系统的行为,如果觉得多余,也可以手动删除。 # 这里的配置项也不会影响到系统的行为,如果觉得多余,也可以手动删除。
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment