From 436bb361eb6907ff0ed70c51368009d3139c55cb Mon Sep 17 00:00:00 2001 From: Nasty Date: Thu, 28 Sep 2023 14:34:01 +0300 Subject: [PATCH] TLDR-474 remove is_inserted attribute --- .../static/html_eng/format_description.html | 1 - .../static/html_rus/format_description.html | 1 - dedoc/data_structures/table_metadata.py | 6 +---- .../docx_reader/data_structures/table.py | 2 +- .../pdf_txtlayer_reader/pdf_tabby_reader.py | 2 +- .../json_format_examples/basic_example.json | 13 +++++------ .../linear_structure_type.json | 13 +++++------ .../with_attachments.json | 23 +++++++++---------- .../with_base64_attachments.json | 23 +++++++++---------- .../with_parsed_attachments.json | 23 +++++++++---------- docs/source/dedoc_api_usage/return_format.rst | 10 ++++---- 11 files changed, 53 insertions(+), 64 deletions(-) diff --git a/dedoc/api/static/html_eng/format_description.html b/dedoc/api/static/html_eng/format_description.html index bcdabc55..8447ab52 100644 --- a/dedoc/api/static/html_eng/format_description.html +++ b/dedoc/api/static/html_eng/format_description.html @@ -71,7 +71,6 @@

TableMetadata

  1. uid: str (required field) - unique identifier.
  2. page_id: integer (optional field) - page number on which the table begins. Can be null.
    3. -
  3. is_inserted: bool (optional field) - was table inserted into document.

TreeNode

diff --git a/dedoc/api/static/html_rus/format_description.html b/dedoc/api/static/html_rus/format_description.html index dc43cc34..7f338393 100644 --- a/dedoc/api/static/html_rus/format_description.html +++ b/dedoc/api/static/html_rus/format_description.html @@ -72,7 +72,6 @@

TableMetadata. Метаинформация таблиц
  1. uid: str (обязательное поле) - уникальный идентификатор таблицы.
  2. page_id: int (необязательное поле) - номер страницы на которой начинается таблица.
    3. -
  3. is_inserted: bool (необязательное поле) - была ли таблица встроена в тело документа.

TreeNode. Древовидная структура документа.

