polyapi-python 0.3.17.dev1__tar.gz → 0.3.18.dev1__tar.gz

{polyapi_python-0.3.17.dev1/polyapi_python.egg-info → polyapi_python-0.3.18.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.17.dev1
+Version: 0.3.18.dev1
 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.17.dev1 → polyapi_python-0.3.18.dev1}/polyapi/generate.py

@@ -399,7 +399,21 @@ def clear() -> None:
 
 def render_spec(spec: SpecificationDto) -> Tuple[str, str]:
     function_type = spec["type"]
-    function_description = spec["description"]
+    raw_description = spec.get("description", "")
+    def _flatten_description(value: Any) -> List[str]:
+        if value is None:
+            return []
+        if isinstance(value, list):
+            flat: List[str] = []
+            for item in value:
+                flat.extend(_flatten_description(item))
+            return flat
+        return [str(value)]
+
+    if isinstance(raw_description, str):
+        function_description = raw_description
+    else:
+        function_description = "\n".join(_flatten_description(raw_description))
     function_name = spec["name"]
     function_context = spec["context"]
     function_id = spec["id"]

{polyapi_python-0.3.17.dev1 → polyapi_python-0.3.18.dev1}/polyapi/poly_tables.py

@@ -531,10 +531,27 @@ def _render_table(table: TableSpecDto) -> str:
     table_where_class = _render_table_where_class(
         table["name"], columns, required_columns
     )
-    if table.get("description", ""):
+    raw_description = table.get("description", "")
+
+    def _flatten_description(value: Any) -> List[str]:
+        if value is None:
+            return []
+        if isinstance(value, list):
+            flat: List[str] = []
+            for item in value:
+                flat.extend(_flatten_description(item))
+            return flat
+        return [str(value)]
+
+    if isinstance(raw_description, str):
+        normalized_description = raw_description
+    else:
+        normalized_description = "\n".join(_flatten_description(raw_description))
+
+    if normalized_description:
         table_description = '\n    """'
         table_description += "\n       ".join(
-            table["description"].replace('"', "'").split("\n")
+            normalized_description.replace('"', "'").split("\n")
         )
         table_description += '\n    """'
     else:

{polyapi_python-0.3.17.dev1 → polyapi_python-0.3.18.dev1}/polyapi/schema.py

@@ -50,6 +50,13 @@ def wrapped_generate_schema_types(type_spec: dict, root, fallback_type):
             # if we have no root, just add "My"
             root = "My" + root
 
+    if isinstance(root, list):
+        root = "_".join([str(x) for x in root if x is not None]) or fallback_type
+    elif root is None:
+        root = fallback_type
+    elif not isinstance(root, str):
+        root = str(root)
+
     root = clean_title(root)
 
     try:
@@ -150,10 +157,19 @@ def clean_title(title: str) -> str:
     """ used by library generation, sometimes functions can be added with spaces in the title
     or other nonsense. fix them!
     """
+    if isinstance(title, list):
+        title = "_".join([str(x) for x in title if x is not None])
+    elif title is None:
+        title = ""
+    elif not isinstance(title, str):
+        title = str(title)
+
     title = title.replace(" ", "")
     # certain reserved words cant be titles, let's replace them
     if title == "List":
         title = "List_"
+    if not title:
+        title = "Dict"
     return title
 
 

{polyapi_python-0.3.17.dev1 → polyapi_python-0.3.18.dev1}/polyapi/server.py

@@ -62,7 +62,7 @@ def render_server_function(
         return_type_def=return_type_def,
     )
     func_str = SERVER_FUNCTION_TEMPLATE.format(
-        return_type_name=add_type_import_path(function_name, return_type_name),
+        return_type_name=_normalize_return_type_for_annotation(function_name, return_type_name),
         function_type="server",
         function_name=function_name,
         function_id=function_id,
@@ -74,9 +74,23 @@ def render_server_function(
     return func_str, func_type_defs
 
 
+def _normalize_return_type_for_annotation(function_name: str, return_type_name: str) -> str:
+    if return_type_name == "ReturnType":
+        return "ReturnType"
+    return add_type_import_path(function_name, return_type_name)
+
+
 def _get_server_return_action(return_type_name: str) -> str:
-    if return_type_name == "str":
+    normalized_type = return_type_name.replace(" ", "")
+
+    if normalized_type in {"str", "Optional[str]"}:
         return_action = "resp.text"
+    elif "|" in normalized_type:
+        union_parts = {part for part in normalized_type.split("|") if part}
+        if union_parts == {"str", "None"}:
+            return_action = "resp.text"
+        else:
+            return_action = "resp.json()"
     else:
         return_action = "resp.json()"
-    return return_action
+    return return_action

{polyapi_python-0.3.17.dev1 → polyapi_python-0.3.18.dev1}/polyapi/utils.py

@@ -71,6 +71,43 @@ def print_red(s: str):
     print(Fore.RED + s + Style.RESET_ALL)
 
 
+def normalize_cross_language_type(type_name: str) -> str:
+    value = (type_name or "").strip()
+    if not value:
+        return "Any"
+
+    primitive_map = {
+        "string": "str",
+        "number": "float",
+        "integer": "int",
+        "boolean": "bool",
+        "null": "None",
+        "void": "None",
+        "any": "Any",
+        "object": "Dict",
+    }
+
+    if value.startswith("Promise<") and value.endswith(">"):
+        return normalize_cross_language_type(value[len("Promise<"):-1])
+
+    if value.startswith("Awaited<") and value.endswith(">"):
+        return normalize_cross_language_type(value[len("Awaited<"):-1])
+
+    if value.endswith("[]"):
+        item_type = normalize_cross_language_type(value[:-2])
+        return f"List[{item_type}]"
+
+    if "|" in value:
+        parts = [p.strip() for p in value.split("|") if p.strip()]
+        normalized = [normalize_cross_language_type(part) for part in parts]
+        return " | ".join(normalized) if normalized else "Any"
+
+    if value == "ReturnType" or value.startswith("ReturnType<") or "typeof" in value:
+        return "Any"
+
+    return primitive_map.get(value, value)
+
+
 def to_type_module_alias(function_name: str) -> str:
     """Return the internal alias used for a function's generated type module."""
     return f"_{to_func_namespace(function_name)}_types"
@@ -81,6 +118,14 @@ def add_type_import_path(function_name: str, arg: str) -> str:
     # from now, we start qualifying non-basic types :)) 
     # e.g. Callable[[EmailAddress, Dict, Dict, Dict], None]
         # becomes Callable[[Set_profile_email.EmailAddress, Dict, Dict, Dict], None]
+    arg = normalize_cross_language_type(arg)
+
+    if "|" in arg:
+        return " | ".join(
+            add_type_import_path(function_name, token.strip())
+            for token in arg.split("|")
+            if token.strip()
+        )
     type_module_alias = to_type_module_alias(function_name)
     
     if arg.startswith("Callable"):
@@ -96,7 +141,7 @@ def add_type_import_path(function_name: str, arg: str) -> str:
         return "Callable[" + ",".join(qualified) + "]"
         # return arg
 
-    if arg in BASIC_PYTHON_TYPES:
+    if arg == "Any" or arg in BASIC_PYTHON_TYPES:
         return arg
 
     if arg.startswith("List["):
@@ -127,14 +172,23 @@ def get_type_and_def(
         return "Any", ""
     
     if type_spec["kind"] == "plain":
-        value = type_spec.get("value", "")
+        value = normalize_cross_language_type(type_spec.get("value", ""))
+
+        if "|" in value or value in BASIC_PYTHON_TYPES:
+            return value, ""
+
         if value.endswith("[]"):
-            primitive = map_primitive_types(value[:-2])
+            primitive = normalize_cross_language_type(value[:-2])
+            if primitive not in BASIC_PYTHON_TYPES:
+                primitive = map_primitive_types(primitive)
             return f"List[{primitive}]", ""
         else:
             return map_primitive_types(value), ""
     elif type_spec["kind"] == "primitive":
-        return map_primitive_types(type_spec.get("type", "any")), ""
+        primitive = normalize_cross_language_type(type_spec.get("type", "any"))
+        if primitive in BASIC_PYTHON_TYPES:
+            return primitive, ""
+        return map_primitive_types(primitive), ""
     elif type_spec["kind"] == "array":
         if type_spec.get("items"):
             items = type_spec["items"]

{polyapi_python-0.3.17.dev1 → polyapi_python-0.3.18.dev1/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.17.dev1
+Version: 0.3.18.dev1
 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.17.dev1 → polyapi_python-0.3.18.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyapi-python"
-version = "0.3.17.dev1"
+version = "0.3.18.dev1"
 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.17.dev1 → polyapi_python-0.3.18.dev1}/tests/test_server.py

@@ -66,6 +66,34 @@ LIST_RECOMMENDATIONS = {
 }
 
 
+RETURN_TYPE_NAMED_RETURN_TYPE = {
+    "id": "ret-1234",
+    "type": "serverFunction",
+    "context": "mixed",
+    "name": "fooFunc",
+    "description": "Return type name collision regression test.",
+    "requirements": [],
+    "function": {
+        "arguments": [],
+        "returnType": {
+            "kind": "object",
+            "schema": {
+                "title": "ReturnType",
+                "type": "object",
+                "properties": {
+                    "value": {"type": "string"},
+                },
+                "required": ["value"],
+            },
+        },
+        "synchronous": True,
+    },
+    "code": "",
+    "language": "javascript",
+    "visibilityMetadata": {"visibility": "ENVIRONMENT"},
+}
+
+
 class T(unittest.TestCase):
     def test_render_function_twilio_server(self):
         # same test but try it as a serverFunction rather than an apiFunction
@@ -117,3 +145,67 @@ class T(unittest.TestCase):
 # stay_date: Required[str]
 # """ Required property """'''
 #         self.assertIn(expected_return_type, func_str)
+
+
+    def test_render_function_return_type_name_collision_does_not_reference_module_attr(self):
+        return_type = RETURN_TYPE_NAMED_RETURN_TYPE["function"]["returnType"]
+        func_str, func_type_defs = render_server_function(
+            RETURN_TYPE_NAMED_RETURN_TYPE["type"],
+            RETURN_TYPE_NAMED_RETURN_TYPE["name"],
+            RETURN_TYPE_NAMED_RETURN_TYPE["id"],
+            RETURN_TYPE_NAMED_RETURN_TYPE["description"],
+            RETURN_TYPE_NAMED_RETURN_TYPE["function"]["arguments"],
+            return_type,
+        )
+        self.assertIn("-> dict", func_str)
+        self.assertNotIn(".returnType", func_str)
+        self.assertNotIn(".ReturnType", func_str)
+
+    def test_render_function_string_union_returns_text(self):
+        function_name = "getMaybeName"
+        return_type = {"kind": "plain", "value": "Promise<string | null>"}
+
+        func_str, _ = render_server_function(
+            "serverFunction",
+            function_name,
+            "ret-str-null-1",
+            "",
+            [],
+            return_type,
+        )
+
+        self.assertIn("-> str | None", func_str)
+        self.assertIn("try:\n        return resp.text", func_str)
+        self.assertNotIn("return resp.json()", func_str)
+
+    def test_render_function_mixed_string_union_returns_json(self):
+        function_name = "getMaybePayload"
+        return_type = {"kind": "plain", "value": "string | object"}
+
+        func_str, _ = render_server_function(
+            "serverFunction",
+            function_name,
+            "ret-str-obj-1",
+            "",
+            [],
+            return_type,
+        )
+
+        self.assertIn("-> str | Dict", func_str)
+        self.assertIn("try:\n        return resp.json()", func_str)
+
+    def test_render_function_number_nullable_returns_json(self):
+        function_name = "getMaybeCount"
+        return_type = {"kind": "plain", "value": "number | null"}
+
+        func_str, _ = render_server_function(
+            "serverFunction",
+            function_name,
+            "ret-num-null-1",
+            "",
+            [],
+            return_type,
+        )
+
+        self.assertIn("-> float | None", func_str)
+        self.assertIn("try:\n        return resp.json()", func_str)

{polyapi_python-0.3.17.dev1 → polyapi_python-0.3.18.dev1}/tests/test_utils.py

@@ -1,5 +1,5 @@
 import unittest
-from polyapi.utils import get_type_and_def, rewrite_reserved
+from polyapi.utils import add_type_import_path, get_type_and_def, rewrite_reserved
 
 OPENAPI_FUNCTION = {
     "kind": "function",
@@ -84,3 +84,26 @@ class T(unittest.TestCase):
     def test_rewrite_reserved(self):
         rv = rewrite_reserved("from")
         self.assertEqual(rv, "_from")
+
+    def test_plain_return_type_utility_normalizes_to_any(self):
+        arg_type, arg_def = get_type_and_def({"kind": "plain", "value": "ReturnType<typeof fooFunc>"})
+        self.assertEqual(arg_type, "Any")
+        self.assertEqual(arg_def, "")
+
+    def test_plain_promise_union_normalizes_to_python_union(self):
+        arg_type, arg_def = get_type_and_def({"kind": "plain", "value": "Promise<string | null>"})
+        self.assertEqual(arg_type, "str | None")
+        self.assertEqual(arg_def, "")
+
+    def test_add_type_import_path_never_qualifies_return_type_utility(self):
+        arg_type = add_type_import_path("fooFunc", "ReturnType<typeof fooFunc>")
+        self.assertEqual(arg_type, "Any")
+
+    def test_plain_promise_array_union_normalizes_to_python_union(self):
+        arg_type, arg_def = get_type_and_def({"kind": "plain", "value": "Promise<string[] | null>"})
+        self.assertEqual(arg_type, "List[str] | None")
+        self.assertEqual(arg_def, "")
+
+    def test_add_type_import_path_keeps_array_union_primitives_valid(self):
+        arg_type = add_type_import_path("fooFunc", "Promise<string[] | null>")
+        self.assertEqual(arg_type, "List[str] | None")