agentkit-sdk-python 0.7.8__tar.gz → 0.7.9__tar.gz

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentkit-sdk-python
-Version: 0.7.8
+Version: 0.7.9
 Summary: Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure.
 Author-email: Xiangrui Cheng <innsdcc@gmail.com>, Yumeng Bao <baoyumeng.123@gmail.com>, Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>
 License:                                  Apache License

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit/sdk/identity/auth.py

@@ -41,7 +41,7 @@ def requires_api_key(*, provider_name: str, into: str = "api_key"):
             endpoint = resolve_endpoint("identity")
             access_key = creds.access_key
             secret_key = creds.secret_key
-            session_token = ""
+            session_token = getattr(creds, "session_token", None) or None
 
             response = ve_request(
                 request_body={
@@ -49,9 +49,9 @@ def requires_api_key(*, provider_name: str, into: str = "api_key"):
                     "IdentityToken": "identity_token",
                 },
                 action="GetResourceApiKey",
-                header={"X-Security-Token": session_token} if session_token else {},
                 ak=access_key,
                 sk=secret_key,
+                session_token=session_token,
                 version=endpoint.api_version,
                 service=endpoint.service,
                 host=endpoint.host,

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit/toolkit/volcengine/code_pipeline.py

@@ -31,11 +31,13 @@ class VeCodePipeline:
         secret_key: str = "",
         region: str = "",
         provider: str | None = None,
+        session_token: str = "",
     ) -> None:
         # Use provided region or None to trigger auto-detection in VolcConfiguration
         config = VolcConfiguration(
             access_key=access_key or None,
             secret_key=secret_key or None,
+            session_token=session_token or None,
             region=region or None,
             provider=provider or None,
         )
@@ -45,6 +47,7 @@ class VeCodePipeline:
             creds = config.get_service_credentials("cp")
             self.volcengine_access_key = creds.access_key
             self.volcengine_secret_key = creds.secret_key
+            self.volcengine_session_token = creds.session_token or None
         elif not all([access_key, secret_key]):
             raise ValueError(
                 "Error create cp instance: missing access key or secret key",
@@ -52,6 +55,7 @@ class VeCodePipeline:
         else:
             self.volcengine_access_key = access_key
             self.volcengine_secret_key = secret_key
+            self.volcengine_session_token = session_token or None
 
         endpoint = config.get_service_endpoint("cp")
 
@@ -61,12 +65,10 @@ class VeCodePipeline:
         self.host = endpoint.host
         self.content_type = "application/json"
 
-    def _get_default_workspace(self) -> str:
-        logger.info("Getting default workspace...")
-
-        res = ve_request(
-            request_body={},
-            action="GetDefaultWorkspaceInner",
+    def _ve_request(self, request_body: dict, action: str) -> dict:
+        return ve_request(
+            request_body=request_body,
+            action=action,
             ak=self.volcengine_access_key,
             sk=self.volcengine_secret_key,
             service=self.service,
@@ -74,6 +76,15 @@ class VeCodePipeline:
             region=self.region,
             host=self.host,
             content_type=self.content_type,
+            session_token=self.volcengine_session_token,
+        )
+
+    def _get_default_workspace(self) -> str:
+        logger.info("Getting default workspace...")
+
+        res = self._ve_request(
+            request_body={},
+            action="GetDefaultWorkspaceInner",
         )
 
         try:
@@ -134,16 +145,9 @@ class VeCodePipeline:
         if visible_users:
             request_body["VisibleUsers"] = visible_users
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="CreateWorkspace",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -206,16 +210,9 @@ class VeCodePipeline:
             if workspace_ids:
                 request_body["Filter"]["Ids"] = workspace_ids
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="ListWorkspaces",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -301,7 +298,7 @@ class VeCodePipeline:
         parameters: list[dict[str, str]] | None = None,
     ) -> str:
         logger.info("Creating pipeline...")
-        res = ve_request(
+        res = self._ve_request(
             request_body={
                 "WorkspaceId": workspace_id,
                 "Name": pipeline_name,
@@ -309,13 +306,6 @@ class VeCodePipeline:
                 "Parameters": parameters or [],
             },
             action="CreatePipeline",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -366,16 +356,9 @@ class VeCodePipeline:
         if resources:
             request_body["Resources"] = resources
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="RunPipeline",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -459,16 +442,9 @@ class VeCodePipeline:
             if run_ids:
                 request_body["Filter"]["Ids"] = run_ids
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="ListPipelineRuns",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -569,16 +545,9 @@ class VeCodePipeline:
             if pipeline_ids:
                 request_body["Filter"]["Ids"] = pipeline_ids
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="ListPipelines",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -684,16 +653,9 @@ class VeCodePipeline:
             "PipelineRunId": pipeline_run_id,
         }
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="ListPipelineRunStagesInner",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:
@@ -757,16 +719,9 @@ class VeCodePipeline:
             "StepName": step_name,
         }
 
-        res = ve_request(
+        res = self._ve_request(
             request_body=request_body,
             action="GetTaskRunLogDownloadURI",
-            ak=self.volcengine_access_key,
-            sk=self.volcengine_secret_key,
-            service=self.service,
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            content_type=self.content_type,
         )
 
         try:

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit/toolkit/volcengine/cr.py

@@ -32,9 +32,11 @@ class VeCR:
         secret_key: str,
         region: str | None = None,
         provider: str | None = None,
+        session_token: str | None = None,
     ):
         self.ak = access_key
         self.sk = secret_key
+        self.session_token = session_token or None
 
         config = VolcConfiguration(region=region or None, provider=provider or None)
         ep = resolve_endpoint(
@@ -47,6 +49,20 @@ class VeCR:
         self.host = ep.host
         self.scheme = ep.scheme
 
+    def _ve_request(self, request_body: dict, action: str) -> dict:
+        return ve_request(
+            request_body=request_body,
+            action=action,
+            ak=self.ak,
+            sk=self.sk,
+            service="cr",
+            version=self.version,
+            region=self.region,
+            host=self.host,
+            scheme=self.scheme,
+            session_token=self.session_token,
+        )
+
     def _create_instance(
         self,
         instance_name: str = DEFAULT_CR_INSTANCE_NAME,
@@ -74,7 +90,7 @@ class VeCR:
         if status != "NONEXIST":
             logger.debug(f"cr instance {instance_name} already running")
             return instance_name
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Name": instance_name,
                 "ResourceTags": [
@@ -83,13 +99,6 @@ class VeCR:
                 "Type": instance_type,
             },
             action="CreateRegistry",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"create cr instance {instance_name}: {response}")
 
@@ -129,20 +138,13 @@ class VeCR:
         Returns:
             cr instance status
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Filter": {
                     "Names": [instance_name],
                 }
             },
             action="ListRegistries",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"check cr instance {instance_name}: {response}")
 
