vectorvein 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

vectorvein/api/client.py

@@ -48,12 +48,11 @@ class VectorVeinClient:
 
         self.api_key = api_key
         self.base_url = base_url or self.BASE_URL
-        self._client = httpx.Client(
-            headers={
-                "VECTORVEIN-API-KEY": api_key,
-                "VECTORVEIN-API-VERSION": self.API_VERSION,
-            }
-        )
+        self.default_headers = {
+            "VECTORVEIN-API-KEY": api_key,
+            "VECTORVEIN-API-VERSION": self.API_VERSION,
+        }
+        self._client = httpx.Client(timeout=60)
 
     def __enter__(self):
         return self
@@ -67,6 +66,7 @@ class VectorVeinClient:
         endpoint: str,
         params: Optional[Dict[str, Any]] = None,
         json: Optional[Dict[str, Any]] = None,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         **kwargs,
     ) -> Dict[str, Any]:
         """发送HTTP请求
@@ -87,9 +87,18 @@ class VectorVeinClient:
             APIKeyError: API密钥无效或已过期
         """
         url = f"{self.base_url}/{endpoint}"
+        headers = self.default_headers.copy()
+        if api_key_type == "VAPP":
+            headers["VECTORVEIN-API-KEY-TYPE"] = "VAPP"
         try:
-            response = self._client.request(method=method, url=url, params=params, json=json, **kwargs)
-            response.raise_for_status()
+            response = self._client.request(
+                method=method,
+                url=url,
+                params=params,
+                json=json,
+                headers=headers,
+                **kwargs,
+            )
             result = response.json()
 
             if result["status"] in [401, 403]:
@@ -107,6 +116,7 @@ class VectorVeinClient:
         input_fields: List[WorkflowInputField],
         output_scope: Literal["all", "output_fields_only"] = "output_fields_only",
         wait_for_completion: Literal[False] = False,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         timeout: int = 30,
     ) -> str: ...
 
@@ -117,6 +127,7 @@ class VectorVeinClient:
         input_fields: List[WorkflowInputField],
         output_scope: Literal["all", "output_fields_only"] = "output_fields_only",
         wait_for_completion: Literal[True] = True,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         timeout: int = 30,
     ) -> WorkflowRunResult: ...
 
@@ -126,6 +137,7 @@ class VectorVeinClient:
         input_fields: List[WorkflowInputField],
         output_scope: Literal["all", "output_fields_only"] = "output_fields_only",
         wait_for_completion: bool = False,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         timeout: int = 30,
     ) -> Union[str, WorkflowRunResult]:
         """运行工作流
@@ -135,6 +147,7 @@ class VectorVeinClient:
             input_fields: 输入字段列表
             output_scope: 输出范围，可选值：'all' 或 'output_fields_only'
             wait_for_completion: 是否等待完成
+            api_key_type: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
             timeout: 超时时间（秒）
 
         Returns:
@@ -154,7 +167,7 @@ class VectorVeinClient:
             ],
         }
 
-        result = self._request("POST", "workflow/run", json=payload)
+        result = self._request("POST", "workflow/run", json=payload, api_key_type=api_key_type)
 
         if not wait_for_completion:
             return result["data"]["rid"]
@@ -166,7 +179,10 @@ class VectorVeinClient:
             if time.time() - start_time > timeout:
                 raise TimeoutError(f"Workflow execution timed out after {timeout} seconds")
 
-            result = self.check_workflow_status(rid)
+            if api_key_type == "WORKFLOW":
+                result = self.check_workflow_status(rid, api_key_type=api_key_type)
+            else:
+                result = self.check_workflow_status(rid, wid=wid, api_key_type=api_key_type)
             if result.status == 200:
                 return result
             elif result.status == 500:
@@ -174,17 +190,38 @@ class VectorVeinClient:
 
             time.sleep(5)
 
-    def check_workflow_status(self, rid: str) -> WorkflowRunResult:
+    @overload
+    def check_workflow_status(
+        self, rid: str, wid: Optional[str] = None, api_key_type: Literal["WORKFLOW"] = "WORKFLOW"
+    ) -> WorkflowRunResult: ...
+
+    @overload
+    def check_workflow_status(
+        self, rid: str, wid: str, api_key_type: Literal["VAPP"] = "VAPP"
+    ) -> WorkflowRunResult: ...
+
+    def check_workflow_status(
+        self, rid: str, wid: Optional[str] = None, api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW"
+    ) -> WorkflowRunResult:
         """检查工作流运行状态
 
         Args:
             rid: 工作流运行记录ID
