polyapi-python 0.3.18.dev3__py3-none-any.whl → 0.3.18.dev5__py3-none-any.whl

polyapi/poly_schemas.py

@@ -1,8 +1,9 @@
 import os
+import re
 import logging
 import tempfile
 import shutil
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 from polyapi.schema import wrapped_generate_schema_types
 from polyapi.utils import add_import_to_init, init_the_init, to_func_namespace
@@ -23,7 +24,7 @@ FALLBACK_SPEC_TEMPLATE = """class {name}(TypedDict, total=False):
 """
 
 
-def generate_schemas(specs: List[SchemaSpecDto], limit_ids: List[str] = None):
+def generate_schemas(specs: List[SchemaSpecDto], limit_ids: Optional[List[str]] = None):
     failed_schemas = []
     successful_schemas = []
     if limit_ids:
@@ -209,6 +210,44 @@ def add_schema_to_init(full_path: str, spec: SchemaSpecDto):
         f.write(render_poly_schema(spec) + "\n\n")
 
 
+def _fix_typed_dict_imports(code: str) -> str:
+    """Move TypedDict/NotRequired from `typing` to `typing_extensions` in generated code.
+
+    jsonschema_gentypes spits out `from typing import ..., TypedDict, ...` which makes
+    typing._TypedDictMeta instances. The deploy validator wants typing_extensions.TypedDict,
+    so let's rewrite the imports here before writing schema files to disk.
+    """
+    lines = code.split('\n')
+    new_lines = []
+    has_te_import = False
+
+    for line in lines:
+        if re.match(r'from\s+typing_extensions\s+import', line):
+            has_te_import = True
+            # Ensure TypedDict and NotRequired are in the existing typing_extensions line
+            name_set = {n.strip() for n in line.split('import', 1)[1].split(',')}
+            name_set |= {'TypedDict', 'NotRequired'}
+            new_lines.append(f"from typing_extensions import {', '.join(sorted(name_set))}")
+            continue
+
+        if re.match(r'from\s+typing\s+import', line):
+            # Strip TypedDict and NotRequired from the typing import
+            names_str = line.split('import', 1)[1]
+            names: list[str] = [n.strip() for n in names_str.split(',')]
+            names = [n for n in names if n not in ('TypedDict', 'NotRequired', '')]
+            if names:
+                new_lines.append(f"from typing import {', '.join(names)}")
+            # drop the line entirely if nothing is left
+            continue
+
+        new_lines.append(line)
+
+    result = '\n'.join(new_lines)
+    if not has_te_import:
+        result = 'from typing_extensions import NotRequired, TypedDict\n' + result
+    return result
+
+
 def render_poly_schema(spec: SchemaSpecDto) -> str:
     definition = spec["definition"]
     if not definition.get("type"):
@@ -216,5 +255,5 @@ def render_poly_schema(spec: SchemaSpecDto) -> str:
     root, schema_types = wrapped_generate_schema_types(
         definition, root=spec["name"], fallback_type=Dict
     )
-    return schema_types
+    return _fix_typed_dict_imports(schema_types)
     # return FALLBACK_SPEC_TEMPLATE.format(name=spec["name"])

{polyapi_python-0.3.18.dev3.dist-info → polyapi_python-0.3.18.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.18.dev3
+Version: 0.3.18.dev5
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: PolyAPI <support@polyapi.io>
 License: MIT License
@@ -32,7 +32,7 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: typing_extensions==4.12.2
 Requires-Dist: jsonschema-gentypes==2.10.0
 Requires-Dist: pydantic==2.8.0
-Requires-Dist: stdlib_list==0.10.0
+Requires-Dist: stdlib_list==0.11.1
 Requires-Dist: colorama==0.4.4
 Requires-Dist: python-socketio[asyncio_client]==5.11.1
 Requires-Dist: truststore==0.8.0

{polyapi_python-0.3.18.dev3.dist-info → polyapi_python-0.3.18.dev5.dist-info}/RECORD

@@ -15,7 +15,7 @@ polyapi/function_cli.py,sha256=kKrecKCDNMmYtcOOCVF2KKOGjFUfWD2TbiVsyYQ84y8,4323
 polyapi/generate.py,sha256=LzQBm2GKYfAwTsJ36ViLr1ypzrudijj1qR0DRzp-Be0,21764
 polyapi/http_client.py,sha256=Pd6FYHGB6plWlBbwZD9LPP6FEicdp0wyLWHd_9jxsaY,2273
 polyapi/parser.py,sha256=pAkeuwp1Kn6bHXiIoj-DuXQ518PztQThIa8vztgsKLQ,21525
-polyapi/poly_schemas.py,sha256=fZ6AGvHcOKQJtlrzSuzeBNed5DxPMA2dJGdJvuFCHWM,9066
+polyapi/poly_schemas.py,sha256=JGMQbELPFw4V_0nA0o71WJKFTdxjCGoKqJvIid_Y-a4,10759
 polyapi/poly_tables.py,sha256=xFxR69dZNmePT9mUz3DvsoreQK7huIa07evEmOSixA0,20271
 polyapi/prepare.py,sha256=DBlrQu_A0PqdaQ3KlMs-C6PkV3qncatkAiBlC7j2hnk,7441
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,8 +27,8 @@ polyapi/typedefs.py,sha256=mfll-KrngOW0wzbvDNiIDaDkFMwbsT-MY5y5hzWj9RE,5642
 polyapi/utils.py,sha256=SfzK86nhg1wuGzbI53DEFKJ3JkxZ0yU-CZBd_caKbrQ,15313
 polyapi/variables.py,sha256=hfSDPGQK6YphNCa9MqE0W88WIFfqCQWgpBDWkExMq-A,7582
 polyapi/webhook.py,sha256=0ceLwHNjNd2Yx_8MX5jOIxiQ5Lwhy2pe81ProAuKon0,5108
-polyapi_python-0.3.18.dev3.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
-polyapi_python-0.3.18.dev3.dist-info/METADATA,sha256=RNGfs03dpAf3Gpdd-jbB9Zi524fPNl5s4zV20WpHheM,5915
-polyapi_python-0.3.18.dev3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-polyapi_python-0.3.18.dev3.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.3.18.dev3.dist-info/RECORD,,
+polyapi_python-0.3.18.dev5.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
+polyapi_python-0.3.18.dev5.dist-info/METADATA,sha256=zMwyubuUS-fqd9d9JQPaG3csk8oVqjzGkH41zRF0yvo,5915
+polyapi_python-0.3.18.dev5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+polyapi_python-0.3.18.dev5.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.3.18.dev5.dist-info/RECORD,,