PySerials 0.0.0.dev6__tar.gz → 0.0.0.dev7__tar.gz

{pyserials-0.0.0.dev6 → pyserials-0.0.0.dev7}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev6
+Version: 0.0.0.dev7
 Requires-Python: >=3.10
 Requires-Dist: jsonschema<5,>=4.21.0
 Requires-Dist: ruamel.yaml<0.18,>=0.17.32
 Requires-Dist: ruamel.yaml.string<1,>=0.1.1
 Requires-Dist: tomlkit<0.12,>=0.11.8
-Requires-Dist: mdit
-Requires-Dist: ansi-sgr
-Requires-Dist: ExceptionMan
+Requires-Dist: MDit==0.0.0.dev3
+Requires-Dist: ExceptionMan==0.0.0.dev4
 Requires-Dist: jsonpath-ng<2,>=1.6.1

{pyserials-0.0.0.dev6 → pyserials-0.0.0.dev7}/pyproject.toml

@@ -17,16 +17,15 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev6"
+version = "0.0.0.dev7"
 name = "PySerials"
 dependencies = [
     "jsonschema >= 4.21.0, < 5",
     "ruamel.yaml >= 0.17.32, < 0.18", # https://yaml.readthedocs.io/en/stable/
     "ruamel.yaml.string >= 0.1.1, < 1",
     "tomlkit >= 0.11.8, < 0.12", # https://tomlkit.readthedocs.io/en/stable/,
-    "mdit",
-    "ansi-sgr",
-    "ExceptionMan",
+    "MDit == 0.0.0.dev3",
+    "ExceptionMan == 0.0.0.dev4",
     "jsonpath-ng >= 1.6.1, < 2",
 ]
 requires-python = ">=3.10"

{pyserials-0.0.0.dev6 → pyserials-0.0.0.dev7}/src/PySerials.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev6
+Version: 0.0.0.dev7
 Requires-Python: >=3.10
 Requires-Dist: jsonschema<5,>=4.21.0
 Requires-Dist: ruamel.yaml<0.18,>=0.17.32
 Requires-Dist: ruamel.yaml.string<1,>=0.1.1
 Requires-Dist: tomlkit<0.12,>=0.11.8
-Requires-Dist: mdit
-Requires-Dist: ansi-sgr
-Requires-Dist: ExceptionMan
+Requires-Dist: MDit==0.0.0.dev3
+Requires-Dist: ExceptionMan==0.0.0.dev4
 Requires-Dist: jsonpath-ng<2,>=1.6.1

{pyserials-0.0.0.dev6 → pyserials-0.0.0.dev7}/src/PySerials.egg-info/requires.txt

@@ -2,7 +2,6 @@ jsonschema<5,>=4.21.0
 ruamel.yaml<0.18,>=0.17.32
 ruamel.yaml.string<1,>=0.1.1
 tomlkit<0.12,>=0.11.8
-mdit
-ansi-sgr
-ExceptionMan
+MDit==0.0.0.dev3
+ExceptionMan==0.0.0.dev4
 jsonpath-ng<2,>=1.6.1

{pyserials-0.0.0.dev6 → pyserials-0.0.0.dev7}/src/pyserials/exception/read.py

@@ -35,12 +35,13 @@ class PySerialsReadException(_base.PySerialsException):
         filepath: _Path | None = None,
     ):
         intro = _mdit.inline_container(
-            "Failed to read ",
-            f"{data_type.upper()} data " if data_type else "data ",
-            "from input ",
+            "Failed to read",
+            f"{data_type.upper()} data" if data_type else "data",
+            "from input",
             "string." if source_type == "string" else _mdit.inline_container(
                 "file at ", _mdit.element.code_span(filepath), "."
             ),
+            separator=" ",
         )
         report = _mdit.document(
             heading="Data Read Error",
@@ -175,7 +176,7 @@ class PySerialsInvalidDataError(PySerialsReadException):
 
     def _report_content(self) -> dict:
 
-        def make_tabel(problem, line, column, data_type):
+        def make_table(problem, line, column, data_type):
             items = [
                 _mdit.element.field_list_item(title=title, description=value) for title, value in [
                     ["Description", problem],
@@ -188,16 +189,16 @@ class PySerialsInvalidDataError(PySerialsReadException):
 
         content = {
             "problem_details": _mdit.element.admonition(
+                make_table(self.problem, self.problem_line, self.problem_column, self.problem_data_type),
                 type="error",
                 title="Problem",
-                content=make_tabel(self.problem, self.problem_line, self.problem_column, self.problem_data_type)
             )
         }
         if self.context:
             content["context_details"] = _mdit.element.admonition(
+                make_table(self.context, self.context_line, self.context_column, self.context_data_type),
                 type="note",
                 title="Context",
-                content=make_tabel(self.context, self.context_line, self.context_column, self.context_data_type)
             )
 
         code_block_full = _mdit.element.code_block(
@@ -235,6 +236,6 @@ class PySerialsInvalidDataError(PySerialsReadException):
                 emphasize_lines=list({1, len(selected_lines)}),
             )
         content["data_short"] = (code_block_short, ("short", "console"))
-        container = _mdit.block_container(**content)
+        container = _mdit.block_container(content)
         doc = _mdit.document(heading="Error Details", body=container)
         return {"details": doc}

{pyserials-0.0.0.dev6 → pyserials-0.0.0.dev7}/src/pyserials/exception/validate.py

@@ -26,7 +26,7 @@ class PySerialsValidateException(_base.PySerialsException):
 
     def __init__(
         self,
-        problem: str,
+        problem,
         data: dict | list | str | int | float | bool,
         schema: dict,
         validator: _Any,
@@ -88,7 +88,7 @@ class PySerialsJsonSchemaValidationError(PySerialsValidateException):
         self.causes = causes
         super().__init__(
             problem=self._generate_problem_statement(),
-            section={idx: self._generate_error_report(error) for idx, error in enumerate(self.causes)},
+            section={str(idx): self._generate_error_report(error) for idx, error in enumerate(self.causes)},
             data=data,
             schema=schema,
             validator=validator,
@@ -145,7 +145,7 @@ class PySerialsJsonSchemaValidationError(PySerialsValidateException):
         if error.context:
             context_paths = []
             for idx, sub_error in enumerate(sorted(error.context, key=lambda x: len(x.context))):
-                section[idx] = self._generate_error_report(sub_error)
+                section[str(idx)] = self._generate_error_report(sub_error)
                 context_paths.append(_mdit.element.code_span(sub_error.json_path))
             context_paths_joined = self._join_list(context_paths)
             short_ver_fieldlist_items.insert(
@@ -163,7 +163,7 @@ class PySerialsJsonSchemaValidationError(PySerialsValidateException):
             heading=_mdit.element.code_span(error.json_path),
             body={
                 "short": (_mdit.element.field_list(short_ver_fieldlist_items), ("short", "console")),
-                "full": (_mdit.element.field_list(full_ver_items), "full"),
+                "full": (_mdit.block_container(*full_ver_items), "full"),
             },
             section=section,
         )
@@ -176,9 +176,9 @@ class PySerialsJsonSchemaValidationError(PySerialsValidateException):
             language="yaml",
         )
         admo = _mdit.element.admonition(
+            code_block,
             type=admo_type,
             title=_mdit.inline_container(f"**{title}**: ", _mdit.element.code_span(title_details)),
-            content=code_block,
             dropdown=True,
         )
         return admo