polyapi-python 0.2.6.dev1__tar.gz → 0.2.7__tar.gz

{polyapi_python-0.2.6.dev1/polyapi_python.egg-info → polyapi_python-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.6.dev1
+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.dev1 → polyapi_python-0.2.7}/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_python-0.2.6.dev1 → polyapi_python-0.2.7}/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
 
 
@@ -45,8 +45,8 @@ def execute_from_cli() -> None:
         clear_config()
         generate()
     elif command == "update_rendered_spec":
-        assert len(args.subcommands) == 2
-        updated = get_and_update_rendered_spec(args.subcommands[0], args.subcommands[1])
+        assert len(args.subcommands) == 1
+        updated = get_and_update_rendered_spec(args.subcommands[0])
         if updated:
             print("Updated rendered spec!")
         else:
@@ -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_python-0.2.6.dev1 → polyapi_python-0.2.7}/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_python-0.2.6.dev1 → polyapi_python-0.2.7}/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_python-0.2.6.dev1 → polyapi_python-0.2.7}/polyapi/rendered_spec.py

@@ -7,7 +7,7 @@ from polyapi.generate import read_cached_specs, render_spec
 from polyapi.typedefs import SpecificationDto
 
 
-def update_rendered_spec(api_key: str, spec: SpecificationDto):
+def update_rendered_spec(spec: SpecificationDto):
     print("Updating rendered spec...")
     func_str, type_defs = render_spec(spec)
     data = {
@@ -27,9 +27,7 @@ def update_rendered_spec(api_key: str, spec: SpecificationDto):
         raise NotImplementedError("todo")
 
     # use super key on develop-k8s here!
-    _, base_url = get_api_key_and_url()
-    if not base_url:
-        base_url = os.environ.get("HOST_URL")
+    api_key, base_url = get_api_key_and_url()
 
     url = f"{base_url}/functions/rendered-specs"
     headers = {"Authorization": f"Bearer {api_key}"}
@@ -37,11 +35,8 @@ def update_rendered_spec(api_key: str, spec: SpecificationDto):
     assert resp.status_code == 201, (resp.text, resp.status_code)
 
 
-def _get_spec(api_key: str, spec_id: str) -> Optional[SpecificationDto]:
-    _, base_url = get_api_key_and_url()
-    if not base_url:
-        base_url = os.environ.get("HOST_URL")
-
+def _get_spec(spec_id: str) -> Optional[SpecificationDto]:
+    api_key, base_url = get_api_key_and_url()
     url = f"{base_url}/specs"
     headers = {"Authorization": f"Bearer {api_key}"}
     resp = requests.get(url, headers=headers)
@@ -55,10 +50,10 @@ def _get_spec(api_key: str, spec_id: str) -> Optional[SpecificationDto]:
         raise NotImplementedError(resp.content)
 
 
-def get_and_update_rendered_spec(api_key: str, spec_id: str) -> bool:
-    spec = _get_spec(api_key, spec_id)
+def get_and_update_rendered_spec(spec_id: str) -> bool:
+    spec = _get_spec(spec_id)
     if spec:
-        update_rendered_spec(api_key, spec)
+        update_rendered_spec(spec)
         return True
     return False
 
@@ -70,4 +65,4 @@ def save_rendered_specs() -> None:
     for spec in api_specs:
         assert spec["function"]
         print("adding", spec["context"], spec["name"])
-        update_rendered_spec("FIXME", spec)
+        update_rendered_spec(spec)

{polyapi_python-0.2.6.dev1 → polyapi_python-0.2.7}/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_python-0.2.6.dev1 → polyapi_python-0.2.7}/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_python-0.2.6.dev1 → polyapi_python-0.2.7}/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.dev1 → polyapi_python-0.2.7/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.6.dev1
+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.dev1 → polyapi_python-0.2.7}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.2.6.dev1"
+version = "0.2.7"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [

{polyapi_python-0.2.6.dev1 → polyapi_python-0.2.7}/tests/test_rendered_spec.py

@@ -36,7 +36,7 @@ class T(unittest.TestCase):
         """ pass in a bad id to update and make sure it returns False
         """
         _get_spec.return_value = None
-        updated = get_and_update_rendered_spec("abc", "123")
+        updated = get_and_update_rendered_spec("123")
         self.assertEqual(_get_spec.call_count, 1)
         self.assertFalse(updated)
 
@@ -47,6 +47,6 @@ class T(unittest.TestCase):
         """
         _get_spec.return_value = GET_PRODUCTS_COUNT
         post.return_value = Mock(status_code=201, text="Created")
-        updated = get_and_update_rendered_spec("abc", "123")
+        updated = get_and_update_rendered_spec("123")
         self.assertEqual(_get_spec.call_count, 1)
         self.assertTrue(updated)

{polyapi_python-0.2.6.dev1 → polyapi_python-0.2.7}/tests/test_utils.py

@@ -1,17 +1,14 @@
 import unittest
-from polyapi.schema import _fix_title
-from polyapi.utils import get_type_and_def
+from polyapi.utils import get_type_and_def, rewrite_reserved
 
 OPENAPI_FUNCTION = {'kind': 'function', 'spec': {'arguments': [{'name': 'event', 'required': False, 'type': {'kind': 'object', 'schema': {'$schema': 'http://json-schema.org/draft-06/schema#', 'type': 'array', 'items': {'$ref': '#/definitions/WebhookEventTypeElement'}, 'definitions': {'WebhookEventTypeElement': {'type': 'object', 'additionalProperties': False, 'properties': {'title': {'type': 'string'}, 'manufacturerName': {'type': 'string'}, 'carType': {'type': 'string'}, 'id': {'type': 'integer'}}, 'required': ['carType', 'id', 'manufacturerName', 'title'], 'title': 'WebhookEventTypeElement'}}}}}, {'name': 'headers', 'required': False, 'type': {'kind': 'object', 'typeName': 'Record<string, any>'}}, {'name': 'params', 'required': False, 'type': {'kind': 'object', 'typeName': 'Record<string, any>'}}, {'name': 'polyCustom', 'required': False, 'type': {'kind': 'object', 'properties': [{'name': 'responseStatusCode', 'type': {'type': 'number', 'kind': 'primitive'}, 'required': True}, {'name': 'responseContentType', 'type': {'type': 'string', 'kind': 'primitive'}, 'required': True, 'nullable': True}]}}], 'returnType': {'kind': 'void'}, 'synchronous': True}}
 
 
 class T(unittest.TestCase):
-    def test_fix_titles(self):
-        input_data = {'properties': {'requestNumber': {'title': 'Requestnumber', 'type': 'integer'}}, 'required': ['requestNumber'], 'title': 'numOfCars', 'type': 'object', 'metadata': {'pydantic.internal.needs_apply_discriminated_union': False}}
-        output = 'from typing import TypedDict\nfrom typing_extensions import Required\n\n\nclass Numofcars(TypedDict, total=False):\n    """ numOfCars. """\n\n    requestNumber: Required[int]\n    """\n    Requestnumber.\n\n    Required property\n    """\n\n'
-        fixed = _fix_title(input_data, output)
-        self.assertIn("class numOfCars", fixed)
-
     def test_get_type_and_def(self):
         arg_type, arg_def = get_type_and_def(OPENAPI_FUNCTION)
         self.assertEqual(arg_type, "Callable[[List[WebhookEventTypeElement], Dict, Dict, Dict], None]")
+
+    def test_rewrite_reserved(self):
+        rv = rewrite_reserved("from")
+        self.assertEqual(rv, "_from")