polyapi-python 0.2.6.dev2__py3-none-any.whl → 0.2.7__py3-none-any.whl

polyapi/api.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Tuple
 
 from polyapi.typedefs import PropertySpecification
-from polyapi.utils import add_type_import_path, camelCase, parse_arguments, get_type_and_def
+from polyapi.utils import add_type_import_path, parse_arguments, get_type_and_def, rewrite_arg_name
 
 
 API_DEFS_TEMPLATE = """
@@ -41,7 +41,7 @@ def render_api_function(
     arg_names = [a["name"] for a in arguments]
     args, args_def = parse_arguments(function_name, arguments)
     return_type_name, return_type_def = get_type_and_def(return_type)  # type: ignore
-    data = "{" + ", ".join([f"'{arg}': {camelCase(arg)}" for arg in arg_names]) + "}"
+    data = "{" + ", ".join([f"'{arg}': {rewrite_arg_name(arg)}" for arg in arg_names]) + "}"
 
     api_response_type = f"{function_name}Response"
     func_type_defs = API_DEFS_TEMPLATE.format(

polyapi/cli.py

@@ -4,7 +4,7 @@ from polyapi.utils import print_green
 
 from .config import clear_config, set_api_key_and_url
 from .generate import generate, clear
-from .function_cli import function_add_or_update
+from .function_cli import function_add_or_update, function_execute
 from .rendered_spec import get_and_update_rendered_spec
 
 
@@ -56,4 +56,7 @@ def execute_from_cli() -> None:
         print("Clearing the generated library...")
         clear()
     elif command == "function":
-        function_add_or_update(args.context, args.description, args.client, args.server, args.logs, args.subcommands, not args.skip_generate)
+        if args.subcommands[0] == "execute":
+            print(function_execute(args.context, args.subcommands))
+        else:
+            function_add_or_update(args.context, args.description, args.client, args.server, args.logs, args.subcommands, not args.skip_generate)

polyapi/client.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Tuple
 
 from polyapi.typedefs import PropertySpecification
-from polyapi.utils import camelCase, add_type_import_path, parse_arguments, get_type_and_def
+from polyapi.utils import parse_arguments, get_type_and_def
 
 DEFS_TEMPLATE = """
 from typing import List, Dict, Any, TypedDict

polyapi/function_cli.py

@@ -3,7 +3,7 @@ import argparse
 import json
 import types
 import sys
-from typing import Dict, List, Mapping, Optional, Tuple
+from typing import Any, Dict, List, Mapping, Optional, Tuple
 from typing import _TypedDictMeta as BaseTypedDict  # type: ignore
 from typing_extensions import _TypedDictMeta  # type: ignore
 import requests
