polyapi-python 0.3.14.dev4__tar.gz → 0.3.15__tar.gz

{polyapi_python-0.3.14.dev4/polyapi_python.egg-info → polyapi_python-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.14.dev4
+Version: 0.3.15
 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.14.dev4 → polyapi_python-0.3.15}/polyapi/schema.py

@@ -101,8 +101,11 @@ def generate_schema_types(input_data: Dict, root=None):
     return output
 
 
-# Regex to match everything between "# example: {\n" and "^}$"
-MALFORMED_EXAMPLES_PATTERN = re.compile(r"# example: \{\n.*?^\}$", flags=re.DOTALL | re.MULTILINE)
+# Matches commented example headers emitted by jsonschema-gentypes before a raw
+# multiline JSON object/array body that is not commented out.
+MALFORMED_EXAMPLE_HEADER_PATTERN = re.compile(
+    r"^\s*#\s*(?:\|\s*)?example:\s*([\[{])\s*$"
+)
 
 # Regex to fix invalid escape sequences in docstrings
 INVALID_ESCAPE_PATTERNS = [
@@ -117,8 +120,24 @@ def clean_malformed_examples(example: str) -> str:
     """ there is a bug in the `jsonschmea_gentypes` library where if an example from a jsonchema is an object,
     it will break the code because the object won't be properly commented out. Also fixes invalid escape sequences.
     """
-    # Remove malformed examples
-    cleaned_example = MALFORMED_EXAMPLES_PATTERN.sub("", example)
+    cleaned_lines = []
+    balance = 0
+    skipping_example = False
+
+    for line in example.splitlines(keepends=True):
+        if not skipping_example:
+            if MALFORMED_EXAMPLE_HEADER_PATTERN.match(line):
+                skipping_example = True
+                balance = line.count("{") + line.count("[") - line.count("}") - line.count("]")
+                continue
+            cleaned_lines.append(line)
+            continue
+
+        balance += line.count("{") + line.count("[") - line.count("}") - line.count("]")
+        if balance <= 0:
+            skipping_example = False
+
+    cleaned_example = "".join(cleaned_lines)
     
     # Fix invalid escape sequences in docstrings
     for pattern, replacement in INVALID_ESCAPE_PATTERNS:

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.15/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.14.dev4
+Version: 0.3.15
 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.14.dev4 → polyapi_python-0.3.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyapi-python"
-version = "0.3.14.dev4"
+version = "0.3.15"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [

{polyapi_python-0.3.14.dev4 → polyapi_python-0.3.15}/tests/test_schema.py

@@ -19,6 +19,7 @@ CHARACTER_SCHEMA = {
 }
 
 APALEO_MALFORMED_EXAMPLE = 'from typing import List, TypedDict, Union\nfrom typing_extensions import Required\n\n\n# Body.\n# \n# example: {\n  "from": "2024-04-21",\n  "to": "2024-04-24",\n  "grossDailyRate": {\n    "amount": 160.0,\n    "currency": "EUR"\n  },\n  "timeSlices": [\n    {\n      "blockedUnits": 3\n    },\n    {\n      "blockedUnits": 0\n    },\n    {\n      "blockedUnits": 7\n    }\n  ]\n}\n# x-readme-ref-name: ReplaceBlockModel\nBody = TypedDict(\'Body\', {\n    # Start date and time from which the inventory will be blockedSpecify either a pure date or a date and time (without fractional second part) in UTC or with UTC offset as defined in <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO8601:2004</a>\n    # \n    # Required property\n    \'from\': Required[str],\n    # End date and time until which the inventory will be blocked. Cannot be more than 5 years after the start date.Specify either a pure date or a date and time (without fractional second part) in UTC or with UTC offset as defined in <a href="https://en.wikipedia.org/wiki/ISO_8601">ISO8601:2004</a>\n    # \n    # Required property\n    \'to\': Required[str],\n    # x-readme-ref-name: MonetaryValueModel\n    # \n    # Required property\n    \'grossDailyRate\': Required["_BodygrossDailyRate"],\n    # The list of time slices\n    # \n    # Required property\n    \'timeSlices\': Required[List["_BodytimeSlicesitem"]],\n}, total=False)\n\n\nclass _BodygrossDailyRate(TypedDict, total=False):\n    """ x-readme-ref-name: MonetaryValueModel """\n\n    amount: Required[Union[int, float]]\n    """\n    format: double\n\n    Required property\n    """\n\n    currency: Required[str]\n    """ Required property """\n\n\n\nclass _BodytimeSlicesitem(TypedDict, total=False):\n    """ x-readme-ref-name: CreateBlockTimeSliceModel """\n\n    blockedUnits: Required[Union[int, float]]\n    """\n    Number of units blocked for the time slice\n\n    format: int32\n\n    Required property\n    """\n\n'
+APALEO_MALFORMED_PIPE_EXAMPLE = APALEO_MALFORMED_EXAMPLE.replace("# example: {", "# | example: {")
 
 
 class T(unittest.TestCase):
@@ -32,9 +33,15 @@ class T(unittest.TestCase):
     def test_clean_malformed_examples(self):
         output = clean_malformed_examples(APALEO_MALFORMED_EXAMPLE)
         self.assertNotIn("# example: {", output)
+        self.assertNotIn('  "from": "2024-04-21",', output)
+
+    def test_clean_malformed_examples_pipe_style(self):
+        output = clean_malformed_examples(APALEO_MALFORMED_PIPE_EXAMPLE)
+        self.assertNotIn("# | example: {", output)
+        self.assertNotIn('  "from": "2024-04-21",', output)
     
     def test_character_encoding(self):
         output = generate_schema_types(CHARACTER_SCHEMA, "Dict")
         expected = 'from typing import TypedDict\n\n\nclass Dict(TypedDict, total=False):\n    CHARACTER_SCHEMA_NAME: str\n    """ This is — “bad”, right? """\n\n'
         self.assertEqual(output, expected)
-        
+