smooth-py 0.2.8.dev20251008__tar.gz → 0.3.0__tar.gz

{smooth_py-0.2.8.dev20251008 → smooth_py-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: smooth-py
-Version: 0.2.8.dev20251008
+Version: 0.3.0
 Summary: 
 Author: Luca Pinchetti
 Author-email: luca@circlemind.co

{smooth_py-0.2.8.dev20251008 → smooth_py-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "smooth-py"
-version = "0.2.8.dev20251008"
+version = "0.3.0"
 description = ""
 authors = [
     {name = "Luca Pinchetti",email = "luca@circlemind.co"}

{smooth_py-0.2.8.dev20251008 → smooth_py-0.3.0}/src/smooth/__init__.py

@@ -13,13 +13,13 @@ from typing import Any, Literal, Type
 import httpx
 import requests
 from deprecated import deprecated
-from pydantic import BaseModel, ConfigDict, Field, model_validator
+from pydantic import BaseModel, ConfigDict, Field, computed_field, model_validator
 
 # Configure logging
 logger = logging.getLogger("smooth")
 
 
-BASE_URL = "https://api2.circlemind.co/api/"
+BASE_URL = "https://api.smooth.sh/api/"
 
 
 # --- Utils ---
@@ -100,11 +100,12 @@ class TaskRequest(BaseModel):
   @model_validator(mode="before")
   @classmethod
   def _handle_deprecated_session_id(cls, data: Any) -> Any:
-    if isinstance(data, dict) and "session_id" in data:
+    if isinstance(data, dict) and "session_id" in data and "profile_id" not in data:
       warnings.warn("'session_id' is deprecated, use 'profile_id' instead", DeprecationWarning, stacklevel=2)
       data["profile_id"] = data.pop("session_id")
     return data
 
+  @computed_field(return_type=str | None)
   @property
   def session_id(self):
     """(Deprecated) Returns the session ID."""
@@ -112,12 +113,12 @@ class TaskRequest(BaseModel):
     return self.profile_id
 
   @session_id.setter
-  def session_id(self, value):
+  def session_id(self, value: str | None):
     """(Deprecated) Sets the session ID."""
     warnings.warn("'session_id' is deprecated, use 'profile_id' instead", DeprecationWarning, stacklevel=2)
     self.profile_id = value
 
-  def model_dump(self, **kwargs) -> dict[str, Any]:
+  def model_dump(self, **kwargs: Any) -> dict[str, Any]:
     """Dump model to dict, including deprecated session_id for retrocompatibility."""
     data = super().model_dump(**kwargs)
     # Add deprecated session_id field for retrocompatibility
@@ -137,11 +138,12 @@ class BrowserSessionRequest(BaseModel):
   @model_validator(mode="before")
   @classmethod
   def _handle_deprecated_session_id(cls, data: Any) -> Any:
-    if isinstance(data, dict) and "session_id" in data:
+    if isinstance(data, dict) and "session_id" in data and "profile_id" not in data:
       warnings.warn("'session_id' is deprecated, use 'profile_id' instead", DeprecationWarning, stacklevel=2)
       data["profile_id"] = data.pop("session_id")
     return data
 
+  @computed_field(return_type=str | None)
   @property
   def session_id(self):
     """(Deprecated) Returns the session ID."""
@@ -149,12 +151,12 @@ class BrowserSessionRequest(BaseModel):
     return self.profile_id
 
   @session_id.setter
-  def session_id(self, value):
+  def session_id(self, value: str | None):
     """(Deprecated) Sets the session ID."""
     warnings.warn("'session_id' is deprecated, use 'profile_id' instead", DeprecationWarning, stacklevel=2)
     self.profile_id = value
 
-  def model_dump(self, **kwargs) -> dict[str, Any]:
+  def model_dump(self, **kwargs: Any) -> dict[str, Any]:
     """Dump model to dict, including deprecated session_id for retrocompatibility."""
     data = super().model_dump(**kwargs)
     # Add deprecated session_id field for retrocompatibility
@@ -173,11 +175,12 @@ class BrowserSessionResponse(BaseModel):
   @model_validator(mode="before")
   @classmethod
   def _handle_deprecated_session_id(cls, data: Any) -> Any:
-    if isinstance(data, dict) and "session_id" in data:
+    if isinstance(data, dict) and "session_id" in data and "profile_id" not in data:
       warnings.warn("'session_id' is deprecated, use 'profile_id' instead", DeprecationWarning, stacklevel=2)
       data["profile_id"] = data.pop("session_id")
     return data
 
+  @computed_field(return_type=str | None)
   @property
   def session_id(self):
     """(Deprecated) Returns the session ID."""
@@ -185,19 +188,11 @@ class BrowserSessionResponse(BaseModel):
     return self.profile_id
 
   @session_id.setter
-  def session_id(self, value):
+  def session_id(self, value: str):
     """(Deprecated) Sets the session ID."""
     warnings.warn("'session_id' is deprecated, use 'profile_id' instead", DeprecationWarning, stacklevel=2)
     self.profile_id = value
 
-  def model_dump(self, **kwargs) -> dict[str, Any]:
-    """Dump model to dict, including deprecated session_id for retrocompatibility."""
-    data = super().model_dump(**kwargs)
-    # Add deprecated session_id field for retrocompatibility
-    if "profile_id" in data:
-      data["session_id"] = data["profile_id"]
-    return data
-
 
 class BrowserProfilesResponse(BaseModel):
   """Response model for listing browser profiles."""
@@ -207,11 +202,12 @@ class BrowserProfilesResponse(BaseModel):
   @model_validator(mode="before")
   @classmethod
   def _handle_deprecated_session_ids(cls, data: Any) -> Any:
-    if isinstance(data, dict) and "session_ids" in data:
+    if isinstance(data, dict) and "session_ids" in data and "profile_ids" not in data:
       warnings.warn("'session_ids' is deprecated, use 'profile_ids' instead", DeprecationWarning, stacklevel=2)
       data["profile_ids"] = data.pop("session_ids")
     return data
 
+  @computed_field(return_type=list[str])
   @property
   def session_ids(self):
     """(Deprecated) Returns the session IDs."""
@@ -219,12 +215,12 @@ class BrowserProfilesResponse(BaseModel):
     return self.profile_ids
 
   @session_ids.setter
-  def session_ids(self, value):
+  def session_ids(self, value: list[str]):
     """(Deprecated) Sets the session IDs."""
     warnings.warn("'session_ids' is deprecated, use 'profile_ids' instead", DeprecationWarning, stacklevel=2)
     self.profile_ids = value
 
-  def model_dump(self, **kwargs) -> dict[str, Any]:
+  def model_dump(self, **kwargs: Any) -> dict[str, Any]:
     """Dump model to dict, including deprecated session_ids for retrocompatibility."""
     data = super().model_dump(**kwargs)
     # Add deprecated session_ids field for retrocompatibility
@@ -351,12 +347,7 @@ class TaskHandle:
 
   def stop(self):
     """Stops the task."""
-    try:
-      response = self._client._client.delete(f"{self._client.base_url}/task/{self._id}")
-      self._handle_response(response)
-    except requests.exceptions.RequestException as e:
-      logger.error(f"Request failed: {e}")
-      raise ApiError(status_code=0, detail=f"Request failed: {str(e)}") from None
+    self._client._delete_task(self._id)
 
   def result(self, timeout: int | None = None, poll_interval: float = 1) -> TaskResponse:
     """Waits for the task to complete and returns the result."""
@@ -452,6 +443,18 @@ class SmoothClient(BaseClient):
       logger.error(f"Request failed: {e}")
       raise ApiError(status_code=0, detail=f"Request failed: {str(e)}") from None
 
+  def _delete_task(self, task_id: str):
+    """Deletes a task."""
+    if not task_id:
+      raise ValueError("Task ID cannot be empty.")
+
+    try:
+      response = self._session.delete(f"{self.base_url}/task/{task_id}")
+      self._handle_response(response)
+    except requests.exceptions.RequestException as e:
+      logger.error(f"Request failed: {e}")
+      raise ApiError(status_code=0, detail=f"Request failed: {str(e)}") from None
+
   def run(
     self,
     task: str,
@@ -483,7 +486,7 @@ class SmoothClient(BaseClient):
         response_model: If provided, the schema describing the desired output structure.
         url: The starting URL for the task. If not provided, the agent will infer it from the task.
         metadata: A dictionary containing variables or parameters that will be passed to the agent.
-        files: A dictionary of file names to their ids. These files will be passed to the agent.
+        files: A list of file ids to pass to the agent.
         agent: The agent to use for the task.
         max_steps: Maximum number of steps the agent can take (max 64).
         device: Device type for the task. Default is mobile.
@@ -507,7 +510,7 @@ class SmoothClient(BaseClient):
     """
     payload = TaskRequest(
       task=task,
-      response_model=response_model.model_json_schema() if issubclass(response_model, BaseModel) else response_model,
+      response_model=response_model if isinstance(response_model, dict | None) else response_model.model_json_schema(),
       url=url,
       metadata=metadata,
       files=files,
@@ -660,6 +663,10 @@ class AsyncTaskHandle:
     """Returns the task ID."""
     return self._id
 
+  async def stop(self):
+    """Stops the task."""
+    await self._client._delete_task(self._id)
+
   async def result(self, timeout: int | None = None, poll_interval: float = 1) -> TaskResponse:
     """Waits for the task to complete and returns the result."""
     if self._task_response and self._task_response.status not in ["running", "waiting"]:
@@ -679,7 +686,7 @@ class AsyncTaskHandle:
       await asyncio.sleep(poll_interval)
     raise TimeoutError(f"Task {self.id()} did not complete within {timeout} seconds.")
 
-  async def live_url(self, interactive: bool = True, embed: bool = False, timeout: int | None = None):
+  async def live_url(self, interactive: bool = False, embed: bool = False, timeout: int | None = None):
     """Returns the live URL for the task."""
     if self._task_response and self._task_response.live_url:
       return _encode_url(self._task_response.live_url, interactive=interactive, embed=embed)
@@ -688,13 +695,13 @@ class AsyncTaskHandle:
     while timeout is None or (time.time() - start_time) < timeout:
       task_response = await self._client._get_task(self.id())
       self._task_response = task_response
-      if task_response.live_url is not None:
+      if self._task_response.live_url:
         return _encode_url(self._task_response.live_url, interactive=interactive, embed=embed)
       await asyncio.sleep(1)
 
     raise TimeoutError(f"Live URL not available for task {self.id()}.")
 
-  async def recording_url(self, timeout: int | None = None):
+  async def recording_url(self, timeout: int | None = None) -> str:
     """Returns the recording URL for the task."""
     if self._task_response and self._task_response.recording_url is not None:
       return self._task_response.recording_url
@@ -749,6 +756,18 @@ class SmoothAsyncClient(BaseClient):
       logger.error(f"Request failed: {e}")
       raise ApiError(status_code=0, detail=f"Request failed: {str(e)}") from None
 
+  async def _delete_task(self, task_id: str):
+    """Deletes a task asynchronously."""
+    if not task_id:
+      raise ValueError("Task ID cannot be empty.")
+
+    try:
+      response = await self._client.delete(f"{self.base_url}/task/{task_id}")
+      self._handle_response(response)
+    except httpx.RequestError as e:
+      logger.error(f"Request failed: {e}")
+      raise ApiError(status_code=0, detail=f"Request failed: {str(e)}") from None
+
   async def run(
     self,
     task: str,
@@ -780,7 +799,7 @@ class SmoothAsyncClient(BaseClient):
         response_model: If provided, the schema describing the desired output structure.
         url: The starting URL for the task. If not provided, the agent will infer it from the task.
         metadata: A dictionary containing variables or parameters that will be passed to the agent.
-        files: A dictionary of file names to their url or base64-encoded content to be used by the agent.
+        files: A list of file ids to pass to the agent.
         agent: The agent to use for the task.
         max_steps: Maximum number of steps the agent can take (max 64).
         device: Device type for the task. Default is mobile.
@@ -804,7 +823,7 @@ class SmoothAsyncClient(BaseClient):
     """
     payload = TaskRequest(
       task=task,
-      response_model=response_model.model_json_schema() if issubclass(response_model, BaseModel) else response_model,
+      response_model=response_model if isinstance(response_model, dict | None) else response_model.model_json_schema(),
       url=url,
       metadata=metadata,
       files=files,
@@ -831,8 +850,8 @@ class SmoothAsyncClient(BaseClient):
     """Opens an interactive browser instance asynchronously.
 
     Args:
+        profile_id: The profile ID to use for the session. If None, a new profile will be created.
         session_id: (Deprecated, now `profile_id`) The session ID to associate with the browser.
-        profile_id: The profile ID to associate with the browser.
         live_view: Whether to enable live view for the session.
 
     Returns:
@@ -917,11 +936,12 @@ class SmoothAsyncClient(BaseClient):
       if name is None:
         raise ValueError("File name must be provided or the file object must have a 'name' attribute.")
 
-      files = {"file": (Path(name).name, file)}
       if purpose:
         data = {"file_purpose": purpose}
       else:
         data = None
+
+      files = {"file": (Path(name).name, file)}
       response = await self._client.post(f"{self.base_url}/file", files=files, data=data)
       data = self._handle_response(response)
       return UploadFileResponse(**data["r"])