senfd 0.2.2__tar.gz → 0.2.3__tar.gz

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

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

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

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

senfd-0.2.3/src/senfd/__init__.py

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

{senfd-0.2.2 → senfd-0.2.3}/src/senfd/documents/base.py

@@ -104,7 +104,7 @@ class Document(BaseModel):
         """Writes the document JSON schema to file at the given 'path'"""
 
         return to_file(
-            json.dumps(cls.schema(), indent=4),
+            json.dumps(cls.model_json_schema(), indent=4),
             cls.schema_filename(),
             path,
         )
@@ -141,7 +141,7 @@ class Document(BaseModel):
         )
         template = env.get_template(self.FILENAME_HTML_TEMPLATE)
 
-        return template.render(document=self.dict())
+        return template.render(document=self.model_dump())
 
     def to_html_file(self, path: Optional[Path] = None) -> Path:
         """Writes the document to HTML-formatted file"""
@@ -152,7 +152,7 @@ class Document(BaseModel):
         """Returns True when validator raises no exceptions, False otherwise"""
 
         try:
-            self.validate(self.dict())
+            self.model_validate(self.model_dump())
         except ValidationError as e:
             print(e)
             return False

{senfd-0.2.2 → senfd-0.2.3}/src/senfd/documents/enriched.py

@@ -24,13 +24,15 @@ class EnrichedFigure(Figure):
     def from_figure_description(
         cls, figure: Figure, match
     ) -> Tuple[Optional[Figure], Optional[NamedTuple]]:
-        shared = set(figure.dict().keys()).intersection(set(match.groupdict().keys()))
+        shared = set(figure.model_dump().keys()).intersection(
+            set(match.groupdict().keys())
+        )
         if shared:
             # This occurs if child attributes overrides parent, this is an error in the
             # implementation of the child-figure
             raise RuntimeError(f"cls({cls.__name__}) has overlap({shared})")
 
-        data = figure.dict()
+        data = figure.model_dump()
         mdict = match.groupdict()
         if mdict:
             data.update(mdict if mdict else {})
@@ -39,6 +41,7 @@ class EnrichedFigure(Figure):
         #    table, errors = senfd.tables.HeaderTable.from_table(figure.table)
         #    data["table"] = table.dict() if table else figure.table.dict()
         enriched_figure = cls(**data)
+        errors = None
         if figure.table:
             table, errors = senfd.tables.HeaderTable.from_table(figure.table)
             enriched_figure.table = table if table else figure.table
@@ -158,7 +161,9 @@ def get_figure_enriching_classes():
     return [
         cls
         for _, cls in inspect.getmembers(senfd.documents.enriched, inspect.isclass)
-        if issubclass(cls, EnrichedFigure) and hasattr(cls, "REGEX_FIGURE_DESCRIPTION")
+        if issubclass(cls, EnrichedFigure)
+        and (cls is not senfd.documents.enriched.EnrichedFigure)
+        and hasattr(cls, "REGEX_FIGURE_DESCRIPTION")
     ]
 
 
@@ -170,9 +175,6 @@ class EnrichedFigureDocument(Document):
     FILENAME_SCHEMA: ClassVar[str] = "enriched.figure.document.schema.json"
     FILENAME_HTML_TEMPLATE: ClassVar[str] = "enriched.figure.document.html.jinja2"
 
-    nontabular: List[Figure] = Field(default_factory=list)
-    uncategorized: List[Figure] = Field(default_factory=list)
-
     acronyms: List[Acronyms] = Field(default_factory=list)
     io_controller_command_set_support: List[IoControllerCommandSetSupport] = Field(
         default_factory=list
@@ -198,6 +200,9 @@ class EnrichedFigureDocument(Document):
     offset: List[Offset] = Field(default_factory=list)
     property_definition: List[PropertyDefinition] = Field(default_factory=list)
 
+    nontabular: List[Figure] = Field(default_factory=list)
+    uncategorized: List[Figure] = Field(default_factory=list)
+
     @classmethod
     def from_figure_document_file(cls, path: Path):
         """Instantiate an 'organized' Document from a 'figure' document"""

{senfd-0.2.2 → senfd-0.2.3}/src/senfd/pipeline.py

@@ -1,11 +1,12 @@
 from pathlib import Path
-from typing import List
+from typing import List, Type
 
+from senfd.documents.base import Converter
 from senfd.documents.enriched import FromFigureDocument
 from senfd.documents.plain import FromDocx
 from senfd.errors import TableError
 
-CONVERTERS = [FromDocx, FromFigureDocument]
+CONVERTERS: List[Type[Converter]] = [FromDocx, FromFigureDocument]
 
 
 def process(input: Path, output: Path) -> List[TableError]:

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

@@ -497,7 +497,7 @@
         "DocumentMeta": {
             "properties": {
                 "version": {
-                    "default": "0.2.2",
+                    "default": "0.2.3",
                     "title": "Version",
                     "type": "string"
                 },
@@ -915,20 +915,6 @@
         "meta": {
             "$ref": "#/$defs/DocumentMeta"
         },
-        "nontabular": {
-            "items": {
-                "$ref": "#/$defs/Figure"
-            },
-            "title": "Nontabular",
-            "type": "array"
-        },
-        "uncategorized": {
-            "items": {
-                "$ref": "#/$defs/Figure"
-            },
-            "title": "Uncategorized",
-            "type": "array"
-        },
         "acronyms": {
             "items": {
                 "$ref": "#/$defs/Acronyms"
@@ -1040,6 +1026,20 @@
             },
             "title": "Property Definition",
             "type": "array"
+        },
+        "nontabular": {
+            "items": {
+                "$ref": "#/$defs/Figure"
+            },
+            "title": "Nontabular",
+            "type": "array"
+        },
+        "uncategorized": {
+            "items": {
+                "$ref": "#/$defs/Figure"
+            },
+            "title": "Uncategorized",
+            "type": "array"
         }
     },
     "title": "EnrichedFigureDocument",

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

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

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

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

senfd-0.2.2/src/senfd/__init__.py

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