feat(ark e2e): req by cert file

Change-Id: I048f4de03da2aa7c28676746d6024d58368ecc98

Author: liuhuiqi.7

volcenginesdkarkruntime/_client.py

@@ -104,8 +104,10 @@ def _get_endpoint_sts_token(self, endpoint_id: str):
 
     def _get_endpoint_certificate(self, endpoint_id: str) -> key_agreement_client:
         if self._certificate_manager is None:
-            if self.ak is None or self.sk is None:
-                raise ArkAPIError("must set ak and sk before get endpoint token.")
+            cert_path = os.environ.get("E2E_CERTIFICATE_PATH")
+            if (self.ak is None or self.sk is None) and cert_path is None:
+                raise ArkAPIError("must set (ak and sk) or (E2E_CERTIFICATE_PATH) \
+                                  before get endpoint token.")
             self._certificate_manager = E2ECertificateManager(self.ak, self.sk, self.region)
         return self._certificate_manager.get(endpoint_id)
 
@@ -299,7 +301,9 @@ def __init__(self, ak: str, sk: str, region: str):
         volcenginesdkcore.Configuration.set_default(configuration)
         self.api_instance = volcenginesdkark.ARKApi()
 
-    def _load_api_key(self, ep: str) -> str:
+        self.cert_path = os.environ.get("E2E_CERTIFICATE_PATH")
+
+    def _load_cert_by_ak_sk(self, ep: str) -> str:
         get_endpoint_certificate_request = volcenginesdkark.GetEndpointCertificateRequest(
             id=ep
         )
@@ -313,7 +317,11 @@ def _load_api_key(self, ep: str) -> str:
 
     def get(self, ep: str) -> key_agreement_client:
         if ep not in self._certificate_manager:
-            cert_pem = self._load_api_key(ep)
+            if self.cert_path is not None:
+                with open(self.cert_path, 'r') as f:
+                    cert_pem = f.read()
+            else:
+                cert_pem = self._load_cert_by_ak_sk(ep)
             self._certificate_manager[ep] = key_agreement_client(
                 certificate_pem_string=cert_pem
             )

volcenginesdkarkruntime/resources/chat/completions.py

@@ -53,6 +53,8 @@ def _process_messages(self, messages: Iterable[ChatCompletionMessageParam],
                             raise TypeError("content type {} is not supported end-to-end encryption".
                                             format(type(c)))
                         for key in c.keys():
+                            if key == 'type':
+                                continue
                             if isinstance(c[key], str):
                                 content[i][key] = f(c[key])
                             if isinstance(c[key], Dict):
@@ -150,8 +152,8 @@ def create(
             stream_cls=Stream[ChatCompletionChunk],
         )
 
-        if is_encrypt:
-            return self._decrypt(resp)
+        # if is_encrypt:
+        #     return self._decrypt(resp)
         return resp