polyapi-python 0.2.5.dev12__py3-none-any.whl → 0.2.6__py3-none-any.whl

polyapi/cli.py

@@ -27,6 +27,7 @@ def execute_from_cli() -> None:
     parser.add_argument("--client", action="store_true", help="Pass --client when adding function to add a client function.")
     parser.add_argument("--server", action="store_true", help="Pass --server when adding function to add a server function.")
     parser.add_argument("--logs", action="store_true", help="Pass --logs when adding function if you want to store and see the function logs.")
+    parser.add_argument("--skip-generate", action="store_true", help="Pass --skip-generate to skip generating the library after adding a function.")
     parser.add_argument("command", choices=CLI_COMMANDS)
     parser.add_argument("subcommands", nargs="*")
     args = parser.parse_args()
@@ -44,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:
@@ -55,4 +56,4 @@ 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)
+        function_add_or_update(args.context, args.description, args.client, args.server, args.logs, args.subcommands, not args.skip_generate)

polyapi/function_cli.py

@@ -207,6 +207,7 @@ def function_add_or_update(
     server: bool,
     logs_enabled: bool,
     subcommands: List,
+    generate: bool = True,
 ):
     parser = argparse.ArgumentParser()
     parser.add_argument("subcommand", choices=["add"])
@@ -268,10 +269,11 @@ def function_add_or_update(
         print_green("DEPLOYED")
         function_id = resp.json()["id"]
         print(f"Function ID: {function_id}")
-        print("Generating new custom function...", end="")
-        functions = get_functions_and_parse(limit_ids=[function_id])
-        generate_functions(functions)
-        print_green("DONE")
+        if generate:
+            print("Generating new custom function...", end="")
+            functions = get_functions_and_parse(limit_ids=[function_id])
+            generate_functions(functions)
+            print_green("DONE")
     else:
         print("Error adding function.")
         print(resp.status_code)

polyapi/generate.py

@@ -11,7 +11,7 @@ from polyapi.webhook import render_webhook_handle
 from .typedefs import PropertySpecification, SpecificationDto, VariableSpecDto
 from .api import render_api_function
 from .server import render_server_function
-from .utils import add_import_to_init, get_auth_headers, init_the_init
+from .utils import add_import_to_init, get_auth_headers, init_the_init, to_func_namespace
 from .variables import generate_variables
 from .config import get_api_key_and_url, initialize_config
 
@@ -232,10 +232,10 @@ def add_function_file(
         # add function to init
         init_path = os.path.join(full_path, "__init__.py")
         with open(init_path, "a") as f:
-            f.write(f"\n\nfrom . import _{function_name}\n\n{func_str}")
+            f.write(f"\n\nfrom . import {to_func_namespace(function_name)}\n\n{func_str}")
 
         # add type_defs to underscore file
-        file_path = os.path.join(full_path, f"_{function_name}.py")
+        file_path = os.path.join(full_path, f"{to_func_namespace(function_name)}.py")
         with open(file_path, "w") as f:
             f.write(func_type_defs)
 

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/schema.py

@@ -64,6 +64,7 @@ def generate_schema_types(input_data: Dict, root=None):
                 "source": tmp_input,
                 "destination": tmp_output,
                 "root_name": root,
+                "api_arguments": {"get_name_properties": "UpperFirst"},
             }
         ],
     }
@@ -71,7 +72,7 @@ def generate_schema_types(input_data: Dict, root=None):
     # jsonschema_gentypes prints source to stdout
     # no option to surpress so we do this
     with contextlib.redirect_stdout(None):
-        process_config(config)
+        process_config(config, [tmp_input])
 
     with open(tmp_output) as f:
         output = f.read()

polyapi/utils.py

@@ -75,11 +75,11 @@ def add_type_import_path(function_name: str, arg: str) -> str:
         else:
             if '"' in sub:
                 sub = sub.replace('"', "")
-                return f'List["_{function_name}.{camelCase(sub)}"]'
+                return f'List["{to_func_namespace(function_name)}.{camelCase(sub)}"]'
             else:
-                return f'List[_{function_name}.{camelCase(sub)}]'
+                return f'List[{to_func_namespace(function_name)}.{camelCase(sub)}]'
 
-    return f'_{function_name}.{camelCase(arg)}'
+    return f'{to_func_namespace(function_name)}.{camelCase(arg)}'
 
 
 def get_type_and_def(type_spec: PropertyType) -> Tuple[str, str]:
@@ -183,4 +183,18 @@ def poly_full_path(context, name) -> str:
         path = context + "." + name
     else:
         path = name
-    return f"poly.{path}"
+    return f"poly.{path}"
+
+
+RESERVED_TYPES = {"List", "Dict", "Any", "Optional", "Callable"}
+
+
+def to_func_namespace(s: str) -> str:
+    """ convert a function name to some function namespace
+    by default it is
+    """
+    rv = s[0].upper() + s[1:]
+    if rv in RESERVED_TYPES:
+        return "_" + rv
+    else:
+        return rv

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 parse_arguments, poly_full_path
+from polyapi.utils import parse_arguments, poly_full_path, to_func_namespace
 
 # all active webhook handlers, used by unregister_all to cleanup
 active_handlers: List[Dict[str, Any]] = []
