polyapi-python 0.2.5.dev7__tar.gz → 0.2.5.dev9__tar.gz

{polyapi_python-0.2.5.dev7/polyapi_python.egg-info → polyapi_python-0.2.5.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.5.dev7
+Version: 0.2.5.dev9
 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.2.5.dev7 → polyapi_python-0.2.5.dev9}/polyapi/rendered_spec.py

@@ -1,4 +1,5 @@
-from typing import Dict, Optional
+import os
+from typing import Optional
 
 import requests
 from polyapi.config import get_api_key_and_url
@@ -24,8 +25,7 @@ def update_rendered_spec(api_key: str, spec: SpecificationDto):
     # use super key on develop-k8s here!
     _, base_url = get_api_key_and_url()
     if not base_url:
-        # local node server runs on port 8000
-        base_url = "http://localhost:8000"
+        base_url = os.environ.get("HOST_URL")
 
     url = f"{base_url}/functions/rendered-specs"
     headers = {"Authorization": f"Bearer {api_key}"}
@@ -37,8 +37,7 @@ def update_rendered_spec(api_key: str, spec: SpecificationDto):
 def _get_spec(api_key: str, spec_id: str) -> Optional[SpecificationDto]:
     _, base_url = get_api_key_and_url()
     if not base_url:
-        # local node server runs on port 8000
-        base_url = "http://localhost:8000"
+        base_url = os.environ.get("HOST_URL")
 
     url = f"{base_url}/specs"
     headers = {"Authorization": f"Bearer {api_key}"}

{polyapi_python-0.2.5.dev7 → polyapi_python-0.2.5.dev9}/polyapi/schema.py

@@ -1,3 +1,4 @@
+import logging
 import contextlib
 from typing import Dict
 from jsonschema_gentypes.cli import process_config
@@ -31,6 +32,21 @@ def _temp_store_input_data(input_data: Dict) -> str:
         return temp_file.name
 
 
+def wrapped_generate_schema_types(type_spec: dict, root, fallback_type):
+    if not root:
+        root = "MyList" if fallback_type == "List" else "MyDict"
+
+    try:
+        return clean_title(root), generate_schema_types(type_spec, root=root)
+    except RecursionError:
+        # 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:
+        logging.exception(f"Error when generating schema type: {type_spec}")
+        return fallback_type, ""
+
+
 def generate_schema_types(input_data: Dict, root=None):
     """takes in a Dict representing a schema as input then appends the resulting python code to the output file"""
     _cleanup_input_for_gentypes(input_data)

{polyapi_python-0.2.5.dev7 → polyapi_python-0.2.5.dev9}/polyapi/utils.py

@@ -1,16 +1,16 @@
 import re
 import os
-import logging
 from typing import Tuple, List
 from colorama import Fore, Style
 from polyapi.constants import BASIC_PYTHON_TYPES
 from polyapi.typedefs import PropertySpecification, PropertyType
-from polyapi.schema import generate_schema_types, clean_title, map_primitive_types
+from polyapi.schema import wrapped_generate_schema_types, clean_title, map_primitive_types
 
 
 # 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"}
 
 
 def init_the_init(full_path: str) -> None:
@@ -96,11 +96,7 @@ def get_type_and_def(type_spec: PropertyType) -> Tuple[str, str]:
         if type_spec.get("items"):
             items = type_spec["items"]
             if items.get("$ref"):
-                try:
-                    return "ResponseType", generate_schema_types(type_spec, root="ResponseType")  # type: ignore
-                except:
-                    logging.exception(f"Error when generating schema type: {type_spec}")
-                    return "Dict", ""
+                return wrapped_generate_schema_types(type_spec, "ResponseType", "Dict")  # type: ignore
             else:
                 item_type, _ = get_type_and_def(items)
                 title = f"List[{item_type}]"
@@ -116,12 +112,7 @@ def get_type_and_def(type_spec: PropertyType) -> Tuple[str, str]:
             title = schema.get("title", "")
             if title:
                 assert isinstance(title, str)
-                title = clean_title(title)
-                try:
-                    return title, generate_schema_types(schema, root=title)  # type: ignore
-                except:
-                    logging.exception(f"Error when generating schema type: {schema}")
-                    return "Dict", ""
+                return wrapped_generate_schema_types(schema, title, "Dict")  # type: ignore
 
             elif schema.get("items"):
                 # fallback to schema $ref name if no explicit title
@@ -132,16 +123,11 @@ def get_type_and_def(type_spec: PropertyType) -> Tuple[str, str]:
                     title = items.get("$ref", "")  # type: ignore
 
                 title = title.rsplit("/", 1)[-1]
-                title = clean_title(title)
                 if not title:
                     return "List", ""
 
                 title = f"List[{title}]"
-                try:
-                    return title, generate_schema_types(schema, root=title)
-                except:
-                    logging.exception(f"Error when generating schema type: {schema}")
-                    return "List", ""
+                return wrapped_generate_schema_types(schema, title, "List")
             else:
                 return "Any", ""
         else:

{polyapi_python-0.2.5.dev7 → polyapi_python-0.2.5.dev9/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.5.dev7
+Version: 0.2.5.dev9
 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.2.5.dev7 → polyapi_python-0.2.5.dev9}/pyproject.toml

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

polyapi_python-0.2.5.dev9/tests/test_schema.py

@@ -0,0 +1,20 @@
+import unittest
+from polyapi.schema import wrapped_generate_schema_types
+
+SCHEMA = {
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "type": "object",
+    "properties": {"name": {"type": "string"}},
+    "required": ["name"],
+    "additionalProperties": False,
+    "definitions": {},
+}
+
+
+class T(unittest.TestCase):
+    def test_fix_titles(self):
+        output = wrapped_generate_schema_types(SCHEMA, "", "Dict")
+        self.assertEqual("MyDict", output[0])
+        self.assertIn("class MyDict", output[1])
+
+        # should not throw with unknown dialect error

polyapi_python-0.2.5.dev7/tests/test_schema.py

@@ -1,14 +0,0 @@
-import unittest
-from polyapi.schema import generate_schema_types
-
-
-class T(unittest.TestCase):
-    def test_fix_titles(self):
-        # schema = json.loads(SCHEMA)
-        schema = {"$schema": "http://json-schema.org/draft-06/schema#"}
-        try:
-            a, b = generate_schema_types(schema)
-        except AssertionError:
-            pass
-
-        # should not throw with unknown dialect error