oneshot-python 0.10.0__tar.gz → 0.10.1__tar.gz

{oneshot_python-0.10.0 → oneshot_python-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneshot-python
-Version: 0.10.0
+Version: 0.10.1
 Summary: Core Python SDK for the OneShot API — HTTP client with x402 payment handling
 License-Expression: MIT
 Requires-Python: >=3.10

{oneshot_python-0.10.0 → oneshot_python-0.10.1}/oneshot/client.py

@@ -44,6 +44,35 @@ _POLL_INTERVAL = 2.0  # seconds
 _MAX_POLL_RETRIES = 3
 
 
+def _build_email_payload(
+    to: str,
+    subject: str,
+    body: str,
+    from_domain: Optional[str],
+    from_mailbox: Optional[str],
+    from_name: Optional[str],
+    extra: dict[str, Any],
+) -> dict[str, Any]:
+    """Build the /v1/tools/email/send body in the API's field convention.
+
+    The API expects ``from_address`` + ``to_address`` (see
+    EmailSendRequestSchema). Construct from_address from the mailbox/domain
+    and forward the optional display name.
+    """
+    mailbox = from_mailbox or "agent"
+    domain = from_domain or "oneshotagent.com"
+    payload: dict[str, Any] = {
+        "from_address": f"{mailbox}@{domain}",
+        "to_address": to,
+        "subject": subject,
+        "body": body,
+        **extra,
+    }
+    if from_name:
+        payload["from_name"] = from_name
+    return payload
+
+
 class OneShotClient:
     """Synchronous + async HTTP client for the OneShot API.
 
@@ -485,19 +514,39 @@ class OneShotClient:
         """Read a web page and extract content as markdown. Async."""
         return await self.acall_tool("/v1/tools/web-read", {"url": url, **kwargs})
 
-    def email(self, to: str, subject: str, body: str, *, from_domain: Optional[str] = None, **kwargs: Any) -> Any:
+    def email(
+        self,
+        to: str,
+        subject: str,
+        body: str,
+        *,
+        from_domain: Optional[str] = None,
+        from_mailbox: Optional[str] = None,
+        from_name: Optional[str] = None,
+        **kwargs: Any,
+    ) -> Any:
         """Send an email. Blocking."""
-        payload: dict[str, Any] = {"to": to, "subject": subject, "body": body, **kwargs}
-        if from_domain:
-            payload["from_domain"] = from_domain
-        return self.call_tool("/v1/tools/email/send", payload)
+        return self.call_tool(
+            "/v1/tools/email/send",
+            _build_email_payload(to, subject, body, from_domain, from_mailbox, from_name, kwargs),
+        )
 
-    async def aemail(self, to: str, subject: str, body: str, *, from_domain: Optional[str] = None, **kwargs: Any) -> Any:
+    async def aemail(
+        self,
+        to: str,
+        subject: str,
+        body: str,
+        *,
+        from_domain: Optional[str] = None,
+        from_mailbox: Optional[str] = None,
+        from_name: Optional[str] = None,
+        **kwargs: Any,
+    ) -> Any:
         """Send an email. Async."""
-        payload: dict[str, Any] = {"to": to, "subject": subject, "body": body, **kwargs}
-        if from_domain:
-            payload["from_domain"] = from_domain
-        return await self.acall_tool("/v1/tools/email/send", payload)
+        return await self.acall_tool(
+            "/v1/tools/email/send",
+            _build_email_payload(to, subject, body, from_domain, from_mailbox, from_name, kwargs),
+        )
 
     def voice(self, objective: str, target_number: str, **kwargs: Any) -> Any:
         """Make an AI voice call. Blocking."""

{oneshot_python-0.10.0 → oneshot_python-0.10.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oneshot-python"
-version = "0.10.0"
+version = "0.10.1"
 description = "Core Python SDK for the OneShot API — HTTP client with x402 payment handling"
 readme = {text = "Core Python SDK for the OneShot API", content-type = "text/plain"}
 license = "MIT"

oneshot_python-0.10.1/tests/test_email_payload.py

@@ -0,0 +1,74 @@
+"""Tests for the email payload construction in OneShotClient.
+
+Verifies that email()/aemail() send the API's field convention
+(from_address + to_address), build from_address from from_mailbox/from_domain,
+and forward the optional from_name display name.
+"""
+
+from __future__ import annotations
+
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from oneshot.client import OneShotClient, _build_email_payload
+
+TEST_PRIVATE_KEY = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+
+
+# ── _build_email_payload (pure) ───────────────────────────────────────────
+
+def test_payload_defaults_to_agent_mailbox():
+    p = _build_email_payload("r@x.com", "S", "B", None, None, None, {})
+    assert p == {
+        "from_address": "agent@oneshotagent.com",
+        "to_address": "r@x.com",
+        "subject": "S",
+        "body": "B",
+    }
+
+
+def test_payload_uses_mailbox_domain_and_name():
+    p = _build_email_payload("r@x.com", "S", "B", "acme.com", "jane", "Jane Doe", {})
+    assert p["from_address"] == "jane@acme.com"
+    assert p["from_name"] == "Jane Doe"
+
+
+def test_payload_omits_empty_from_name():
+    p = _build_email_payload("r@x.com", "S", "B", None, None, "", {})
+    assert "from_name" not in p
+
+
+def test_payload_passes_extra_kwargs():
+    p = _build_email_payload("r@x.com", "S", "B", None, None, None, {"wait": True})
+    assert p["wait"] is True
+
+
+# ── email() delegation ────────────────────────────────────────────────────
+
+def _client() -> OneShotClient:
+    c = OneShotClient(TEST_PRIVATE_KEY)
+    c.call_tool = MagicMock(return_value={"request_id": "r1"})  # type: ignore[method-assign]
+    return c
+
+
+def test_email_sends_correct_contract():
+    c = _client()
+    c.email("r@x.com", "Hi", "Body", from_mailbox="jane", from_domain="acme.com", from_name="Jane Doe")
+    endpoint, payload = c.call_tool.call_args[0]
+    assert endpoint == "/v1/tools/email/send"
+    assert payload["from_address"] == "jane@acme.com"
+    assert payload["to_address"] == "r@x.com"
+    assert payload["from_name"] == "Jane Doe"
+
+
+@pytest.mark.asyncio
+async def test_aemail_sends_correct_contract():
+    c = OneShotClient(TEST_PRIVATE_KEY)
+    c.acall_tool = AsyncMock(return_value={"request_id": "r2"})  # type: ignore[method-assign]
+    await c.aemail("r@x.com", "Hi", "Body")
+    endpoint, payload = c.acall_tool.call_args[0]
+    assert endpoint == "/v1/tools/email/send"
+    assert payload["from_address"] == "agent@oneshotagent.com"
+    assert payload["to_address"] == "r@x.com"
+    assert "from_name" not in payload