Skip to content

Commit f9e2372

Browse files
authored
fix: fix VikingDB memory credential get (#467)
1 parent b77fabc commit f9e2372

File tree

3 files changed

+40
-27
lines changed

3 files changed

+40
-27
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "veadk-python"
3-
version = "0.5.11"
3+
version = "0.5.12"
44
description = "Volcengine agent development kit, integrations with Volcengine cloud services."
55
readme = "README.md"
66
requires-python = ">=3.10"

veadk/memory/long_term_memory_backends/vikingdb_memory_backend.py

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -116,30 +116,55 @@ def _create_collection(self) -> None:
116116
logger.debug(f"Create collection with response {response}")
117117
return response
118118

119-
def _get_client(self) -> VikingDBMemoryClient:
120-
if not (self.volcengine_access_key and self.volcengine_secret_key):
119+
def _get_ak_sk_sts(self) -> tuple[str, str, str]:
120+
ak = ""
121+
sk = ""
122+
sts_token = ""
123+
124+
if self.volcengine_access_key and self.volcengine_secret_key:
125+
ak = self.volcengine_access_key
126+
sk = self.volcengine_secret_key
127+
sts_token = self.session_token
128+
logger.debug(
129+
"Get volcengine credential from Environments for VikingMEMBackend"
130+
)
131+
132+
else:
121133
cred = get_credential_from_vefaas_iam()
122-
self.volcengine_access_key = cred.access_key_id
123-
self.volcengine_secret_key = cred.secret_access_key
124-
self.session_token = cred.session_token
134+
ak = cred.access_key_id
135+
sk = cred.secret_access_key
136+
sts_token = cred.session_token
137+
logger.debug(
138+
"Get volcengine credential from VeFaaS IAM file for VikingMEMBackend."
139+
)
125140

141+
return ak, sk, sts_token
142+
143+
def _get_client(self) -> VikingDBMemoryClient:
144+
ak, sk, sts_token = self._get_ak_sk_sts()
126145
return VikingDBMemoryClient(
127-
ak=self.volcengine_access_key,
128-
sk=self.volcengine_secret_key,
129-
sts_token=self.session_token,
146+
ak=ak,
147+
sk=sk,
148+
sts_token=sts_token,
130149
region=self.region,
131150
)
132151

133152
def _get_sdk_client(self) -> VikingMem:
134-
client = self._get_client()
153+
ak, sk, sts_token = self._get_ak_sk_sts()
154+
client = VikingDBMemoryClient(
155+
ak=ak,
156+
sk=sk,
157+
sts_token=sts_token,
158+
region=self.region,
159+
)
135160
return VikingMem(
136161
host=client.get_host(),
137162
region=self.region,
138163
auth=IAM(
139-
ak=self.volcengine_access_key,
140-
sk=self.volcengine_secret_key,
164+
ak=ak,
165+
sk=sk,
141166
),
142-
sts_token=self.session_token,
167+
sts_token=sts_token,
143168
)
144169

145170
@override
@@ -237,19 +262,7 @@ def get_user_profile(self, user_id: str) -> str:
237262
f"Get user profile for user_id={user_id} from Viking Memory with mem_id={mem_id}"
238263
)
239264

240-
ak = ""
241-
sk = ""
242-
sts_token = ""
243-
if self.volcengine_access_key and self.volcengine_secret_key:
244-
ak = self.volcengine_access_key
245-
sk = self.volcengine_secret_key
246-
sts_token = self.session_token
247-
else:
248-
cred = get_credential_from_vefaas_iam()
249-
ak = cred.access_key_id
250-
sk = cred.secret_access_key
251-
sts_token = cred.session_token
252-
265+
ak, sk, sts_token = self._get_ak_sk_sts()
253266
response = ve_request(
254267
request_body={
255268
"filter": {

veadk/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
VERSION = "0.5.11"
15+
VERSION = "0.5.12"

0 commit comments

Comments
 (0)