diff --git a/dedoc/data_structures/table_metadata.py b/dedoc/data_structures/table_metadata.py index 3c9ea615..6b16c53c 100644 --- a/dedoc/data_structures/table_metadata.py +++ b/dedoc/data_structures/table_metadata.py @@ -11,23 +11,20 @@ class TableMetadata(Serializable): """ This class holds the information about table unique identifier, rotation angle (if table has been rotated - for images) and so on. """ - def __init__(self, page_id: Optional[int], uid: Optional[str] = None, is_inserted: bool = False, rotated_angle: float = 0.0) -> None: + def __init__(self, page_id: Optional[int], uid: Optional[str] = None, rotated_angle: float = 0.0) -> None: """ :param page_id: number of the page where table starts :param uid: unique identifier of the table - :param is_inserted: indicator if table was already inserted into paragraphs list :param rotated_angle: value of the rotation angle by which the table was rotated during recognition """ self.page_id = page_id self.uid = str(uuid.uuid1()) if not uid else uid - self.is_inserted = is_inserted self.rotated_angle = rotated_angle def to_dict(self) -> dict: res = OrderedDict() res["uid"] = self.uid res["page_id"] = self.page_id - res["is_inserted"] = self.is_inserted res["rotated_angle"] = self.rotated_angle return res @@ -36,6 +33,5 @@ def get_api_dict(api: Api) -> Model: return api.model("TableMetadata", { "page_id": fields.Integer(readonly=False, description="table start page number"), "uid": fields.String(description="table unique id"), - "is_inserted": fields.Boolean(description="was the table inserted into document body"), "rotated_angle": fields.Float(readonly=False, description="At what angle should the table be rotated to use boxes") }) diff --git a/dedoc/readers/docx_reader/data_structures/table.py b/dedoc/readers/docx_reader/data_structures/table.py index 46d46485..73a0ad47 100644 --- a/dedoc/readers/docx_reader/data_structures/table.py +++ b/dedoc/readers/docx_reader/data_structures/table.py @@ -90,7 +90,7 @@ def to_table(self) -> Table: result_row.append(cell) result_cells_with_meta.append(result_row) - return Table(cells=result_cells_with_meta, metadata=TableMetadata(page_id=None, uid=self.uid, is_inserted=False)) + return Table(cells=result_cells_with_meta, metadata=TableMetadata(page_id=None, uid=self.uid)) def __get_cell_text(self, cell: Tag) -> str: cell_text = "" diff --git a/dedoc/readers/pdf_reader/pdf_txtlayer_reader/pdf_tabby_reader.py b/dedoc/readers/pdf_reader/pdf_txtlayer_reader/pdf_tabby_reader.py index 3692d19e..c746000a 100644 --- a/dedoc/readers/pdf_reader/pdf_txtlayer_reader/pdf_tabby_reader.py +++ b/dedoc/readers/pdf_reader/pdf_txtlayer_reader/pdf_tabby_reader.py @@ -152,7 +152,7 @@ def __get_tables(self, page: dict, file_hash: str) -> Tuple[List[Table], List[Sc result_cells.append(result_row) table_bbox = BBox.from_two_points((x_top_left, y_top_left), (x_bottom_right, y_bottom_right)) # noqa TODO add table location into TableMetadata - tables.append(Table(cells=result_cells, metadata=TableMetadata(page_id=page_number, is_inserted=False))) + tables.append(Table(cells=result_cells, metadata=TableMetadata(page_id=page_number))) table_name = file_hash + str(page_number) + str(table_num) tables_on_image.append(ScanTable(page_number=page_number, matrix_cells=None, bbox=table_bbox, name=table_name, order=order)) diff --git a/docs/source/_static/json_format_examples/basic_example.json b/docs/source/_static/json_format_examples/basic_example.json index a470920e..d5007fc0 100644 --- a/docs/source/_static/json_format_examples/basic_example.json +++ b/docs/source/_static/json_format_examples/basic_example.json @@ -298,7 +298,7 @@ "start": 0, "end": 14, "name": "attachment", - "value": "attach_fa1143ae-5d3c-11ee-b518-0242ac120002" + "value": "attach_75af2486-5df1-11ee-bfc1-0242ac120002" } ], "metadata": { @@ -420,20 +420,19 @@ "metadata": { "uid": "3a327789721e09b3fa6fd9560f3ee263", "page_id": null, - "is_inserted": false, "rotated_angle": 0.0 } } ] }, "metadata": { - "uid": "doc_uid_auto_fa1f6786-5d3c-11ee-b518-0242ac120002", + "uid": "doc_uid_auto_75c93394-5df1-11ee-bfc1-0242ac120002", "file_name": "example_return_format.docx", - "temporary_file_name": "1695822696_268.docx", + "temporary_file_name": "1695900213_314.docx", "size": 21270, - "modified_time": 1695822696, - "created_time": 1695822696, - "access_time": 1695822696, + "modified_time": 1695900213, + "created_time": 1695900213, + "access_time": 1695900213, "file_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "document_subject": "", "keywords": "", diff --git a/docs/source/_static/json_format_examples/linear_structure_type.json b/docs/source/_static/json_format_examples/linear_structure_type.json index 848053fb..535aa687 100644 --- a/docs/source/_static/json_format_examples/linear_structure_type.json +++ b/docs/source/_static/json_format_examples/linear_structure_type.json @@ -388,7 +388,7 @@ "start": 0, "end": 14, "name": "attachment", - "value": "attach_fa23fd78-5d3c-11ee-b518-0242ac120002" + "value": "attach_75d13b70-5df1-11ee-bfc1-0242ac120002" } ], "metadata": { @@ -504,20 +504,19 @@ "metadata": { "uid": "3a327789721e09b3fa6fd9560f3ee263", "page_id": null, - "is_inserted": false, "rotated_angle": 0.0 } } ] }, "metadata": { - "uid": "doc_uid_auto_fa309d08-5d3c-11ee-b518-0242ac120002", + "uid": "doc_uid_auto_75e45e94-5df1-11ee-bfc1-0242ac120002", "file_name": "example_return_format.docx", - "temporary_file_name": "1695822697_827.docx", + "temporary_file_name": "1695900214_259.docx", "size": 21270, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900213, + "created_time": 1695900213, + "access_time": 1695900214, "file_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "document_subject": "", "keywords": "", diff --git a/docs/source/_static/json_format_examples/with_attachments.json b/docs/source/_static/json_format_examples/with_attachments.json index 053791ce..944837f6 100644 --- a/docs/source/_static/json_format_examples/with_attachments.json +++ b/docs/source/_static/json_format_examples/with_attachments.json @@ -298,7 +298,7 @@ "start": 0, "end": 14, "name": "attachment", - "value": "attach_fa355abe-5d3c-11ee-b518-0242ac120002" + "value": "attach_75ea598e-5df1-11ee-bfc1-0242ac120002" } ], "metadata": { @@ -420,20 +420,19 @@ "metadata": { "uid": "3a327789721e09b3fa6fd9560f3ee263", "page_id": null, - "is_inserted": false, "rotated_angle": 0.0 } } ] }, "metadata": { - "uid": "doc_uid_auto_fa4285e0-5d3c-11ee-b518-0242ac120002", + "uid": "doc_uid_auto_75fac01c-5df1-11ee-bfc1-0242ac120002", "file_name": "example_return_format.docx", - "temporary_file_name": "1695822697_953.docx", + "temporary_file_name": "1695900214_51.docx", "size": 21270, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900214, + "created_time": 1695900214, + "access_time": 1695900214, "file_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "document_subject": "", "keywords": "", @@ -476,13 +475,13 @@ "tables": [] }, "metadata": { - "uid": "attach_fa355abe-5d3c-11ee-b518-0242ac120002", + "uid": "attach_75ea598e-5df1-11ee-bfc1-0242ac120002", "file_name": "image1.png", - "temporary_file_name": "1695822697_181.png", + "temporary_file_name": "1695900214_864.png", "size": 14874, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900214, + "created_time": 1695900214, + "access_time": 1695900214, "file_type": "image/png", "other_fields": {} }, diff --git a/docs/source/_static/json_format_examples/with_base64_attachments.json b/docs/source/_static/json_format_examples/with_base64_attachments.json index 4fa1a2d3..5b674120 100644 --- a/docs/source/_static/json_format_examples/with_base64_attachments.json +++ b/docs/source/_static/json_format_examples/with_base64_attachments.json @@ -298,7 +298,7 @@ "start": 0, "end": 14, "name": "attachment", - "value": "attach_fa48dd8c-5d3c-11ee-b518-0242ac120002" + "value": "attach_7604e13c-5df1-11ee-bfc1-0242ac120002" } ], "metadata": { @@ -420,20 +420,19 @@ "metadata": { "uid": "3a327789721e09b3fa6fd9560f3ee263", "page_id": null, - "is_inserted": false, "rotated_angle": 0.0 } } ] }, "metadata": { - "uid": "doc_uid_auto_fa562866-5d3c-11ee-b518-0242ac120002", + "uid": "doc_uid_auto_76126078-5df1-11ee-bfc1-0242ac120002", "file_name": "example_return_format.docx", - "temporary_file_name": "1695822697_293.docx", + "temporary_file_name": "1695900214_267.docx", "size": 21270, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900214, + "created_time": 1695900214, + "access_time": 1695900214, "file_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "document_subject": "", "keywords": "", @@ -476,13 +475,13 @@ "tables": [] }, "metadata": { - "uid": "attach_fa48dd8c-5d3c-11ee-b518-0242ac120002", + "uid": "attach_7604e13c-5df1-11ee-bfc1-0242ac120002", "file_name": "image1.png", - "temporary_file_name": "1695822697_915.png", + "temporary_file_name": "1695900214_880.png", "size": 14874, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900214, + "created_time": 1695900214, + "access_time": 1695900214, "file_type": "image/png", "base64_encode": "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", "other_fields": { diff --git a/docs/source/_static/json_format_examples/with_parsed_attachments.json b/docs/source/_static/json_format_examples/with_parsed_attachments.json index 2c519c3c..b8c33290 100644 --- a/docs/source/_static/json_format_examples/with_parsed_attachments.json +++ b/docs/source/_static/json_format_examples/with_parsed_attachments.json @@ -298,7 +298,7 @@ "start": 0, "end": 14, "name": "attachment", - "value": "attach_fa5c54ac-5d3c-11ee-b518-0242ac120002" + "value": "attach_7619127e-5df1-11ee-bfc1-0242ac120002" } ], "metadata": { @@ -420,20 +420,19 @@ "metadata": { "uid": "3a327789721e09b3fa6fd9560f3ee263", "page_id": null, - "is_inserted": false, "rotated_angle": 0.0 } } ] }, "metadata": { - "uid": "doc_uid_auto_fa7fdbc0-5d3c-11ee-b518-0242ac120002", + "uid": "doc_uid_auto_7630e7b4-5df1-11ee-bfc1-0242ac120002", "file_name": "example_return_format.docx", - "temporary_file_name": "1695822697_469.docx", + "temporary_file_name": "1695900214_402.docx", "size": 21270, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900214, + "created_time": 1695900214, + "access_time": 1695900214, "file_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "document_subject": "", "keywords": "", @@ -913,13 +912,13 @@ "tables": [] }, "metadata": { - "uid": "attach_fa5c54ac-5d3c-11ee-b518-0242ac120002", + "uid": "attach_7619127e-5df1-11ee-bfc1-0242ac120002", "file_name": "image1.png", - "temporary_file_name": "1695822697_301.png", + "temporary_file_name": "1695900214_972.png", "size": 14874, - "modified_time": 1695822697, - "created_time": 1695822697, - "access_time": 1695822697, + "modified_time": 1695900214, + "created_time": 1695900214, + "access_time": 1695900214, "file_type": "image/png", "rotated_page_angles": [ 0 diff --git a/docs/source/dedoc_api_usage/return_format.rst b/docs/source/dedoc_api_usage/return_format.rst index c50c6daf..70d37ff0 100644 --- a/docs/source/dedoc_api_usage/return_format.rst +++ b/docs/source/dedoc_api_usage/return_format.rst @@ -64,13 +64,13 @@ The beginning of the document's metadata: .. literalinclude:: ../_static/json_format_examples/basic_example.json :language: json - :lines: 429-437 + :lines: 428-436 The document's attachments: .. literalinclude:: ../_static/json_format_examples/basic_example.json :language: json - :lines: 459 + :lines: 458 As we see, the `attachments` field is empty because the option `with_attachments` is set to `"false"` by default (see :ref:`table_parameters`). @@ -118,7 +118,7 @@ Unlike the previous examples, in this case we have `attachments` field filled: .. literalinclude:: ../_static/json_format_examples/with_attachments.json :language: json - :lines: 459-491 + :lines: 458-490 Example with base64 attachments ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -136,7 +136,7 @@ The only difference is in the attachment's metadata: attachment's content is enc .. literalinclude:: ../_static/json_format_examples/with_base64_attachments.json :language: json - :lines: 459-494 + :lines: 458-493 Example with parsed attachments ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -156,4 +156,4 @@ The beginning of the document's attachments: .. literalinclude:: ../_static/json_format_examples/with_parsed_attachments.json :language: json - :lines: 459-484 + :lines: 458-483