@@ -168,19 +170,12 @@ class VeCR:
         Returns:
             cr namespace name
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Name": namespace_name,
                 "Registry": instance_name,
             },
             action="CreateNamespace",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"create cr namespace {namespace_name}: {response}")
 
@@ -217,7 +212,7 @@ class VeCR:
         Returns:
             cr repo name
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Name": repo_name,
                 "Registry": instance_name,
@@ -226,13 +221,6 @@ class VeCR:
                 "Description": "veadk cr repo",
             },
             action="CreateRepository",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"create cr repo {repo_name}: {response}")
 
@@ -255,18 +243,11 @@ class VeCR:
         """
         get cr authorization token
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Registry": instance_name,
             },
             action="GetAuthorizationToken",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug("got cr authorization token")
 
@@ -291,18 +272,11 @@ class VeCR:
         """
         get cr public endpoint
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Registry": instance_name,
             },
             action="GetPublicEndpoint",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"get cr public endpoint: {response}")
         if "Error" in response["ResponseMetadata"]:
@@ -318,19 +292,12 @@ class VeCR:
         """
         update cr public endpoint
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Registry": instance_name,
                 "Enabled": enabled,
             },
             action="UpdatePublicEndpoint",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"update cr public endpoint: {response}")
         if "Error" in response["ResponseMetadata"]:
@@ -354,7 +321,7 @@ class VeCR:
         """
         create endpoint acl policies
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Registry": instance_name,
                 "Type": policy_type,
@@ -362,13 +329,6 @@ class VeCR:
                 "Description": description,
             },
             action="CreateEndpointAclPolicies",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"create endpoint acl policies: {response}")
 
@@ -387,18 +347,11 @@ class VeCR:
         """
         list cr domains
         """
