ssc_codegen 0.28.0__tar.gz → 0.29.1__tar.gz

{ssc_codegen-0.28.0 → ssc_codegen-0.29.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssc_codegen
-Version: 0.28.0
+Version: 0.29.1
 Summary: Python-dsl code converter to html parser for web scraping 
 Project-URL: Documentation, https://github.com/vypivshiy/selector_schema_codegen#readme
 Project-URL: Issues, https://github.com/vypivshiy/selector_schema_codegen/issues

{ssc_codegen-0.28.0 → ssc_codegen-0.29.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssc_codegen"
-version = "0.28.0"
+version = "0.29.1"
 description = "Python-dsl code converter to html parser for web scraping "
 readme = "README.md"
 requires-python = ">=3.10"

{ssc_codegen-0.28.0 → ssc_codegen-0.29.1}/ssc_codegen/converters/js_pure.py

@@ -419,14 +419,17 @@ def pre_struct_item(node: a.StructItem, ctx: ConverterContext):
 def pre_struct_list(node: a.StructList, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
 
+
 @JS_CONVERTER(a.StructFlatList, post_callback="}")
 def pre_struct_flatlist(node: a.StructFlatList, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
 
+
 @JS_CONVERTER(a.StructDict, post_callback="}")
 def pre_struct_dict(node: a.StructDict, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
 
+
 @JS_CONVERTER(a.StructTable, post_callback="}")
 def pre_struct_table(node: a.StructTable, ctx: ConverterContext):
     return _js_struct_header(node, ctx)
@@ -1964,7 +1967,9 @@ def _js_rest_method(node: a.RequestConfig, ctx: ConverterContext) -> list[str]:
 
     # Shared response extraction + dispatch
     parser_fn = (
-        "sscParseResponseAxios" if http_client == "axios" else "sscParseResponse"
+        "sscParseResponseAxios"
+        if http_client == "axios"
+        else "sscParseResponse"
     )
     parse_prefix = "" if http_client == "axios" else "await "
     lines.append(

{ssc_codegen-0.28.0 → ssc_codegen-0.29.1}/ssc_codegen/converters/py_bs4.py

@@ -1824,8 +1824,12 @@ def _emit_rest_methods(
         lines.append(f"{i3})")
         lines.append(f"{i2}except httpx.HTTPError as _exc:")
         lines.append(f"{i3}return TransportErr(cause=repr(_exc))")
-        lines.append(f"{i2}_status, _headers, _body = ssc_parse_response(_resp)")
-        lines.append(f"{i2}_err = cls.ssc_dispatch_err(_status, _headers, _body)")
+        lines.append(
+            f"{i2}_status, _headers, _body = ssc_parse_response(_resp)"
+        )
+        lines.append(
+            f"{i2}_err = cls.ssc_dispatch_err(_status, _headers, _body)"
+        )
         lines.append(f"{i2}if _err is not None:")
         lines.append(f"{i3}return _err")
         lines.append(

{ssc_codegen-0.28.0 → ssc_codegen-0.29.1}/ssc_codegen/kdl/reader.py

@@ -145,7 +145,6 @@ class KdlNode:
     children: tuple[KdlNode, ...]
     span: Span
 
-    @classmethod
     @classmethod
     def _value_type_annotation(cls, entry_value: object) -> str | None:
         if isinstance(entry_value, CSTValue) and entry_value.type_annotation:

{ssc_codegen-0.28.0 → ssc_codegen-0.29.1}/ssc_codegen/main.py

@@ -260,7 +260,7 @@ def generate(
         register_runtime_file(converter, _runtime_name)
 
     # Phase 1: parse all KDL files
-    from ssc_codegen.ast import Module, Struct
+    from ssc_codegen.ast import Module, StructRest
 
     parsed: list[tuple[Path, Module]] = []
     for kdl_file in kdl_files:
@@ -280,6 +280,7 @@ def generate(
             parsed.append((kdl_file, ast))
         except Exception as exc:
             if verbose:
+                typer.echo(f"ERROR {kdl_file}:", err=True)
                 typer.echo(traceback.format_exc(), err=True)
             else:
                 typer.echo(f"  ERROR {kdl_file}: {exc}", err=True)
@@ -295,7 +296,7 @@ def generate(
             (
                 ast
                 for _, ast in parsed
-                if any(isinstance(n, Struct) and n.is_rest for n in ast.body)
+                if any(isinstance(n, StructRest) for n in ast.body)
             ),
             parsed[0][1],
         )
@@ -320,6 +321,7 @@ def generate(
             typer.echo(f"  {kdl_file} -> {out_file}")
         except Exception as exc:
             if verbose:
+                typer.echo(f"ERROR {kdl_file}:", err=True)
                 typer.echo(traceback.format_exc(), err=True)
             else:
                 typer.echo(f"  ERROR {kdl_file}: {exc}", err=True)
@@ -395,9 +397,18 @@ def check(
     total_errors = 0
 
     for kdl_file in kdl_files:
-        _, errs = parse_module(
-            kdl_file.read_text(encoding="utf-8"), source_path=kdl_file
-        )
+        try:
+            _, errs = parse_module(
+                kdl_file.read_text(encoding="utf-8"), source_path=kdl_file
+            )
+        except Exception as exc:
+            if verbose:
+                typer.echo(f"ERROR {kdl_file}:", err=True)
+                typer.echo(traceback.format_exc(), err=True)
+            else:
+                typer.echo(f"  ERROR {kdl_file}: {exc}", err=True)
+            total_errors += 1
+            continue
         all_results.extend(errs)
 
         if errs: