polyapi-python 0.3.12.dev2__tar.gz → 0.3.13.dev2__tar.gz

{polyapi_python-0.3.12.dev2/polyapi_python.egg-info → polyapi_python-0.3.13.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.12.dev2
+Version: 0.3.13.dev2
 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.12.dev2 → polyapi_python-0.3.13.dev2}/polyapi/deployables.py

@@ -6,6 +6,7 @@ import json
 import hashlib
 from pathlib import Path
 from typing import TypedDict, List, Dict, Tuple, Optional, Any, Union
+from typing_extensions import Required
 from subprocess import check_output, CalledProcessError
 
 
@@ -54,7 +55,7 @@ class DeployableRecord(ParsedDeployableConfig, total=False):
     gitRevision: str
     fileRevision: str
     file: str
-    types: DeployableFunctionTypes
+    types: Required[DeployableFunctionTypes]
     typeSchemas: Dict[str, Any]
     dependencies: List[str]
     deployments: List[Deployment]

{polyapi_python-0.3.12.dev2 → polyapi_python-0.3.13.dev2}/polyapi/parser.py

@@ -3,7 +3,7 @@ import json
 import types
 import sys
 import re
-from typing import Dict, List, Mapping, Optional, Tuple, Any
+from typing import Dict, List, Mapping, Optional, Tuple, Any, Union
 from typing import _TypedDictMeta as BaseTypedDict  # type: ignore
 from typing_extensions import _TypedDictMeta, cast # type: ignore
 from stdlib_list import stdlib_list
@@ -390,7 +390,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                 deployable["config"] = _parse_dict(node.value)
                 self._name = deployable["config"]["name"]
 
-        def _extract_docstring_from_function(self, node: ast.FunctionDef):
+        def _extract_docstring_from_function(self, node: Union[ast.FunctionDef, ast.AsyncFunctionDef]):
             start_lineno = (node.body[0].lineno if node.body else node.lineno) - 1
             start_offset = self._line_offsets[start_lineno]
             end_offset = start_offset
@@ -452,15 +452,19 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
             for name in node.names:
                 req = _get_req_name_if_not_in_base(name.name, pip_name_lookup)
                 if req:
+                    if "dependencies" not in deployable or deployable["dependencies"] is None:
+                        deployable["dependencies"] = []
                     deployable["dependencies"].append(req)
 
         def visit_ImportFrom(self, node: ast.ImportFrom):
             if node.module:
                 req = _get_req_name_if_not_in_base(node.module, pip_name_lookup)
                 if req:
+                    if "dependencies" not in deployable or deployable["dependencies"] is None:
+                        deployable["dependencies"] = []
                     deployable["dependencies"].append(req)
 
-        def visit_FunctionDef(self, node: ast.FunctionDef):
+        def _handle_function_def(self, node: Union[ast.FunctionDef, ast.AsyncFunctionDef]):
             if node.name == self._name:
                 # Parse docstring which may contain param types and descriptions
                 self._extract_docstring_from_function(node)
@@ -506,6 +510,12 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                 else:
                     deployable["types"]["returns"]["type"] = "Any"
 
+        def visit_FunctionDef(self, node: ast.FunctionDef):
+            self._handle_function_def(node)
+
+        def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef):
+            self._handle_function_def(node)
+
         def generic_visit(self, node):
             if hasattr(node, 'lineno') and hasattr(node, 'col_offset'):
                 self._current_offset = self._line_offsets[node.lineno - 1] + node.col_offset

{polyapi_python-0.3.12.dev2 → polyapi_python-0.3.13.dev2}/polyapi/utils.py

@@ -73,9 +73,23 @@ def print_red(s: str):
 
 def add_type_import_path(function_name: str, arg: str) -> str:
     """if not basic type, coerce to camelCase and add the import path"""
-    # for now, just treat Callables as basic types
+    # outdated og comment - for now, just treat Callables as basic types 
+    # 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]
+    
     if arg.startswith("Callable"):
-        return arg
+        inner = arg[len("Callable["):-1]  # strip outer Callable[...]
+        parts = [p.strip() for p in inner.split(",")]
+        qualified = []
+        for p in parts:
+            clean = p.strip("[] ")
+            if clean and clean not in BASIC_PYTHON_TYPES:
+                replacement = f"{to_func_namespace(function_name)}.{camelCase(clean)}"
+                p = p.replace(clean, replacement)
+            qualified.append(p)
+        return "Callable[" + ",".join(qualified) + "]"
+        # return arg
 
     if arg in BASIC_PYTHON_TYPES:
         return arg

{polyapi_python-0.3.12.dev2 → polyapi_python-0.3.13.dev2}/polyapi/webhook.py

@@ -124,11 +124,7 @@ def render_webhook_handle(
 ) -> Tuple[str, str]:
     try:
         function_args, function_args_def = parse_arguments(function_name, arguments)
-
-        if "WebhookEventType" in function_args:
-            # let's add the function name import!
-            function_args = function_args.replace("WebhookEventType", f"{to_func_namespace(function_name)}.WebhookEventType")
-
+       
         func_str = WEBHOOK_TEMPLATE.format(
             description=function_description,
             function_id=function_id,

{polyapi_python-0.3.12.dev2 → polyapi_python-0.3.13.dev2/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.12.dev2
+Version: 0.3.13.dev2
 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.12.dev2 → polyapi_python-0.3.13.dev2}/pyproject.toml

@@ -1,9 +1,10 @@
 [build-system]
 requires = ["setuptools>=61.2", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyapi-python"
-version = "0.3.12.dev2"
+version = "0.3.13.dev2" # bump
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [
@@ -23,14 +24,11 @@ requires-python = ">=3.10"
 [project.urls]
 Homepage = "https://github.com/polyapi/polyapi-python"
 
-[tool.setuptools]
-packages = ["polyapi"]
-
-[tools.setuptools.packages.find]
+[tool.setuptools.packages.find]
 include = ["polyapi"]
 exclude = ["polyapi/poly*", "polyapi/vari*", "polyapi/.config.env", "polyapi/cached_deployables*", "polyapi/deployments_revision"]  # exclude the generated libraries from builds
 
 [tool.mypy]
 # for now redef errors happen sometimes, we will clean this up in the future!
 disable_error_code = "no-redef,name-defined"
-implicit_optional = true
+implicit_optional = true