polyapi-python 0.1.0.dev0__py3-none-any.whl → 0.1.0.dev2__py3-none-any.whl

polyapi/api.py

@@ -1,7 +1,7 @@
 import os
 from typing import Any, Dict, List, Tuple
 
-from polyapi.constants import JSONSCHEMA_TO_PYTHON_TYPE_MAP
+from polyapi.constants import BASIC_PYTHON_TYPES, JSONSCHEMA_TO_PYTHON_TYPE_MAP
 from polyapi.typedefs import PropertySpecification, PropertyType
 from polyapi.utils import append_init, camelCase
 from polyapi.schema import generate_schema_types, clean_title
@@ -12,47 +12,38 @@ TEMPLATE_FUNCTION_TYPE_MAP = {
     "serverFunction": "server",
 }
 
-SERVER_TEMPLATE = """
-import requests
-from typing import List, Dict, Any
-from polyapi.execute import execute
-from polyapi.exceptions import PolyApiException
+SERVER_DEFS_TEMPLATE = """
+from typing import List, Dict, Any, TypedDict
 {args_def}
 {return_type_def}
+"""
+
+SERVER_FUNCTION_TEMPLATE = """
 def {function_name}(
 {args}
 ) -> {return_type_name}:
     "{function_description}"
     resp = execute("{function_type}", "{function_id}", {data})
-    if resp.status_code != 200 and resp.status_code != 201:
-        error_content = resp.content.decode("utf-8", errors="ignore")
-        raise PolyApiException(f"{{resp.status_code}}: {{error_content}}")
-
     return {return_action}
 """
 
-API_TEMPLATE = """
-import requests
+API_DEFS_TEMPLATE = """
 from typing import List, Dict, Any, TypedDict
-from polyapi.execute import execute
-from polyapi.exceptions import PolyApiException
 {args_def}
 {return_type_def}
-class ApiFunctionResponse(TypedDict):
+class {api_response_type}(TypedDict):
     status: int
     headers: Dict
     data: {return_type_name}
+"""
 
-
+API_FUNCTION_TEMPLATE = """
 def {function_name}(
 {args}
-) -> ApiFunctionResponse:
+) -> {api_response_type}:
     "{function_description}"
     resp = execute("{function_type}", "{function_id}", {data})
-    if resp.status_code != 200 and resp.status_code != 201:
-        error_content = resp.content.decode("utf-8", errors="ignore")
-        raise PolyApiException(f"{{resp.status_code}}: {{error_content}}")
-    return ApiFunctionResponse(resp.json())
+    return {api_response_type}(resp.json())  # type: ignore
 """
 
 
@@ -118,7 +109,7 @@ def _get_type(type_spec: PropertyType) -> Tuple[str, str]:
         return "Any", ""
 
 
-def _parse_arguments(arguments: List[PropertySpecification]) -> Tuple[str, str]:
+def _parse_arguments(function_name: str, arguments: List[PropertySpecification]) -> Tuple[str, str]:
     args_def = []
     arg_string = ""
     for idx, a in enumerate(arguments):
@@ -126,7 +117,7 @@ def _parse_arguments(arguments: List[PropertySpecification]) -> Tuple[str, str]:
         if arg_def:
             args_def.append(arg_def)
         a["name"] = camelCase(a["name"])
-        arg_string += f"    {a['name']}: {arg_type}"
+        arg_string += f"    {a['name']}: {_add_type_import_path(function_name, arg_type)}"
         description = a.get("description", "")
         if description:
             if idx == len(arguments) - 1:
@@ -138,6 +129,25 @@ def _parse_arguments(arguments: List[PropertySpecification]) -> Tuple[str, str]:
     return arg_string.rstrip("\n"), "\n\n".join(args_def)
 
 
+def _add_type_import_path(function_name: str, arg: str) -> str:
+    """ if not basic type, coerce to camelCase and add the import path
+    """
+    if arg in BASIC_PYTHON_TYPES:
+        return arg
+
+    if arg.startswith("List["):
+        sub = arg[5:-1]
+        if sub in BASIC_PYTHON_TYPES:
+            return arg
+        else:
+            if '"' in sub:
+                return f'List[_{function_name}.{camelCase(sub)}]'
+            else:
+                return f'List["_{function_name}.{camelCase(sub)}"]'
+
+    return f'_{function_name}.{camelCase(arg)}'
+
+
 def render_function(
     function_type: str,
     function_name: str,
@@ -145,38 +155,44 @@ def render_function(
     function_description: str,
     arguments: List[PropertySpecification],
     return_type: Dict[str, Any],
-) -> str:
+) -> Tuple[str, str]:
     arg_names = [a["name"] for a in arguments]