-        response = ve_request(
+        response = self._ve_request(
             request_body={
                 "Registry": instance_name,
             },
             action="ListDomains",
-            ak=self.ak,
-            sk=self.sk,
-            service="cr",
-            version=self.version,
-            region=self.region,
-            host=self.host,
-            scheme=self.scheme,
         )
         logger.debug(f"list cr domains: {response}")
         if "Error" in response["ResponseMetadata"]:

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit/toolkit/volcengine/services/cr_service.py

@@ -207,6 +207,7 @@ class CRService:
             self._vecr_client = ve_cr.VeCR(
                 access_key=creds.access_key,
                 secret_key=creds.secret_key,
+                session_token=creds.session_token,
                 region=endpoint.region,
                 provider=self.provider,
             )

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit/utils/ve_sign.py

@@ -212,19 +212,22 @@ def norm_query(params):
     return query.replace("+", "%20")
 
 
-# 第一步：准备辅助函数。
-# sha256 非对称加密
 def hmac_sha256(key: bytes, content: str):
     return hmac.new(key, content.encode("utf-8"), hashlib.sha256).digest()
 
 
-# sha256 hash算法
 def hash_sha256(content: str):
     return hashlib.sha256(content.encode("utf-8")).hexdigest()
 
 
-# 第二步：签名请求函数
-def request(method, date, query, header, ak, sk, action, body):
+def _header_value(headers: dict, name: str) -> str | None:
+    for key, value in headers.items():
+        if key.lower() == name.lower() and value:
+            return str(value)
+    return None
+
+
+def request(method, date, query, header, ak, sk, action, body, session_token=None):
     # 第三步：创建身份证明。其中的 Service 和 Region 字段是固定的。ak 和 sk 分别代表
     # AccessKeyID 和 SecretAccessKey。同时需要初始化签名结构体。一些签名计算时需要的属性也在这里处理。
     # 初始化身份证明结构体
@@ -257,24 +260,28 @@ def request(method, date, query, header, ak, sk, action, body):
         "X-Date": x_date,
         "Content-Type": request_param["content_type"],
     }
+    token = session_token or _header_value(header, "X-Security-Token")
+    if token:
+        sign_result["X-Security-Token"] = token
+
     # 第五步：计算 Signature 签名。
-    signed_headers_str = ";".join(
-        ["content-type", "host", "x-content-sha256", "x-date"]
-    )
-    # signed_headers_str = signed_headers_str + ";x-security-token"
+    signed_header_names = ["content-type", "host", "x-content-sha256", "x-date"]
+    canonical_header_lines = [
+        "content-type:" + request_param["content_type"],
+        "host:" + request_param["host"],
+        "x-content-sha256:" + x_content_sha256,
+        "x-date:" + x_date,
+    ]
+    if token:
+        signed_header_names.append("x-security-token")
+        canonical_header_lines.append("x-security-token:" + token)
+    signed_headers_str = ";".join(signed_header_names)
     canonical_request_str = "\n".join(
         [
             request_param["method"].upper(),
             request_param["path"],
             norm_query(request_param["query"]),
-            "\n".join(
-                [
-                    "content-type:" + request_param["content_type"],
-                    "host:" + request_param["host"],
-                    "x-content-sha256:" + x_content_sha256,
-                    "x-date:" + x_date,
-                ]
-            ),
+            "\n".join(canonical_header_lines),
             "",
             signed_headers_str,
             x_content_sha256,
@@ -309,9 +316,14 @@ def request(method, date, query, header, ak, sk, action, body):
             signature,
         )
     )
+    if token:
+        header = {
+            key: value
+            for key, value in header.items()
+            if key.lower() != "x-security-token"
+        }
     header = ensure_x_custom_source_header(header)
     header = {**header, **sign_result}
-    # header = {**header, **{"X-Security-Token": SessionToken}}
     # 第六步：将 Signature 签名写入 HTTP Header 中，并发送 HTTP 请求。
     r = _signed_request(
         method=method,
@@ -335,6 +347,7 @@ def ve_request(
     header: dict | None = None,
     content_type: str = "application/json",
     scheme: str = "https",
+    session_token: str | None = None,
 ):
     # response_body = request("Get", datetime.datetime.utcnow(), {}, {}, AK, SK, "ListUsers", None)
     # print(response_body)
@@ -355,14 +368,22 @@ def ve_request(
     AK = ak
     SK = sk
 
-    now = datetime.datetime.utcnow()
+    now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
 
     # Body的格式需要配合Content-Type，API使用的类型请阅读具体的官方文档，如:json格式需要json.dumps(obj)
     # response_body = request("GET", now, {"Limit": "2"}, {}, AK, SK, "ListUsers", None)
     import json
 
     response_body = request(
-        "POST", now, {}, header or {}, AK, SK, action, json.dumps(request_body)
+        "POST",
+        now,
+        {},
+        header or {},
+        AK,
+        SK,
+        action,
+        json.dumps(request_body),
+        session_token=session_token,
     )
     check_error(response_body)
     return response_body

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.7.8"
+VERSION = "0.7.9"

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/agentkit_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentkit-sdk-python
-Version: 0.7.8
+Version: 0.7.9
 Summary: Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure.
 Author-email: Xiangrui Cheng <innsdcc@gmail.com>, Yumeng Bao <baoyumeng.123@gmail.com>, Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>
 License:                                  Apache License

{agentkit_sdk_python-0.7.8 → agentkit_sdk_python-0.7.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentkit-sdk-python"
-version = "0.7.8"
+version = "0.7.9"
 description = "Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure."
 readme = "README.md"
 requires-python = ">=3.10"