polyapi-python 0.3.14.dev4__tar.gz → 0.3.16__tar.gz

{polyapi_python-0.3.14.dev4/polyapi_python.egg-info → polyapi_python-0.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.14.dev4
+Version: 0.3.16
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.16}/polyapi/http_client.py

@@ -3,6 +3,7 @@ import httpx
 
 _sync_client: httpx.Client | None = None
 _async_client: httpx.AsyncClient | None = None
+_async_client_loop: asyncio.AbstractEventLoop | None = None
 
 
 def _get_sync_client() -> httpx.Client:
@@ -13,9 +14,11 @@ def _get_sync_client() -> httpx.Client:
 
 
 def _get_async_client() -> httpx.AsyncClient:
-    global _async_client
-    if _async_client is None:
+    global _async_client, _async_client_loop
+    current_loop = asyncio.get_running_loop()
+    if _async_client is None or _async_client_loop is not current_loop:
         _async_client = httpx.AsyncClient(timeout=None)
+        _async_client_loop = current_loop
     return _async_client
 
 
@@ -66,8 +69,15 @@ def close():
         _sync_client = None
 
 async def close_async():
-    global _sync_client, _async_client
+    global _sync_client, _async_client, _async_client_loop
     close()
-    if _async_client is not None:
-        await _async_client.aclose()
-        _async_client = None
+    client = _async_client
+    client_loop = _async_client_loop
+    _async_client = None
+    _async_client_loop = None
+    if client is None:
+        return
+
+    current_loop = asyncio.get_running_loop()
+    if client_loop is current_loop:
+        await client.aclose()

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.16}/polyapi/schema.py

@@ -101,8 +101,11 @@ def generate_schema_types(input_data: Dict, root=None):
     return output
 
 
-# Regex to match everything between "# example: {\n" and "^}$"
-MALFORMED_EXAMPLES_PATTERN = re.compile(r"# example: \{\n.*?^\}$", flags=re.DOTALL | re.MULTILINE)
+# Matches commented example headers emitted by jsonschema-gentypes before a raw
+# multiline JSON object/array body that is not commented out.
+MALFORMED_EXAMPLE_HEADER_PATTERN = re.compile(
+    r"^\s*#\s*(?:\|\s*)?example:\s*([\[{])\s*$"
+)
 
 # Regex to fix invalid escape sequences in docstrings
 INVALID_ESCAPE_PATTERNS = [
@@ -117,8 +120,24 @@ def clean_malformed_examples(example: str) -> str:
     """ there is a bug in the `jsonschmea_gentypes` library where if an example from a jsonchema is an object,
     it will break the code because the object won't be properly commented out. Also fixes invalid escape sequences.
     """
-    # Remove malformed examples
-    cleaned_example = MALFORMED_EXAMPLES_PATTERN.sub("", example)
+    cleaned_lines = []
+    balance = 0
+    skipping_example = False
+
+    for line in example.splitlines(keepends=True):
+        if not skipping_example:
+            if MALFORMED_EXAMPLE_HEADER_PATTERN.match(line):
+                skipping_example = True
+                balance = line.count("{") + line.count("[") - line.count("}") - line.count("]")
+                continue
+            cleaned_lines.append(line)
+            continue
+
+        balance += line.count("{") + line.count("[") - line.count("}") - line.count("]")
+        if balance <= 0:
+            skipping_example = False
+
+    cleaned_example = "".join(cleaned_lines)
     
     # Fix invalid escape sequences in docstrings
     for pattern, replacement in INVALID_ESCAPE_PATTERNS:

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.16/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.14.dev4
+Version: 0.3.16
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyapi-python"
-version = "0.3.14.dev4"
+version = "0.3.16"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.16}/tests/test_async_proof.py

@@ -56,10 +56,12 @@ class TestHttpClientPairing:
         # Reset singletons so each test starts fresh
         http_client._sync_client = None
         http_client._async_client = None
+        http_client._async_client_loop = None
 
     def teardown_method(self):
         http_client._sync_client = None
         http_client._async_client = None
+        http_client._async_client_loop = None
 
     @patch.object(httpx.Client, "post", return_value=_fake_response())
     def test_sync_post_uses_sync_client(self, mock_post):
@@ -79,6 +81,90 @@ class TestHttpClientPairing:
         mock_post.assert_called_once()
         assert resp.status_code == 200
         assert http_client._async_client is not None
