diff --git a/dsLightRag/Volcengine/VikingDBMemoryService.py b/dsLightRag/Volcengine/Kit/VikingDBMemoryService.py similarity index 97% rename from dsLightRag/Volcengine/VikingDBMemoryService.py rename to dsLightRag/Volcengine/Kit/VikingDBMemoryService.py index 2643a0a9..5db9e779 100644 --- a/dsLightRag/Volcengine/VikingDBMemoryService.py +++ b/dsLightRag/Volcengine/Kit/VikingDBMemoryService.py @@ -6,8 +6,6 @@ import json import logging import threading import time -import sys -import os from dotenv import load_dotenv from volcengine.ApiInfo import ApiInfo diff --git a/dsLightRag/Volcengine/Kit/__init__.py b/dsLightRag/Volcengine/Kit/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/dsLightRag/Volcengine/State.py b/dsLightRag/Volcengine/State.py deleted file mode 100644 index 44a1aaf6..00000000 --- a/dsLightRag/Volcengine/State.py +++ /dev/null @@ -1,53 +0,0 @@ -import json -import requests -from volcengine.base.Request import Request -from volcengine.Credentials import Credentials -from volcengine.auth.SignerV4 import SignerV4 - -from Config.Config import VOLC_ACCESSKEY, VOLC_SECRETKEY -from Volcengine.VikingDBMemoryService import MEMORY_COLLECTION_NAME - -AK = VOLC_ACCESSKEY -SK = VOLC_SECRETKEY -Domain = "api-knowledgebase.mlp.cn-beijing.volces.com" - -def prepare_request(method, path, ak, sk, data=None): - r = Request() - r.set_shema("http") # 注意:这里用 http,因为 SignerV4 内部会拼 host - r.set_method(method) - r.set_host(Domain) - r.set_path(path) - - if data is not None: - r.set_body(json.dumps(data)) - - # 使用 air 服务和 cn-north-1 区域 - credentials = Credentials(ak, sk, 'air', 'cn-north-1') - SignerV4.sign(r, credentials) - return r - -def internal_request(method, api, payload, params=None): - req = prepare_request( - method=method, - path=api, - ak=AK, - sk=SK, - data=payload - ) - - r = requests.request( - method=req.method, - url="{}://{}{}".format(req.schema, req.host, req.path), - headers=req.headers, - data=req.body, - params=params, - ) - return r - -# 查询记忆库信息 -path = '/api/memory/collection/info' -payload = { - "CollectionName": MEMORY_COLLECTION_NAME -} -rsp = internal_request("POST", path, payload) -print(rsp.json()) \ No newline at end of file diff --git a/dsLightRag/Volcengine/T1_DropIndex.py b/dsLightRag/Volcengine/T1_DropIndex.py index 1c5e1fec..a8e50b6d 100644 --- a/dsLightRag/Volcengine/T1_DropIndex.py +++ b/dsLightRag/Volcengine/T1_DropIndex.py @@ -6,7 +6,7 @@ import os # 添加当前目录到系统路径 sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from VikingDBMemoryService import VikingDBMemoryService, MEMORY_COLLECTION_NAME +from Volcengine.Kit.VikingDBMemoryService import VikingDBMemoryService, MEMORY_COLLECTION_NAME from Config.Config import VOLC_ACCESSKEY, VOLC_SECRETKEY # 控制日志输出 diff --git a/dsLightRag/Volcengine/T2_CreateIndex.py b/dsLightRag/Volcengine/T2_CreateIndex.py index 37ed8c09..c5cfa690 100644 --- a/dsLightRag/Volcengine/T2_CreateIndex.py +++ b/dsLightRag/Volcengine/T2_CreateIndex.py @@ -5,7 +5,7 @@ import time from volcenginesdkarkruntime import Ark from Config.Config import VOLC_ACCESSKEY, VOLC_SECRETKEY, VOLC_API_KEY -from VikingDBMemoryService import VikingDBMemoryService, MEMORY_COLLECTION_NAME +from Volcengine.Kit.VikingDBMemoryService import VikingDBMemoryService, MEMORY_COLLECTION_NAME # 控制日志输出 logger = logging.getLogger('CollectionMemory') diff --git a/dsLightRag/Volcengine/__pycache__/VikingDBMemoryService.cpython-310.pyc b/dsLightRag/Volcengine/__pycache__/VikingDBMemoryService.cpython-310.pyc deleted file mode 100644 index 9e9d1f4f..00000000 Binary files a/dsLightRag/Volcengine/__pycache__/VikingDBMemoryService.cpython-310.pyc and /dev/null differ