polyapi-python 0.3.9.dev6__tar.gz → 0.3.9.dev8__tar.gz

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.9.dev6
+Version: 0.3.9.dev8
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/polyapi/__init__.py

@@ -2,6 +2,8 @@ import os
 import sys
 import copy
 import truststore
+import logging
+import builtins
 from typing import Any, Dict, Optional, overload, Literal
 from typing_extensions import TypedDict
 truststore.inject_into_ssl()
@@ -98,4 +100,19 @@ class _PolyCustom:
         return new
 
 
-polyCustom: PolyCustomDict = _PolyCustom()
+polyCustom: PolyCustomDict = _PolyCustom()
+
+original_print = print
+
+logging.basicConfig(level=logging.INFO, format='%(levelname)s - %(message)s')
+
+def log_prints(*objects, sep=' ', end='\n', file=sys.stdout, flush=False):
+    message = sep.join(map(str, objects)) + end
+    if file is sys.stdout:
+        logging.info(message)
+    elif file is sys.stderr:
+        logging.error(message)
+    else: 
+        original_print(*objects, sep=sep, end=end, file=file, flush=flush)
+
+builtins.print = log_prints

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/polyapi/execute.py

@@ -1,12 +1,11 @@
 from typing import Dict, Optional
 import requests
 import os
-import logging
+import sys
 from requests import Response
 from polyapi.config import get_api_key_and_url, get_mtls_config
 from polyapi.exceptions import PolyApiException
 
-logger = logging.getLogger("poly")
 
 def direct_execute(function_type, function_id, data) -> Response:
     """ execute a specific function id/type
@@ -49,7 +48,7 @@ def direct_execute(function_type, function_id, data) -> Response:
     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}")
+            print(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}", file=sys.stderr)
         elif function_type != 'api':   
             raise PolyApiException(f"{resp.status_code}: {error_content}")    
     
@@ -73,7 +72,7 @@ def execute(function_type, function_id, data) -> Response:
     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}")
+            print(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}", file=sys.stderr)
         elif function_type != 'api':
             raise PolyApiException(f"{resp.status_code}: {error_content}")
 

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/polyapi/generate.py

@@ -4,6 +4,8 @@ import os
 import shutil
 import logging
 import tempfile
+
+from copy import deepcopy
 from typing import Any, List, Optional, Tuple, cast
 
 from .auth import render_auth_function
@@ -136,19 +138,22 @@ def parse_function_specs(
     limit_ids: List[str] | None = None,  # optional list of ids to limit to
 ) -> List[SpecificationDto]:
     functions = []
-    for spec in specs:
-        if not spec:
+    for raw_spec in specs:
+        if not raw_spec:
             continue
 
         # For no_types mode, we might not have function data, but we still want to include the spec
         # if it's a supported function type
-        if spec["type"] not in SUPPORTED_FUNCTION_TYPES:
+        if raw_spec["type"] not in SUPPORTED_FUNCTION_TYPES:
             continue
 
         # Skip if we have a limit and this spec is not in it
-        if limit_ids and spec.get("id") not in limit_ids:
+        if limit_ids and raw_spec.get("id") not in limit_ids:
             continue
 
+        # Should really be fixed in specs api, but for now handle json strings in arg schemas
+        spec = normalize_args_schema(raw_spec)
+
         # For customFunction, check language if we have function data
         if spec["type"] == "customFunction":
             if spec.get("language") and spec["language"] != "python":
@@ -286,6 +291,37 @@ def generate_from_cache() -> None:
     )
 
 
+def _parse_arg_schema(value: Any) -> Any:
+    if isinstance(value, str):
+        text = value.strip()
+        if text and text[0] in "{[":
+            try:
+                return json.loads(text)
+            except json.JSONDecodeError:
+                logging.warning("Could not parse function argument schema (leaving as str): %s", text[:200])
+    return value
+
+
+def normalize_args_schema(
+    raw_spec: SpecificationDto
+) -> SpecificationDto:
+    spec = deepcopy(raw_spec)
+
+    function_block = spec.get("function")
+    if not isinstance(function_block, dict):
+        return spec
+    arguments_block = function_block.get("arguments")
+    if not isinstance(arguments_block, list):
+        return spec
+
+    for argument in arguments_block:
+        arg_type = argument.get("type")
+        if isinstance(arg_type, dict) and "schema" in arg_type:
+            arg_type["schema"] = _parse_arg_schema(arg_type["schema"])
+
+    return spec
+
+
 def generate(contexts: Optional[List[str]] = None, names: Optional[List[str]] = None, function_ids: Optional[List[str]] = None, no_types: bool = False) -> None:
     generate_msg = f"Generating Poly Python SDK for contexts ${contexts}..." if contexts else "Generating Poly Python SDK..."
     print(generate_msg, end="", flush=True)

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/polyapi/schema.py

@@ -3,6 +3,8 @@
 import logging
 import contextlib
 import re
+import polyapi
+import builtins
 from typing import Dict
 from jsonschema_gentypes.cli import process_config
 from jsonschema_gentypes import configuration
@@ -89,9 +91,12 @@ def generate_schema_types(input_data: Dict, root=None):
     }
 
     # jsonschema_gentypes prints source to stdout
-    # no option to surpress so we do this
+    # no option to suppress so we do this
+    # Not reverting the print monkeypatch causes print to bypass redirect
+    builtins.print = polyapi.original_print
     with contextlib.redirect_stdout(None):
         process_config(config, [tmp_input])
+    builtins.print = polyapi.log_prints
 
     with open(tmp_output, encoding='utf-8') as f:
         output = f.read()

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/polyapi_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.9.dev6
+Version: 0.3.9.dev8
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi_python-0.3.9.dev6 → polyapi_python-0.3.9.dev8}/pyproject.toml

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