@@ -279,3 +279,31 @@ def function_add_or_update(
         print(resp.status_code)
         print(resp.content)
         sys.exit(1)
+
+
+def function_execute(context: str, subcommands: List) -> Any:
+    assert subcommands[0] == "execute"
+    context_code = importlib.import_module(f"polyapi.poly.{context}")
+    print(f"Executing poly.{context}.{subcommands[1]}... ")
+    fn = getattr(context_code, subcommands[1])
+    return fn(*subcommands[2:])
+
+
+def spec_delete(function_type: str, function_id: str):
+    api_key, api_url = get_api_key_and_url()
+    assert api_key
+    if function_type == "api":
+        url = f"{api_url}/functions/api/{function_id}"
+    elif function_type == "serverFunction":
+        url = f"{api_url}/functions/server/{function_id}"
+    elif function_type == "customFunction":
+        url = f"{api_url}/functions/client/{function_id}"
+    elif function_type == "webhookHandle":
+        url = f"{api_url}/webhooks/{function_id}"
+    else:
+        print_red("ERROR")
+        print(f"Unknown function type: {function_type}")
+        sys.exit(1)
+    headers = get_auth_headers(api_key)
+    resp = requests.delete(url, headers=headers)
+    return resp

polyapi/schema.py

@@ -77,20 +77,6 @@ def generate_schema_types(input_data: Dict, root=None):
     with open(tmp_output) as f:
         output = f.read()
 
-    output = _fix_title(input_data, output)
-    return output
-
-
-def _fix_title(input_data, output) -> str:
-    """ the jsonschema_gentypes library changes all titles to Pascalcase
-    this function changes them back
-    TODO fix bug in gentypes so this step is not necessary
-    """
-    for k, v in input_data.items():
-        if isinstance(v, dict):
-            output = _fix_title(v, output)
-        elif k == "title":
-            output = output.replace(f"class {v.title()}", f"class {v}")
     return output
 
 

polyapi/server.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Tuple
 
 from polyapi.typedefs import PropertySpecification
-from polyapi.utils import camelCase, add_type_import_path, parse_arguments, get_type_and_def
+from polyapi.utils import add_type_import_path, parse_arguments, get_type_and_def, rewrite_arg_name
 
 SERVER_DEFS_TEMPLATE = """
 from typing import List, Dict, Any, TypedDict, Callable
@@ -38,7 +38,7 @@ def render_server_function(
     arg_names = [a["name"] for a in arguments]
     args, args_def = parse_arguments(function_name, arguments)
     return_type_name, return_type_def = get_type_and_def(return_type)  # type: ignore
-    data = "{" + ", ".join([f"'{arg}': {camelCase(arg)}" for arg in arg_names]) + "}"
+    data = "{" + ", ".join([f"'{arg}': {rewrite_arg_name(arg)}" for arg in arg_names]) + "}"
     func_type_defs = SERVER_DEFS_TEMPLATE.format(
         args_def=args_def,
         return_type_def=return_type_def,

polyapi/utils.py

@@ -1,3 +1,4 @@
+import keyword
 import re
 import os
 from typing import Tuple, List
@@ -164,9 +165,10 @@ def parse_arguments(function_name: str, arguments: List[PropertySpecification])
         arg_type, arg_def = get_type_and_def(a["type"])
         if arg_def:
             args_def.append(arg_def)
-        a["name"] = camelCase(a["name"])
+        a["name"] = rewrite_arg_name(a["name"])
         arg_string += f"    {a['name']}: {add_type_import_path(function_name, arg_type)}"
         description = a.get("description", "")
+        description = description.replace("\n", " ")
         if description:
             if idx == len(arguments) - 1:
                 arg_string += f"  # {description}\n"
@@ -186,7 +188,7 @@ def poly_full_path(context, name) -> str:
     return f"poly.{path}"
 
 
-RESERVED_TYPES = {"List", "Dict", "Any", "Optional", "Callable"}
+RESERVED_WORDS = {"List", "Dict", "Any", "Optional", "Callable"} | set(keyword.kwlist)
 
 
 def to_func_namespace(s: str) -> str:
@@ -194,7 +196,16 @@ def to_func_namespace(s: str) -> str:
     by default it is
     """
     rv = s[0].upper() + s[1:]
-    if rv in RESERVED_TYPES:
-        return "_" + rv
+    rv = rewrite_reserved(rv)
+    return rv
+
+
+def rewrite_reserved(s: str) -> str:
+    if s in RESERVED_WORDS:
+        return "_" + s
     else:
-        return rv
+        return s
+
+
+def rewrite_arg_name(s: str):
+    return rewrite_reserved(camelCase(s))

{polyapi_python-0.2.6.dev2.dist-info → polyapi_python-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.6.dev2
+Version: 0.2.7
 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.2.6.dev2.dist-info → polyapi_python-0.2.7.dist-info}/RECORD

@@ -1,26 +1,26 @@
 polyapi/__init__.py,sha256=5iujRodfgRyLxT-zY0L3xax3rKRvfSt4NZlZYKOz03w,608
 polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
-polyapi/api.py,sha256=bE651P47RuhqNYkVyvTH_pA44JypRZED_2M5UG_qzDI,1863
+polyapi/api.py,sha256=e-8nOzq6SXD7_YPVBlW82_9wVxDCc8XD9ioMv_QvnH0,1877
 polyapi/auth.py,sha256=zrIGatjba5GwUTNjKj1GHQWTEDP9B-HrSzCKbLFoqvc,5336
-polyapi/cli.py,sha256=XvsE5QEJZpobISVN2U0Mi-fC1nN8dmXF7AQOIpjUe-A,2636
-polyapi/client.py,sha256=w15XOABkwdL4V4r2iWY_nypzLjvoKVuux8jUKbA16pQ,1329
+polyapi/cli.py,sha256=1ZeaK1A0wZM91YLJrYmvSR2wwHRkT7w1p7q9Y0KZu9c,2785
+polyapi/client.py,sha256=CoFDYvyKsqL4wPQbUDIr0Qb8Q5eD92xN4OEEcJEVuGQ,1296
 polyapi/config.py,sha256=S8TU10upy5OW1_vX-CqQTJD-ZOB6329aMjiUCmukfUI,2292
 polyapi/constants.py,sha256=sc-FnS0SngBLvSu1ZWMs0UCf9EYD1u1Yhfr-sZXGLns,607
 polyapi/error_handler.py,sha256=I_e0iz6VM23FLVQWJljxs2NGcl_OODbi43OcbnqBlp8,2398
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
 polyapi/execute.py,sha256=kXnvlNQ7nz9cRlV2_5gXH09UCmyiDP5zi3wiAw0uDuk,1943
-polyapi/function_cli.py,sha256=NE8CT1E22PC5DorVWJefXsBBGUnpSIsUyhHla02SV4k,9193
+polyapi/function_cli.py,sha256=E92Pq3sDh7qrKL322DTQiTCqigp-IKayHJOmdlR5vT4,10232
 polyapi/generate.py,sha256=LN2Z6fE-HfpMsXlkJfOl8bqZdR3fUythE_ZsAe15tmk,8012
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/rendered_spec.py,sha256=uaNzBhP4cX7iGfKwzZv0dxMagWzsGeDr0cQYx_AyIhQ,2153
-polyapi/schema.py,sha256=qxzuWhpDLyO4eGutiaWHGVL9sT46-kVE3r4xByIwGVI,3662
-polyapi/server.py,sha256=n-nMGjXoq9T9ZwE2EBDkAaxJ7UytConGaHthkjbkCXA,1894
+polyapi/schema.py,sha256=VVMHAT5yU47cRC7xF44BrmUSemlk5oIKSxH2HTVPaQ8,3169
+polyapi/server.py,sha256=NzQCZFSAJK7XiRw1kiU_i9uMvgYK7i8qh7UX2xjytJU,1908
 polyapi/typedefs.py,sha256=mRqwd2LKofxNn_VSKxBzixni2j-tai8mfTQ0Wi2aLNM,1487
-polyapi/utils.py,sha256=JtL_v0PVkJBlTeRu0gIV5IDScqoiggS8m-VcS4HN22c,6890
+polyapi/utils.py,sha256=PD70FbVLZX0x1Jf2IYZLG2U5XHP6DfYZAwjwlVcl1z8,7141
 polyapi/variables.py,sha256=d36-trnfTL_8m2NkorMiImb4O3UrJbiFV38CHxV5i0A,4200
 polyapi/webhook.py,sha256=LWv28c2MLz_OKBI_Nn7WR4C-gs1SWgbdXsoxIIf-9UI,4886
-polyapi_python-0.2.6.dev2.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.2.6.dev2.dist-info/METADATA,sha256=uTLAKOtYHntaVrHussXHXROuhLTQEWRFaAcjd87loGY,4867
-polyapi_python-0.2.6.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-polyapi_python-0.2.6.dev2.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.2.6.dev2.dist-info/RECORD,,
+polyapi_python-0.2.7.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.2.7.dist-info/METADATA,sha256=97IpFMAOromWL3zv2DKfN4fK6qfH2dmHvFcIpN3aYX8,4862
+polyapi_python-0.2.7.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+polyapi_python-0.2.7.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.2.7.dist-info/RECORD,,

{polyapi_python-0.2.6.dev2.dist-info → polyapi_python-0.2.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any