+            wid: 工作流ID，非必填，api_key_type 为 'VAPP' 时必填
+            api_key_type: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
 
         Returns:
             WorkflowRunResult: 工作流运行结果
+
+        Raises:
+            VectorVeinAPIError: 工作流错误
         """
         payload = {"rid": rid}
-        response = self._request("POST", "workflow/check-status", json=payload)
+        if api_key_type == "VAPP" and not wid:
+            raise VectorVeinAPIError("api_key_type 为 'VAPP' 时工作流 ID 不能为空")
+        if wid:
+            payload["wid"] = wid
+        response = self._request("POST", "workflow/check-status", json=payload, api_key_type=api_key_type)
         if response["status"] in [200, 202]:
             return WorkflowRunResult(
                 rid=rid,
@@ -452,12 +489,11 @@ class AsyncVectorVeinClient:
 
         self.api_key = api_key
         self.base_url = base_url or self.BASE_URL
-        self._client = httpx.AsyncClient(
-            headers={
-                "VECTORVEIN-API-KEY": api_key,
-                "VECTORVEIN-API-VERSION": self.API_VERSION,
-            }
-        )
+        self.default_headers = {
+            "VECTORVEIN-API-KEY": api_key,
+            "VECTORVEIN-API-VERSION": self.API_VERSION,
+        }
+        self._client = httpx.AsyncClient(timeout=60)
 
     async def __aenter__(self):
         return self
@@ -471,6 +507,7 @@ class AsyncVectorVeinClient:
         endpoint: str,
         params: Optional[Dict[str, Any]] = None,
         json: Optional[Dict[str, Any]] = None,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         **kwargs,
     ) -> Dict[str, Any]:
         """发送异步HTTP请求
@@ -491,9 +528,18 @@ class AsyncVectorVeinClient:
             APIKeyError: API密钥无效或已过期
         """
         url = f"{self.base_url}/{endpoint}"
+        headers = self.default_headers.copy()
+        if api_key_type == "VAPP":
+            headers["VECTORVEIN-API-KEY-TYPE"] = "VAPP"
         try:
-            response = await self._client.request(method=method, url=url, params=params, json=json, **kwargs)
-            response.raise_for_status()
+            response = await self._client.request(
+                method=method,
+                url=url,
+                params=params,
+                json=json,
+                headers=headers,
+                **kwargs,
+            )
             result = response.json()
 
             if result["status"] in [401, 403]:
@@ -511,6 +557,7 @@ class AsyncVectorVeinClient:
         input_fields: List[WorkflowInputField],
         output_scope: Literal["all", "output_fields_only"] = "output_fields_only",
         wait_for_completion: Literal[False] = False,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         timeout: int = 30,
     ) -> str: ...
 
@@ -521,6 +568,7 @@ class AsyncVectorVeinClient:
         input_fields: List[WorkflowInputField],
         output_scope: Literal["all", "output_fields_only"] = "output_fields_only",
         wait_for_completion: Literal[True] = True,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         timeout: int = 30,
     ) -> WorkflowRunResult: ...
 
@@ -530,6 +578,7 @@ class AsyncVectorVeinClient:
         input_fields: List[WorkflowInputField],
         output_scope: Literal["all", "output_fields_only"] = "output_fields_only",
         wait_for_completion: bool = False,
+        api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW",
         timeout: int = 30,
     ) -> Union[str, WorkflowRunResult]:
         """异步运行工作流
@@ -539,6 +588,7 @@ class AsyncVectorVeinClient:
             input_fields: 输入字段列表
             output_scope: 输出范围，可选值：'all' 或 'output_fields_only'
             wait_for_completion: 是否等待完成
+            api_key_type: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
             timeout: 超时时间（秒）
 
         Returns:
@@ -558,7 +608,7 @@ class AsyncVectorVeinClient:
             ],
         }
 
-        result = await self._request("POST", "workflow/run", json=payload)
+        result = await self._request("POST", "workflow/run", json=payload, api_key_type=api_key_type)
 
         if not wait_for_completion:
             return result["data"]["rid"]
@@ -570,7 +620,10 @@ class AsyncVectorVeinClient:
             if time.time() - start_time > timeout:
                 raise TimeoutError(f"Workflow execution timed out after {timeout} seconds")
 
