polyapi-python 0.2.9__tar.gz → 0.3.1.dev0__tar.gz

{polyapi_python-0.2.9 → polyapi_python-0.3.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.9
+Version: 0.3.1.dev0
 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.9 → polyapi_python-0.3.1.dev0}/polyapi/cli.py

@@ -2,7 +2,7 @@ import argparse
 
 from polyapi.utils import print_green
 
-from .config import clear_config, set_api_key_and_url
+from .config import initialize_config, set_api_key_and_url
 from .generate import generate, clear
 from .function_cli import function_add_or_update, function_execute
 from .rendered_spec import get_and_update_rendered_spec
@@ -28,6 +28,7 @@ def execute_from_cli() -> None:
     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("--execution-api-key", required=False, default="", help="API key for execution (for server functions only).")
     parser.add_argument("command", choices=CLI_COMMANDS)
     parser.add_argument("subcommands", nargs="*")
     args = parser.parse_args()
@@ -42,7 +43,7 @@ def execute_from_cli() -> None:
     elif command == "setup" and len(args.subcommands) == 2:
         set_api_key_and_url(args.subcommands[1], args.subcommands[0])
     elif command == "setup":
-        clear_config()
+        initialize_config(force=True)
         generate()
     elif command == "update_rendered_spec":
         assert len(args.subcommands) == 1
@@ -59,4 +60,13 @@ def execute_from_cli() -> None:
         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)
+            function_add_or_update(
+                context=args.context,
+                description=args.description,
+                client=args.client,
+                server=args.server,
+                logs_enabled=args.logs,
+                subcommands=args.subcommands,
+                generate=not args.skip_generate,
+                execution_api_key=args.execution_api_key
+            )

{polyapi_python-0.2.9 → polyapi_python-0.3.1.dev0}/polyapi/config.py

@@ -3,6 +3,8 @@ import os
 import configparser
 from typing import Tuple
 
+from polyapi.utils import is_valid_polyapi_url, is_valid_uuid, print_green, print_yellow
+
 # cached values
 API_KEY = None
 API_URL = None
@@ -55,18 +57,34 @@ def set_api_key_and_url(key: str, url: str):
         config.write(f)
 
 
-def initialize_config():
+def initialize_config(force=False):
     key, url = get_api_key_and_url()
-    if not key or not url:
+    if force or (not key or not url):
+        url = url or "https://na1.polyapi.io"
         print("Please setup your connection to PolyAPI.")
-        url = input("? Poly API Base URL (https://na1.polyapi.io): ") or "https://na1.polyapi.io"
-        key = input("? Poly App Key or User Key: ")
+        url = input(f"? Poly API Base URL ({url}): ").strip() or url
+
+        if not key:
+            key = input("? Poly App Key or User Key: ").strip()
+        else:
+            key_input = input(f"? Poly App Key or User Key ({key}): ").strip()
+            key = key_input if key_input else key
 
         if url and key:
+            errors = []
+            if not is_valid_polyapi_url(url):
+                errors.append(f"{url} is not a valid Poly API Base URL")
+            if not is_valid_uuid(key):
+                errors.append(f"{key} is not a valid Poly App Key or User Key")
+            if errors:
+                print_yellow("\n".join(errors))
+                sys.exit(1)
+
             set_api_key_and_url(key, url)
+            print_green(f"Poly setup complete.")
 
     if not key or not url:
-        print("Poly API Key and Poly API Base URL are required.")
+        print_yellow("Poly API Key and Poly API Base URL are required.")
         sys.exit(1)
 
     return key, url

{polyapi_python-0.2.9 → polyapi_python-0.3.1.dev0}/polyapi/function_cli.py

@@ -208,6 +208,7 @@ def function_add_or_update(
     logs_enabled: bool,
     subcommands: List,
     generate: bool = True,
+    execution_api_key: str = ""
 ):
     parser = argparse.ArgumentParser()
     parser.add_argument("subcommand", choices=["add"])
@@ -256,6 +257,10 @@ def function_add_or_update(
     assert api_key
     if server:
         url = f"{api_url}/functions/server"
+
+        if execution_api_key:
+            data["executionApiKey"] = execution_api_key
+
     elif client:
         url = f"{api_url}/functions/client"
     else:

{polyapi_python-0.2.9 → polyapi_python-0.3.1.dev0}/polyapi/utils.py

@@ -1,6 +1,7 @@
 import keyword
 import re
 import os
+import uuid
 from typing import Tuple, List
 from colorama import Fore, Style
 from polyapi.constants import BASIC_PYTHON_TYPES
@@ -208,4 +209,23 @@ def rewrite_reserved(s: str) -> str:
 
 
 def rewrite_arg_name(s: str):
-    return rewrite_reserved(camelCase(s))
+    return rewrite_reserved(camelCase(s))
+
+
+valid_subdomains = ["na[1-2]", "eu[1-2]", "dev"]
+
+
+def is_valid_polyapi_url(_url: str):
+    # Join the subdomains into a pattern
+    subdomain_pattern = "|".join(valid_subdomains)
+    pattern = rf"^https://({subdomain_pattern})\.polyapi\.io$"
+    return re.match(pattern, _url) is not None
+
+
+def is_valid_uuid(uuid_string, version=4):
+    try:
+        uuid_obj = uuid.UUID(uuid_string, version=version)
+    except ValueError:
+        return False
+
+    return str(uuid_obj) == uuid_string

{polyapi_python-0.2.9 → polyapi_python-0.3.1.dev0}/polyapi_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.9
+Version: 0.3.1.dev0
 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.9 → polyapi_python-0.3.1.dev0}/pyproject.toml

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