polyapi-python 0.1.0.dev8__tar.gz → 0.1.0.dev10__tar.gz

{polyapi-python-0.1.0.dev8/polyapi_python.egg-info → polyapi-python-0.1.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.1.0.dev8
+Version: 0.1.0.dev10
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -33,6 +33,7 @@ Requires-Dist: typing_extensions
 Requires-Dist: jsonschema-gentypes
 Requires-Dist: pydantic>=2.5.3
 Requires-Dist: stdlib_list
+Requires-Dist: colorama
 
 # PolyAPI Python Library
 
@@ -145,6 +146,14 @@ To upgrade your library to the latest dev version, pass the `--pre` flag.
 pip install polyapi-python --pre --upgrade
 ```
 
+## Change Your API Key
+
+If you need to change your API key or what server you are pointing to, you can run:
+
+```bash
+python -m polyapi setup
+```
+
 ## Unit Tests
 
 To run this library's unit tests, please clone the repo then run:

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/README.md

@@ -109,6 +109,14 @@ To upgrade your library to the latest dev version, pass the `--pre` flag.
 pip install polyapi-python --pre --upgrade
 ```
 
+## Change Your API Key
+
+If you need to change your API key or what server you are pointing to, you can run:
+
+```bash
+python -m polyapi setup
+```
+
 ## Unit Tests
 
 To run this library's unit tests, please clone the repo then run:

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi/api.py

@@ -275,5 +275,4 @@ def create_function(
 
 def generate_api(api_functions: List) -> None:
     for func in api_functions:
-        create_function(*func)
-    print("API functions generated!")
+        create_function(*func)

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi/cli.py

@@ -1,21 +1,30 @@
 import argparse
 
+from polyapi.utils import print_green
+
 from .config import clear_config
 from .generate import generate, clear
 from .function_cli import function_add_or_update
 
 
-CLI_COMMANDS = ["generate", "config", "clear", "function", "help"]
+CLI_COMMANDS = ["setup", "generate", "function", "clear", "help"]
+
+CLIENT_DESC = """Commands
+  python -m polyapi setup                Setup your Poly connection
+  python -m polyapi generate             Generates Poly library
+  python -m polyapi function <command>   Manages functions
+  python -m polyapi clear                Clear current generated Poly library
+"""
 
 
 def execute_from_cli():
     parser = argparse.ArgumentParser(
-        prog="python -m polyapi", description="PolyAPI Client"
+        prog="python -m polyapi", description=CLIENT_DESC, formatter_class=argparse.RawTextHelpFormatter
     )
     parser.add_argument("--context", required=False, default="")
     parser.add_argument("--description", required=False, default="")
-    parser.add_argument("--server", action="store_true", help="Pass --server if you want this to be a server function. By default, it will be a client function.")
-    parser.add_argument("--logs", action="store_true", help="Pass --logs if you want to store and see the logs from this function executing")
+    parser.add_argument("--server", action="store_true", help="Pass --server when adding function to add a server function. By default, new functions are client.")
+    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("command", choices=CLI_COMMANDS)
     parser.add_argument("subcommands", nargs="*")
     args = parser.parse_args()
@@ -24,10 +33,10 @@ def execute_from_cli():
     if command == "help":
         parser.print_help()
     elif command == "generate":
-        print("Generating...")
+        print("Generating Poly functions...", end="")
         generate()
-    elif command == "config":
-        print("Clearing old config...")
+        print_green("DONE")
+    elif command == "setup":
         clear_config()
         generate()
     elif command == "clear":

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi/config.py

@@ -69,6 +69,10 @@ def initialize_config():
 
 
 def clear_config():
+    if os.environ.get("POLY_API_KEY"):
+        print("Using POLY_API_KEY from environment. Please unset environment variable to manually set api key.")
+        return
+
     global API_KEY
     global API_URL
     API_KEY = None

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi/function_cli.py

@@ -11,12 +11,13 @@ from pydantic import TypeAdapter
 from polyapi.generate import get_functions_and_parse, generate_api
 from polyapi.config import get_api_key_and_url
 from polyapi.constants import PYTHON_TO_JSONSCHEMA_TYPE_MAP
-from polyapi.utils import get_auth_headers
+from polyapi.utils import get_auth_headers, print_green, print_red, print_yellow
+import importlib
 
 
 # these libraries are already installed in the base docker image
 # and shouldnt be included in additional requirements
-BASE_REQUIREMENTS = {"requests", "typing_extensions", "jsonschema-gentypes", "pydantic"}
+BASE_REQUIREMENTS = {"polyapi", "requests", "typing_extensions", "jsonschema-gentypes", "pydantic"}
 all_stdlib_symbols = stdlib_list('.'.join([str(v) for v in sys.version_info[0:2]]))
 BASE_REQUIREMENTS.update(all_stdlib_symbols)  # dont need to pip install stuff in the python standard library
 
@@ -141,6 +142,14 @@ def _parse_code(code: str, function_name: str):
     return parsed_args, return_type, return_type_schema, requirements
 
 
+def _func_already_exists(context: str, function_name: str) -> bool:
+    try:
+        module = importlib.import_module(f"polyapi.poly.{context}")
+        return bool(getattr(module, function_name, False))
+    except ModuleNotFoundError:
+        return False
+
+
 def function_add_or_update(
     context: str, description: str, server: bool, logs_enabled: bool, subcommands: List
 ):
@@ -150,6 +159,9 @@ def function_add_or_update(
     parser.add_argument("filename")
     args = parser.parse_args(subcommands)
 
+    verb = "Updating" if _func_already_exists(context, args.function_name) else "Adding"
+    print(f"{verb} custom server side function...", end="")
+
     with open(args.filename, "r") as f:
         code = f.read()
 
@@ -162,11 +174,13 @@ def function_add_or_update(
     ) = _parse_code(code, args.function_name)
 
     if not return_type:
-        print(
-            f"Error: function named {args.function_name} not found as top-level function in file. Exiting."
-        )
+        print_red("ERROR")
+        print(f"Function {args.function_name} not found as top-level function in {args.filename}")
         sys.exit(1)
 
+    if requirements:
+        print_yellow('\nPlease note that deploying your functions will take a few minutes because it makes use of libraries other than polyapi.')
+
     data = {
         "context": context,
         "name": args.function_name,
@@ -189,14 +203,15 @@ def function_add_or_update(
         # url = f"{base_url}/functions/client"
 
     headers = get_auth_headers(api_key)
-    print("Adding function...")
     resp = requests.post(url, headers=headers, json=data)
     if resp.status_code == 201:
+        print_green("DEPLOYED")
         function_id = resp.json()["id"]
-        print(f"Function added successfully. Function id is {function_id}")
-        print("Adding new function to environment...")
+        print(f"Function ID: {function_id}")
+        print("Generating new custom function...", end="")
         functions = get_functions_and_parse(limit_ids=[function_id])
         generate_api(functions)
+        print_green("DONE")
     else:
         print("Error adding function.")
         print(resp.status_code)

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi/utils.py

@@ -1,5 +1,6 @@
 import re
 import os
+from colorama import Fore, Style
 
 
 # this string should be in every __init__ file.
@@ -37,4 +38,16 @@ def camelCase(s):
         return ''.join([s[0].lower(), s[1:]])
     else:
         # s is already in camelcase as best as we can tell, just move on!
-        return s
+        return s
+
+
+def print_green(s: str):
+    print(Fore.GREEN + s + Style.RESET_ALL)
+
+
+def print_yellow(s: str):
+    print(Fore.YELLOW + s + Style.RESET_ALL)
+
+
+def print_red(s: str):
+    print(Fore.RED + s + Style.RESET_ALL)

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi/variables.py

@@ -34,7 +34,6 @@ class {variable_name}:{get_method}
 def generate_variables(variables: List[VariableSpecDto]):
     for variable in variables:
         create_variable(variable)
-    print("Variables generated!")
 
 
 def render_variable(variable: VariableSpecDto):

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.1.0.dev8
+Version: 0.1.0.dev10
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -33,6 +33,7 @@ Requires-Dist: typing_extensions
 Requires-Dist: jsonschema-gentypes
 Requires-Dist: pydantic>=2.5.3
 Requires-Dist: stdlib_list
+Requires-Dist: colorama
 
 # PolyAPI Python Library
 
@@ -145,6 +146,14 @@ To upgrade your library to the latest dev version, pass the `--pre` flag.
 pip install polyapi-python --pre --upgrade
 ```
 
+## Change Your API Key
+
+If you need to change your API key or what server you are pointing to, you can run:
+
+```bash
+python -m polyapi setup
+```
+
 ## Unit Tests
 
 To run this library's unit tests, please clone the repo then run:

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/polyapi_python.egg-info/requires.txt

@@ -3,3 +3,4 @@ typing_extensions
 jsonschema-gentypes
 pydantic>=2.5.3
 stdlib_list
+colorama

{polyapi-python-0.1.0.dev8 → polyapi-python-0.1.0.dev10}/pyproject.toml

@@ -3,10 +3,10 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.1.0.dev8"
+version = "0.1.0.dev10"
 description = "The PolyAPI Python Client"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
-dependencies = ["requests", "typing_extensions", "jsonschema-gentypes", "pydantic>=2.5.3", "stdlib_list"]
+dependencies = ["requests", "typing_extensions", "jsonschema-gentypes", "pydantic>=2.5.3", "stdlib_list", "colorama"]
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"