From babbccb5ef16928cb6301973159f4db13c5cf1b7 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Sun, 7 Sep 2025 13:17:19 +0800 Subject: [PATCH] 'commit' --- .../{ => Kit}/VikingDBMemoryService.py | 2 - dsLightRag/Volcengine/Kit/__init__.py | 0 dsLightRag/Volcengine/State.py | 53 ------------------ dsLightRag/Volcengine/T1_DropIndex.py | 2 +- dsLightRag/Volcengine/T2_CreateIndex.py | 2 +- .../VikingDBMemoryService.cpython-310.pyc | Bin 14042 -> 0 bytes 6 files changed, 2 insertions(+), 57 deletions(-) rename dsLightRag/Volcengine/{ => Kit}/VikingDBMemoryService.py (97%) create mode 100644 dsLightRag/Volcengine/Kit/__init__.py delete mode 100644 dsLightRag/Volcengine/State.py delete mode 100644 dsLightRag/Volcengine/__pycache__/VikingDBMemoryService.cpython-310.pyc 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 9e9d1f4f16083449fc84d56a27de736efd7fc602..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14042 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