-            result = await self.check_workflow_status(rid)
+            if api_key_type == "WORKFLOW":
+                result = await self.check_workflow_status(rid, api_key_type=api_key_type)
+            else:
+                result = await self.check_workflow_status(rid, wid=wid, api_key_type=api_key_type)
             if result.status == 200:
                 return result
             elif result.status == 500:
@@ -578,17 +631,35 @@ class AsyncVectorVeinClient:
 
             await asyncio.sleep(5)
 
-    async def check_workflow_status(self, rid: str) -> WorkflowRunResult:
+    @overload
+    async def check_workflow_status(
+        self, rid: str, wid: Optional[str] = None, api_key_type: Literal["WORKFLOW"] = "WORKFLOW"
+    ) -> WorkflowRunResult: ...
+
+    @overload
+    async def check_workflow_status(
+        self, rid: str, wid: str, api_key_type: Literal["VAPP"] = "VAPP"
+    ) -> WorkflowRunResult: ...
+
+    async def check_workflow_status(
+        self, rid: str, wid: Optional[str] = None, api_key_type: Literal["WORKFLOW", "VAPP"] = "WORKFLOW"
+    ) -> WorkflowRunResult:
         """异步检查工作流运行状态
 
         Args:
             rid: 工作流运行记录ID
+            wid: 工作流ID，非必填，api_key_type 为 'VAPP' 时必填
+            api_key_type: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
 
-        Returns:
-            WorkflowRunResult: 工作流运行结果
+        Raises:
+            VectorVeinAPIError: 工作流错误
         """
         payload = {"rid": rid}
-        response = await self._request("POST", "workflow/check-status", json=payload)
+        if api_key_type == "VAPP" and not wid:
+            raise VectorVeinAPIError("api_key_type 为 'VAPP' 时工作流 ID 不能为空")
+        if wid:
+            payload["wid"] = wid
+        response = await self._request("POST", "workflow/check-status", json=payload, api_key_type=api_key_type)
         if response["status"] in [200, 202]:
             return WorkflowRunResult(
                 rid=rid,

{vectorvein-0.2.2.dist-info → vectorvein-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.2.2
+Version: 0.2.4
 Summary: VectorVein python SDK
 Author-Email: Anderson <andersonby@163.com>
 License: MIT

{vectorvein-0.2.2.dist-info → vectorvein-0.2.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
-vectorvein-0.2.2.dist-info/METADATA,sha256=wS-CyMabwgi8OjyI4c9bcTRekuY2fmfOvekZB6Dh_PQ,4413
-vectorvein-0.2.2.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.4.dist-info/METADATA,sha256=TFMh4mGtTFrgaRTpXSj5wa9HMcVJ2j74Z1AwTockagI,4413
+vectorvein-0.2.4.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/api/__init__.py,sha256=lfY-XA46fgD2iIZTU0VYP8i07AwA03Egj4Qua0vUKrQ,738
-vectorvein/api/client.py,sha256=bym9p462CxtY3pkOyZb28EmjLUYaQQn9_eTWJSKS8mk,29464
+vectorvein/api/client.py,sha256=K93a-EvmBqh6sz_iFkMK1VlM54mgZsjOabnRzJJnbWM,32732
 vectorvein/api/exceptions.py,sha256=btfeXfNfc7zLykMKklpJePLnmJie5YSxCYHyMReCC9s,751
 vectorvein/api/models.py,sha256=z5MeXMxWFHlNkP5vjVz6gEn5cxD1FbQ8pQvbx9KtgkE,1422
 vectorvein/chat_clients/__init__.py,sha256=omQuG4PRRPNflSAgtdU--rwsWG6vMpwMEyIGZyFVHVQ,18596
@@ -59,4 +59,4 @@ vectorvein/workflow/nodes/vector_db.py,sha256=t6I17q6iR3yQreiDHpRrksMdWDPIvgqJs0
 vectorvein/workflow/nodes/video_generation.py,sha256=qmdg-t_idpxq1veukd-jv_ChICMOoInKxprV9Z4Vi2w,4118
 vectorvein/workflow/nodes/web_crawlers.py,sha256=LsqomfXfqrXfHJDO1cl0Ox48f4St7X_SL12DSbAMSOw,5415
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
-vectorvein-0.2.2.dist-info/RECORD,,
+vectorvein-0.2.4.dist-info/RECORD,,