polyapi-python 0.2.4.dev13__tar.gz → 0.2.5.dev2__tar.gz

{polyapi_python-0.2.4.dev13/polyapi_python.egg-info → polyapi_python-0.2.5.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.4.dev13
+Version: 0.2.5.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.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/api.py

@@ -24,6 +24,8 @@ def {function_name}(
     \"""
     resp = execute("{function_type}", "{function_id}", {data})
     return {api_response_type}(resp.json())  # type: ignore
+
+
 """
 
 

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/auth.py

@@ -16,9 +16,9 @@ import asyncio
 
 
 class AuthFunctionResponse(TypedDict):
-  status: int
-  data: Any
-  headers: Dict[str, str]
+    status: int
+    data: Any
+    headers: Dict[str, str]
 
 
 async def getToken(clientId: str, clientSecret: str, scopes: List[str], callback, options: Optional[Dict[str, Any]] = None):

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/cli.py

@@ -3,8 +3,9 @@ import argparse
 from polyapi.utils import print_green
 
 from .config import clear_config, set_api_key_and_url
-from .generate import generate, clear, save_rendered_specs
+from .generate import generate, clear
 from .function_cli import function_add_or_update
+from .rendered_spec import save_rendered_specs
 
 
 CLI_COMMANDS = ["setup", "generate", "function", "clear", "help", "save_rendered_specs"]

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/constants.py

@@ -5,6 +5,8 @@ JSONSCHEMA_TO_PYTHON_TYPE_MAP = {
     "boolean": "bool",
     "array": "List",
     "object": "Dict",
+    "function": "Callable",
+    "void": "None",
 }
 
 
@@ -15,6 +17,8 @@ PYTHON_TO_JSONSCHEMA_TYPE_MAP = {
     "bool": "boolean",
     "List": "array",
     "Dict": "object",
+    "Callable": "function",
+    "None": "void",
 }
 
 BASIC_PYTHON_TYPES = set(PYTHON_TO_JSONSCHEMA_TYPE_MAP.keys())

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/function_cli.py

@@ -13,6 +13,7 @@ from importlib.metadata import packages_distributions
 from polyapi.generate import get_functions_and_parse, generate_functions
 from polyapi.config import get_api_key_and_url
 from polyapi.constants import PYTHON_TO_JSONSCHEMA_TYPE_MAP
+# from polyapi.rendered_spec import update_rendered_spec
 from polyapi.utils import get_auth_headers, print_green, print_red, print_yellow
 import importlib
 
@@ -270,6 +271,7 @@ def function_add_or_update(
         print(f"Function ID: {function_id}")
         print("Generating new custom function...", end="")
         functions = get_functions_and_parse(limit_ids=[function_id])
+        # update_rendered_spec(functions[0])
         generate_functions(functions)
         print_green("DONE")
     else:

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/generate.py

@@ -6,7 +6,6 @@ from typing import List
 
 from polyapi.auth import render_auth_function
 from polyapi.client import render_client_function
-from polyapi.execute import execute_post
 from polyapi.webhook import render_webhook_handle
 
 from .typedefs import PropertySpecification, SpecificationDto, VariableSpecDto
@@ -75,11 +74,14 @@ def cache_specs(specs: List[SpecificationDto]):
 
     full_path = os.path.dirname(os.path.abspath(__file__))
     full_path = os.path.join(full_path, "poly")
-    if not os.path.exists(full_path):
-        os.makedirs(full_path)
+    try:
+        if not os.path.exists(full_path):
+            os.makedirs(full_path)
 
-    with open(os.path.join(full_path, "specs.json"), "w") as f:
-        f.write(json.dumps(supported))
+        with open(os.path.join(full_path, "specs.json"), "w") as f:
+            f.write(json.dumps(supported))
+    except Exception as e:
+        print("Failed to cache specs", e)
 
 
 def read_cached_specs() -> List[SpecificationDto]:
@@ -154,24 +156,6 @@ def clear() -> None:
     print("Cleared!")
 
 
-def save_rendered_specs() -> None:
-    specs = read_cached_specs()
-    # right now we just support rendered apiFunctions
-    api_specs = [spec for spec in specs if spec["type"] == "apiFunction"]
-    for spec in api_specs:
-        assert spec["function"]
-        func_str, type_defs = render_spec(spec)
-        data = {
-            "language": "python",
-            "apiFunctionId": spec["id"],
-            "signature": func_str,
-            "typedefs": type_defs,
-        }
-        resp = execute_post("/functions/rendered-specs", data)
-        print("adding", spec["context"], spec["name"])
-        assert resp.status_code == 201, (resp.text, resp.status_code)
-
-
 def render_spec(spec: SpecificationDto):
     function_type = spec["type"]
     function_description = spec["description"]

polyapi_python-0.2.5.dev2/polyapi/rendered_spec.py

@@ -0,0 +1,34 @@
+from typing import Dict
+from polyapi.generate import read_cached_specs, render_spec
+from polyapi.execute import execute_post
+from polyapi.typedefs import SpecificationDto
+
+
+def update_rendered_spec(spec: SpecificationDto):
+    print("Updating rendered spec...")
+    func_str, type_defs = render_spec(spec)
+    data = {
+        "language": "python",
+        "signature": func_str,
+        "typedefs": type_defs,
+    }
+    if spec["type"] == "apiFunction":
+        data["apiFunctionId"] = spec["id"]
+    elif spec["type"] == "serverFunction":
+        data["customFunctionId"] = spec["id"]
+    else:
+        raise NotImplementedError("todo")
+
+    resp = execute_post("/functions/rendered-specs", data)
+    assert resp.status_code == 201, (resp.text, resp.status_code)
+    # this needs to run with something like `kn func run...`
+
+
+def save_rendered_specs() -> None:
+    specs = read_cached_specs()
+    # right now we just support rendered apiFunctions
+    api_specs = [spec for spec in specs if spec["type"] == "apiFunction"]
+    for spec in api_specs:
+        assert spec["function"]
+        print("adding", spec["context"], spec["name"])
+        update_rendered_spec(spec)

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/server.py

@@ -4,7 +4,7 @@ from polyapi.typedefs import PropertySpecification
 from polyapi.utils import camelCase, add_type_import_path, parse_arguments, get_type_and_def
 
 SERVER_DEFS_TEMPLATE = """
-from typing import List, Dict, Any, TypedDict
+from typing import List, Dict, Any, TypedDict, Callable
 {args_def}
 {return_type_def}
 """
@@ -22,6 +22,8 @@ def {function_name}(
         return {return_action}
     except:
         return resp.text
+
+
 """
 
 

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/typedefs.py

@@ -12,6 +12,7 @@ class PropertySpecification(TypedDict):
 
 class PropertyType(TypedDict):
     kind: Literal['void', 'primitive', 'array', 'object', 'function', 'plain']
+    spec: NotRequired[Dict]
     name: NotRequired[str]
     type: NotRequired[str]
     items: NotRequired['PropertyType']

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/utils.py

@@ -10,7 +10,7 @@ from polyapi.schema import generate_schema_types, clean_title, map_primitive_typ
 
 # this string should be in every __init__ file.
 # it contains all the imports needed for the function or variable code to run
-CODE_IMPORTS = "from typing import List, Dict, Any, TypedDict, Optional\nimport logging\nimport requests\nimport socketio  # type: ignore\nfrom polyapi.config import get_api_key_and_url\nfrom polyapi.execute import execute, execute_post, variable_get, variable_update\n\n"
+CODE_IMPORTS = "from typing import List, Dict, Any, TypedDict, Optional, Callable\nimport logging\nimport requests\nimport socketio  # type: ignore\nfrom polyapi.config import get_api_key_and_url\nfrom polyapi.execute import execute, execute_post, variable_get, variable_update\n\n"
 
 
 def init_the_init(full_path: str) -> None:
@@ -61,6 +61,10 @@ 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
+    if arg.startswith("Callable"):
+        return arg
+
     if arg in BASIC_PYTHON_TYPES:
         return arg
 
@@ -142,6 +146,25 @@ def get_type_and_def(type_spec: PropertyType) -> Tuple[str, str]:
                 return "Any", ""
         else:
             return "Dict", ""
+    elif type_spec["kind"] == "function":
+        arg_types = []
+        arg_defs = []
+        if "spec" in type_spec:
+            return_type, _ = get_type_and_def(type_spec["spec"]["returnType"])
+            if return_type not in BASIC_PYTHON_TYPES:
+                # for now only Python only supports basic types as return types
+                return_type = "Any"
+
+            for argument in type_spec["spec"]["arguments"]:
+                arg_type, arg_def = get_type_and_def(argument["type"])
+                arg_types.append(arg_type)
+                if arg_def:
+                    arg_defs.append(arg_def)
+
+            final_arg_type = "Callable[[{}], {}]".format(", ".join(arg_types), return_type)
+            return final_arg_type, "\n".join(arg_defs)
+        else:
+            return "Callable", ""
     elif type_spec["kind"] == "any":
         return "Any", ""
     else:

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi/webhook.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, List, Tuple
 
 from polyapi.config import get_api_key_and_url
 from polyapi.typedefs import PropertySpecification
-from polyapi.utils import poly_full_path
+from polyapi.utils import parse_arguments, poly_full_path
 
 # all active webhook handlers, used by unregister_all to cleanup
 active_handlers: List[Dict[str, Any]] = []
@@ -15,10 +15,18 @@ active_handlers: List[Dict[str, Any]] = []
 client = None
 
 
+WEBHOOK_DEFS_TEMPLATE = """
+from typing import List, Dict, Any, TypedDict, Callable
+{function_args_def}
+"""
+
+
 WEBHOOK_TEMPLATE = """
 
 
-async def {function_name}(callback, options=None):
+async def {function_name}(
+{function_args}
+):
     \"""{description}
 
     Function ID: {function_id}
@@ -112,15 +120,22 @@ def render_webhook_handle(
     arguments: List[PropertySpecification],
     return_type: Dict[str, Any],
 ) -> Tuple[str, str]:
+    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"_{function_name}.WebhookEventType")
+
     func_str = WEBHOOK_TEMPLATE.format(
         description=function_description,
         client_id=uuid.uuid4().hex,
         function_id=function_id,
         function_name=function_name,
+        function_args=function_args,
         function_path=poly_full_path(function_context, function_name),
     )
-
-    return func_str, ""
+    func_defs = WEBHOOK_DEFS_TEMPLATE.format(function_args_def=function_args_def)
+    return func_str, func_defs
 
 
 def start(*args):

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.4.dev13
+Version: 0.2.5.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.2.4.dev13 → polyapi_python-0.2.5.dev2}/polyapi_python.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ polyapi/execute.py
 polyapi/function_cli.py
 polyapi/generate.py
 polyapi/py.typed
+polyapi/rendered_spec.py
 polyapi/schema.py
 polyapi/server.py
 polyapi/typedefs.py

{polyapi_python-0.2.4.dev13 → polyapi_python-0.2.5.dev2}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.2.4.dev13"
+version = "0.2.5.dev2"
 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.5.dev2/tests/test_utils.py

@@ -0,0 +1,17 @@
+import unittest
+from polyapi.schema import _fix_title
+from polyapi.utils import get_type_and_def
+
+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]")

polyapi_python-0.2.4.dev13/tests/test_utils.py

@@ -1,10 +0,0 @@
-import unittest
-from polyapi.schema import _fix_title
-
-
-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)