polyapi-python 0.3.2.dev2__tar.gz → 0.3.3.dev2__tar.gz

{polyapi_python-0.3.2.dev2/polyapi_python.egg-info → polyapi_python-0.3.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.2.dev2
+Version: 0.3.3.dev2
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -28,14 +28,15 @@ Project-URL: Homepage, https://github.com/polyapi/polyapi-python
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests==2.31.0
-Requires-Dist: typing_extensions>=4.10.0
+Requires-Dist: requests>=2.32.3
+Requires-Dist: typing_extensions>=4.12.2
 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
 Requires-Dist: python-socketio[asyncio_client]==5.11.1
 Requires-Dist: truststore==0.8.0
+Dynamic: license-file
 
 # PolyAPI Python Library
 
@@ -182,6 +183,16 @@ To run this library's unit tests, please clone the repo then run:
 python -m unittest discover
 ```
 
+## Linting
+
+The flake8 config is at the root of this repo at `.flake8`.
+
+When hacking on this library, please enable flake8 and add this line to your flake8 args (e.g., in your VSCode Workspace Settings):
+
+```
+--config=.flake8
+```
+
 ## Support
 
 If you run into any issues or want help getting started with this project, please contact support@polyapi.io

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/README.md

@@ -143,6 +143,16 @@ To run this library's unit tests, please clone the repo then run:
 python -m unittest discover
 ```
 
+## Linting
+
+The flake8 config is at the root of this repo at `.flake8`.
+
+When hacking on this library, please enable flake8 and add this line to your flake8 args (e.g., in your VSCode Workspace Settings):
+
+```
+--config=.flake8
+```
+
 ## Support
 
 If you run into any issues or want help getting started with this project, please contact support@polyapi.io

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/api.py

@@ -8,6 +8,7 @@ API_DEFS_TEMPLATE = """
 from typing import List, Dict, Any, TypedDict
 {args_def}
 {return_type_def}
+
 class {api_response_type}(TypedDict):
     status: int
     headers: Dict

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/cli.py

@@ -13,6 +13,7 @@ from .sync import sync_deployables
 
 CLI_COMMANDS = ["setup", "generate", "function", "clear", "help", "update_rendered_spec"]
 
+
 def execute_from_cli():
     # First we setup all our argument parsing logic
     # Then we parse the arguments (waaay at the bottom)
@@ -21,7 +22,7 @@ def execute_from_cli():
         description="Manage your Poly API configurations and functions",
         formatter_class=argparse.RawTextHelpFormatter
     )
-    
+
     subparsers = parser.add_subparsers(help="Available commands")
 
     ###########################################################################
@@ -46,7 +47,7 @@ def execute_from_cli():
 
     def generate_command(args):
         initialize_config()
-        print("Generating Poly functions...", end="")
+        print("Generating Poly Python SDK...", end="")
         generate()
         print_green("DONE")
 

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/deployables.py

@@ -261,7 +261,7 @@ def update_deployable_function_comments(file_content: str, deployable: dict, dis
         if deployable["docStartIndex"] == deployable["docEndIndex"]:
             # Function doesn't yet have any docstrings so we need to add additional whitespace
             docstring = "    " + docstring + "\n"
-        
+
         return f"{file_content[:deployable['docStartIndex']]}{docstring}{file_content[deployable['docEndIndex']:]}"
     return file_content
 
@@ -271,17 +271,17 @@ def write_updated_deployable(deployable: dict, disable_docs: bool = False) -> di
     """
     with open(deployable['file'], 'r', encoding='utf-8') as file:
         file_contents = file.read()
-    
+
     if deployable['type'] in ['client-function', 'server-function']:
         file_contents = update_deployable_function_comments(file_contents, deployable, disable_docs)
     else:
         raise ValueError(f"Unsupported deployable type: '{deployable['type']}'")
 
     file_contents = update_deployment_comments(file_contents, deployable)
-    
+
     with open(deployable['file'], 'w', encoding='utf-8') as file:
         file.write(file_contents)
-    
+
     deployable['fileRevision'] = get_deployable_file_revision(file_contents)
     return deployable
 

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/function_cli.py

@@ -1,7 +1,7 @@
 import sys
 from typing import Any, List, Optional
 import requests
-from polyapi.generate import get_functions_and_parse, generate_functions
+from polyapi.generate import cache_specs, generate_functions, get_specs, parse_function_specs
 from polyapi.config import get_api_key_and_url
 from polyapi.utils import get_auth_headers, print_green, print_red, print_yellow
 from polyapi.parser import parse_function_code, get_jsonschema_type
@@ -55,7 +55,7 @@ def function_add_or_update(
         "code": code,
         "language": "python",
         "returnType": get_jsonschema_type(return_type),
-        "arguments": [{**p, "key": p["name"], "type": get_jsonschema_type(p["type"])  } for p in parsed["types"]["params"]],
+        "arguments": [{**p, "key": p["name"], "type": get_jsonschema_type(p["type"])} for p in parsed["types"]["params"]],
         "logsEnabled": logs_enabled,
     }
 
@@ -88,7 +88,10 @@ def function_add_or_update(
         print(f"Function ID: {function_id}")
         if generate:
             print("Generating new custom function...", end="")
-            functions = get_functions_and_parse(limit_ids=[function_id])
+            # TODO do something more efficient here rather than regetting ALL the specs again
+            specs = get_specs()
+            cache_specs(specs)
+            functions = parse_function_specs(specs)
             generate_functions(functions)
             print_green("DONE")
     else:

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/generate.py

@@ -2,13 +2,15 @@ import json
 import requests
 import os
 import shutil
-from typing import List
+from typing import List, cast
 
+from polyapi import schema
 from polyapi.auth import render_auth_function
 from polyapi.client import render_client_function
+from polyapi.poly_schemas import generate_schemas
 from polyapi.webhook import render_webhook_handle
 
-from .typedefs import PropertySpecification, SpecificationDto, VariableSpecDto
+from .typedefs import PropertySpecification, SchemaSpecDto, 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, to_func_namespace
@@ -18,12 +20,21 @@ from .config import get_api_key_and_url
 SUPPORTED_FUNCTION_TYPES = {
     "apiFunction",
     "authFunction",
-    "customFunction",
+    "customFunction",  # client function - this is badly named in /specs atm
     "serverFunction",
     "webhookHandle",
 }
 
-SUPPORTED_TYPES = SUPPORTED_FUNCTION_TYPES | {"serverVariable"}
+SUPPORTED_TYPES = SUPPORTED_FUNCTION_TYPES | {"serverVariable", "schema", "snippet"}
+
+
+X_POLY_REF_WARNING = '''"""
+x-poly-ref:
+  path:'''
+
+X_POLY_REF_BETTER_WARNING = '''"""
+Unresolved schema, please add the following schema to complete it:
+  path:'''
 
 
 def get_specs() -> List:
@@ -38,9 +49,56 @@ def get_specs() -> List:
         raise NotImplementedError(resp.content)
 
 
+def build_schema_index(items):
+    index = {}
+    for item in items:
+        if item.get("type") == "schema" and "contextName" in item:
+            index[item["contextName"]] = {**item.get("definition", {}), "name": item.get("name")}
+    return index
+
+
+def resolve_poly_refs(obj, schema_index):
+    if isinstance(obj, dict):
+        if "x-poly-ref" in obj:
+            ref = obj["x-poly-ref"]
+            if isinstance(ref, dict) and "path" in ref:
+                path = ref["path"]
+                if path in schema_index:
+                    return resolve_poly_refs(schema_index[path], schema_index)
+                else:
+                    return obj
+        return {k: resolve_poly_refs(v, schema_index) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [resolve_poly_refs(item, schema_index) for item in obj]
+    else:
+        return obj
+
+
+def replace_poly_refs_in_functions(specs: List[SpecificationDto], schema_index):
+    spec_idxs_to_remove = []
+    for idx, spec in enumerate(specs):
+        if spec.get("type") in ("apiFunction", "customFunction", "serverFunction"):
+            func = spec.get("function")
+            if func:
+                try:
+                    spec["function"] = resolve_poly_refs(func, schema_index)
+                except Exception:
+                    print()
+                    print(f"{spec['context']}.{spec['name']} (id: {spec['id']}) failed to resolve poly refs, skipping!")
+                    spec_idxs_to_remove.append(idx)
+
+    # reverse the list so we pop off later indexes first
+    spec_idxs_to_remove.reverse()
+
+    for idx in spec_idxs_to_remove:
+        specs.pop(idx)
+
+    return specs
+
+
 def parse_function_specs(
     specs: List[SpecificationDto],
-    limit_ids: List[str] | None,  # optional list of ids to limit to
+    limit_ids: List[str] | None = None,  # optional list of ids to limit to
 ) -> List[SpecificationDto]:
     functions = []
     for spec in specs:
@@ -91,23 +149,14 @@ def read_cached_specs() -> List[SpecificationDto]:
         return json.loads(f.read())
 
 
-def get_functions_and_parse(limit_ids: List[str] | None = None) -> List[SpecificationDto]:
-    specs = get_specs()
-    cache_specs(specs)
-    return parse_function_specs(specs, limit_ids=limit_ids)
+def get_variables() -> List[VariableSpecDto]:
+    specs = read_cached_specs()
+    return [cast(VariableSpecDto, spec) for spec in specs if spec["type"] == "serverVariable"]
 
 
-def get_variables() -> List[VariableSpecDto]:
-    api_key, api_url = get_api_key_and_url()
-    headers = {"Authorization": f"Bearer {api_key}"}
-    # 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:
-        specs = resp.json()
-        return [spec for spec in specs if spec["type"] == "serverVariable"]
-    else:
-        raise NotImplementedError(resp.content)
+def get_schemas() -> List[SchemaSpecDto]:
+    specs = read_cached_specs()
+    return [cast(SchemaSpecDto, spec) for spec in specs if spec["type"] == "schema"]
 
 
 def remove_old_library():
@@ -120,12 +169,28 @@ def remove_old_library():
     if os.path.exists(path):
         shutil.rmtree(path)
 
+    path = os.path.join(currdir, "schemas")
+    if os.path.exists(path):
+        shutil.rmtree(path)
+
 
 def generate() -> None:
 
     remove_old_library()
 
-    functions = get_functions_and_parse()
+    limit_ids: List[str] = []  # useful for narrowing down generation to a single function to debug
+
+    specs = get_specs()
+    cache_specs(specs)
+    functions = parse_function_specs(specs, limit_ids=limit_ids)
+
+    schemas = get_schemas()
+    if schemas:
+        generate_schemas(schemas)
+
+    schema_index = build_schema_index(schemas)
+    functions = replace_poly_refs_in_functions(functions, schema_index)
+
     if functions:
         generate_functions(functions)
     else:
@@ -138,6 +203,7 @@ def generate() -> None:
     if variables:
         generate_variables(variables)
 
+
     # indicator to vscode extension that this is a polyapi-python project
     file_path = os.path.join(os.getcwd(), ".polyapi-python")
     open(file_path, "w").close()
@@ -214,6 +280,12 @@ def render_spec(spec: SpecificationDto):
             arguments,
             return_type,
         )
+
+    if X_POLY_REF_WARNING in func_type_defs:
+        # this indicates that jsonschema_gentypes has detected an x-poly-ref
+        # let's add a more user friendly error explaining what is going on
+        func_type_defs = func_type_defs.replace(X_POLY_REF_WARNING, X_POLY_REF_BETTER_WARNING)
+
     return func_str, func_type_defs
 
 

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/parser.py

@@ -47,7 +47,7 @@ def _parse_sphinx_docstring(docstring: str) -> Dict[str, Any]:
         "type": "Any"
     }
     current_section = None
-    
+
     for line in lines:
         stripped_line = line.strip()
         if stripped_line.startswith(":param "):
@@ -56,7 +56,7 @@ def _parse_sphinx_docstring(docstring: str) -> Dict[str, Any]:
             param_name = param_name.strip()
             if param_name in params:
                 params[param_name]["description"] = param_desc.strip()
-            else:    
+            else:
                 params[param_name] = { "name": param_name, "type": "", "description": param_desc.strip() }
             current_section = param_name
 
@@ -118,7 +118,7 @@ def _parse_google_docstring(docstring: str) -> Dict[str, Any]:
     for line in lines:
         line = line.rstrip()
         section_match = section_pattern.match(line)
-        
+
         if section_match:
             mode = section_match.group(1).lower()
             continue
@@ -365,7 +365,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                 self._line_offsets.append(
                     self._line_offsets[i-1] + len(self._lines[i-1])
                 )
-            
+
             self._extract_deploy_comments()
 
         def visit_AnnAssign(self, node):
@@ -483,7 +483,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                                 if docstring_params[type_index]["type"] != python_type:
                                     deployable["dirty"] = True
                         except:
-                            pass    
+                            pass
                     else:
                         deployable["dirty"] = True
 
@@ -497,7 +497,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                     deployable["types"]["returns"]["typeSchema"] = return_type_schema
                 else:
                     deployable["types"]["returns"]["type"] = "Any"
-                
+
         def generic_visit(self, node):
             if hasattr(node, 'lineno') and hasattr(node, 'col_offset'):
                 self._current_offset = self._line_offsets[node.lineno - 1] + node.col_offset

polyapi_python-0.3.3.dev2/polyapi/poly_schemas.py

@@ -0,0 +1,60 @@
+import os
+from typing import Any, Dict, List, Tuple
+
+from polyapi.schema import wrapped_generate_schema_types
+from polyapi.utils import add_import_to_init, init_the_init
+
+from .typedefs import SchemaSpecDto
+
+SCHEMA_CODE_IMPORTS = """from typing_extensions import TypedDict, NotRequired
+
+
+"""
+
+
+FALLBACK_SPEC_TEMPLATE = """class {name}(TypedDict, total=False):
+    ''' unable to generate schema for {name}, defaulting to permissive type '''
+    pass
+"""
+
+
+def generate_schemas(specs: List[SchemaSpecDto]):
+    for spec in specs:
+        create_schema(spec)
+
+
+def create_schema(spec: SchemaSpecDto) -> None:
+    folders = ["schemas"]
+    if spec["context"]:
+        folders += [s for s in spec["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, code_imports=SCHEMA_CODE_IMPORTS)
+
+    add_schema_to_init(full_path, spec)
+
+
+def add_schema_to_init(full_path: str, spec: SchemaSpecDto):
+    init_the_init(full_path, code_imports="")
+    init_path = os.path.join(full_path, "__init__.py")
+    with open(init_path, "a") as f:
+        f.write(render_poly_schema(spec) + "\n\n")
+
+
+def render_poly_schema(spec: SchemaSpecDto) -> str:
+    definition = spec["definition"]
+    if not definition.get("type"):
+        definition["type"] = "object"
+    root, schema_types = wrapped_generate_schema_types(
+        definition, root=spec["name"], fallback_type=Dict
+    )
+    return schema_types
+    # return FALLBACK_SPEC_TEMPLATE.format(name=spec["name"])

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/schema.py

@@ -1,11 +1,18 @@
+""" NOTE: this file represents the schema parsing logic for jsonschema_gentypes
+"""
+import random
+import string
 import logging
 import contextlib
 from typing import Dict
 from jsonschema_gentypes.cli import process_config
 from jsonschema_gentypes import configuration
+import referencing
 import tempfile
 import json
 
+import referencing.exceptions
+
 from polyapi.constants import JSONSCHEMA_TO_PYTHON_TYPE_MAP
 
 
@@ -33,8 +40,18 @@ def _temp_store_input_data(input_data: Dict) -> str:
 
 
 def wrapped_generate_schema_types(type_spec: dict, root, fallback_type):
+    from polyapi.utils import pascalCase
     if not root:
-        root = "MyList" if fallback_type == "List" else "MyDict"
+        root = "List" if fallback_type == "List" else "Dict"
+        if type_spec.get("x-poly-ref") and type_spec["x-poly-ref"].get("path"):
+            # x-poly-ref occurs when we have an unresolved reference
+            # lets name the root after the reference for some level of visibility
+            root += pascalCase(type_spec["x-poly-ref"]["path"].replace(".", " "))
+        else:
+            # add three random letters for uniqueness
+            root += random.choice(string.ascii_letters).upper()
+            root += random.choice(string.ascii_letters).upper()
+            root += random.choice(string.ascii_letters).upper()
 
     root = clean_title(root)
 
@@ -44,8 +61,13 @@ def wrapped_generate_schema_types(type_spec: dict, root, fallback_type):
         # some schemas are so huge, our library cant handle it
         # TODO identify critical recursion penalty and maybe switch underlying logic to iterative?
         return fallback_type, ""
+    except referencing.exceptions.CannotDetermineSpecification:
+        # just go with fallback_type here
+        # we couldn't match the right $ref earlier in resolve_poly_refs
+        # {'$ref': '#/definitions/FinanceAccountListModel'}
+        return fallback_type, ""
     except:
-        logging.exception(f"Error when generating schema type: {type_spec}")
+        logging.error(f"Error when generating schema type: {type_spec}\nusing fallback type '{fallback_type}'")
         return fallback_type, ""
 
 

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/typedefs.py

@@ -55,6 +55,19 @@ class VariableSpecDto(TypedDict):
     variable: VariableSpecification
     type: Literal['serverVariable']
 
+
+class SchemaSpecDto(TypedDict):
+    id: str
+    context: str
+    name: str
+    contextName: str
+    type: Literal['schema']
+    definition: Dict[Any, Any]
+    visibilityMetadata: object
+    unresolvedPolySchemaRefs: List
+    # TODO add more
+
+
 Visibility = Union[Literal['PUBLIC'], Literal['TENANT'], Literal['ENVIRONMENT']]
 
 
@@ -69,6 +82,7 @@ class PolyServerFunction(PolyDeployable):
     always_on: NotRequired[bool]
     visibility: NotRequired[Visibility]
 
+
 class PolyClientFunction(PolyDeployable):
     logs_enabled: NotRequired[bool]
     visibility: NotRequired[Visibility]

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi/utils.py

@@ -11,19 +11,19 @@ from polyapi.schema import wrapped_generate_schema_types, clean_title, map_primi
 
 # 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, 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"
-FALLBACK_TYPES = {"Dict", "List"}
+CODE_IMPORTS = "from typing import List, Dict, Any, Optional, Callable\nfrom typing_extensions import TypedDict, NotRequired\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:
+def init_the_init(full_path: str, code_imports="") -> None:
     init_path = os.path.join(full_path, "__init__.py")
     if not os.path.exists(init_path):
+        code_imports = code_imports or CODE_IMPORTS
         with open(init_path, "w") as f:
-            f.write(CODE_IMPORTS)
+            f.write(code_imports)
 
 
-def add_import_to_init(full_path: str, next: str) -> None:
-    init_the_init(full_path)
+def add_import_to_init(full_path: str, next: str, code_imports="") -> None:
+    init_the_init(full_path, code_imports=code_imports)
 
     init_path = os.path.join(full_path, "__init__.py")
     with open(init_path, "a+") as f:
@@ -38,7 +38,7 @@ def get_auth_headers(api_key: str):
     return {"Authorization": f"Bearer {api_key}"}
 
 
-def camelCase(s):
+def camelCase(s: str) -> str:
     s = s.strip()
     if " " in s or "-" in s:
         s = re.sub(r"(_|-)+", " ", s).title().replace(" ", "")
@@ -48,6 +48,10 @@ def camelCase(s):
         return s
 
 
+def pascalCase(s) -> str:
+    return re.sub(r"(^|_)([a-z])", lambda match: match.group(2).upper(), s)
+
+
 def print_green(s: str):
     print(Fore.GREEN + s + Style.RESET_ALL)
 
@@ -111,15 +115,20 @@ def get_type_and_def(type_spec: PropertyType) -> Tuple[str, str]:
     elif type_spec["kind"] == "object":
         if type_spec.get("schema"):
             schema = type_spec["schema"]
-            title = schema.get("title", "")
+            title = schema.get("title", schema.get("name", ""))
             if title:
                 assert isinstance(title, str)
                 return wrapped_generate_schema_types(schema, title, "Dict")  # type: ignore
-
+            elif schema.get("allOf") and len(schema['allOf']):
+                # we are in a case of a single allOf, lets strip off the allOf and move on!
+                # our library doesn't handle allOf well yet
+                allOf = schema['allOf'][0]
+                title = allOf.get("title", allOf.get("name", ""))
+                return wrapped_generate_schema_types(allOf, title, "Dict")
             elif schema.get("items"):
                 # fallback to schema $ref name if no explicit title
                 items = schema.get("items")  # type: ignore
-                title = items.get("title", "")  # type: ignore
+                title = items.get("title")  # type: ignore
                 if not title:
                     # title is actually a reference to another schema
                     title = items.get("$ref", "")  # type: ignore

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.2.dev2
+Version: 0.3.3.dev2
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -28,14 +28,15 @@ Project-URL: Homepage, https://github.com/polyapi/polyapi-python
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests==2.31.0
-Requires-Dist: typing_extensions>=4.10.0
+Requires-Dist: requests>=2.32.3
+Requires-Dist: typing_extensions>=4.12.2
 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
 Requires-Dist: python-socketio[asyncio_client]==5.11.1
 Requires-Dist: truststore==0.8.0
+Dynamic: license-file
 
 # PolyAPI Python Library
 
@@ -182,6 +183,16 @@ To run this library's unit tests, please clone the repo then run:
 python -m unittest discover
 ```
 
+## Linting
+
+The flake8 config is at the root of this repo at `.flake8`.
+
+When hacking on this library, please enable flake8 and add this line to your flake8 args (e.g., in your VSCode Workspace Settings):
+
+```
+--config=.flake8
+```
+
 ## Support
 
 If you run into any issues or want help getting started with this project, please contact support@polyapi.io

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi_python.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ polyapi/execute.py
 polyapi/function_cli.py
 polyapi/generate.py
 polyapi/parser.py
+polyapi/poly_schemas.py
 polyapi/prepare.py
 polyapi/py.typed
 polyapi/rendered_spec.py
@@ -34,6 +35,7 @@ polyapi_python.egg-info/top_level.txt
 tests/test_api.py
 tests/test_auth.py
 tests/test_deployables.py
+tests/test_generate.py
 tests/test_parser.py
 tests/test_rendered_spec.py
 tests/test_schema.py

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/polyapi_python.egg-info/requires.txt

@@ -1,5 +1,5 @@
-requests==2.31.0
-typing_extensions>=4.10.0
+requests>=2.32.3
+typing_extensions>=4.12.2
 jsonschema-gentypes==2.6.0
 pydantic==2.6.4
 stdlib_list==0.10.0

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/pyproject.toml

@@ -3,12 +3,12 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.3.2.dev2"
+version = "0.3.3.dev2"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [
-    "requests==2.31.0",
-    "typing_extensions>=4.10.0",
+    "requests>=2.32.3",
+    "typing_extensions>=4.12.2",
     "jsonschema-gentypes==2.6.0",
     "pydantic==2.6.4",
     "stdlib_list==0.10.0",

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/tests/test_deployables.py

@@ -21,7 +21,6 @@ def foobar() -> int:
 
 EXPECTED_SERVER_FN_DEPLOYMENTS = '''# Poly deployed @ 2024-11-12T14:43:22.631113 - testing.foobar - https://na1.polyapi.io/canopy/polyui/collections/server-functions/jh23h5g3h5b24jh5b2j3h45v2jhg43v52j3h - 086aedd
 # Poly deployed @ 2024-11-11T14:43:22.631113 - testing.foobar - https://dev.polyapi.io/canopy/polyui/collections/server-functions/jh23h5g3h5b24jh5b2j3h45v2jhg43v52j3h - 086aedd
-
 from polyapi.typedefs import PolyServerFunction
 
 polyConfig: PolyServerFunction = {
@@ -66,11 +65,11 @@ def foobar(foo: str, bar: Dict[str, str]) -> int:
     """A function that does something really import.
 
     Args:
-        foo (str): 
-        bar (Dict[str, str]): 
+        foo (str):
+        bar (Dict[str, str]):
 
     Returns:
-        int: 
+        int:
     """
     print("Okay then!")
     return 7

{polyapi_python-0.3.2.dev2 → polyapi_python-0.3.3.dev2}/tests/test_parser.py

@@ -186,7 +186,7 @@ class T(unittest.TestCase):
         code = "import requests\n\n\ndef foobar(n: int) -> int:\n    return 9\n"
         deployable = parse_function_code(code, "foobar")
         self.assertEqual(deployable["dependencies"], [])
-    
+
     def test_parse_glide_server_function_no_docstring(self):
         code = GLIDE_SIMPLE_SERVER_FN
         deployable = parse_function_code(code, "foobar")

polyapi_python-0.3.3.dev2/tests/test_utils.py

@@ -0,0 +1,14 @@
+import unittest
+from polyapi.utils import get_type_and_def, rewrite_reserved
+
+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_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]")
+
+    def test_rewrite_reserved(self):
+        rv = rewrite_reserved("from")
+        self.assertEqual(rv, "_from")