hiagent-api 2.3.2__tar.gz → 3.1.0__tar.gz

{hiagent_api-2.3.2 → hiagent_api-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: hiagent-api
-Version: 2.3.2
+Version: 3.1.0
 Summary: Add your description here
 Requires-Python: >=3.10
 Requires-Dist: aiofiles>=23.1.0
@@ -9,7 +9,7 @@ Requires-Dist: httpx>=0.28.1
 Requires-Dist: pydantic>=2.11.5
 Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: strenum>=0.4.15
-Requires-Dist: volcengine>=1.0.187
+Requires-Dist: volcengine>=1.0.219
 Description-Content-Type: text/markdown
 
 # HiAgent API

{hiagent_api-2.3.2 → hiagent_api-3.1.0}/hiagent_api/base.py

@@ -42,8 +42,9 @@ from volcengine.base.Service import Service
 from volcengine.Policy import ComplexEncoder, InnerToken, SecurityToken2
 from volcengine.ServiceInfo import ServiceInfo
 from volcengine.util.Util import *
+from .product_code import PRODUCT_CODE_HEADER, normalize_product_code, has_header
 
-VERSION = "0.0.1"
+VERSION = "3.1.0"
 
 
 class VolcAuth(AuthBase):
@@ -77,6 +78,14 @@ class Service(object):
         self.api_info = api_info
         self.init()
         self.init_http_client(http_client, async_http_client)
+        self.product_code = None
+
+    def set_product_code(self, product_code):
+        self.product_code = normalize_product_code(product_code)
+        return self
+
+    def get_product_code(self):
+        return self.product_code
 
     def init_http_client(
             self,
@@ -115,6 +124,7 @@ class Service(object):
             # 先尝试从credentials中读取ak、sk，credentials不存在则从config中读取
             path_ini = os.environ["HOME"] + "/.volc/credentials"
             path_json = os.environ["HOME"] + "/.volc/config"
+            path_env = os.environ["HOME"] + "/.volc/.env"
             if os.path.isfile(path_ini):
                 conf = configparser.ConfigParser()
                 conf.read(path_ini)
@@ -141,6 +151,13 @@ class Service(object):
                         self.service_info.credentials.set_ak(j["ak"])
                     if "sk" in j:
                         self.service_info.credentials.set_sk(j["sk"])
+            elif os.path.isfile(path_env):
+                dotenv_data = dotenv_values(path_env) if os.path.isfile(path_env) else {}
+                ak = os.environ.get("VOLC_ACCESSKEY") or str(dotenv_data.get("VOLC_ACCESSKEY") or "").strip()
+                sk = os.environ.get("VOLC_SECRETKEY") or str(dotenv_data.get("VOLC_SECRETKEY") or "").strip()
+                if ak and sk:
+                    self.service_info.credentials.set_ak(ak)
+                    self.service_info.credentials.set_sk(sk)
 
     def set_ak(self, ak):
         self.service_info.credentials.set_ak(ak)
@@ -383,6 +400,8 @@ class Service(object):
         r.set_socket_timeout(socket_timeout)
 
         mheaders = self.merge(api_info.header, self.service_info.header)
+        if self.product_code and not has_header(mheaders, PRODUCT_CODE_HEADER):
+            mheaders[PRODUCT_CODE_HEADER] = self.product_code
         mheaders["Host"] = self.service_info.host
         mheaders["User-Agent"] = "hiagent-python-sdk" + VERSION
         r.set_headers(mheaders)
@@ -484,6 +503,9 @@ class AppAPIMixin:
         app_url = f"{self.base_url}/{action}"
 
         headers = {"Apikey": f"{app_key}", "Content-Type": "application/json"}
+        product_code = getattr(self, "product_code", None)
+        if product_code:
+            headers[PRODUCT_CODE_HEADER] = product_code
         if _headers is not None:
             headers.update(_headers)
         response = await self.async_http_client.post(
@@ -496,7 +518,7 @@ class AppAPIMixin:
         res_text = response.text
         if not res_text:
             raise Exception("empty response")
-        return res_text
+        return res_text.strip("null")
 
     def _post(self, app_key: str, action: str, params: dict, _headers: Optional[dict] = None) -> str:
         if self.base_url == "":
@@ -506,6 +528,9 @@ class AppAPIMixin:
 
         app_url = f"{self.base_url}/{action}"
         headers = {"Apikey": f"{app_key}", "Content-Type": "application/json"}
+        product_code = getattr(self, "product_code", None)
+        if product_code:
+            headers[PRODUCT_CODE_HEADER] = product_code
         if _headers is not None:
             headers.update(_headers)
 
@@ -517,7 +542,7 @@ class AppAPIMixin:
         res_text = response.text
         if not res_text:
             raise Exception("empty response")
-        return res_text
+        return res_text.strip("null")
 
     def _sse_post(
             self, app_key: str, action: str, params: dict
@@ -530,6 +555,9 @@ class AppAPIMixin:
         app_url = f"{self.base_url}/{action}"
 
         headers = {"Apikey": f"{app_key}", "Content-Type": "application/json"}
+        product_code = getattr(self, "product_code", None)
+        if product_code:
+            headers[PRODUCT_CODE_HEADER] = product_code
 
         with connect_sse(
                 self.http_client,
@@ -552,6 +580,9 @@ class AppAPIMixin:
         app_url = f"{self.base_url}/{action}"
 
         headers = {"Apikey": f"{app_key}", "Content-Type": "application/json"}
+        product_code = getattr(self, "product_code", None)
+        if product_code:
+            headers[PRODUCT_CODE_HEADER] = product_code
 
         async with aconnect_sse(
                 self.async_http_client,