vectorvein 0.2.1__tar.gz → 0.2.3__tar.gz

{vectorvein-0.2.1 → vectorvein-0.2.3}/PKG-INFO

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

{vectorvein-0.2.1 → vectorvein-0.2.3}/pyproject.toml

@@ -18,7 +18,7 @@ description = "VectorVein python SDK"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.2.1"
+version = "0.2.3"
 
 [project.license]
 text = "MIT"

{vectorvein-0.2.1 → vectorvein-0.2.3}/src/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,8 +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 = self._client.request(
+                method=method,
+                url=url,
+                params=params,
+                json=json,
+                headers=headers,
+                **kwargs,
+            )
             response.raise_for_status()
             result = response.json()
 
@@ -107,6 +117,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 +128,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 +138,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 +148,7 @@ class VectorVeinClient:
             input_fields: 输入字段列表
             output_scope: 输出范围，可选值：'all' 或 'output_fields_only'
             wait_for_completion: 是否等待完成
+            api_key_type: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
             timeout: 超时时间（秒）
 
         Returns:
@@ -154,7 +168,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,30 +180,43 @@ class VectorVeinClient:
             if time.time() - start_time > timeout:
                 raise TimeoutError(f"Workflow execution timed out after {timeout} seconds")
 
-            status = self.check_workflow_status(rid)
-            if status["status"] == 200:
-                return WorkflowRunResult(
-                    rid=rid,
-                    status=status["status"],
-                    msg=status["msg"],
-                    data=[WorkflowOutput(**output) for output in status["data"]],
-                )
-            elif status["status"] == 500:
-                raise WorkflowError(f"Workflow execution failed: {status['msg']}")
+            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:
+                raise WorkflowError(f"Workflow execution failed: {result.msg}")
 
             time.sleep(5)
 
-    def check_workflow_status(self, rid: str) -> Dict:
+    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: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
 
         Returns:
-            Dict: 工作流状态信息
+            WorkflowRunResult: 工作流运行结果
         """
         payload = {"rid": rid}
-        return self._request("POST", "workflow/check-status", json=payload)
+        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,
+                status=response["status"],
+                msg=response["msg"],
+                data=[WorkflowOutput(**output) for output in response["data"]],
+            )
+        else:
+            raise WorkflowError(f"Workflow execution failed: {response['msg']}")
 
     def get_access_keys(
         self, access_keys: Optional[List[str]] = None, get_type: Literal["selected", "all"] = "selected"
@@ -448,12 +475,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
@@ -467,6 +493,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请求
@@ -487,8 +514,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 = await self._client.request(
+                method=method,
+                url=url,
+                params=params,
+                json=json,
+                headers=headers,
+                **kwargs,
+            )
             response.raise_for_status()
             result = response.json()
 
@@ -507,6 +544,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: ...
 
@@ -517,6 +555,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: ...
 
@@ -526,6 +565,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]:
         """异步运行工作流
@@ -535,6 +575,7 @@ class AsyncVectorVeinClient:
             input_fields: 输入字段列表
             output_scope: 输出范围，可选值：'all' 或 'output_fields_only'
             wait_for_completion: 是否等待完成
+            api_key_type: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
             timeout: 超时时间（秒）
 
         Returns:
@@ -554,7 +595,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"]
@@ -566,30 +607,43 @@ class AsyncVectorVeinClient:
             if time.time() - start_time > timeout:
                 raise TimeoutError(f"Workflow execution timed out after {timeout} seconds")
 
-            status = await self.check_workflow_status(rid)
-            if status["status"] == 200:
-                return WorkflowRunResult(
-                    rid=rid,
-                    status=status["status"],
-                    msg=status["msg"],
-                    data=[WorkflowOutput(**output) for output in status["data"]],
-                )
-            elif status["status"] == 500:
-                raise WorkflowError(f"Workflow execution failed: {status['msg']}")
+            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:
+                raise WorkflowError(f"Workflow execution failed: {result.msg}")
 
             await asyncio.sleep(5)
 
-    async def check_workflow_status(self, rid: str) -> Dict:
+    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: 密钥类型，可选值：'WORKFLOW' 或 'VAPP'
 
         Returns:
-            Dict: 工作流状态信息
+            WorkflowRunResult: 工作流运行结果
         """
         payload = {"rid": rid}
-        return await self._request("POST", "workflow/check-status", json=payload)
+        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,
+                status=response["status"],
+                msg=response["msg"],
+                data=[WorkflowOutput(**output) for output in response["data"]],
+            )
+        else:
+            raise WorkflowError(f"Workflow execution failed: {response['msg']}")
 
     async def get_access_keys(
         self, access_keys: Optional[List[str]] = None, get_type: Literal["selected", "all"] = "selected"