waapi 0.1.0__tar.gz → 0.1.2__tar.gz

{waapi-0.1.0 → waapi-0.1.2}/PKG-INFO

@@ -1,38 +1,17 @@
 Metadata-Version: 2.5
 Name: waapi
-Version: 0.1.0
+Version: 0.1.2
 Summary: Official Python SDK for the WaAPI REST API
 Project-URL: Homepage, https://waapi.app
 Project-URL: Documentation, https://waapi.app/docs
 Project-URL: Source, https://github.com/WaAPIapp/waapi-python-sdk
 Project-URL: Issues, https://github.com/WaAPIapp/waapi-python-sdk/issues
 Author-email: WaAPI <info@waapi.app>
-License: The MIT License (MIT)
-        
-        Copyright (c) WaAPI <info@waapi.app>
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
+License-Expression: MIT
 License-File: LICENSE
 Keywords: api,automation,chatbot,messaging,sdk,waapi
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -105,10 +84,18 @@ async with AsyncWaAPI(token="YOUR_API_TOKEN", instance_id=123) as client:
 
 ## Errors
 
-A successful HTTP exchange is not proof the message was sent. The API answers
-`200` with `{"status": "error"}` when, for example, the instance is not
-connected — so the SDK raises on that too, rather than handing back a body that
-looks like success.
+A successful HTTP exchange is not proof the message was sent. The API carries
+two envelopes:
+
+| Field | Answers |
+|---|---|
+| `status` | did the request reach the instance |
+| `data.status` | did the instance carry the action out |
+
+**The inner one is authoritative.** A malformed chat ID comes back as
+`{"status": "success", "data": {"status": "error", …}}` — nothing was sent. The
+SDK raises `FailedActionError` on either envelope, so neither case reaches you
+looking like success.
 
 ```python
 from waapi import WaAPI, FailedActionError, AuthenticationError, RateLimitError

{waapi-0.1.0 → waapi-0.1.2}/README.md

@@ -51,10 +51,18 @@ async with AsyncWaAPI(token="YOUR_API_TOKEN", instance_id=123) as client:
 
 ## Errors
 
-A successful HTTP exchange is not proof the message was sent. The API answers
-`200` with `{"status": "error"}` when, for example, the instance is not
-connected — so the SDK raises on that too, rather than handing back a body that
-looks like success.
+A successful HTTP exchange is not proof the message was sent. The API carries
+two envelopes:
+
+| Field | Answers |
+|---|---|
+| `status` | did the request reach the instance |
+| `data.status` | did the instance carry the action out |
+
+**The inner one is authoritative.** A malformed chat ID comes back as
+`{"status": "success", "data": {"status": "error", …}}` — nothing was sent. The
+SDK raises `FailedActionError` on either envelope, so neither case reaches you
+looking like success.
 
 ```python
 from waapi import WaAPI, FailedActionError, AuthenticationError, RateLimitError

{waapi-0.1.0 → waapi-0.1.2}/pyproject.toml

@@ -1,20 +1,22 @@
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling>=1.27"]
 build-backend = "hatchling.build"
 
 [project]
 name = "waapi"
-version = "0.1.0"
+version = "0.1.2"
 description = "Official Python SDK for the WaAPI REST API"
 readme = "README.md"
-license = { file = "LICENSE" }
+# PEP 639: an SPDX expression, not the file. The table form made PyPI
+# render the whole licence text where the licence name belongs.
+license = "MIT"
+license-files = ["LICENSE"]
 requires-python = ">=3.9"
 authors = [{ name = "WaAPI", email = "info@waapi.app" }]
 keywords = ["waapi", "messaging", "api", "sdk", "automation", "chatbot"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",

{waapi-0.1.0 → waapi-0.1.2}/src/waapi/__init__.py

@@ -6,7 +6,7 @@
     client.send_message(chat_id="4915112345678@c.us", message="Hello")
 """
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 from .client import AsyncWaAPI, WaAPI
 from .exceptions import (

{waapi-0.1.0 → waapi-0.1.2}/src/waapi/_http.py

@@ -73,20 +73,33 @@ def interpret(response: httpx.Response, *, check_body_status: bool = True) -> An
     if not 200 <= status < 300:
         raise WaAPIError(f"WaAPI returned HTTP {status}: {_brief(body)}")
 
-    # A 2xx is not proof the action happened. The API answers 200 with
-    # {"status": "error"} when, for example, the instance is not connected.
+    # Two envelopes, and the inner one is the authoritative answer:
+    #
+    #   body.status        did the request reach the instance
+    #   body.data.status   did the instance carry the action out
+    #
+    # A malformed chatId comes back as {"status": "success", "data":
+    # {"status": "error", "message": "incorrect chatId format."}} -- nothing
+    # was sent. Checking only the outer envelope reports that as delivered,
+    # which is the exact failure this class exists to prevent, one level down.
     if check_body_status and isinstance(body, Mapping):
-        envelope = body.get("status")
-        if envelope is not None and envelope != "success":
-            raise FailedActionError(
-                "WaAPI accepted the request but did not carry the action out: "
-                + _brief(body),
-                body,
-            )
+        for envelope in (_inner_status(body), body.get("status")):
+            if envelope is not None and envelope != "success":
+                raise FailedActionError(
+                    "WaAPI accepted the request but did not carry the action out: "
+                    + _brief(body),
+                    body,
+                )
 
     return body
 
 
+def _inner_status(body: Mapping[str, Any]) -> Any:
+    """``body.data.status`` when the response wraps a client action."""
+    data = body.get("data")
+    return data.get("status") if isinstance(data, Mapping) else None
+
+
 def _brief(body: Any, limit: int = 400) -> str:
     text = body if isinstance(body, str) else _json.dumps(body, ensure_ascii=False)
     return text if len(text) <= limit else text[:limit] + "..."

{waapi-0.1.0 → waapi-0.1.2}/tests/test_client.py

@@ -212,3 +212,26 @@ def test_the_generated_surface_is_not_empty():
 
     methods = {n for n in vars(GeneratedActions) if not n.startswith("_")}
     assert len(methods) > 100, f"only {len(methods)} generated methods"
+
+
+def test_the_inner_status_is_the_authoritative_one():
+    """A request can reach the instance and still not be carried out.
+
+    The outer envelope reports delivery to the instance; the inner one reports
+    whether the instance did the thing. A malformed chatId produces
+    success-outside, error-inside — and was reported as sent until the check
+    looked one level down.
+    """
+    client = client_returning(200, {
+        "status": "success",
+        "data": {"status": "error", "message": "incorrect chatId format."},
+    })
+    with pytest.raises(FailedActionError) as excinfo:
+        client.send_message(chat_id="bogus", message="must not count as sent")
+    assert "did not carry the action out" in str(excinfo.value)
+
+
+def test_a_data_array_does_not_trip_the_inner_check():
+    """Plenty of actions return a list in `data`, which has no status at all."""
+    client = client_returning(200, {"status": "success", "data": [{"id": 1}, {"id": 2}]})
+    assert client.get_chats()["data"] == [{"id": 1}, {"id": 2}]