polyapi-python 0.3.14.dev4__py3-none-any.whl → 0.3.16__py3-none-any.whl

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/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.dist-info → polyapi_python-0.3.16.dist-info}/METADATA

@@ -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.dist-info → polyapi_python-0.3.16.dist-info}/RECORD

@@ -13,22 +13,22 @@ polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
 polyapi/execute.py,sha256=MeAmc5qsMQfnQPiHJK9Khkn_wrBxMoyMYYqmuFFPsRg,8779
 polyapi/function_cli.py,sha256=kKrecKCDNMmYtcOOCVF2KKOGjFUfWD2TbiVsyYQ84y8,4323
 polyapi/generate.py,sha256=TjMlxxjWN1WnFEmOjSygFcl9RkHCZeCq79R-K_7GYRU,21059
-polyapi/http_client.py,sha256=dfsfFzHlhScQgYMf3zJshJJCwgJGQqM8B5peY9O4NPU,1872
+polyapi/http_client.py,sha256=Pd6FYHGB6plWlBbwZD9LPP6FEicdp0wyLWHd_9jxsaY,2273
 polyapi/parser.py,sha256=pAkeuwp1Kn6bHXiIoj-DuXQ518PztQThIa8vztgsKLQ,21525
 polyapi/poly_schemas.py,sha256=fZ6AGvHcOKQJtlrzSuzeBNed5DxPMA2dJGdJvuFCHWM,9066
 polyapi/poly_tables.py,sha256=T07j4H-HdcIFP5HwUq0uljpzzYzMtJvdqYvOdC0oZ4I,19728
 polyapi/prepare.py,sha256=DBlrQu_A0PqdaQ3KlMs-C6PkV3qncatkAiBlC7j2hnk,7441
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/rendered_spec.py,sha256=J2Num7MXnW_mKAe2MSVIL1coWopNYZ-6nNNwQRfseV0,2262
-polyapi/schema.py,sha256=-mtRV5iL3CV0X3phXhGYFV8sLz0KouTACOKWyGO9Pwc,5309
+polyapi/schema.py,sha256=2ehUgs4IcNvqsg5cUjZReg-X83hbh4l0eStKmJhFsBY,5921
 polyapi/server.py,sha256=35l3f9d6jWaa60MfX5n7KF4UCAQR-Xg8WLc0NL9dlfY,2479
 polyapi/sync.py,sha256=t0Khh8B5GylxB7KWRP_xvkrvkuyVarSLCOvtmaz7lcc,6766
 polyapi/typedefs.py,sha256=mfll-KrngOW0wzbvDNiIDaDkFMwbsT-MY5y5hzWj9RE,5642
 polyapi/utils.py,sha256=VN8n_jvphderplI5MDYjSutxVnYbJjHhJznYkwjgstw,13349
 polyapi/variables.py,sha256=hfSDPGQK6YphNCa9MqE0W88WIFfqCQWgpBDWkExMq-A,7582
 polyapi/webhook.py,sha256=0ceLwHNjNd2Yx_8MX5jOIxiQ5Lwhy2pe81ProAuKon0,5108
-polyapi_python-0.3.14.dev4.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
-polyapi_python-0.3.14.dev4.dist-info/METADATA,sha256=_SPOiz8v0LAzfWBJQw4XwS7w0Z5-sJuPW7WghBXnT38,5928
-polyapi_python-0.3.14.dev4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-polyapi_python-0.3.14.dev4.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.3.14.dev4.dist-info/RECORD,,
+polyapi_python-0.3.16.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
+polyapi_python-0.3.16.dist-info/METADATA,sha256=6cpwjHGYw4FUgfcoCI_isd-JYAm52BZDzr-KrqST1qs,5923
+polyapi_python-0.3.16.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+polyapi_python-0.3.16.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.3.16.dist-info/RECORD,,