tzafon 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

tzafon/_connection.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 import asyncio
 import traceback
 import websockets
-from websockets.connection import State
-
+from websockets.protocol import State
 from .models import Command, Result
 
 

tzafon/client.py

@@ -56,7 +56,8 @@ class Waypoint:
         path: str | os.PathLike | None = None,
         *,
         mkdir: bool = True,
-    ) -> bytes:
+        return_url: bool = False,
+    ) -> bytes | str:
         """
         Grab a **JPEG** screenshot.
 
@@ -66,8 +67,29 @@ class Waypoint:
             *and* the raw bytes are still returned.
         mkdir:
             Automatically create parent folders if they do not exist.
+        return_url:
+            If True, return the remote URL instead of the image bytes.
         """
         res = await self._send(Command(ActionType.SCREENSHOT))
+
+        if return_url:
+            if res.image_url:
+                return res.image_url
+            if path is not None:
+                from pathlib import Path
+
+                p = Path(path)
+                if mkdir:
+                    p.parent.mkdir(parents=True, exist_ok=True)
+                p.write_bytes(res.image)
+                return str(p.resolve())
+            raise ScreenshotFailed(
+                "Server did not provide image_url; set return_url=False to get bytes"
+            )
+
+        if res.success and res.image is None and res.image_url is not None:
+            await res.download_image()
+
         if not (res.success and res.image):
             raise ScreenshotFailed(res.error_message or "unknown error")
 

tzafon/models.py

@@ -52,8 +52,23 @@ class Command:
 class Result:
     success: bool
     image: Optional[bytes] = None  # jpeg bytes
+    image_url: Optional[str] = None  # remote location if bytes omitted
     error_message: Optional[str] = None
 
+    async def download_image(self) -> None:
+        """If `image` is None but `image_url` present, fetch the bytes (async)."""
+        if self.image is None and self.image_url is not None:
+            try:
+                import httpx
+
+                async with httpx.AsyncClient(timeout=20.0, follow_redirects=True) as c:
+                    resp = await c.get(self.image_url)
+                    resp.raise_for_status()
+                    self.image = resp.content
+            except Exception:
+                # keep silent – caller will treat as missing image later
+                pass
+
     @classmethod
     def load(cls, body: bytes) -> Self:
         data = json.loads(body.decode("utf-8"))
@@ -62,6 +77,7 @@ class Result:
         return cls(
             success=data.get("success", False),
             image=img,
+            image_url=data.get("image_url"),
             error_message=data.get("error_message"),
         )
 
@@ -69,8 +85,12 @@ class Result:
         d: Dict[str, Any] = {
             "success": self.success,
             "error_message": self.error_message,
-            "image": base64.b64encode(self.image).decode() if self.image else None,
         }
+
+        if self.image is not None:
+            d["image"] = base64.b64encode(self.image).decode()
+        if self.image_url is not None:
+            d["image_url"] = self.image_url
         return json.dumps({k: v for k, v in d.items() if v is not None}).encode()
 
     def __str__(self) -> str:

{tzafon-0.1.1.dist-info → tzafon-0.1.2.dist-info}/METADATA

@@ -1,9 +1,13 @@
 Metadata-Version: 2.4
 Name: tzafon
-Version: 0.1.1
+Version: 0.1.2
 Summary: Tzafon Waypoint – browser automation
 License: MIT
 Requires-Python: >=3.10
+Requires-Dist: httpx>=0.26.0
+Requires-Dist: pytest-asyncio>=0.24.0
+Requires-Dist: pytest>=8.3.4
+Requires-Dist: python-dotenv>=1.1.0
 Requires-Dist: twine>=6.1.0
 Requires-Dist: websockets>=15.0.1
 Description-Content-Type: text/markdown

tzafon-0.1.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+tzafon/__init__.py,sha256=QpZABzfciDC1uUdoRHp5tW0694ZJGtHNF9ieGilnt94,53
+tzafon/_connection.py,sha256=6kqekASLSAGrjx5bWJNVTQ3mifw2MbemB8b8xJm8_Qg,1599
+tzafon/client.py,sha256=uzh8ZLntw9cOIK5jAcfSokrpfBWxIksm-AuH3xfHM3s,3901
+tzafon/exceptions.py,sha256=SeeZRBAsyeogXXcfF3b3IaKUsehWNeNZAgxbmrzjI48,168
+tzafon/models.py,sha256=HTpU4YwjbggV85l5-_VxVvjHGOX_jupSNtMEUZ4f1oM,3239
+tzafon-0.1.2.dist-info/METADATA,sha256=hjU1dVxy-MnGkXjaQNTeaj7WDdOIVnVCIAQjiAAOOic,1184
+tzafon-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tzafon-0.1.2.dist-info/RECORD,,

tzafon-0.1.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-tzafon/__init__.py,sha256=QpZABzfciDC1uUdoRHp5tW0694ZJGtHNF9ieGilnt94,53
-tzafon/_connection.py,sha256=HmmnHjO0N9pN3esCsVucws7lm1ZfyB6F0G8GMZoOCXw,1602
-tzafon/client.py,sha256=NUwXgrGPhoFbmHq122ZtSLBJvs2hiz1d8EbaRsGDW8o,3149
-tzafon/exceptions.py,sha256=SeeZRBAsyeogXXcfF3b3IaKUsehWNeNZAgxbmrzjI48,168
-tzafon/models.py,sha256=woHESkPE3R2TbiQoZjlknz7VR938WU5ZYlPFCh0Td9U,2428
-tzafon-0.1.1.dist-info/METADATA,sha256=nJmiwa8WRJFuQvhPtxTqWDl4ugGMlZsfmzXtBZo2ooE,1052
-tzafon-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tzafon-0.1.1.dist-info/RECORD,,