polyapi-python 0.1.0.dev2__py3-none-any.whl → 0.1.0.dev4__py3-none-any.whl

polyapi/api.py

@@ -1,10 +1,10 @@
 import os
 from typing import Any, Dict, List, Tuple
 
-from polyapi.constants import BASIC_PYTHON_TYPES, JSONSCHEMA_TO_PYTHON_TYPE_MAP
+from polyapi.constants import BASIC_PYTHON_TYPES
 from polyapi.typedefs import PropertySpecification, PropertyType
-from polyapi.utils import append_init, camelCase
-from polyapi.schema import generate_schema_types, clean_title
+from polyapi.utils import add_import_to_init, camelCase, init_the_init
+from polyapi.schema import generate_schema_types, clean_title, map_primitive_types
 
 # map the function type from the spec type to the function execute type
 TEMPLATE_FUNCTION_TYPE_MAP = {
@@ -47,21 +47,16 @@ def {function_name}(
 """
 
 
-def _map_primitive_types(type_: str) -> str:
-    # Define your mapping logic here
-    return JSONSCHEMA_TO_PYTHON_TYPE_MAP.get(type_, "Any")
-
-
 def _get_type(type_spec: PropertyType) -> Tuple[str, str]:
     if type_spec["kind"] == "plain":
         value = type_spec["value"]
         if value.endswith("[]"):
-            primitive = _map_primitive_types(value[:-2])
+            primitive = map_primitive_types(value[:-2])
             return f"List[{primitive}]", ""
         else:
-            return _map_primitive_types(value), ""
+            return map_primitive_types(value), ""
     elif type_spec["kind"] == "primitive":
-        return _map_primitive_types(type_spec["type"]), ""
+        return map_primitive_types(type_spec["type"]), ""
     elif type_spec["kind"] == "array":
         if type_spec.get("items"):
             items = type_spec["items"]
@@ -141,9 +136,10 @@ def _add_type_import_path(function_name: str, arg: str) -> str:
             return arg
         else:
             if '"' in sub:
-                return f'List[_{function_name}.{camelCase(sub)}]'
-            else:
+                sub = sub.replace('"', "")
                 return f'List["_{function_name}.{camelCase(sub)}"]'
+            else:
+                return f'List[_{function_name}.{camelCase(sub)}]'
 
     return f'_{function_name}.{camelCase(arg)}'
 
@@ -221,8 +217,7 @@ def add_function_file(
     return_type: Dict[str, Any],
 ):
     # first lets add the import to the __init__
-    init_path = os.path.join(full_path, "__init__.py")
-    _init_the_init(init_path)
+    init_the_init(full_path)
 
     func_str, func_type_defs = render_function(
         function_type,
@@ -233,6 +228,7 @@ def add_function_file(
         return_type,
     )
 
+    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}")
 
@@ -242,12 +238,6 @@ def add_function_file(
         f.write(func_type_defs)
 
 
-def _init_the_init(init_path: str) -> None:
-    if not os.path.exists(init_path):
-        with open(init_path, "w") as f:
-            f.write("from typing import List, Dict, Any, TypedDict\nfrom polyapi.execute import execute\nfrom polyapi.exceptions import PolyApiException\n")
-
-
 def create_function(
     function_type: str,
     path: str,
@@ -279,8 +269,8 @@ def create_function(
             # append to __init__.py file if nested folders
             next = folders[idx + 1] if idx + 2 < len(folders) else ""
             if next:
-                _init_the_init(os.path.join(full_path, "__init__.py"))
-                append_init(full_path, next)
+                init_the_init(full_path)
+                add_import_to_init(full_path, next)
 
 
 def generate_api(api_functions: List) -> None:

polyapi/config.py

@@ -69,6 +69,11 @@ def initialize_config():
 
 
 def clear_config():
+    global API_KEY
+    global API_URL
+    API_KEY = None
+    API_URL = None
+
     path = get_config_file_path()
     if os.path.exists(path):
         os.remove(path)

polyapi/execute.py

@@ -9,6 +9,28 @@ def execute(function_type, function_id, data) -> Response:
     headers = {"Authorization": f"Bearer {api_key}"}
     url = f"{api_url}/functions/{function_type}/{function_id}/execute"
     resp = requests.post(url, json=data, headers=headers)
+    if resp.status_code != 200 and resp.status_code != 201:
+        error_content = resp.content.decode("utf-8", errors="ignore")
+        raise PolyApiException(f"{resp.status_code}: {error_content}")
+    return resp
+
+
+def variable_get(variable_id: str) -> Response:
+    api_key, base_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
+    url = f"{base_url}/variables/{variable_id}/value"
+    resp = requests.get(url, headers=headers)
+    if resp.status_code != 200 and resp.status_code != 201:
+        error_content = resp.content.decode("utf-8", errors="ignore")
+        raise PolyApiException(f"{resp.status_code}: {error_content}")
+    return resp
+
+
+def variable_update(variable_id: str, value) -> Response:
+    api_key, base_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
+    url = f"{base_url}/variables/{variable_id}/value"
+    resp = requests.patch(url, data={"value": value}, headers=headers)
     if resp.status_code != 200 and resp.status_code != 201:
         error_content = resp.content.decode("utf-8", errors="ignore")
         raise PolyApiException(f"{resp.status_code}: {error_content}")

polyapi/generate.py

@@ -4,7 +4,7 @@ import os
 import shutil
 from typing import Any, Dict, List, Tuple
 
-from .typedefs import PropertySpecification
+from .typedefs import PropertySpecification, VariableSpecDto
 from .utils import get_auth_headers
 from .api import generate_api
 from .variables import generate_variables
@@ -81,31 +81,19 @@ def get_functions_and_parse():
     return functions
 
 
-def get_variables_and_parse() -> List[Tuple[str, str, bool]]:
-    raw = get_variables()
-    variables = parse_variables(raw)
-    return variables
-
-
-def get_variables():
+def get_variables() -> List[VariableSpecDto]:
     api_key, api_url = get_api_key_and_url()
     headers = {"Authorization": f"Bearer {api_key}"}
-    url = f"{api_url}/variables"
+    # TODO do some caching so this and get_functions just do 1 function call
+    url = f"{api_url}/specs"
     resp = requests.get(url, headers=headers)
     if resp.status_code == 200:
-        return resp.json()
+        specs = resp.json()
+        return [spec for spec in specs if spec['type'] == "serverVariable"]
     else:
         raise NotImplementedError(resp.content)
 
 
-def parse_variables(variables: List) -> List[Tuple[str, str, bool]]:
-    rv = []
-    for v in variables:
-        path = f"vari.{v['context']}.{v['name']}"
-        rv.append((path, v["id"], v["secret"]))
-    return rv
-
-
 def remove_old_library():
     currdir = os.path.dirname(os.path.abspath(__file__))
     path = os.path.join(currdir, "poly")
@@ -131,7 +119,7 @@ def generate() -> None:
         )
         exit()
 
-    variables = get_variables_and_parse()
+    variables = get_variables()
     if variables:
         generate_variables(variables)
 

polyapi/schema.py

@@ -5,6 +5,8 @@ from jsonschema_gentypes import configuration
 import tempfile
 import json
 
+from polyapi.constants import JSONSCHEMA_TO_PYTHON_TYPE_MAP
+
 
 def _cleanup_input_for_gentypes(input_data: Dict):
     """ cleanup input_data in place to make it more suitable for jsonschema_gentypes
@@ -83,4 +85,9 @@ def clean_title(title: str) -> str:
     # certain reserved words cant be titles, let's replace them
     if title == "List":
         title = "List_"
-    return title
+    return title
+
+
+def map_primitive_types(type_: str) -> str:
+    # Define your mapping logic here
+    return JSONSCHEMA_TO_PYTHON_TYPE_MAP.get(type_, "Any")

polyapi/typedefs.py

@@ -32,6 +32,22 @@ class SpecificationDto(TypedDict):
     context: str
     name: str
     description: str
+    # function is none if this is actually VariableSpecDto
     function: FunctionSpecification | None
-    # variables have variable: {"secret": boolean} and NO function
-    type: Literal['apiFunction', 'customFunction', 'serverFunction', 'authFunction', 'webhookHandle', 'serverVariable']
+    type: Literal['apiFunction', 'customFunction', 'serverFunction', 'authFunction', 'webhookHandle', 'serverVariable']
+
+
+class VariableSpecification(TypedDict):
+    environmentId: str
+    value: Any
+    valueType: PropertyType
+    secret: bool
+
+
+class VariableSpecDto(TypedDict):
+    id: str
+    context: str
+    name: str
+    description: str
+    variable: VariableSpecification
+    type: Literal['serverVariable']

polyapi/utils.py

@@ -2,7 +2,21 @@ import re
 import os
 
 
-def append_init(full_path: str, next: str) -> None:
+# 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\nfrom polyapi.execute import execute, variable_get, variable_update\n\n"
+
+
+def init_the_init(full_path: str) -> None:
+    init_path = os.path.join(full_path, "__init__.py")
+    if not os.path.exists(init_path):
+        with open(init_path, "w") as f:
+            f.write(CODE_IMPORTS)
+
+
+def add_import_to_init(full_path: str, next: str) -> None:
+    init_the_init(full_path)
+
     init_path = os.path.join(full_path, "__init__.py")
     with open(init_path, "a+") as f:
         import_stmt = "from . import {}\n".format(next)

polyapi/variables.py

@@ -1,86 +1,103 @@
 import os
+from typing import List
 
-from polyapi.utils import append_init
+from polyapi.schema import map_primitive_types
+from polyapi.typedefs import PropertyType, VariableSpecDto
+from polyapi.utils import add_import_to_init, init_the_init
 
 
-TEMPLATE = """
-import requests
-from polyapi.config import get_api_key_and_url
-from polyapi.exceptions import PolyApiException
-
-
-class {variable_name}:
+# GET is only included if the variable is not a secret
+GET_TEMPLATE = """
     @staticmethod
-    def get():
-        secret = {secret}
-        if secret:
-            raise ValueError('Cannot access secret variable from client. Use .inject() instead within Poly function.')
-        else:
-            api_key, base_url = get_api_key_and_url()
-            headers = {{"Authorization": f"Bearer {{api_key}}"}}
-            url = f"{{base_url}}/variables/{variable_id}/value"
-            resp = requests.get(url, headers=headers)
-            if resp.status_code != 200 and resp.status_code != 201:
-                raise PolyApiException(f"{{resp.status_code}}: {{resp.content}}")
-            return resp.text
+    def get() -> {variable_type}:
+        resp = variable_get("{variable_id}")
+        return resp.text
+"""
 
+
+TEMPLATE = """
+class {variable_name}:{get_method}
     @staticmethod
-    def update(value):
-        api_key, base_url = get_api_key_and_url()
-        headers = {{"Authorization": f"Bearer {{api_key}}"}}
-        url = f"{{base_url}}/variables/{variable_id}"
-        resp = requests.patch(url, data={{"value": value}}, headers=headers)
-        if resp.status_code != 200 and resp.status_code != 201:
-            raise PolyApiException(f"{{resp.status_code}}: {{resp.content}}")
+    def update(value: {variable_type}):
+        resp = variable_update("{variable_id}", value)
         return resp.json()
 
-    def inject(path=None):
+    @staticmethod
+    def inject(path=None) -> {variable_type}:
         return {{
             "type": "PolyVariable",
             "id": "{variable_id}",
             "path": path,
-        }}
-"""
+        }}  # type: ignore"""
 
 
-def generate_variables(variables):
+def generate_variables(variables: List[VariableSpecDto]):
     for variable in variables:
-        create_variable(*variable)
+        create_variable(variable)
     print("Variables generated!")
 
 
-def add_variable_file(full_path: str, variable_name: str, variable_id: str, secret: str):
-    # first lets add the import to the __init__
-    init_path = os.path.join(full_path, "__init__.py")
-    with open(init_path, "a") as f:
-        f.write(f"from ._{variable_name} import {variable_name}\n")
-
-    # now lets add the code!
-    file_path = os.path.join(full_path, f"_{variable_name}.py")
-    with open(file_path, "w") as f:
-        f.write(
-            TEMPLATE.format(
-                variable_name=variable_name,
-                variable_id=variable_id,
-                secret=secret,
-            )
+def render_variable(variable: VariableSpecDto):
+    variable_type = _get_variable_type(variable["variable"]["valueType"])
+    get_method = (
+        ""
+        if variable["variable"]["secret"]
+        else GET_TEMPLATE.format(
+            variable_id=variable["id"], variable_type=variable_type
         )
+    )
+    return TEMPLATE.format(
+        variable_name=variable["name"],
+        variable_id=variable["id"],
+        variable_type=variable_type,
+        get_method=get_method,
+    )
+
+
+def _get_variable_type(type_spec: PropertyType) -> str:
+    # simplified version of _get_type from api.py
+    if type_spec["kind"] == "plain":
+        value = type_spec["value"]
+        if value.endswith("[]"):
+            primitive = map_primitive_types(value[:-2])
+            return f"List[{primitive}]"
+        else:
+            return map_primitive_types(value)
+    elif type_spec["kind"] == "primitive":
+        return map_primitive_types(type_spec["type"])
+    elif type_spec["kind"] == "array":
+        return "List"
+    elif type_spec["kind"] == "void":
+        return "None"
+    elif type_spec["kind"] == "object":
+        return "Dict"
+    elif type_spec["kind"] == "any":
+        return "Any"
+    else:
+        return "Any"
+
+
+def create_variable(variable: VariableSpecDto) -> None:
+    folders = ["vari"]
+    if variable["context"]:
+        folders += variable["context"].split(".")
+
+    # build up the full_path by adding all the folders
+    full_path = os.path.join(os.path.dirname(os.path.abspath(__file__)))
 
+    for idx, folder in enumerate(folders):
+        full_path = os.path.join(full_path, folder)
+        if not os.path.exists(full_path):
+            os.makedirs(full_path)
+        next = folders[idx + 1] if idx + 1 < len(folders) else None
+        if next:
+            add_import_to_init(full_path, next)
 
-def create_variable(path: str, variable_id: str, secret: str) -> None:
-    full_path = os.path.dirname(os.path.abspath(__file__))
+    add_variable_to_init(full_path, variable)
 
-    folders = path.split(".")
-    for idx, folder in enumerate(folders):
-        if idx + 1 == len(folders):
-            variable_name = folder
-            add_variable_file(full_path, variable_name, variable_id, secret)
-        else:
-            full_path = os.path.join(full_path, folder)
-            if not os.path.exists(full_path):
-                os.makedirs(full_path)
-
-            # append to __init__.py file if nested folders
-            next = folders[idx + 1] if idx + 2 < len(folders) else ""
-            if next:
-                append_init(full_path, next)
+
+def add_variable_to_init(full_path: str, variable: VariableSpecDto):
+    init_the_init(full_path)
+    init_path = os.path.join(full_path, "__init__.py")
+    with open(init_path, "a") as f:
+        f.write(render_variable(variable) + "\n\n")

{polyapi_python-0.1.0.dev2.dist-info → polyapi_python-0.1.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.1.0.dev2
+Version: 0.1.0.dev4
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -124,6 +124,11 @@ def bar(n: int) -> Foobar:
     return Foobar(count=n)
 ```
 
+## Pypi
+
+This library is hosted on Pypi. You can find the latest version on the [pypi polyapi-python](https://pypi.org/project/polyapi-python/) project.
+
+
 ## Upgrade
 
 To upgrade your library to the latest version, pass the upgrade flag.
@@ -147,3 +152,7 @@ To run this library's unit tests, please clone the repo then run:
 ```bash
 python -m unittest discover
 ```
+
+## Support
+
+If you run into any issues or want help getting started with this project, please contact support@polyapi.io

polyapi_python-0.1.0.dev4.dist-info/RECORD

@@ -0,0 +1,20 @@
+polyapi/__init__.py,sha256=BbXhEtZ3TSGBfAagj62oRxrc5yFNz5fO0FMoGqS-ENQ,366
+polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
+polyapi/api.py,sha256=--MMEbj_F6qdMW1JOd1nSJ9OYyx4ecs2KvbSnYokBOk,9338
+polyapi/cli.py,sha256=XafGV_MGYWHOSbn7KZ03GKrSihirT2LVLDhFh_FgyF0,1425
+polyapi/config.py,sha256=GCjQaKxz4EkbTdwm9Rp4itfjR5NPDdtzYPbBzvqfrmg,2083
+polyapi/constants.py,sha256=NGjso6K5rGnE8TGdrXmdEfvvr-HI3DTVGwOYiWO68LM,511
+polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
+polyapi/execute.py,sha256=ehFfZP3uoGDDeRMNoKpf0R0Vgq1Po1NFP2C7lM5jKLY,1612
+polyapi/function_cli.py,sha256=qMWZm07F0PP1d-LeHnUw2oJzIea0YEwYJG809zYJeqY,6557
+polyapi/generate.py,sha256=eQNM9VZEcfKd8nzg6seioV0i0dALao2FqKpXDarqy4A,3929
+polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+polyapi/schema.py,sha256=mUMKPa5xURKiAQtiX1WoBK3_pcqS9xlhp92z0F8SRCU,2959
+polyapi/typedefs.py,sha256=RZ3I6sgJm_5MuuORG1QjUE-UJy_z2WRXNdiWjEdLvQg,1371
+polyapi/utils.py,sha256=t4NkZ0GAOCCbcm015sdFfmEYcCNGtcxOp9qx0NRkeKg,1221
+polyapi/variables.py,sha256=aijpKzH_8IqNHBRdHe5VWR-lh_LlkuYqEaw8IfHVZBU,3078
+polyapi_python-0.1.0.dev4.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.1.0.dev4.dist-info/METADATA,sha256=M5WHHOlG2iu6zyJXj40p9T2W4UDpe7VwsVnHzYHqdR8,4520
+polyapi_python-0.1.0.dev4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+polyapi_python-0.1.0.dev4.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.1.0.dev4.dist-info/RECORD,,

polyapi_python-0.1.0.dev2.dist-info/RECORD

@@ -1,20 +0,0 @@
-polyapi/__init__.py,sha256=BbXhEtZ3TSGBfAagj62oRxrc5yFNz5fO0FMoGqS-ENQ,366
-polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
-polyapi/api.py,sha256=hUE-XrrCjJutQ5cvji9jcY8Sjga_HgZV9pZg8-UoqlY,9734
-polyapi/cli.py,sha256=XafGV_MGYWHOSbn7KZ03GKrSihirT2LVLDhFh_FgyF0,1425
-polyapi/config.py,sha256=RMg8OUKXKFENtS17l4rkaZhfGrwXN-_-F1V1HKJGbYU,2006
-polyapi/constants.py,sha256=NGjso6K5rGnE8TGdrXmdEfvvr-HI3DTVGwOYiWO68LM,511
-polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
-polyapi/execute.py,sha256=VtdFU0HraviVtseg8X-o34yqx1XRy3rufcHDibtDppU,645
-polyapi/function_cli.py,sha256=qMWZm07F0PP1d-LeHnUw2oJzIea0YEwYJG809zYJeqY,6557
-polyapi/generate.py,sha256=0ZYXParP_vm9YXWfMl6Rn7MKrpdUXfgHb4UUzgJ1HKk,4114
-polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-polyapi/schema.py,sha256=LBBj2_qR793-4dhp0xyywtctbYMnS85lPwitldGJ5yo,2756
-polyapi/typedefs.py,sha256=zh4F36fZSZ6r4YqkcjDjNo_z__kIdiX7fLkC3QniDK0,1082
-polyapi/utils.py,sha256=mvkuJU27QMLKdcqyPktlDD-iO0OI3gbA7xhWCjR4UeM,709
-polyapi/variables.py,sha256=z1zfR3imJ735G2V89BMOYdzEdXiEHKZ5Q58O4ipWcpk,2897
-polyapi_python-0.1.0.dev2.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.1.0.dev2.dist-info/METADATA,sha256=Vsi2Fa7OJfWZNr3MCqwUrIjiIcuTuFf3xrXW8jr6hXg,4243
-polyapi_python-0.1.0.dev2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-polyapi_python-0.1.0.dev2.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.1.0.dev2.dist-info/RECORD,,