Skip to content

Commit 6b71edc

Browse files
committed
fix: tos logger and config
1 parent ade40b6 commit 6b71edc

File tree

2 files changed

+8
-37
lines changed

2 files changed

+8
-37
lines changed

config.yaml.full

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ database:
142142
mem0:
143143
base_url: # default "https://api.mem0.ai/v1", using full https url including port
144144
api_key: #api_key
145+
tos_vector:
146+
endpoint: tosvectors-cn-beijing.volces.com # default Volcengine TOS Vector endpoint
147+
region: cn-beijing # default Volcengine TOS Vector region
148+
bucket:
149+
account_id:
145150

146151

147152

veadk/knowledgebase/backends/tos_vector_backend.py

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
from typing_extensions import Any, override
2525

2626
import veadk.config # noqa E401
27-
from veadk.auth.veauth.utils import get_credential_from_vefaas_iam
2827
from veadk.configs.database_configs import TOSVectorConfig
2928
from veadk.configs.model_configs import EmbeddingModelConfig, NormalEmbeddingModelConfig
30-
from veadk.integrations.ve_tos.ve_tos import VeTOS
29+
3130
from veadk.knowledgebase.backends.base_backend import BaseKnowledgebaseBackend
3231
from veadk.knowledgebase.backends.utils import get_llama_index_splitter
3332
from veadk.utils.logger import get_logger
3433

35-
logger = get_logger()
34+
logger = get_logger(__name__)
3635
try:
3736
from tos.vector_client import VectorClient
3837
from tos import DataType, DistanceMetricType
@@ -77,27 +76,12 @@ def model_post_init(self, __context: Any) -> None:
7776
# create_bucket and index if not exist
7877
self._create_index()
7978

80-
self._tos_client = self._get_tos_client()
81-
8279
self._embed_model = OpenAILikeEmbedding(
8380
model_name=self.embedding_config.name,
8481
api_key=self.embedding_config.api_key,
8582
api_base=self.embedding_config.api_base,
8683
)
8784

88-
def _bucket_exists(self) -> bool:
89-
try:
90-
bucket_exist = self._tos_vector_client.get_vector_bucket(
91-
vector_bucket_name=self.tos_vector_bucket_name,
92-
account_id=self.tos_vector_account_id,
93-
)
94-
return bucket_exist.status_code == 200
95-
except TosServerError as e:
96-
if e.status_code == 404:
97-
return False
98-
else:
99-
raise e
100-
10185
def _index_exists(self) -> bool:
10286
try:
10387
index_exist = self._tos_vector_client.get_index(
@@ -122,6 +106,7 @@ def _split_documents(self, documents: list[Document]) -> list[BaseNode]:
122106
return nodes
123107

124108
def _create_index(self):
109+
# no need to check if bucket exists, create_bucket will create it if not exist
125110
self._tos_vector_client.create_vector_bucket(
126111
vector_bucket_name=self.tos_vector_bucket_name,
127112
)
@@ -136,25 +121,6 @@ def _create_index(self):
136121
distance_metric=DistanceMetricType.DistanceMetricCosine,
137122
)
138123

139-
def _get_tos_client(self) -> VeTOS:
140-
volcengine_access_key = self.volcengine_access_key
141-
volcengine_secret_key = self.volcengine_secret_key
142-
session_token = self.session_token
143-
144-
if not (volcengine_access_key and volcengine_secret_key):
145-
cred = get_credential_from_vefaas_iam()
146-
volcengine_access_key = cred.access_key_id
147-
volcengine_secret_key = cred.secret_access_key
148-
session_token = cred.session_token
149-
150-
return VeTOS(
151-
ak=volcengine_access_key,
152-
sk=volcengine_secret_key,
153-
session_token=session_token,
154-
region=self.tos_vector_config.region,
155-
bucket_name=self.tos_vector_bucket_name,
156-
)
157-
158124
def precheck_index_naming(self) -> None:
159125
pass
160126

0 commit comments

Comments
 (0)