@@ -124,7 +124,7 @@ def render_webhook_handle(
 
     if "WebhookEventType" in function_args:
         # let's add the function name import!
-        function_args = function_args.replace("WebhookEventType", f"_{function_name}.WebhookEventType")
+        function_args = function_args.replace("WebhookEventType", f"{to_func_namespace(function_name)}.WebhookEventType")
 
     func_str = WEBHOOK_TEMPLATE.format(
         description=function_description,

{polyapi_python-0.2.5.dev12.dist-info → polyapi_python-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.5.dev12
+Version: 0.2.6
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -30,7 +30,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests ==2.31.0
 Requires-Dist: typing-extensions ==4.10.0
-Requires-Dist: jsonschema-gentypes ==2.4.0
+Requires-Dist: jsonschema-gentypes ==2.6.0
 Requires-Dist: pydantic ==2.6.4
 Requires-Dist: stdlib-list ==0.10.0
 Requires-Dist: colorama ==0.4.4

{polyapi_python-0.2.5.dev12.dist-info → polyapi_python-0.2.6.dist-info}/RECORD

@@ -2,25 +2,25 @@ 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/auth.py,sha256=zrIGatjba5GwUTNjKj1GHQWTEDP9B-HrSzCKbLFoqvc,5336
-polyapi/cli.py,sha256=QYsZmsnVLsf4LgE4iN7Tse1rrlTpycgG9nuL3Uoq9HU,2484
+polyapi/cli.py,sha256=XvsE5QEJZpobISVN2U0Mi-fC1nN8dmXF7AQOIpjUe-A,2636
 polyapi/client.py,sha256=w15XOABkwdL4V4r2iWY_nypzLjvoKVuux8jUKbA16pQ,1329
 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=F0cb5MGcmFvspgwxptWq_2e50X5NNno0B0p8Vgu_oNI,9129
-polyapi/generate.py,sha256=dtS6Wyb_lq9FrOs7NA_ceKCX9rogx2_3Fp57_hGwdDc,7957
+polyapi/function_cli.py,sha256=NE8CT1E22PC5DorVWJefXsBBGUnpSIsUyhHla02SV4k,9193
+polyapi/generate.py,sha256=LN2Z6fE-HfpMsXlkJfOl8bqZdR3fUythE_ZsAe15tmk,8012
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-polyapi/rendered_spec.py,sha256=JIsFkqAhYEtKa3-ToTli_th_wLbJpxgr_eYOMz4Z7yY,2345
-polyapi/schema.py,sha256=K7ayGu6K5vBTTvqr-Iqhf1QttqRFaXoJmtmGJRuDSTI,3577
+polyapi/rendered_spec.py,sha256=uaNzBhP4cX7iGfKwzZv0dxMagWzsGeDr0cQYx_AyIhQ,2153
+polyapi/schema.py,sha256=qxzuWhpDLyO4eGutiaWHGVL9sT46-kVE3r4xByIwGVI,3662
 polyapi/server.py,sha256=n-nMGjXoq9T9ZwE2EBDkAaxJ7UytConGaHthkjbkCXA,1894
 polyapi/typedefs.py,sha256=mRqwd2LKofxNn_VSKxBzixni2j-tai8mfTQ0Wi2aLNM,1487
-polyapi/utils.py,sha256=f003Y5qP1uuyMKrvvaIUYS1TSGfSZjLnwPiXR5o4eA8,6530
+polyapi/utils.py,sha256=JtL_v0PVkJBlTeRu0gIV5IDScqoiggS8m-VcS4HN22c,6890
 polyapi/variables.py,sha256=d36-trnfTL_8m2NkorMiImb4O3UrJbiFV38CHxV5i0A,4200
-polyapi/webhook.py,sha256=GvnS49Vl4k5STTvv4KKUnUAyn27OhIHHXChFmiI53Cs,4849
-polyapi_python-0.2.5.dev12.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.2.5.dev12.dist-info/METADATA,sha256=n0tSre7-Lox50K8i3e6GKzbx_8XcHJpGLsozAXhpjjM,4868
-polyapi_python-0.2.5.dev12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-polyapi_python-0.2.5.dev12.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.2.5.dev12.dist-info/RECORD,,
+polyapi/webhook.py,sha256=LWv28c2MLz_OKBI_Nn7WR4C-gs1SWgbdXsoxIIf-9UI,4886
+polyapi_python-0.2.6.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.2.6.dist-info/METADATA,sha256=UiW1oigsmC4JUFFsyoeh4FMiVcXAXeRA3LUbh1HMaRs,4862
+polyapi_python-0.2.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+polyapi_python-0.2.6.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.2.6.dist-info/RECORD,,