polyapi-python 0.3.13.dev1__py3-none-any.whl → 0.3.14.dev1__py3-none-any.whl

polyapi/api.py

@@ -35,6 +35,25 @@ def {function_name}(
         return {api_response_type}(resp.json())  # type: ignore
 
 
+async def {function_name}_async(
+{args}
+) -> {api_response_type}:
+    \"""{function_description}
+
+    Function ID: {function_id}
+    \"""
+    if get_direct_execute_config():
+        resp = await direct_execute_async("{function_type}", "{function_id}", {data})
+        return {api_response_type}({{
+            "status": resp.status_code,
+            "headers": dict(resp.headers),
+            "data": resp.json()
+        }})  # type: ignore
+    else:
+        resp = await execute_async("{function_type}", "{function_id}", {data})
+        return {api_response_type}(resp.json())  # type: ignore
+
+
 """
 
 

polyapi/auth.py

@@ -117,6 +117,16 @@ def introspectToken(token: str) -> AuthFunctionResponse:
     url = "/auth-providers/{function_id}/introspect"
     resp = execute_post(url, {{"token": token}})
     return resp.json()
+
+
+async def introspectToken_async(token: str) -> AuthFunctionResponse:
+    \"""{description}
+
+    Function ID: {function_id}
+    \"""
+    url = "/auth-providers/{function_id}/introspect"
+    resp = await execute_post_async(url, {{"token": token}})
+    return resp.json()
 """
 
 REFRESH_TOKEN_TEMPLATE = """
@@ -128,6 +138,16 @@ def refreshToken(token: str) -> AuthFunctionResponse:
     url = "/auth-providers/{function_id}/refresh"
     resp = execute_post(url, {{"token": token}})
     return resp.json()
+
+
+async def refreshToken_async(token: str) -> AuthFunctionResponse:
+    \"""{description}
+
+    Function ID: {function_id}
+    \"""
+    url = "/auth-providers/{function_id}/refresh"
+    resp = await execute_post_async(url, {{"token": token}})
+    return resp.json()
 """
 
 REVOKE_TOKEN_TEMPLATE = """
@@ -142,6 +162,19 @@ def revokeToken(token: str) -> Optional[AuthFunctionResponse]:
         return resp.json()
     except:
         return None
+
+
+async def revokeToken_async(token: str) -> Optional[AuthFunctionResponse]:
+    \"""{description}
+
+    Function ID: {function_id}
+    \"""
+    url = "/auth-providers/{function_id}/revoke"
+    resp = await execute_post_async(url, {{"token": token}})
+    try:
+        return resp.json()
+    except:
+        return None
 """
 
 

polyapi/execute.py

@@ -1,109 +1,224 @@
-from typing import Dict, Optional
-import requests
+import httpx
 import os
 import logging
-from requests import Response
 from polyapi.config import get_api_key_and_url, get_mtls_config
 from polyapi.exceptions import PolyApiException
+from polyapi import http_client
 
 logger = logging.getLogger("poly")
 
-def direct_execute(function_type, function_id, data) -> Response:
-    """ execute a specific function id/type
-    """
-    api_key, api_url = get_api_key_and_url()
-    headers = {"Authorization": f"Bearer {api_key}"}
-    url = f"{api_url}/functions/{function_type}/{function_id}/direct-execute"
-    
-    endpoint_info = requests.post(url, json=data, headers=headers)
-    if endpoint_info.status_code < 200 or endpoint_info.status_code >= 300:
-        error_content = endpoint_info.content.decode("utf-8", errors="ignore")
+def _check_response_error(resp, function_type, function_id, data):
+    if resp.status_code < 200 or resp.status_code >= 300:
+        error_content = resp.content.decode("utf-8", errors="ignore")
         if function_type == 'api' and os.getenv("LOGS_ENABLED"):
-            raise PolyApiException(f"Error executing api function with id: {function_id}. Status code: {endpoint_info.status_code}. Request data: {data}, Response: {error_content}")
+            logger.error(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}")
         elif function_type != 'api':
-            raise PolyApiException(f"{endpoint_info.status_code}: {error_content}")
-    
-    endpoint_info_data = endpoint_info.json()
+            raise PolyApiException(f"{resp.status_code}: {error_content}")
+
+
+def _check_endpoint_error(resp, function_type, function_id, data):
+    if resp.status_code < 200 or resp.status_code >= 300:
+        error_content = resp.content.decode("utf-8", errors="ignore")
+        if function_type == 'api' and os.getenv("LOGS_ENABLED"):
+            raise PolyApiException(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}")
+        elif function_type != 'api':
+            raise PolyApiException(f"{resp.status_code}: {error_content}")
+
+
+def _build_direct_execute_params(endpoint_info_data):
     request_params = endpoint_info_data.copy()
     request_params.pop("url", None)
-    
     if "maxRedirects" in request_params:
-        request_params["allow_redirects"] = request_params.pop("maxRedirects") > 0
-    
+        request_params["follow_redirects"] = request_params.pop("maxRedirects") > 0
+    return request_params
+
+
+def _sync_direct_execute(function_type, function_id, data) -> httpx.Response:
+    api_key, api_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
+    url = f"{api_url}/functions/{function_type}/{function_id}/direct-execute"
+
+    endpoint_info = http_client.post(url, json=data, headers=headers)
+    _check_endpoint_error(endpoint_info, function_type, function_id, data)
+
+    endpoint_info_data = endpoint_info.json()
+    request_params = _build_direct_execute_params(endpoint_info_data)
+
     has_mtls, cert_path, key_path, ca_path = get_mtls_config()
-    
+
+    # Direct-execute hits URL that may need custom TLS
+    # settings (mTLS certs or disabled verification). httpx Client.request()
+    # doesn't accept per-request transport kwargs, so use one-off calls.
     if has_mtls:
-        resp = requests.request(
+        resp = httpx.request(
             url=endpoint_info_data["url"],
             cert=(cert_path, key_path),
             verify=ca_path,
+            timeout=None,
             **request_params
         )
     else:
-        resp = requests.request(
+        resp = httpx.request(
             url=endpoint_info_data["url"],
             verify=False,
+            timeout=None,
             **request_params
         )
 
-    if (resp.status_code < 200 or resp.status_code >= 300):
-        error_content = resp.content.decode("utf-8", errors="ignore")
-        if function_type == 'api' and os.getenv("LOGS_ENABLED"):
-            logger.error(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}")
-        elif function_type != 'api':   
-            raise PolyApiException(f"{resp.status_code}: {error_content}")    
-    
+    _check_response_error(resp, function_type, function_id, data)
+    return resp
+
+
+async def _async_direct_execute(function_type, function_id, data) -> httpx.Response:
+    api_key, api_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
+    url = f"{api_url}/functions/{function_type}/{function_id}/direct-execute"
+
+    endpoint_info = await http_client.async_post(url, json=data, headers=headers)
+    _check_endpoint_error(endpoint_info, function_type, function_id, data)
+
+    endpoint_info_data = endpoint_info.json()
+    request_params = _build_direct_execute_params(endpoint_info_data)
+
+    has_mtls, cert_path, key_path, ca_path = get_mtls_config()
+
+    # One-off async client for custom TLS settings on external URLs.
+    if has_mtls:
+        async with httpx.AsyncClient(
+            cert=(cert_path, key_path), verify=ca_path, timeout=None
+        ) as client:
+            resp = await client.request(
+                url=endpoint_info_data["url"], **request_params
+            )
+    else:
+        async with httpx.AsyncClient(verify=False, timeout=None) as client:
+            resp = await client.request(
+                url=endpoint_info_data["url"], **request_params
+            )
+
+    _check_response_error(resp, function_type, function_id, data)
     return resp
 
-def execute(function_type, function_id, data) -> Response:
-    """ execute a specific function id/type
+
+def direct_execute(function_type, function_id, data) -> httpx.Response:
+    """ execute a specific function id/type (sync)
     """
+    return _sync_direct_execute(function_type, function_id, data)
+
+
+async def direct_execute_async(function_type, function_id, data) -> httpx.Response:
+    """ execute a specific function id/type (async)
+    """
+    return await _async_direct_execute(function_type, function_id, data)
+
+
+def _sync_execute(function_type, function_id, data) -> httpx.Response:
     api_key, api_url = get_api_key_and_url()
     headers = {"Authorization": f"Bearer {api_key}"}
+    url = f"{api_url}/functions/{function_type}/{function_id}/execute"
 
+    resp = http_client.post(url, json=data, headers=headers)
+    _check_response_error(resp, function_type, function_id, data)
+    return resp
+
+
+async def _async_execute(function_type, function_id, data) -> httpx.Response:
+    api_key, api_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
     url = f"{api_url}/functions/{function_type}/{function_id}/execute"
-    
-    # Make the request
-    resp = requests.post(
-        url, 
-        json=data, 
-        headers=headers,
-    )
-
-    if (resp.status_code < 200 or resp.status_code >= 300) and os.getenv("LOGS_ENABLED"):
-        error_content = resp.content.decode("utf-8", errors="ignore")
-        if function_type == 'api' and os.getenv("LOGS_ENABLED"):
-            logger.error(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}")
-        elif function_type != 'api':
-            raise PolyApiException(f"{resp.status_code}: {error_content}")
 
+    resp = await http_client.async_post(url, json=data, headers=headers)
+    _check_response_error(resp, function_type, function_id, data)
     return resp
 
 
-def execute_post(path, data):
+def execute(function_type, function_id, data) -> httpx.Response:
+    """ execute a specific function id/type (sync)
+    """
+    return _sync_execute(function_type, function_id, data)
+
+
+async def execute_async(function_type, function_id, data) -> httpx.Response:
+    """ execute a specific function id/type (async)
+    """
+    return await _async_execute(function_type, function_id, data)
+
+
+def _sync_execute_post(path, data):
+    api_key, api_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
+    return http_client.post(api_url + path, json=data, headers=headers)
+
+
+async def _async_execute_post(path, data):
     api_key, api_url = get_api_key_and_url()
     headers = {"Authorization": f"Bearer {api_key}"}
-    resp = requests.post(api_url + path, json=data, headers=headers)
+    return await http_client.async_post(api_url + path, json=data, headers=headers)
+
+
+def execute_post(path, data):
+    return _sync_execute_post(path, data)
+
+
+async def execute_post_async(path, data):
+    return await _async_execute_post(path, data)
+
+
+def _sync_variable_get(variable_id: str) -> httpx.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 = http_client.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_get(variable_id: str) -> Response:
+async def _async_variable_get(variable_id: str) -> httpx.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)
+    resp = await http_client.async_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:
+def variable_get(variable_id: str) -> httpx.Response:
+    return _sync_variable_get(variable_id)
+
+
+async def variable_get_async(variable_id: str) -> httpx.Response:
+    return await _async_variable_get(variable_id)
+
+
+def _sync_variable_update(variable_id: str, value) -> httpx.Response:
     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)
+    resp = http_client.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}")
-    return resp
+    return resp
+
+
+async def _async_variable_update(variable_id: str, value) -> httpx.Response:
+    api_key, base_url = get_api_key_and_url()
+    headers = {"Authorization": f"Bearer {api_key}"}
+    url = f"{base_url}/variables/{variable_id}"
+    resp = await http_client.async_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}")
+    return resp
+
+
+def variable_update(variable_id: str, value) -> httpx.Response:
+    return _sync_variable_update(variable_id, value)
+
+
+async def variable_update_async(variable_id: str, value) -> httpx.Response:
+    return await _async_variable_update(variable_id, value)

polyapi/function_cli.py

@@ -1,7 +1,6 @@
 import sys
 from typing import Any, List, Optional
-import requests
-
+from polyapi import http_client
 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
@@ -87,7 +86,7 @@ def function_add_or_update(
         sys.exit(1)
 
     headers = get_auth_headers(api_key)
-    resp = requests.post(url, headers=headers, json=data)
+    resp = http_client.post(url, headers=headers, json=data)
     if resp.status_code in [200, 201]:
         print_green("DEPLOYED")
         function_id = resp.json()["id"]
@@ -126,5 +125,5 @@ def spec_delete(function_type: str, function_id: str):
         print(f"Unknown function type: {function_type}")
         sys.exit(1)
     headers = get_auth_headers(api_key)
-    resp = requests.delete(url, headers=headers)
+    resp = http_client.delete(url, headers=headers)
     return resp

polyapi/generate.py

@@ -1,5 +1,4 @@
 import json
-import requests
 import os
 import uuid
 import shutil
@@ -20,6 +19,7 @@ from .server import render_server_function
 from .utils import add_import_to_init, get_auth_headers, init_the_init, print_green, to_func_namespace
 from .variables import generate_variables
 from .poly_tables import generate_tables
+from . import http_client
 from .config import get_api_key_and_url, get_direct_execute_config, get_cached_generate_args
 
 SUPPORTED_FUNCTION_TYPES = {
@@ -62,7 +62,7 @@ def get_specs(contexts: Optional[List[str]] = None, names: Optional[List[str]] =
     if get_direct_execute_config():
         params["apiFunctionDirectExecute"] = "true"
 
-    resp = requests.get(url, headers=headers, params=params)
+    resp = http_client.get(url, headers=headers, params=params)
     if resp.status_code == 200:
         return resp.json()
     else:

polyapi/http_client.py

@@ -0,0 +1,73 @@
+import asyncio
+import httpx
+
+_sync_client: httpx.Client | None = None
+_async_client: httpx.AsyncClient | None = None
+
+
+def _get_sync_client() -> httpx.Client:
+    global _sync_client
+    if _sync_client is None:
+        _sync_client = httpx.Client(timeout=None)
+    return _sync_client
+
+
+def _get_async_client() -> httpx.AsyncClient:
+    global _async_client
+    if _async_client is None:
+        _async_client = httpx.AsyncClient(timeout=None)
+    return _async_client
+
+
+def post(url, **kwargs) -> httpx.Response:
+    return _get_sync_client().post(url, **kwargs)
+
+
+async def async_post(url, **kwargs) -> httpx.Response:
+    return await _get_async_client().post(url, **kwargs)
+
+
+def get(url, **kwargs) -> httpx.Response:
+    return _get_sync_client().get(url, **kwargs)
+
+
+async def async_get(url, **kwargs) -> httpx.Response:
+    return await _get_async_client().get(url, **kwargs)
+
+
+def patch(url, **kwargs) -> httpx.Response:
+    return _get_sync_client().patch(url, **kwargs)
+
+
+async def async_patch(url, **kwargs) -> httpx.Response:
+    return await _get_async_client().patch(url, **kwargs)
+
+
+def delete(url, **kwargs) -> httpx.Response:
+    return _get_sync_client().delete(url, **kwargs)
+
+
+async def async_delete(url, **kwargs) -> httpx.Response:
+    return await _get_async_client().delete(url, **kwargs)
+
+
+def request(method, url, **kwargs) -> httpx.Response:
+    return _get_sync_client().request(method, url, **kwargs)
+
+
+async def async_request(method, url, **kwargs) -> httpx.Response:
+    return await _get_async_client().request(method, url, **kwargs)
+
+
+def close():
+    global _sync_client
+    if _sync_client is not None:
+        _sync_client.close()
+        _sync_client = None
+
+async def close_async():
+    global _sync_client, _async_client
+    close()
+    if _async_client is not None:
+        await _async_client.aclose()
+        _async_client = None

polyapi/poly_tables.py

@@ -1,27 +1,64 @@
 import os
-import requests
+from polyapi import http_client
 from typing_extensions import NotRequired, TypedDict
-from typing import List, Union, Type, Dict, Any, Literal, Tuple, Optional, get_args, get_origin
+from typing import (
+    List,
+    Union,
+    Type,
+    Dict,
+    Any,
+    Literal,
+    Tuple,
+    Optional,
+    get_args,
+    get_origin,
+)
 from polyapi.utils import add_import_to_init, init_the_init
 from polyapi.typedefs import TableSpecDto
 from polyapi.constants import JSONSCHEMA_TO_PYTHON_TYPE_MAP
+from polyapi.config import get_api_key_and_url
 
-def scrub(data) -> Dict[str, Any]:
-    if (not data or not isinstance(data, (Dict, List))): return data
+TABI_MODULE_IMPORTS = "\n".join(
+    [
+        "from typing_extensions import NotRequired, TypedDict",
+        "from typing import Union, List, Dict, Any, Literal, Optional, Required, overload",
+        "from polyapi.poly_tables import execute_query, first_result, transform_query, delete_one_response",
+        "from polyapi.typedefs import Table, PolyCountResult, PolyDeleteResult, PolyDeleteResults, SortOrder, StringFilter, NullableStringFilter, NumberFilter, NullableNumberFilter, BooleanFilter, NullableBooleanFilter, NullableObjectFilter",
+    ]
+)
+
+
+def scrub(data: Any) -> Any:
+    if not data or not isinstance(data, (Dict, List)):
+        return data
     if isinstance(data, List):
         return [scrub(item) for item in data]
     else:
         temp = {}
-        secrets = ["x_api_key", "x-api-key", "access_token", "access-token", "authorization", "api_key", "api-key", "apikey", "accesstoken", "token", "password", "key"]
+        secrets = [
+            "x_api_key",
+            "x-api-key",
+            "access_token",
+            "access-token",
+            "authorization",
+            "api_key",
+            "api-key",
+            "apikey",
+            "accesstoken",
+            "token",
+            "password",
+            "key",
+        ]
         for key, value in data.items():
             if isinstance(value, (Dict, List)):
                 temp[key] = scrub(data[key])
             elif key.lower() in secrets:
-                temp[key] = '********'
+                temp[key] = "********"
             else:
                 temp[key] = data[key]
         return temp
 
+
 def scrub_keys(e: Exception) -> Dict[str, Any]:
     """
     Scrub the keys of an exception to remove sensitive information.
@@ -31,19 +68,27 @@ def scrub_keys(e: Exception) -> Dict[str, Any]:
         "error": str(e),
         "type": type(e).__name__,
         "message": str(e),
-        "args": scrub(getattr(e, 'args', None))
+        "args": scrub(getattr(e, "args", None)),
     }
 
 
 def execute_query(table_id, method, query):
     from polyapi import polyCustom
     from polyapi.poly.client_id import client_id
+
     try:
-        url = f"/tables/{table_id}/{method}?clientId={client_id}"
-        headers = {{
-            'x-poly-execution-id': polyCustom.get('executionId')
-        }}
-        response = requests.post(url, json=query, headers=headers)
+        api_key, base_url = get_api_key_and_url()
+        if not base_url:
+            raise ValueError(
+                "PolyAPI Instance URL is not configured, run `python -m polyapi setup`."
+            )
+
+        auth_key = polyCustom.get("executionApiKey") or api_key
+        url = f"{base_url.rstrip('/')}/tables/{table_id}/{method}?clientId={client_id}"
+        headers = {"x-poly-execution-id": polyCustom.get("executionId")}
+        if auth_key:
+            headers["Authorization"] = f"Bearer {auth_key}"
+        response = http_client.post(url, json=query, headers=headers)
         response.raise_for_status()
         return response.json()
     except Exception as e:
@@ -51,14 +96,16 @@ def execute_query(table_id, method, query):
 
 
 def first_result(rsp):
-    if isinstance(rsp, dict) and isinstance(rsp.get('results'), list):
-        return rsp['results'][0] if rsp['results'] else None
+    if isinstance(rsp, dict) and isinstance(rsp.get("results"), list):
+        return rsp["results"][0] if rsp["results"] else None
     return rsp
 
+
 def delete_one_response(rsp):
-    if isinstance(rsp, dict) and isinstance(rsp.get('deleted'), int):
-        return { 'deleted': bool(rsp.get('deleted')) }
-    return { 'deleted': false }
+    if isinstance(rsp, dict) and isinstance(rsp.get("deleted"), int):
+        return {"deleted": bool(rsp.get("deleted"))}
+    return {"deleted": False}
+
 
 _key_transform_map = {
     "not_": "not",
@@ -72,8 +119,7 @@ _key_transform_map = {
 def _transform_keys(obj: Any) -> Any:
     if isinstance(obj, dict):
         return {
-            _key_transform_map.get(k, k): _transform_keys(v)
-            for k, v in obj.items()
+            _key_transform_map.get(k, k): _transform_keys(v) for k, v in obj.items()
         }
 
     elif isinstance(obj, list):
@@ -88,13 +134,13 @@ def transform_query(query: dict) -> dict:
         return {
             **query,
             "where": _transform_keys(query["where"]) if query["where"] else None,
-            "orderBy": query["order_by"] if query["order_by"] else None
+            "orderBy": query["order_by"] if query["order_by"] else None,
         }
 
     return query
 
 
-TABI_TABLE_TEMPLATE = '''
+TABI_TABLE_TEMPLATE = """
 {table_name}Columns = Literal[{table_columns}]
 
 
@@ -369,7 +415,7 @@ class {table_name}:{table_description}
             query["where"]["id"] = kwargs["id"]
             query.pop("id", None)
         return delete_one_response(execute_query({table_name}.table_id, "delete", transform_query(query)))
-'''
+"""
 
 
 def _get_column_type_str(name: str, schema: Dict[str, Any], is_required: bool) -> str:
@@ -377,11 +423,17 @@ def _get_column_type_str(name: str, schema: Dict[str, Any], is_required: bool) -
 
     col_type = schema.get("type", "object")
     if isinstance(col_type, list):
-        subtypes = [_get_column_type_str(name, { **schema, "type": t }, is_required) for t in col_type]
+        subtypes = [
+            _get_column_type_str(name, {**schema, "type": t}, is_required)
+            for t in col_type
+        ]
         result = f"Union[{', '.join(subtypes)}]"
     elif col_type == "array":
         if isinstance(schema["items"], list):
-            subtypes = [_get_column_type_str(f"{name}{i}", s, True) for i, s in enumerate(schema["items"])]
+            subtypes = [
+                _get_column_type_str(f"{name}{i}", s, True)
+                for i, s in enumerate(schema["items"])
+            ]
             result = f"Tuple[{', '.join(subtypes)}]"
         elif isinstance(schema["items"], dict):
             result = f"List[{_get_column_type_str(name, schema['items'], True)}]"
@@ -391,7 +443,10 @@ def _get_column_type_str(name: str, schema: Dict[str, Any], is_required: bool) -
         if isinstance(schema.get("patternProperties"), dict):
             # TODO: Handle multiple pattern properties
             result = f"Dict[str, {_get_column_type_str(f'{name}_', schema['patternProperties'], True)}]"
-        elif isinstance(schema.get("properties"), dict) and len(schema["properties"].values()) > 0:
+        elif (
+            isinstance(schema.get("properties"), dict)
+            and len(schema["properties"].values()) > 0
+        ):
             # TODO: Handle x-poly-refs
             result = f'"{name}"'
         else:
@@ -413,24 +468,32 @@ def _render_table_row_classes(table_name: str, schema: Dict[str, Any]) -> str:
     return output[1].split("\n", 1)[1].strip()
 
 
-def _render_table_subset_class(table_name: str, columns: List[Tuple[str, Dict[str, Any]]], required: List[str]) -> str:
+def _render_table_subset_class(
+    table_name: str, columns: List[Tuple[str, Dict[str, Any]]], required: List[str]
+) -> str:
     # Generate class which can match any subset of a table row
     lines = [f"class {table_name}Subset(TypedDict):"]
 
     for name, schema in columns:
-        type_str = _get_column_type_str(f"_{table_name}Row{name}", schema, name in required)
+        type_str = _get_column_type_str(
+            f"_{table_name}Row{name}", schema, name in required
+        )
         lines.append(f"    {name}: NotRequired[{type_str}]")
 
     return "\n".join(lines)
 
 
-def _render_table_where_class(table_name: str, columns: List[Tuple[str, Dict[str, Any]]], required: List[str]) -> str:
+def _render_table_where_class(
+    table_name: str, columns: List[Tuple[str, Dict[str, Any]]], required: List[str]
+) -> str:
     # Generate class for the 'where' part of the query
     lines = [f"class {table_name}WhereFilter(TypedDict):"]
 
     for name, schema in columns:
         ftype_str = ""
-        type_str = _get_column_type_str(f"_{table_name}Row{name}", schema, True) # force required to avoid wrapping type in Optional[]
+        type_str = _get_column_type_str(
+            f"_{table_name}Row{name}", schema, True
+        )  # force required to avoid wrapping type in Optional[]
         is_required = name in required
         if type_str == "bool":
             ftype_str = "BooleanFilter" if is_required else "NullableBooleanFilter"
@@ -445,24 +508,34 @@ def _render_table_where_class(table_name: str, columns: List[Tuple[str, Dict[str
         if ftype_str:
             lines.append(f"    {name}: NotRequired[Union[{type_str}, {ftype_str}]]")
 
-    lines.append(f'    AND: NotRequired[Union["{table_name}WhereFilter", List["{table_name}WhereFilter"]]]')
+    lines.append(
+        f'    AND: NotRequired[Union["{table_name}WhereFilter", List["{table_name}WhereFilter"]]]'
+    )
     lines.append(f'    OR: NotRequired[List["{table_name}WhereFilter"]]')
-    lines.append(f'    NOT: NotRequired[Union["{table_name}WhereFilter", List["{table_name}WhereFilter"]]]')
+    lines.append(
+        f'    NOT: NotRequired[Union["{table_name}WhereFilter", List["{table_name}WhereFilter"]]]'
+    )
 
     return "\n".join(lines)
 
 
 def _render_table(table: TableSpecDto) -> str:
     columns = list(table["schema"]["properties"].items())
-    required_colunms = table["schema"].get("required", [])
+    required_columns = table["schema"].get("required", [])
 
-    table_columns = ",".join([ f'"{k}"' for k,_ in columns])
+    table_columns = ",".join([f'"{k}"' for k, _ in columns])
     table_row_classes = _render_table_row_classes(table["name"], table["schema"])
-    table_row_subset_class = _render_table_subset_class(table["name"], columns, required_colunms)
-    table_where_class = _render_table_where_class(table["name"], columns, required_colunms)
+    table_row_subset_class = _render_table_subset_class(
+        table["name"], columns, required_columns
+    )
+    table_where_class = _render_table_where_class(
+        table["name"], columns, required_columns
+    )
     if table.get("description", ""):
-        table_description =  '\n    """'
-        table_description += '\n       '.join(table["description"].replace('"', "'").split("\n"))
+        table_description = '\n    """'
+        table_description += "\n       ".join(
+            table["description"].replace('"', "'").split("\n")
+        )
         table_description += '\n    """'
     else:
         table_description = ""
@@ -502,12 +575,7 @@ def _create_table(table: TableSpecDto) -> None:
 
     init_path = os.path.join(full_path, "__init__.py")
 
-    imports = "\n".join([
-        "from typing_extensions import NotRequired, TypedDict",
-        "from typing import Union, List, Dict, Any, Literal, Optional, Required, overload",
-        "from polyapi.poly_tables import execute_query, first_result, transform_query",
-        "from polyapi.typedefs import Table, PolyCountResult, PolyDeleteResults, SortOrder, StringFilter, NullableStringFilter, NumberFilter, NullableNumberFilter, BooleanFilter, NullableBooleanFilter, NullableObjectFilter",
-    ])
+    imports = TABI_MODULE_IMPORTS
     table_contents = _render_table(table)
 
     file_contents = ""

polyapi/prepare.py

@@ -2,8 +2,7 @@ import os
 import sys
 import subprocess
 from typing import List, Tuple, Literal
-import requests
-
+from polyapi import http_client
 from polyapi.utils import get_auth_headers
 from polyapi.config import get_api_key_and_url
 from polyapi.parser import parse_function_code
@@ -32,7 +31,7 @@ def get_server_function_description(description: str, arguments, code: str) -> s
     api_key, api_url = get_api_key_and_url()
     headers = get_auth_headers(api_key)
     data = {"description": description, "arguments": arguments, "code": code}
-    response = requests.post(f"{api_url}/functions/server/description-generation", headers=headers, json=data)
+    response = http_client.post(f"{api_url}/functions/server/description-generation", headers=headers, json=data)
     return response.json()
 
 def get_client_function_description(description: str, arguments, code: str) -> str:
@@ -40,7 +39,7 @@ def get_client_function_description(description: str, arguments, code: str) -> s
     headers = get_auth_headers(api_key)
     # Simulated API call to generate client function descriptions
     data = {"description": description, "arguments": arguments, "code": code}
-    response = requests.post(f"{api_url}/functions/client/description-generation", headers=headers, json=data)
+    response = http_client.post(f"{api_url}/functions/client/description-generation", headers=headers, json=data)
     return response.json()
 
 def fill_in_missing_function_details(deployable: DeployableRecord, code: str) -> DeployableRecord:

polyapi/rendered_spec.py

@@ -1,7 +1,7 @@
 import os
 from typing import Optional
 
-import requests
+from polyapi import http_client
 from polyapi.config import get_api_key_and_url
 from polyapi.generate import read_cached_specs, render_spec
 from polyapi.typedefs import SpecificationDto
@@ -31,7 +31,7 @@ def update_rendered_spec(spec: SpecificationDto):
 
     url = f"{base_url}/functions/rendered-specs"
     headers = {"Authorization": f"Bearer {api_key}"}
-    resp = requests.post(url, json=data, headers=headers)
+    resp = http_client.post(url, json=data, headers=headers)
     assert resp.status_code == 201, (resp.text, resp.status_code)
 
 
@@ -40,7 +40,7 @@ def _get_spec(spec_id: str, no_types: bool = False) -> Optional[SpecificationDto
     url = f"{base_url}/specs"
     headers = {"Authorization": f"Bearer {api_key}"}
     params = {"noTypes": str(no_types).lower()}
-    resp = requests.get(url, headers=headers, params=params)
+    resp = http_client.get(url, headers=headers, params=params)
     if resp.status_code == 200:
         specs = resp.json()
         for spec in specs:

polyapi/server.py

@@ -24,6 +24,20 @@ def {function_name}(
         return resp.text  # type: ignore # fallback for debugging
 
 
+async def {function_name}_async(
+{args}
+) -> {return_type_name}:
+    \"""{function_description}
+
+    Function ID: {function_id}
+    \"""
+    resp = await execute_async("{function_type}", "{function_id}", {data})
+    try:
+        return {return_action}
+    except:
+        return resp.text  # type: ignore # fallback for debugging
+
+
 """
 
 

polyapi/sync.py

@@ -2,8 +2,7 @@ import os
 from datetime import datetime
 from typing import List, Dict
 from typing_extensions import cast # type: ignore
-import requests
-
+from polyapi import http_client
 from polyapi.utils import get_auth_headers
 from polyapi.config import get_api_key_and_url
 from polyapi.parser import get_jsonschema_type
@@ -35,10 +34,10 @@ def remove_deployable_function(deployable: SyncDeployment) -> bool:
         raise Exception("Missing api key!")
     headers = get_auth_headers(api_key)
     url = f'{deployable["instance"]}/functions/{deployable["type"].replace("-function", "")}/{deployable["id"]}'
-    response = requests.get(url, headers=headers)
+    response = http_client.get(url, headers=headers)
     if response.status_code != 200:
         return False
-    requests.delete(url, headers=headers)
+    http_client.delete(url, headers=headers)
     return True
 
 def remove_deployable(deployable: SyncDeployment) -> bool:
@@ -65,7 +64,7 @@ def sync_function_and_get_id(deployable: SyncDeployment, code: str) -> str:
         "returnTypeSchema": deployable["types"]["returns"]["typeSchema"],
         "arguments": [{**p, "key": p["name"], "type": get_jsonschema_type(p["type"])  } for p in deployable["types"]["params"]],
     }
-    response = requests.post(url, headers=headers, json=payload)
+    response = http_client.post(url, headers=headers, json=payload)
     response.raise_for_status()
     return response.json()['id']
 

polyapi/utils.py

@@ -16,7 +16,7 @@ from polyapi.schema import (
 
 # 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, 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, get_direct_execute_config\nfrom polyapi.execute import execute, execute_post, variable_get, variable_update, direct_execute\n\n"
+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, get_direct_execute_config\nfrom polyapi.execute import execute, execute_async, execute_post, execute_post_async, variable_get, variable_get_async, variable_update, variable_update_async, direct_execute, direct_execute_async\n\n"
 
 
 def init_the_init(full_path: str, code_imports: Optional[str] = None) -> None:
@@ -73,9 +73,22 @@ def print_red(s: str):
 
 def add_type_import_path(function_name: str, arg: str) -> str:
     """if not basic type, coerce to camelCase and add the import path"""
-    # for now, just treat Callables as basic types
+    # from now, we start qualifying non-basic types :)) 
+    # e.g. Callable[[EmailAddress, Dict, Dict, Dict], None]
+        # becomes Callable[[Set_profile_email.EmailAddress, Dict, Dict, Dict], None]
+    
     if arg.startswith("Callable"):
-        return arg
+        inner = arg[len("Callable["):-1]  # strip outer Callable[...]
+        parts = [p.strip() for p in inner.split(",")]
+        qualified = []
+        for p in parts:
+            clean = p.strip("[] ")
+            if clean and clean not in BASIC_PYTHON_TYPES:
+                replacement = f"{to_func_namespace(function_name)}.{camelCase(clean)}"
+                p = p.replace(clean, replacement)
+            qualified.append(p)
+        return "Callable[" + ",".join(qualified) + "]"
+        # return arg
 
     if arg in BASIC_PYTHON_TYPES:
         return arg

polyapi/variables.py

@@ -15,6 +15,11 @@ GET_TEMPLATE = """
     def get() -> {variable_type}:
         resp = variable_get("{variable_id}")
         return resp.text
+
+    @staticmethod
+    async def get_async() -> {variable_type}:
+        resp = await variable_get_async("{variable_id}")
+        return resp.text
 """
 
 
@@ -30,6 +35,11 @@ class {variable_name}:{get_method}
         resp = variable_update("{variable_id}", value)
         return resp.json()
 
+    @staticmethod
+    async def update_async(value: {variable_type}):
+        resp = await variable_update_async("{variable_id}", value)
+        return resp.json()
+
     @classmethod
     async def onUpdate(cls, callback):
         api_key, base_url = get_api_key_and_url()

polyapi/webhook.py

@@ -124,11 +124,7 @@ def render_webhook_handle(
 ) -> Tuple[str, str]:
     try:
         function_args, function_args_def = parse_arguments(function_name, arguments)
-
-        if "WebhookEventType" in function_args:
-            # let's add the function name import!
-            function_args = function_args.replace("WebhookEventType", f"{to_func_namespace(function_name)}.WebhookEventType")
-
+       
         func_str = WEBHOOK_TEMPLATE.format(
             description=function_description,
             function_id=function_id,

{polyapi_python-0.3.13.dev1.dist-info → polyapi_python-0.3.14.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.13.dev1
+Version: 0.3.14.dev1
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -36,6 +36,7 @@ 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
+Requires-Dist: httpx>=0.28.1
 Dynamic: license-file
 
 # PolyAPI Python Library
@@ -185,6 +186,14 @@ This script is handy for checking for any mypy types:
 
 Please ignore \[name-defined\] errors for now. This is a known bug we are working to fix!
 
+## Strategies for QA'ing Changes To Generate Or Other Core Functionality
+
+Our https://na1.polyapi.io has a large OOB catalog (as does eu1/na2). We also have several big internal PolyAPI projects with Python (message @eupharis if you need a pointer to which ones).
+
+Running `python -m polyapi generate` in all these projects and then checking the flake8 and check_mypy steps above is a great way to build confidence that the `generate` changes has no gotchas.
+
+Of course all this is in addition to the changes passing through normal unittests and integration tests!
+
 ## Support
 
 If you run into any issues or want help getting started with this project, please contact support@polyapi.io

polyapi_python-0.3.14.dev1.dist-info/RECORD

@@ -0,0 +1,33 @@
+polyapi/__init__.py,sha256=hw7x4j9JNJfPdkIOZqV0X9pbYcw3_5AH1iQFdSogH-c,3235
+polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
+polyapi/api.py,sha256=CzqX99GekhQJVqAAWlL03hUenIi_5iTln9cWgQzz6Ko,2784
+polyapi/auth.py,sha256=l0pGAoYvEWqa2TMsrM9GS8imXu3GsWvpn4eFPy1vksI,6195
+polyapi/cli.py,sha256=3M6XpMhpvQSHq4X8tBsq7N93YEwyVIqNFkz1tx_6aSs,11107
+polyapi/client.py,sha256=DW6ljG_xCwAo2yz23A9QfLooE6ZUDvSpdA4e_dCQjiQ,1418
+polyapi/config.py,sha256=dnowfPKEau5sA4zwBzLK_dYAHA-Wi3AOnMtDNsYwUmM,7520
+polyapi/constants.py,sha256=sc-FnS0SngBLvSu1ZWMs0UCf9EYD1u1Yhfr-sZXGLns,607
+polyapi/deployables.py,sha256=njmqTU0W7d3JdDWhjjjr2UOghEv4bTKUN-3ztJvcC7o,12233
+polyapi/error_handler.py,sha256=I_e0iz6VM23FLVQWJljxs2NGcl_OODbi43OcbnqBlp8,2398
+polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
+polyapi/execute.py,sha256=MeAmc5qsMQfnQPiHJK9Khkn_wrBxMoyMYYqmuFFPsRg,8779
+polyapi/function_cli.py,sha256=kKrecKCDNMmYtcOOCVF2KKOGjFUfWD2TbiVsyYQ84y8,4323
+polyapi/generate.py,sha256=TjMlxxjWN1WnFEmOjSygFcl9RkHCZeCq79R-K_7GYRU,21059
+polyapi/http_client.py,sha256=dfsfFzHlhScQgYMf3zJshJJCwgJGQqM8B5peY9O4NPU,1872
+polyapi/parser.py,sha256=pAkeuwp1Kn6bHXiIoj-DuXQ518PztQThIa8vztgsKLQ,21525
+polyapi/poly_schemas.py,sha256=fZ6AGvHcOKQJtlrzSuzeBNed5DxPMA2dJGdJvuFCHWM,9066
+polyapi/poly_tables.py,sha256=T07j4H-HdcIFP5HwUq0uljpzzYzMtJvdqYvOdC0oZ4I,19728
+polyapi/prepare.py,sha256=DBlrQu_A0PqdaQ3KlMs-C6PkV3qncatkAiBlC7j2hnk,7441
+polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+polyapi/rendered_spec.py,sha256=J2Num7MXnW_mKAe2MSVIL1coWopNYZ-6nNNwQRfseV0,2262
+polyapi/schema.py,sha256=-mtRV5iL3CV0X3phXhGYFV8sLz0KouTACOKWyGO9Pwc,5309
+polyapi/server.py,sha256=35l3f9d6jWaa60MfX5n7KF4UCAQR-Xg8WLc0NL9dlfY,2479
+polyapi/sync.py,sha256=t0Khh8B5GylxB7KWRP_xvkrvkuyVarSLCOvtmaz7lcc,6766
+polyapi/typedefs.py,sha256=mfll-KrngOW0wzbvDNiIDaDkFMwbsT-MY5y5hzWj9RE,5642
+polyapi/utils.py,sha256=VN8n_jvphderplI5MDYjSutxVnYbJjHhJznYkwjgstw,13349
+polyapi/variables.py,sha256=hfSDPGQK6YphNCa9MqE0W88WIFfqCQWgpBDWkExMq-A,7582
+polyapi/webhook.py,sha256=0ceLwHNjNd2Yx_8MX5jOIxiQ5Lwhy2pe81ProAuKon0,5108
+polyapi_python-0.3.14.dev1.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
+polyapi_python-0.3.14.dev1.dist-info/METADATA,sha256=X2RhN7oTKSIFtSQ1wXqKc0Jq9QTWLUBCwyBpgnzmtpw,5913
+polyapi_python-0.3.14.dev1.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+polyapi_python-0.3.14.dev1.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.3.14.dev1.dist-info/RECORD,,

polyapi_python-0.3.13.dev1.dist-info/RECORD

@@ -1,32 +0,0 @@
-polyapi/__init__.py,sha256=hw7x4j9JNJfPdkIOZqV0X9pbYcw3_5AH1iQFdSogH-c,3235
-polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
-polyapi/api.py,sha256=2nds6ZdNe9OHvCba4IjOPga0CAYIsib2SbhEyDDCmd8,2188
-polyapi/auth.py,sha256=EGstBjTSdAydI5hGAHeRRc1GcmHshogudb3sxCgO6zA,5341
-polyapi/cli.py,sha256=3M6XpMhpvQSHq4X8tBsq7N93YEwyVIqNFkz1tx_6aSs,11107
-polyapi/client.py,sha256=DW6ljG_xCwAo2yz23A9QfLooE6ZUDvSpdA4e_dCQjiQ,1418
-polyapi/config.py,sha256=dnowfPKEau5sA4zwBzLK_dYAHA-Wi3AOnMtDNsYwUmM,7520
-polyapi/constants.py,sha256=sc-FnS0SngBLvSu1ZWMs0UCf9EYD1u1Yhfr-sZXGLns,607
-polyapi/deployables.py,sha256=njmqTU0W7d3JdDWhjjjr2UOghEv4bTKUN-3ztJvcC7o,12233
-polyapi/error_handler.py,sha256=I_e0iz6VM23FLVQWJljxs2NGcl_OODbi43OcbnqBlp8,2398
-polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
-polyapi/execute.py,sha256=q4xtV6rYO8f-8hULlFTlVgoTVQSahvlMu3FHkFzYpMs,4423
-polyapi/function_cli.py,sha256=W30yL2i152iZCr6zAU1CHKlDp_tt7kB2cGIXIxmWumk,4302
-polyapi/generate.py,sha256=0zVDEnKVZnbMNZ6O0SWAuDLHrBrkW01vFkjpf9wrQZo,21046
-polyapi/parser.py,sha256=pAkeuwp1Kn6bHXiIoj-DuXQ518PztQThIa8vztgsKLQ,21525
-polyapi/poly_schemas.py,sha256=fZ6AGvHcOKQJtlrzSuzeBNed5DxPMA2dJGdJvuFCHWM,9066
-polyapi/poly_tables.py,sha256=SrByuusS1aL7L7R8o28TEr4A-8AfMGGHCKLg-9vmnxc,18783
-polyapi/prepare.py,sha256=NQzpMIoakNovStvOGOmqSYIpTwiWXaweNSE9se10A2E,7420
-polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-polyapi/rendered_spec.py,sha256=nJEj2vRgG3N20fU4s-ThRtOIwAuTzXwXuOBIkXljDVc,2240
-polyapi/schema.py,sha256=-mtRV5iL3CV0X3phXhGYFV8sLz0KouTACOKWyGO9Pwc,5309
-polyapi/server.py,sha256=YXWxhYBx-hluwDQ8Jvfpy2s8ogz0GsNTMcZVNcP5ca8,2147
-polyapi/sync.py,sha256=52ODc82jBJpbNYTB9zXlrVZLR39iwDPW3cuIC3P8dbM,6742
-polyapi/typedefs.py,sha256=mfll-KrngOW0wzbvDNiIDaDkFMwbsT-MY5y5hzWj9RE,5642
-polyapi/utils.py,sha256=Ca189i4PM4TpwvpzwF3T8MfQsOPD45b_falXjjgYCyI,12603
-polyapi/variables.py,sha256=SJv106ePpQP5mx7Iiafl_shtFlE8FoaO9Q8lvw-3IRg,7270
-polyapi/webhook.py,sha256=I3_uOl4f4L2-2WehzRLMVMRrB-76EiXCPA9Vzoaj30I,5326
-polyapi_python-0.3.13.dev1.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
-polyapi_python-0.3.13.dev1.dist-info/METADATA,sha256=3dfqvKcLsYjGJpeIGIu-KoC7RjOtSEddhx68R_qTuNc,5318
-polyapi_python-0.3.13.dev1.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-polyapi_python-0.3.13.dev1.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.3.13.dev1.dist-info/RECORD,,