PySerials 0.0.0.dev6__py3-none-any.whl → 0.0.0.dev8__py3-none-any.whl

{PySerials-0.0.0.dev6.dist-info → PySerials-0.0.0.dev8.dist-info}/METADATA

@@ -1,13 +1,14 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev6
+Version: 0.0.0.dev8
 Requires-Python: >=3.10
 Requires-Dist: jsonschema <5,>=4.21.0
+Requires-Dist: referencing >=0.35.1
+Requires-Dist: jsonpath-ng <2,>=1.6.1
 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: jsonpath-ng <2,>=1.6.1
+Requires-Dist: MDit ==0.0.0.dev5
+Requires-Dist: ExceptionMan ==0.0.0.dev5
+Requires-Dist: ProtocolMan ==0.0.0.dev2
 

{PySerials-0.0.0.dev6.dist-info → PySerials-0.0.0.dev8.dist-info}/RECORD

@@ -8,10 +8,10 @@ pyserials/validate.py,sha256=Ocs0x0BAV9zwRCgg_J5BGU2kEZV6vVjfDBsR3M9Teus,3564
 pyserials/write.py,sha256=pN8w78qVsKJjZd_jvPUcZjYp_RJkP7uQzpiXvPOv4lM,1776
 pyserials/exception/__init__.py,sha256=ZhbggwJUMlTyBhifAivC8ZQxP1Na6lJAwzZs7_YjOSU,151
 pyserials/exception/_base.py,sha256=Juns3cyAEV9bZ4_nYuefQnPOrXvpQTY_7peXnoCjlgI,765
-pyserials/exception/read.py,sha256=4_OQ6SUvxR61TN0_1v5SK5MgBeJlgYz8j9vJb_6abNY,9275
+pyserials/exception/read.py,sha256=7yTqtT2V4xXthg7wzNMI0bYF9GMDc-AaEN8r2PhRkMw,9282
 pyserials/exception/update.py,sha256=P0js2-iY2fgO_KLdqedgWE3TTS5Xz15cusZY_wuKIW4,4222
-pyserials/exception/validate.py,sha256=gsvbq1bIHHKlIf-KJc7-PSzDZmYDxUFWiYEApJgcm74,7465
-PySerials-0.0.0.dev6.dist-info/METADATA,sha256=-o3uQuTjzfx7Q7zLSCi9CRHLgDIKtYKAtnLK6HVqzxc,357
-PySerials-0.0.0.dev6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-PySerials-0.0.0.dev6.dist-info/top_level.txt,sha256=SAks7WjSjdkv3i9Hvt4gY_P7VQbhhYJN5mf5dqx1aao,10
-PySerials-0.0.0.dev6.dist-info/RECORD,,
+pyserials/exception/validate.py,sha256=fs4yMw5wSbRbINuTbjdj7HGo8PlE3-zir1JRveJkcPk,7461
+PySerials-0.0.0.dev8.dist-info/METADATA,sha256=V99F7qfD9BhoyfJ5BPB_iZ7FyjxgohvKWkoEKn7XUcU,435
+PySerials-0.0.0.dev8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+PySerials-0.0.0.dev8.dist-info/top_level.txt,sha256=SAks7WjSjdkv3i9Hvt4gY_P7VQbhhYJN5mf5dqx1aao,10
+PySerials-0.0.0.dev8.dist-info/RECORD,,

{PySerials-0.0.0.dev6.dist-info → PySerials-0.0.0.dev8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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/exception/validate.py

@@ -5,7 +5,7 @@ from typing import Any as _Any
 
 import jsonschema as _jsonschema
 import mdit as _mdit
-from pyprotocol import Stringable
+from protocolman import Stringable
 
 from pyserials import write as _write
 from pyserials.exception import _base
@@ -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