Skip to content

Commit 0b47c5b

Browse files
committed
fix: avoid incompatible error for wenxing model and add middleware config for baidu vector database
1 parent 052ba50 commit 0b47c5b

File tree

4 files changed

+5
-54
lines changed

4 files changed

+5
-54
lines changed

api/commands.py

-49
Original file line numberDiff line numberDiff line change
@@ -325,55 +325,6 @@ def migrate_knowledge_vector_database():
325325

326326
elif vector_type in lower_colletion_vector_types:
327327
collection_name = Dataset.gen_collection_name_by_id(dataset_id).lower()
328-
elif vector_type == VectorType.MILVUS:
329-
dataset_id = dataset.id
330-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
331-
index_struct_dict = {"type": VectorType.MILVUS, "vector_store": {"class_prefix": collection_name}}
332-
dataset.index_struct = json.dumps(index_struct_dict)
333-
elif vector_type == VectorType.RELYT:
334-
dataset_id = dataset.id
335-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
336-
index_struct_dict = {"type": "relyt", "vector_store": {"class_prefix": collection_name}}
337-
dataset.index_struct = json.dumps(index_struct_dict)
338-
elif vector_type == VectorType.TENCENT:
339-
dataset_id = dataset.id
340-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
341-
index_struct_dict = {"type": VectorType.TENCENT, "vector_store": {"class_prefix": collection_name}}
342-
dataset.index_struct = json.dumps(index_struct_dict)
343-
elif vector_type == VectorType.PGVECTOR:
344-
dataset_id = dataset.id
345-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
346-
index_struct_dict = {"type": VectorType.PGVECTOR, "vector_store": {"class_prefix": collection_name}}
347-
dataset.index_struct = json.dumps(index_struct_dict)
348-
elif vector_type == VectorType.OPENSEARCH:
349-
dataset_id = dataset.id
350-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
351-
index_struct_dict = {
352-
"type": VectorType.OPENSEARCH,
353-
"vector_store": {"class_prefix": collection_name},
354-
}
355-
dataset.index_struct = json.dumps(index_struct_dict)
356-
elif vector_type == VectorType.ANALYTICDB:
357-
dataset_id = dataset.id
358-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
359-
index_struct_dict = {
360-
"type": VectorType.ANALYTICDB,
361-
"vector_store": {"class_prefix": collection_name},
362-
}
363-
dataset.index_struct = json.dumps(index_struct_dict)
364-
elif vector_type == VectorType.ELASTICSEARCH:
365-
dataset_id = dataset.id
366-
index_name = Dataset.gen_collection_name_by_id(dataset_id)
367-
index_struct_dict = {"type": "elasticsearch", "vector_store": {"class_prefix": index_name}}
368-
dataset.index_struct = json.dumps(index_struct_dict)
369-
elif vector_type == VectorType.BAIDU:
370-
dataset_id = dataset.id
371-
collection_name = Dataset.gen_collection_name_by_id(dataset_id)
372-
index_struct_dict = {
373-
"type": VectorType.BAIDU,
374-
"vector_store": {"class_prefix": collection_name},
375-
}
376-
dataset.index_struct = json.dumps(index_struct_dict)
377328
else:
378329
raise ValueError(f"Vector store {vector_type} is not supported.")
379330

api/configs/middleware/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from configs.middleware.storage.tencent_cos_storage_config import TencentCloudCOSStorageConfig
1717
from configs.middleware.storage.volcengine_tos_storage_config import VolcengineTOSStorageConfig
1818
from configs.middleware.vdb.analyticdb_config import AnalyticdbConfig
19+
from configs.middleware.vdb.baidu_vector_config import BaiduVectorDBConfig
1920
from configs.middleware.vdb.chroma_config import ChromaConfig
2021
from configs.middleware.vdb.couchbase_config import CouchbaseConfig
2122
from configs.middleware.vdb.elasticsearch_config import ElasticsearchConfig
@@ -34,7 +35,6 @@
3435
from configs.middleware.vdb.upstash_config import UpstashConfig
3536
from configs.middleware.vdb.vikingdb_config import VikingDBConfig
3637
from configs.middleware.vdb.weaviate_config import WeaviateConfig
37-
from configs.middleware.vdb.baidu_vector_config import BaiduVectorDBConfig
3838

3939

4040
class StorageConfig(BaseSettings):

api/core/rag/datasource/vdb/baidu/baidu_vector.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
import time
33
import uuid
44
from typing import Any
5-
import numpy as np
65

6+
import numpy as np
77
from pydantic import BaseModel, model_validator
88
from pymochow import MochowClient
99
from pymochow.auth.bce_credentials import BceCredentials
1010
from pymochow.configuration import Configuration
11-
from pymochow.exception import ClientError, ServerError
12-
from pymochow.model.enum import FieldType, IndexState, IndexType, MetricType, TableState, ServerErrCode
11+
from pymochow.exception import ServerError
12+
from pymochow.model.enum import FieldType, IndexState, IndexType, MetricType, ServerErrCode, TableState
1313
from pymochow.model.schema import Field, HNSWParams, Schema, VectorIndex
1414
from pymochow.model.table import AnnSearch, HNSWSearchParams, Partition, Row
1515

api/core/rag/datasource/vdb/vector_type.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ class VectorType(str, Enum):
2222
UPSTASH = "upstash"
2323
TIDB_ON_QDRANT = "tidb_on_qdrant"
2424
OCEANBASE = "oceanbase"
25-
BAIDU = "baidu"
25+

0 commit comments

Comments
 (0)