polyapi-python 0.3.8.dev9__tar.gz → 0.3.9.dev1__tar.gz

{polyapi_python-0.3.8.dev9 → polyapi_python-0.3.9.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.8.dev9
+Version: 0.3.9.dev1
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -206,3 +206,4 @@ Please ignore \[name-defined\] errors for now. This is a known bug we are workin
 ## Support
 
 If you run into any issues or want help getting started with this project, please contact support@polyapi.io
+.

{polyapi_python-0.3.8.dev9 → polyapi_python-0.3.9.dev1}/README.md

@@ -165,4 +165,5 @@ Please ignore \[name-defined\] errors for now. This is a known bug we are workin
 
 ## Support
 
-If you run into any issues or want help getting started with this project, please contact support@polyapi.io
+If you run into any issues or want help getting started with this project, please contact support@polyapi.io
+.

{polyapi_python-0.3.8.dev9 → polyapi_python-0.3.9.dev1}/polyapi/poly_schemas.py

@@ -25,11 +25,13 @@ FALLBACK_SPEC_TEMPLATE = """class {name}(TypedDict, total=False):
 
 def generate_schemas(specs: List[SchemaSpecDto], limit_ids: List[str] = None):
     failed_schemas = []
+    successful_schemas = []
     if limit_ids:
         for spec in specs:
             if spec["id"] in limit_ids:
                 try:
                     create_schema(spec)
+                    successful_schemas.append(f"{spec.get('context', 'unknown')}.{spec.get('name', 'unknown')}")
                 except Exception as e:
                     schema_path = f"{spec.get('context', 'unknown')}.{spec.get('name', 'unknown')}"
                     schema_id = spec.get('id', 'unknown')
@@ -40,6 +42,7 @@ def generate_schemas(specs: List[SchemaSpecDto], limit_ids: List[str] = None):
         for spec in specs:
             try:
                 create_schema(spec)
+                successful_schemas.append(f"{spec.get('context', 'unknown')}.{spec.get('name', 'unknown')}")
             except Exception as e:
                 schema_path = f"{spec.get('context', 'unknown')}.{spec.get('name', 'unknown')}"
                 schema_id = spec.get('id', 'unknown')
@@ -51,6 +54,37 @@ def generate_schemas(specs: List[SchemaSpecDto], limit_ids: List[str] = None):
         logging.warning(f"WARNING: {len(failed_schemas)} schema(s) failed to generate:")
         for failed_schema in failed_schemas:
             logging.warning(f"  - {failed_schema}")
+        logging.warning(f"Successfully generated {len(successful_schemas)} schema(s)")
+
+
+def validate_schema_content(schema_content: str, schema_name: str) -> bool:
+    """
+    Validate that the schema content is meaningful and not just imports.
+    Returns True if the schema is valid, False otherwise.
+    """
+    if not schema_content or not schema_content.strip():
+        logging.debug(f"Schema {schema_name} failed validation: Empty content")
+        return False
+    
+    lines = schema_content.strip().split('\n')
+    
+    # Check if the content has any actual class definitions or type aliases
+    has_class_definition = any(line.strip().startswith('class ') for line in lines)
+    has_type_alias = any(schema_name in line and '=' in line and not line.strip().startswith('#') for line in lines)
+    
+    # Check if it's essentially just imports (less than 5 lines and no meaningful definitions)
+    meaningful_lines = [line for line in lines if line.strip() and not line.strip().startswith('from ') and not line.strip().startswith('import ') and not line.strip().startswith('#')]
+    
+    # Enhanced logging for debugging
+    if not (has_class_definition or has_type_alias) or len(meaningful_lines) < 1:
+        # Determine the specific reason for failure
+        if len(meaningful_lines) == 0:
+            logging.debug(f"Schema {schema_name} failed validation: No meaningful content (only imports) - likely empty object or unresolved reference")
+        elif not has_class_definition and not has_type_alias:
+            logging.debug(f"Schema {schema_name} failed validation: No class definition or type alias found")
+        return False
+    
+    return True
 
 
 def add_schema_file(
@@ -75,9 +109,9 @@ def add_schema_file(
 
         schema_defs = render_poly_schema(spec)
 
-        if not schema_defs:
-            # If render_poly_schema failed and returned empty string, don't create any files
-            raise Exception("Schema rendering failed - empty schema content returned")
+        # Validate schema content before proceeding
+        if not validate_schema_content(schema_defs, schema_name):
+            raise Exception(f"Schema rendering failed or produced invalid content for {schema_name}")
 
         # Prepare all content first before writing any files
         schema_namespace = to_func_namespace(schema_name)
@@ -87,7 +121,7 @@ def add_schema_file(
         # Read current __init__.py content if it exists
         init_content = ""
         if os.path.exists(init_path):
-            with open(init_path, "r") as f:
+            with open(init_path, "r", encoding='utf-8') as f:
                 init_content = f.read()
         
         # Prepare new content to append to __init__.py
@@ -95,12 +129,12 @@ def add_schema_file(
         
         # Use temporary files for atomic writes
         # Write to __init__.py atomically
-        with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=full_path, suffix=".tmp") as temp_init:
+        with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=full_path, suffix=".tmp", encoding='utf-8') as temp_init:
             temp_init.write(new_init_content)
             temp_init_path = temp_init.name
         
         # Write to schema file atomically  
-        with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=full_path, suffix=".tmp") as temp_schema:
+        with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=full_path, suffix=".tmp", encoding='utf-8') as temp_schema:
             temp_schema.write(schema_defs)
             temp_schema_path = temp_schema.name
         
@@ -171,7 +205,7 @@ def create_schema(
 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:
+    with open(init_path, "a", encoding='utf-8') as f:
         f.write(render_poly_schema(spec) + "\n\n")
 
 

{polyapi_python-0.3.8.dev9 → polyapi_python-0.3.9.dev1}/polyapi/schema.py

@@ -93,7 +93,7 @@ def generate_schema_types(input_data: Dict, root=None):
     with contextlib.redirect_stdout(None):
         process_config(config, [tmp_input])
 
-    with open(tmp_output) as f:
+    with open(tmp_output, encoding='utf-8') as f:
         output = f.read()
 
     output = clean_malformed_examples(output)
@@ -104,12 +104,26 @@ def generate_schema_types(input_data: Dict, root=None):
 # Regex to match everything between "# example: {\n" and "^}$"
 MALFORMED_EXAMPLES_PATTERN = re.compile(r"# example: \{\n.*?^\}$", flags=re.DOTALL | re.MULTILINE)
 
+# Regex to fix invalid escape sequences in docstrings
+INVALID_ESCAPE_PATTERNS = [
+    # Fix "\ " (backslash space) which is not a valid escape sequence
+    (re.compile(r'\\(\s)', re.DOTALL), r'\1'),
+    # Fix other common invalid escape sequences in docstrings
+    (re.compile(r'\\([^nrtbfav"\'\\])', re.DOTALL), r'\\\\\1'),
+]
+
 
 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
+    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)
+    
+    # Fix invalid escape sequences in docstrings
+    for pattern, replacement in INVALID_ESCAPE_PATTERNS:
+        cleaned_example = pattern.sub(replacement, cleaned_example)
+    
     return cleaned_example
 
 

{polyapi_python-0.3.8.dev9 → polyapi_python-0.3.9.dev1}/polyapi_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.8.dev9
+Version: 0.3.9.dev1
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -206,3 +206,4 @@ Please ignore \[name-defined\] errors for now. This is a known bug we are workin
 ## Support
 
 If you run into any issues or want help getting started with this project, please contact support@polyapi.io
+.

{polyapi_python-0.3.8.dev9 → polyapi_python-0.3.9.dev1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.3.8.dev9"
+version = "0.3.9.dev1"
 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.8.dev9 → polyapi_python-0.3.9.dev1}/tests/test_schema.py

@@ -1,5 +1,5 @@
 import unittest
-from polyapi.schema import clean_malformed_examples, wrapped_generate_schema_types
+from polyapi.schema import clean_malformed_examples, wrapped_generate_schema_types, generate_schema_types
 
 SCHEMA = {
     "$schema": "http://json-schema.org/draft-06/schema#",
@@ -10,6 +10,14 @@ SCHEMA = {
     "definitions": {},
 }
 
+CHARACTER_SCHEMA = {
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "type": "object",
+    "properties": {"CHARACTER_SCHEMA_NAME": {"description": "This is — “bad”, right?", "type": "string"}},
+    "additionalProperties": False,
+    "definitions": {},
+}
+
 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'
 
 
@@ -23,4 +31,10 @@ class T(unittest.TestCase):
 
     def test_clean_malformed_examples(self):
         output = clean_malformed_examples(APALEO_MALFORMED_EXAMPLE)
-        self.assertNotIn("# example: {", output)
+        self.assertNotIn("# example: {", 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)
+