skyvern-llamaindex 0.0.5__py3-none-any.whl → 0.2.1__py3-none-any.whl

skyvern_llamaindex/agent.py

@@ -1,17 +1,17 @@
-from typing import List, Optional
+from typing import Any, List
 
 from llama_index.core.tools import FunctionTool
 from llama_index.core.tools.tool_spec.base import SPEC_FUNCTION_TYPE, BaseToolSpec
 from skyvern_llamaindex.settings import settings
 
 from skyvern import Skyvern
-from skyvern.client.agent.types.agent_get_run_response import AgentGetRunResponse
+from skyvern.client.types.get_run_response import GetRunResponse
 from skyvern.client.types.task_run_response import TaskRunResponse
 from skyvern.schemas.runs import RunEngine
 
 
 class SkyvernTool:
-    def __init__(self, agent: Optional[Skyvern] = None):
+    def __init__(self, agent: Skyvern | None = None):
         if agent is None:
             agent = Skyvern(base_url=None, api_key=None)
         self.agent = agent
@@ -49,7 +49,13 @@ class SkyvernTaskToolSpec(BaseToolSpec):
         self.engine = engine
         self.run_task_timeout_seconds = run_task_timeout_seconds
 
-    async def run_task(self, user_prompt: str, url: Optional[str] = None) -> TaskRunResponse:
+    async def run_task(
+        self,
+        user_prompt: str | None = None,
+        url: str | None = None,
+        *_: Any,
+        **kw: Any,
+    ) -> TaskRunResponse:
         """
         Use Skyvern agent to run a task. This function won't return until the task is finished.
 
@@ -57,6 +63,17 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             user_prompt[str]: The user's prompt describing the task.
             url (Optional[str]): The URL of the target website for the task.
         """
+        if user_prompt is None and kw.get("args"):
+            user_prompt = kw["args"][0]
+
+        if url is None:
+            if kw.get("args") and len(kw["args"]) > 1:
+                url = kw["args"][1]
+            elif kw.get("kwargs"):
+                url = kw["kwargs"].get("url")
+
+        assert user_prompt is not None, "user_prompt is required"
+
         return await self.agent.run_task(
             prompt=user_prompt,
             url=url,
@@ -65,7 +82,13 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             wait_for_completion=True,
         )
 
-    async def dispatch_task(self, user_prompt: str, url: Optional[str] = None) -> TaskRunResponse:
+    async def dispatch_task(
+        self,
+        user_prompt: str | None = None,
+        url: str | None = None,
+        *_: Any,
+        **kw: Any,
+    ) -> TaskRunResponse:
         """
         Use Skyvern agent to dispatch a task. This function will return immediately and the task will be running in the background.
 
@@ -73,6 +96,17 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             user_prompt[str]: The user's prompt describing the task.
             url (Optional[str]): The URL of the target website for the task.
         """
+        if user_prompt is None and kw.get("args"):
+            user_prompt = kw["args"][0]
+
+        if url is None:
+            if kw.get("args") and len(kw["args"]) > 1:
+                url = kw["args"][1]
+            elif kw.get("kwargs"):
+                url = kw["kwargs"].get("url")
+
+        assert user_prompt is not None, "user_prompt is required"
+
         return await self.agent.run_task(
             prompt=user_prompt,
             url=url,
@@ -81,11 +115,15 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             wait_for_completion=False,
         )
 
-    async def get_task(self, task_id: str) -> AgentGetRunResponse | None:
+    async def get_task(self, task_id: str | None = None, *_: Any, **kwargs: Any) -> GetRunResponse | None:
         """
         Use Skyvern agent to get a task.
 
         Args:
             task_id[str]: The id of the task.
         """
+        if task_id is None and "args" in kwargs:
+            task_id = kwargs["args"][0]
+
+        assert task_id is not None, "task_id is required"
         return await self.agent.get_run(run_id=task_id)

skyvern_llamaindex/client.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Any, List
 
 from llama_index.core.tools import FunctionTool
 from llama_index.core.tools.tool_spec.base import SPEC_FUNCTION_TYPE, BaseToolSpec
@@ -6,7 +6,7 @@ from pydantic import BaseModel
 from skyvern_llamaindex.settings import settings
 
 from skyvern import Skyvern
-from skyvern.client.agent.types.agent_get_run_response import AgentGetRunResponse
+from skyvern.client.types.get_run_response import GetRunResponse
 from skyvern.client.types.task_run_response import TaskRunResponse
 from skyvern.schemas.runs import RunEngine
 
@@ -59,7 +59,13 @@ class SkyvernTaskToolSpec(BaseToolSpec):
         self.run_task_timeout_seconds = run_task_timeout_seconds
         self.client = Skyvern(base_url=base_url, api_key=api_key)
 