-    args, args_def = _parse_arguments(arguments)
+    args, args_def = _parse_arguments(function_name, arguments)
     return_type_name, return_type_def = _get_type(return_type)  # type: ignore
     data = "{" + ", ".join([f"'{arg}': {camelCase(arg)}" for arg in arg_names]) + "}"
     if function_type == "apiFunction":
-        rendered = API_TEMPLATE.format(
+        api_response_type = f"{function_name}Response"
+        func_type_defs = API_DEFS_TEMPLATE.format(
+            args_def=args_def,
+            api_response_type=api_response_type,
+            return_type_name=return_type_name,
+            return_type_def=return_type_def,
+        )
+        func_str = API_FUNCTION_TEMPLATE.format(
             function_type=TEMPLATE_FUNCTION_TYPE_MAP[function_type],
             function_name=function_name,
             function_id=function_id,
             function_description=function_description.replace('"', "'"),
             args=args,
-            args_def=args_def,
-            return_type_name=return_type_name,
-            return_type_def=return_type_def,
             data=data,
+            api_response_type=_add_type_import_path(function_name, api_response_type),
         )
     else:
-        return_action = _get_server_return_action(return_type_name)
-        rendered = SERVER_TEMPLATE.format(
+        func_type_defs = SERVER_DEFS_TEMPLATE.format(
+            args_def=args_def,
+            return_type_def=return_type_def,
+        )
+        func_str = SERVER_FUNCTION_TEMPLATE.format(
+            return_type_name=_add_type_import_path(function_name, return_type_name),
             function_type=TEMPLATE_FUNCTION_TYPE_MAP[function_type],
             function_name=function_name,
             function_id=function_id,
             function_description=function_description.replace('"', "'"),
             args=args,
-            args_def=args_def,
-            return_type_name=return_type_name,
-            return_type_def=return_type_def,
-            return_action=return_action,
+            return_action=_get_server_return_action(return_type_name),
             data=data,
         )
-    return rendered
+    return func_str, func_type_defs
 
 
 def _get_server_return_action(return_type_name: str) -> str:
@@ -206,22 +222,30 @@ def add_function_file(
 ):
     # first lets add the import to the __init__
     init_path = os.path.join(full_path, "__init__.py")
+    _init_the_init(init_path)
+
+    func_str, func_type_defs = render_function(
+        function_type,
+        function_name,
+        function_id,
+        function_description,
+        arguments,
+        return_type,
+    )
+
     with open(init_path, "a") as f:
-        f.write(f"from ._{function_name} import {function_name}\n")
+        f.write(f"\n\nfrom . import _{function_name}\n\n{func_str}")
 
     # now lets add the code!
     file_path = os.path.join(full_path, f"_{function_name}.py")
     with open(file_path, "w") as f:
-        f.write(
-            render_function(
-                function_type,
-                function_name,
-                function_id,
-                function_description,
-                arguments,
-                return_type,
-            )
-        )
+        f.write(func_type_defs)
+
+
+def _init_the_init(init_path: str) -> None:
+    if not os.path.exists(init_path):
+        with open(init_path, "w") as f:
+            f.write("from typing import List, Dict, Any, TypedDict\nfrom polyapi.execute import execute\nfrom polyapi.exceptions import PolyApiException\n")
 
 
 def create_function(
@@ -255,6 +279,7 @@ def create_function(
             # append to __init__.py file if nested folders
             next = folders[idx + 1] if idx + 2 < len(folders) else ""
             if next:
+                _init_the_init(os.path.join(full_path, "__init__.py"))
                 append_init(full_path, next)
 
 

polyapi/constants.py

@@ -15,4 +15,9 @@ PYTHON_TO_JSONSCHEMA_TYPE_MAP = {
     "bool": "boolean",
     "List": "array",
     "Dict": "object",
-}
+}
+
+BASIC_PYTHON_TYPES = set(PYTHON_TO_JSONSCHEMA_TYPE_MAP.keys())
+
+# TODO wire this up to config-variables in future so clients can modify
+SUPPORT_EMAIL = 'support@polyapi.io'

polyapi/execute.py

@@ -4,7 +4,6 @@ from polyapi.config import get_api_key_and_url
 from polyapi.exceptions import PolyApiException
 
 
-# TODO use this to cleanup generated code
 def execute(function_type, function_id, data) -> Response:
     api_key, api_url = get_api_key_and_url()
     headers = {"Authorization": f"Bearer {api_key}"}

polyapi/schema.py

@@ -79,4 +79,8 @@ 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!
     """
-    return title.replace(" ", "")
+    title = title.replace(" ", "")
+    # certain reserved words cant be titles, let's replace them
+    if title == "List":
+        title = "List_"
+    return title

{polyapi_python-0.1.0.dev0.dist-info → polyapi_python-0.1.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.1.0.dev0
+Version: 0.1.0.dev2
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi_python-0.1.0.dev0.dist-info → polyapi_python-0.1.0.dev2.dist-info}/RECORD

@@ -1,20 +1,20 @@
 polyapi/__init__.py,sha256=BbXhEtZ3TSGBfAagj62oRxrc5yFNz5fO0FMoGqS-ENQ,366
 polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
-polyapi/api.py,sha256=9C-JiWtKryTrLWQBtBWnbgNLRd4FaGscViOAkKdL7iw,8875
+polyapi/api.py,sha256=hUE-XrrCjJutQ5cvji9jcY8Sjga_HgZV9pZg8-UoqlY,9734
 polyapi/cli.py,sha256=XafGV_MGYWHOSbn7KZ03GKrSihirT2LVLDhFh_FgyF0,1425
 polyapi/config.py,sha256=RMg8OUKXKFENtS17l4rkaZhfGrwXN-_-F1V1HKJGbYU,2006
-polyapi/constants.py,sha256=SKDdSaG6NUZHsyBxGxBGYm85y82hSE_M1ytKv1hp5gk,337
+polyapi/constants.py,sha256=NGjso6K5rGnE8TGdrXmdEfvvr-HI3DTVGwOYiWO68LM,511
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
-polyapi/execute.py,sha256=nbZGmjPRBT2U-YFFLRNlOf9HP0vTn1yUDKSQVykZ5PQ,687
+polyapi/execute.py,sha256=VtdFU0HraviVtseg8X-o34yqx1XRy3rufcHDibtDppU,645
 polyapi/function_cli.py,sha256=qMWZm07F0PP1d-LeHnUw2oJzIea0YEwYJG809zYJeqY,6557
 polyapi/generate.py,sha256=0ZYXParP_vm9YXWfMl6Rn7MKrpdUXfgHb4UUzgJ1HKk,4114
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-polyapi/schema.py,sha256=ljXDoXDY5570onOEAzWyVTF7Cc76WK48dG6u51xCIxQ,2626
+polyapi/schema.py,sha256=LBBj2_qR793-4dhp0xyywtctbYMnS85lPwitldGJ5yo,2756
 polyapi/typedefs.py,sha256=zh4F36fZSZ6r4YqkcjDjNo_z__kIdiX7fLkC3QniDK0,1082
 polyapi/utils.py,sha256=mvkuJU27QMLKdcqyPktlDD-iO0OI3gbA7xhWCjR4UeM,709
 polyapi/variables.py,sha256=z1zfR3imJ735G2V89BMOYdzEdXiEHKZ5Q58O4ipWcpk,2897
-polyapi_python-0.1.0.dev0.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.1.0.dev0.dist-info/METADATA,sha256=MZKXtg2ZvvOiWjCBwtPwZ0Y4eNs3dcUiEDGnpZORMsI,4243
-polyapi_python-0.1.0.dev0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-polyapi_python-0.1.0.dev0.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.1.0.dev0.dist-info/RECORD,,
+polyapi_python-0.1.0.dev2.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.1.0.dev2.dist-info/METADATA,sha256=Vsi2Fa7OJfWZNr3MCqwUrIjiIcuTuFf3xrXW8jr6hXg,4243
+polyapi_python-0.1.0.dev2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+polyapi_python-0.1.0.dev2.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.1.0.dev2.dist-info/RECORD,,