senfd 0.2.1__tar.gz → 0.2.2__tar.gz

{senfd-0.2.1/src/senfd.egg-info → senfd-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: senfd
-Version: 0.2.1
+Version: 0.2.2
 Summary: Semantic Enhancer for Figure Documents
 Author-email: "Simon A. F. Lund" <os@safl.dk>
 License: LGPL-2.1-only

{senfd-0.2.1 → senfd-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "senfd"
-version = "0.2.1"
+version = "0.2.2"
 description = "Semantic Enhancer for Figure Documents"
 authors = [
     { name = "Simon A. F. Lund", email = "os@safl.dk" }

senfd-0.2.2/src/senfd/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{senfd-0.2.1 → senfd-0.2.2}/src/senfd/cli.py

@@ -23,10 +23,7 @@ def to_log_file(
 ) -> Path:
 
     content = json.dumps(
-        [
-            {"type": type(error).__name__, **senfd.errors.error_to_dict(error)}
-            for error in errors
-        ],
+        [{"type": type(error).__name__, **error.model_dump()} for error in errors],
         indent=4,
     )
 

{senfd-0.2.1 → senfd-0.2.2}/src/senfd/documents/plain.py

@@ -107,8 +107,8 @@ class FromDocx(Converter):
             if not figure:
                 errors.append(
                     senfd.errors.TableCaptionError(
-                        "Does not match figure caption assumptions",
-                        caption,
+                        message="Does not match figure caption assumptions",
+                        caption=caption,
                     )
                 )
                 continue
@@ -116,8 +116,8 @@ class FromDocx(Converter):
             if figure.figure_nr in figures:
                 errors.append(
                     senfd.errors.TableCaptionError(
-                        "Duplicate caption",
-                        caption,
+                        message="Duplicate caption",
+                        caption=caption,
                     )
                 )
                 continue
@@ -147,15 +147,17 @@ class FromDocx(Converter):
             if not figure:
                 errors.append(
                     senfd.errors.TableOfFiguresError(
-                        "Does not match figure assumptions",
-                        caption,
+                        message="Does not match figure assumptions",
+                        caption=caption,
                     )
                 )
                 continue
 
             if not figure.page_nr:
                 errors.append(
-                    senfd.errors.TableOfFiguresError("Is missing <page_nr>", caption)
+                    senfd.errors.TableOfFiguresError(
+                        message="Is missing <page_nr>", caption=caption
+                    )
                 )
                 continue
 
@@ -165,8 +167,8 @@ class FromDocx(Converter):
                 if figure.description not in existing.description:
                     errors.append(
                         senfd.errors.TableOfFiguresError(
-                            f"({existing.description}) != {figure.description}",
-                            caption,
+                            message=f"({existing.description}) != {figure.description}",
+                            caption=caption,
                         )
                     )
             else:

senfd-0.2.2/src/senfd/errors.py

@@ -0,0 +1,28 @@
+from typing import Any, List
+
+from pydantic import BaseModel
+
+
+class TableError(BaseModel):
+    message: str
+
+
+class TableOfFiguresError(TableError):
+    caption: str
+
+
+class TableCaptionError(TableError):
+    caption: str
+
+
+class TableHeaderError(TableError):
+    caption: str
+    cells: List[Any]
+
+
+class IrregularTableError(TableError):
+    lengths: List[int]
+
+
+class NonTableHeaderError(TableError):
+    pass

{senfd-0.2.1 → senfd-0.2.2}/src/senfd/schemas/enriched.figure.document.schema.json

@@ -497,7 +497,7 @@
         "DocumentMeta": {
             "properties": {
                 "version": {
-                    "default": "0.2.1",
+                    "default": "0.2.2",
                     "title": "Version",
                     "type": "string"
                 },

{senfd-0.2.1 → senfd-0.2.2}/src/senfd/schemas/plain.figure.document.schema.json

@@ -20,7 +20,7 @@
         "DocumentMeta": {
             "properties": {
                 "version": {
-                    "default": "0.2.1",
+                    "default": "0.2.2",
                     "title": "Version",
                     "type": "string"
                 },

{senfd-0.2.1 → senfd-0.2.2}/src/senfd/tables.py

@@ -48,11 +48,13 @@ class HeaderTable(Table):
         lengths = list(set([len(row.cells) for row in table.rows]))
         if len(lengths) != 1:
             return None, senfd.errors.IrregularTableError(
-                f"Varying row lengths({lengths})", lengths
+                message=f"Varying row lengths({lengths})", lengths=lengths
             )
 
         if len(table.rows) < 2:
-            return None, senfd.errors.NonTableHeaderError("Insufficent number of rows")
+            return None, senfd.errors.NonTableHeaderError(
+                message="Insufficent number of rows"
+            )
 
         headers = [
             cell.text.strip()
@@ -61,9 +63,9 @@ class HeaderTable(Table):
         ]
         if len(headers) != len(table.rows[1].cells):
             return None, senfd.errors.TableHeaderError(
-                "Unsupported names",
-                table.rows[0].cells[0].text,
-                [cell.text for cell in table.rows[1].cells],
+                message="Unsupported names",
+                caption=table.rows[0].cells[0].text,
+                cells=[cell.text for cell in table.rows[1].cells],
             )
 
         data = table.dict()

{senfd-0.2.1 → senfd-0.2.2/src/senfd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: senfd
-Version: 0.2.1
+Version: 0.2.2
 Summary: Semantic Enhancer for Figure Documents
 Author-email: "Simon A. F. Lund" <os@safl.dk>
 License: LGPL-2.1-only

senfd-0.2.1/src/senfd/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"

senfd-0.2.1/src/senfd/errors.py

@@ -1,30 +0,0 @@
-from collections import namedtuple
-from typing import Any, Dict, List
-
-from pydantic import BaseModel
-
-TableOfFiguresError = namedtuple("TableOfFiguresError", ["message", "caption"])
-
-TableCaptionError = namedtuple("TableCaptionError", ["message", "caption"])
-
-TableHeaderError = namedtuple("TableHeaderError", ["message", "caption", "cells"])
-
-IrregularTableError = namedtuple("IrregularTableError", ["message", "lengths"])
-
-NonTableHeaderError = namedtuple("NonTableHeaderError", ["message"])
-
-TableError = (
-    TableOfFiguresError
-    | TableCaptionError
-    | TableHeaderError
-    | IrregularTableError
-    | NonTableHeaderError
-)
-
-
-def error_to_dict(error: TableError) -> Dict[str, List[Any]]:
-    error_dict = error._asdict()
-    for key, value in error_dict.items():
-        if isinstance(value, BaseModel):
-            error_dict[key] = value.dict()
-    return error_dict