Commit
·
9c6d79f
1
Parent(s):
17b1039
Fix error response (#3719)
Browse files### What problem does this PR solve?
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
---------
Co-authored-by: Jin Hai <[email protected]>
api/apps/chunk_app.py
CHANGED
|
@@ -96,7 +96,7 @@ def get():
|
|
| 96 |
kb_ids = KnowledgebaseService.get_kb_ids(tenant_id)
|
| 97 |
chunk = settings.docStoreConn.get(chunk_id, search.index_name(tenant_id), kb_ids)
|
| 98 |
if chunk is None:
|
| 99 |
-
return server_error_response("Chunk not found")
|
| 100 |
k = []
|
| 101 |
for n in chunk.keys():
|
| 102 |
if re.search(r"(_vec$|_sm_|_tks|_ltks)", n):
|
|
|
|
| 96 |
kb_ids = KnowledgebaseService.get_kb_ids(tenant_id)
|
| 97 |
chunk = settings.docStoreConn.get(chunk_id, search.index_name(tenant_id), kb_ids)
|
| 98 |
if chunk is None:
|
| 99 |
+
return server_error_response(Exception("Chunk not found"))
|
| 100 |
k = []
|
| 101 |
for n in chunk.keys():
|
| 102 |
if re.search(r"(_vec$|_sm_|_tks|_ltks)", n):
|
rag/llm/rerank_model.py
CHANGED
|
@@ -158,6 +158,8 @@ class XInferenceRerank(Base):
|
|
| 158 |
def __init__(self, key="xxxxxxx", model_name="", base_url=""):
|
| 159 |
if base_url.find("/v1") == -1:
|
| 160 |
base_url = urljoin(base_url, "/v1/rerank")
|
|
|
|
|
|
|
| 161 |
self.model_name = model_name
|
| 162 |
self.base_url = base_url
|
| 163 |
self.headers = {
|
|
|
|
| 158 |
def __init__(self, key="xxxxxxx", model_name="", base_url=""):
|
| 159 |
if base_url.find("/v1") == -1:
|
| 160 |
base_url = urljoin(base_url, "/v1/rerank")
|
| 161 |
+
if base_url.find("/rerank") == -1:
|
| 162 |
+
base_url = urljoin(base_url, "/v1/rerank")
|
| 163 |
self.model_name = model_name
|
| 164 |
self.base_url = base_url
|
| 165 |
self.headers = {
|
sdk/python/test/test_frontend_api/test_dataset.py
CHANGED
|
@@ -4,6 +4,7 @@ import pytest
|
|
| 4 |
import random
|
| 5 |
import string
|
| 6 |
|
|
|
|
| 7 |
def test_dataset(get_auth):
|
| 8 |
# create dataset
|
| 9 |
res = create_dataset(get_auth, "test_create_dataset")
|
|
@@ -58,6 +59,7 @@ def test_dataset_1k_dataset(get_auth):
|
|
| 58 |
assert res.get("code") == 0, f"{res.get('message')}"
|
| 59 |
print(f"{len(dataset_list)} datasets are deleted")
|
| 60 |
|
|
|
|
| 61 |
def test_duplicated_name_dataset(get_auth):
|
| 62 |
# create dataset
|
| 63 |
for i in range(20):
|
|
@@ -81,6 +83,7 @@ def test_duplicated_name_dataset(get_auth):
|
|
| 81 |
assert res.get("code") == 0, f"{res.get('message')}"
|
| 82 |
print(f"{len(dataset_list)} datasets are deleted")
|
| 83 |
|
|
|
|
| 84 |
def test_invalid_name_dataset(get_auth):
|
| 85 |
# create dataset
|
| 86 |
# with pytest.raises(Exception) as e:
|
|
@@ -99,6 +102,7 @@ def test_invalid_name_dataset(get_auth):
|
|
| 99 |
assert res['code'] == 102
|
| 100 |
print(res)
|
| 101 |
|
|
|
|
| 102 |
def test_update_different_params_dataset(get_auth):
|
| 103 |
# create dataset
|
| 104 |
res = create_dataset(get_auth, "test_create_dataset")
|
|
|
|
| 4 |
import random
|
| 5 |
import string
|
| 6 |
|
| 7 |
+
|
| 8 |
def test_dataset(get_auth):
|
| 9 |
# create dataset
|
| 10 |
res = create_dataset(get_auth, "test_create_dataset")
|
|
|
|
| 59 |
assert res.get("code") == 0, f"{res.get('message')}"
|
| 60 |
print(f"{len(dataset_list)} datasets are deleted")
|
| 61 |
|
| 62 |
+
|
| 63 |
def test_duplicated_name_dataset(get_auth):
|
| 64 |
# create dataset
|
| 65 |
for i in range(20):
|
|
|
|
| 83 |
assert res.get("code") == 0, f"{res.get('message')}"
|
| 84 |
print(f"{len(dataset_list)} datasets are deleted")
|
| 85 |
|
| 86 |
+
|
| 87 |
def test_invalid_name_dataset(get_auth):
|
| 88 |
# create dataset
|
| 89 |
# with pytest.raises(Exception) as e:
|
|
|
|
| 102 |
assert res['code'] == 102
|
| 103 |
print(res)
|
| 104 |
|
| 105 |
+
|
| 106 |
def test_update_different_params_dataset(get_auth):
|
| 107 |
# create dataset
|
| 108 |
res = create_dataset(get_auth, "test_create_dataset")
|