-    async def run_task(self, user_prompt: str, url: Optional[str] = None) -> TaskRunResponse:
+    async def run_task(
+        self,
+        user_prompt: str | None = None,
+        url: str | None = None,
+        *_: Any,
+        **kw: Any,
+    ) -> TaskRunResponse:
         """
         Use Skyvern client to run a task. This function won't return until the task is finished.
 
@@ -67,6 +73,16 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             user_prompt[str]: The user's prompt describing the task.
             url (Optional[str]): The URL of the target website for the task.
         """
+        if user_prompt is None and kw.get("args"):
+            user_prompt = kw["args"][0]
+
+        if url is None:
+            if kw.get("args") and len(kw["args"]) > 1:
+                url = kw["args"][1]
+            elif kw.get("kwargs"):
+                url = kw["kwargs"].get("url")
+
+        assert user_prompt is not None, "user_prompt is required"
 
         return await self.client.run_task(
             prompt=user_prompt,
@@ -76,7 +92,13 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             wait_for_completion=True,
         )
 
-    async def dispatch_task(self, user_prompt: str, url: Optional[str] = None) -> TaskRunResponse:
+    async def dispatch_task(
+        self,
+        user_prompt: str | None = None,
+        url: str | None = None,
+        *_: Any,
+        **kw: Any,
+    ) -> TaskRunResponse:
         """
         Use Skyvern client to dispatch a task. This function will return immediately and the task will be running in the background.
 
@@ -84,7 +106,16 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             user_prompt[str]: The user's prompt describing the task.
             url (Optional[str]): The URL of the target website for the task.
         """
+        if user_prompt is None and kw.get("args"):
+            user_prompt = kw["args"][0]
+
+        if url is None:
+            if kw.get("args") and len(kw["args"]) > 1:
+                url = kw["args"][1]
+            elif kw.get("kwargs"):
+                url = kw["kwargs"].get("url")
 
+        assert user_prompt is not None, "user_prompt is required"
         return await self.client.run_task(
             prompt=user_prompt,
             url=url,
@@ -93,12 +124,15 @@ class SkyvernTaskToolSpec(BaseToolSpec):
             wait_for_completion=False,
         )
 
-    async def get_task(self, task_id: str) -> AgentGetRunResponse | None:
+    async def get_task(self, task_id: str | None = None, *_: Any, **kwargs: Any) -> GetRunResponse | None:
         """
         Use Skyvern client to get a task.
 
         Args:
             task_id[str]: The id of the task.
         """
+        if task_id is None and "args" in kwargs:
+            task_id = kwargs["args"][0]
 
+        assert task_id is not None, "task_id is required"
         return await self.client.get_run(run_id=task_id)

{skyvern_llamaindex-0.0.5.dist-info → skyvern_llamaindex-0.2.1.dist-info}/METADATA

@@ -1,14 +1,16 @@
 Metadata-Version: 2.3
 Name: skyvern-llamaindex
-Version: 0.0.5
+Version: 0.2.1
 Summary: Skyvern integration for LlamaIndex
 Author: lawyzheng
 Author-email: lawy@skyvern.com
-Requires-Python: >=3.11,<3.12
+Requires-Python: >=3.11,<3.14
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: llama-index (>=0.12.19,<0.13.0)
-Requires-Dist: skyvern (>=0.1.84)
+Requires-Dist: skyvern (>=0.2.0)
 Description-Content-Type: text/markdown
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->

skyvern_llamaindex-0.2.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+skyvern_llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+skyvern_llamaindex/agent.py,sha256=FIPia1j-S3cqbGb763CXgwjYxkvOBty17dEW3qst9vA,4237
+skyvern_llamaindex/client.py,sha256=SiJPmXvkjunPGxfmbIPu00f1ywwVKFicMwztESLFnT8,4380
+skyvern_llamaindex/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+skyvern_llamaindex/settings.py,sha256=PG8SyXuwXvRmgWLEkF8i7bgn8pcvznin7opzTMFKEkM,396
+skyvern_llamaindex-0.2.1.dist-info/METADATA,sha256=ESAIzftsBuSSxwG1jc_fJIqFaUFp3NjY8S8gGvZ30DU,10640
+skyvern_llamaindex-0.2.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+skyvern_llamaindex-0.2.1.dist-info/RECORD,,

skyvern_llamaindex-0.0.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-skyvern_llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-skyvern_llamaindex/agent.py,sha256=0Qz1HOCcajL-uAzh6TT5pwS2AI8_IldBhzEIz3lm7SE,3213
-skyvern_llamaindex/client.py,sha256=0OCEUEmOP4UD6pR7Vt34lICFjU2NAS5ZI7ce0oIT4cA,3357
-skyvern_llamaindex/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-skyvern_llamaindex/settings.py,sha256=PG8SyXuwXvRmgWLEkF8i7bgn8pcvznin7opzTMFKEkM,396
-skyvern_llamaindex-0.0.5.dist-info/METADATA,sha256=qhOISJr-RsdWZMQRP2mKDIcJN3EoR9GbrLxhVmHj6Ak,10539
-skyvern_llamaindex-0.0.5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-skyvern_llamaindex-0.0.5.dist-info/RECORD,,