pyapiary 2.0.0__tar.gz → 2.0.2__tar.gz

{pyapiary-2.0.0 → pyapiary-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyapiary
-Version: 2.0.0
+Version: 2.0.2
 Summary: A simple, lightweight set of connectors and functions to various APIs and DBMSs, controlled by a central broker.
 Author: Rob D'Aveta
 Author-email: rob.daveta@gmail.com

{pyapiary-2.0.0 → pyapiary-2.0.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "pyapiary"
 packages = [{ include = "pyapiary", from = "src" }]
-version = "2.0.0"
+version = "2.0.2"
 description = "A simple, lightweight set of connectors and functions to various APIs and DBMSs, controlled by a central broker."
 authors = ["Rob D'Aveta <rob.daveta@gmail.com>"]
 readme = "README.md"

{pyapiary-2.0.0 → pyapiary-2.0.2}/src/pyapiary/api_connectors/ipqs.py

@@ -1,6 +1,5 @@
 import httpx
 from typing import Optional
-from urllib.parse import quote
 from pyapiary.api_connectors.broker import Broker, AsyncBroker, bubble_broker_init_signature, log_method_call
 
 @bubble_broker_init_signature()
@@ -16,12 +15,12 @@ class IPQSConnector(Broker):
         api_key (str): The API key used to authenticate with IPQS.
     """
     def __init__(self, api_key: Optional[str] = None, **kwargs):
-        super().__init__(base_url="https://ipqualityscore.com/api/json", **kwargs)
+        super().__init__(base_url="https://www.ipqualityscore.com/api/json", **kwargs)
 
         self.api_key = api_key or self.env_config.get("IPQS_API_KEY")
         if not self.api_key:
             raise ValueError("API key is required for IPQSConnector")
-        self.headers.update({"Content-Type": "application/json"})
+        self.headers.update({"Content-Type": "application/x-www-form-urlencoded"})
 
     @log_method_call
     def malicious_url(self, query: str, **kwargs) -> httpx.Response:
@@ -29,14 +28,13 @@ class IPQSConnector(Broker):
         Scan a URL using IPQualityScore's Malicious URL Scanner API.
 
         Args:
-            query (str): The URL to scan (will be URL-encoded).
+            query (str): The URL to scan.
             **kwargs: Optional parameters like 'strictness' or 'fast' to influence scan behavior.
 
         Returns:
             httpx.Response: the httpx.Response object
         """
-        encoded_query: str = quote(query, safe="")
-        return self.post(f"/url/", json={"url": query, "key": self.api_key, **kwargs})
+        return self.post("/url/", data={"url": query, "key": self.api_key, **kwargs})
 
 
 @bubble_broker_init_signature()
@@ -45,12 +43,12 @@ class AsyncIPQSConnector(AsyncBroker):
     Async version of IPQSConnector using AsyncBroker infrastructure.
     """
     def __init__(self, api_key: Optional[str] = None, **kwargs):
-        super().__init__(base_url="https://ipqualityscore.com/api/json", **kwargs)
+        super().__init__(base_url="https://www.ipqualityscore.com/api/json", **kwargs)
 
         self.api_key = api_key or self.env_config.get("IPQS_API_KEY")
         if not self.api_key:
             raise ValueError("API key is required for AsyncIPQSConnector")
-        self.headers.update({"Content-Type": "application/json"})
+        self.headers.update({"Content-Type": "application/x-www-form-urlencoded"})
 
     @log_method_call
     async def malicious_url(self, query: str, **kwargs) -> httpx.Response:
@@ -58,11 +56,10 @@ class AsyncIPQSConnector(AsyncBroker):
         Asynchronously scan a URL using IPQualityScore's Malicious URL Scanner API.
 
         Args:
-            query (str): The URL to scan (will be URL-encoded).
+            query (str): The URL to scan.
             **kwargs: Optional parameters like 'strictness' or 'fast' to influence scan behavior.
 
         Returns:
             httpx.Response: the httpx.Response object
         """
-        encoded_query: str = quote(query, safe="")
-        return await self.post(f"/url/", json={"url": query, "key": self.api_key, **kwargs})
+        return await self.post("/url/", data={"url": query, "key": self.api_key, **kwargs})

{pyapiary-2.0.0 → pyapiary-2.0.2}/src/pyapiary/tests/test_ipqs/cassettes/test_ipqs_malicious_url_vcr.yaml

@@ -13,11 +13,11 @@ interactions:
       content-type:
       - application/json
       host:
-      - ipqualityscore.com
+      - www.ipqualityscore.com
       user-agent:
       - python-httpx/0.28.1
     method: POST
-    uri: https://ipqualityscore.com/api/json/url/
+    uri: https://www.ipqualityscore.com/api/json/url/
   response:
     body:
       string: !!binary |

{pyapiary-2.0.0 → pyapiary-2.0.2}/src/pyapiary/tests/test_ipqs/test_unit_async_ipqs.py

@@ -8,7 +8,7 @@ from pyapiary.api_connectors.ipqs import AsyncIPQSConnector
 async def test_async_init_with_api_key():
     connector = AsyncIPQSConnector(api_key="test_key")
     assert connector.api_key == "test_key"
-    assert connector.headers["Content-Type"] == "application/json"
+    assert connector.headers["Content-Type"] == "application/x-www-form-urlencoded"
 
 
 @pytest.mark.asyncio
@@ -16,7 +16,7 @@ async def test_async_init_with_env_key():
     with patch.dict("os.environ", {"IPQS_API_KEY": "env_key"}):
         connector = AsyncIPQSConnector(load_env_vars=True)
         assert connector.api_key == "env_key"
-        assert connector.headers["Content-Type"] == "application/json"
+        assert connector.headers["Content-Type"] == "application/x-www-form-urlencoded"
 
 
 @pytest.mark.asyncio
@@ -31,7 +31,7 @@ async def test_async_init_missing_key():
 async def test_async_malicious_url(mock_post):
     import json
 
-    request = httpx.Request("POST", "https://ipqualityscore.com/api/json/url/")
+    request = httpx.Request("POST", "https://www.ipqualityscore.com/api/json/url/")
     payload = {"success": True, "domain": "example.com"}
     mock_response = httpx.Response(
         200,
@@ -49,5 +49,5 @@ async def test_async_malicious_url(mock_post):
     assert response.json() == payload
     mock_post.assert_awaited_once_with(
         "/url/",
-        json={"url": "example.com", "key": "test_key", "strictness": 1}
-    )
+        data={"url": "example.com", "key": "test_key", "strictness": 1}
+    )

{pyapiary-2.0.0 → pyapiary-2.0.2}/src/pyapiary/tests/test_ipqs/test_unit_ipqs.py

@@ -1,13 +1,13 @@
 import httpx
 import pytest
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch
 from pyapiary.api_connectors.ipqs import IPQSConnector
 
 
 def test_init_with_api_key():
     connector = IPQSConnector(api_key="test_key")
     assert connector.api_key == "test_key"
-    assert connector.headers["Content-Type"] == "application/json"
+    assert connector.headers["Content-Type"] == "application/x-www-form-urlencoded"
 
 
 def test_init_with_env_key():
@@ -27,7 +27,7 @@ def test_malicious_url(mock_post):
     # Build a real httpx.Response to match the new return type
     import json
 
-    request = httpx.Request("POST", "https://ipqualityscore.com/api/json/url/")
+    request = httpx.Request("POST", "https://www.ipqualityscore.com/api/json/url/")
     payload = {"success": True, "domain": "example.com"}
     mock_response = httpx.Response(
         200,
@@ -40,6 +40,9 @@ def test_malicious_url(mock_post):
     connector = IPQSConnector(api_key="test_key")
     result = connector.malicious_url("example.com")
 
-    mock_post.assert_called_once()
+    mock_post.assert_called_once_with(
+        "/url/",
+        data={"url": "example.com", "key": "test_key"},
+    )
     assert isinstance(result, httpx.Response)
     assert result.json() == payload