+        assert http_client._async_client_loop is not None
+
+    def test_async_post_reuses_client_within_same_loop(self):
+        first_client = MagicMock()
+        first_client.post = AsyncMock(return_value=_fake_response())
+
+        with patch("polyapi.http_client.httpx.AsyncClient", return_value=first_client) as mock_async_client:
+            async def _run():
+                first_response = await http_client.async_post("https://example.com/first", json={})
+                second_response = await http_client.async_post("https://example.com/second", json={})
+                return first_response, second_response, asyncio.get_running_loop()
+
+            first_response, second_response, current_loop = asyncio.run(_run())
+
+        assert first_response.status_code == 200
+        assert second_response.status_code == 200
+        assert mock_async_client.call_count == 1
+        assert first_client.post.await_count == 2
+        assert http_client._async_client is first_client
+        assert http_client._async_client_loop is current_loop
+
+    def test_async_post_recreates_client_after_loop_change(self):
+        first_client = MagicMock()
+        first_client.post = AsyncMock(return_value=_fake_response())
+        second_client = MagicMock()
+        second_client.post = AsyncMock(return_value=_fake_response())
+
+        with patch(
+            "polyapi.http_client.httpx.AsyncClient",
+            side_effect=[first_client, second_client],
+        ) as mock_async_client:
+            async def _run_once(url: str):
+                response = await http_client.async_post(url, json={})
+                return response, http_client._async_client, asyncio.get_running_loop()
+
+            first_response, first_cached_client, first_loop = asyncio.run(_run_once("https://example.com/first"))
+            second_response, second_cached_client, second_loop = asyncio.run(_run_once("https://example.com/second"))
+
+        assert first_response.status_code == 200
+        assert second_response.status_code == 200
+        assert mock_async_client.call_count == 2
+        assert first_client.post.await_count == 1
+        assert second_client.post.await_count == 1
+        assert first_cached_client is first_client
+        assert second_cached_client is second_client
+        assert first_loop is not second_loop
+        assert http_client._async_client is second_client
+        assert http_client._async_client_loop is second_loop
+
+    def test_close_async_clears_cached_client_for_current_loop(self):
+        async def _run():
+            cached_client = MagicMock()
+            cached_client.aclose = AsyncMock()
+            http_client._async_client = cached_client
+            http_client._async_client_loop = asyncio.get_running_loop()
+
+            await http_client.close_async()
+
+            return cached_client
+
+        cached_client = asyncio.run(_run())
+
+        cached_client.aclose.assert_awaited_once()
+        assert http_client._async_client is None
+        assert http_client._async_client_loop is None
+
+    def test_close_async_drops_stale_client_without_cross_loop_close(self):
+        stale_client = MagicMock()
+        stale_client.aclose = AsyncMock()
+
+        async def _seed_stale_client():
+            http_client._async_client = stale_client
+            http_client._async_client_loop = asyncio.get_running_loop()
+
+        asyncio.run(_seed_stale_client())
+
+        async def _close_on_new_loop():
+            await http_client.close_async()
+
+        asyncio.run(_close_on_new_loop())
+
+        stale_client.aclose.assert_not_awaited()
+        assert http_client._async_client is None
+        assert http_client._async_client_loop is None
 
     @patch.object(httpx.Client, "get", return_value=_fake_response())
     def test_sync_get(self, mock_get):

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.16}/tests/test_schema.py

@@ -19,6 +19,7 @@ CHARACTER_SCHEMA = {
 }
 
 APALEO_MALFORMED_EXAMPLE = 'from typing import List, TypedDict, Union\nfrom typing_extensions import Required\n\n\n# Body.\n# \n# example: {\n  "from": "2024-04-21",\n  "to": "2024-04-24",\n  "grossDailyRate": {\n    "amount": 160.0,\n    "currency": "EUR"\n  },\n  "timeSlices": [\n    {\n      "blockedUnits": 3\n    },\n    {\n      "blockedUnits": 0\n    },\n    {\n      "blockedUnits": 7\n    }\n  ]\n}\n# x-readme-ref-name: ReplaceBlockModel\nBody = TypedDict(\'Body\', {\n    # Start date and time from which the inventory will be blockedSpecify either a pure date or a date and time (without fractional second part) in UTC or with UTC offset as defined in <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO8601:2004</a>\n    # \n    # Required property\n    \'from\': Required[str],\n    # End date and time until which the inventory will be blocked. Cannot be more than 5 years after the start date.Specify either a pure date or a date and time (without fractional second part) in UTC or with UTC offset as defined in <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO8601:2004</a>\n    # \n    # Required property\n    \'to\': Required[str],\n    # x-readme-ref-name: MonetaryValueModel\n    # \n    # Required property\n    \'grossDailyRate\': Required["_BodygrossDailyRate"],\n    # The list of time slices\n    # \n    # Required property\n    \'timeSlices\': Required[List["_BodytimeSlicesitem"]],\n}, total=False)\n\n\nclass _BodygrossDailyRate(TypedDict, total=False):\n    """ x-readme-ref-name: MonetaryValueModel """\n\n    amount: Required[Union[int, float]]\n    """\n    format: double\n\n    Required property\n    """\n\n    currency: Required[str]\n    """ Required property """\n\n\n\nclass _BodytimeSlicesitem(TypedDict, total=False):\n    """ x-readme-ref-name: CreateBlockTimeSliceModel """\n\n    blockedUnits: Required[Union[int, float]]\n    """\n    Number of units blocked for the time slice\n\n    format: int32\n\n    Required property\n    """\n\n'
+APALEO_MALFORMED_PIPE_EXAMPLE = APALEO_MALFORMED_EXAMPLE.replace("# example: {", "# | example: {")
 
 
 class T(unittest.TestCase):
@@ -32,9 +33,15 @@ class T(unittest.TestCase):
     def test_clean_malformed_examples(self):
         output = clean_malformed_examples(APALEO_MALFORMED_EXAMPLE)
         self.assertNotIn("# example: {", output)
+        self.assertNotIn('  "from": "2024-04-21",', output)
+
+    def test_clean_malformed_examples_pipe_style(self):
+        output = clean_malformed_examples(APALEO_MALFORMED_PIPE_EXAMPLE)
+        self.assertNotIn("# | example: {", output)
+        self.assertNotIn('  "from": "2024-04-21",', output)
     
     def test_character_encoding(self):
         output = generate_schema_types(CHARACTER_SCHEMA, "Dict")
         expected = 'from typing import TypedDict\n\n\nclass Dict(TypedDict, total=False):\n    CHARACTER_SCHEMA_NAME: str\n    """ This is — “bad”, right? """\n\n'
         self.assertEqual(output, expected)
-        
+