numbers-parser 4.23.0__tar.gz → 4.23.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {numbers_parser-4.23.0/src/numbers_parser.egg-info → numbers_parser-4.23.1}/PKG-INFO +1 -1
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/pyproject.toml +1 -1
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/containers.py +16 -29
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/iwafile.py +92 -25
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/model.py +35 -26
- {numbers_parser-4.23.0 → numbers_parser-4.23.1/src/numbers_parser.egg-info}/PKG-INFO +1 -1
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_issues.py +41 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/LICENSE.rst +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/README.md +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/setup.cfg +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/__init__.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/_cat_numbers.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/_csv2numbers.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/_unpack_numbers.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/bullets.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/cell.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/constants.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/currencies.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/data/empty.numbers +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/document.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/exceptions.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/experimental.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/formula.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNCommandArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCEArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCH3DArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_Common_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHCommandArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2 2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDCommandArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSKArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPArchiveMessages_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPMessages_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTCommandArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_sos_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPCommandArchives_pb2.pyi +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/__init__.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/fontmap.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/functionmap.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/mapping.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/iwork.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/numbers_cache.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/numbers_uuid.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/py.typed +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/roman.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/xrefs.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/SOURCES.txt +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/entry_points.txt +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/requires.txt +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/top_level.txt +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_all_formulas.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_api_change.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_borders.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_bullets.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_cat_numbers.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_categories.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_comments.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_coverage.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_create_cells.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_csv2numbers.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_currency.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_encrypted.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_folder.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_formatting.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_formulas.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_large.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_local_docs.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_memory_leaks.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_merges.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_package.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_properties.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_roman.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_save.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_slices.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_styles.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_table_size.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_tables.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_unpack_numbers.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_unsupported.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_uuids.py +0 -0
- {numbers_parser-4.23.0 → numbers_parser-4.23.1}/tests/test_version.py +0 -0
|
@@ -4,7 +4,7 @@ import math
|
|
|
4
4
|
import re
|
|
5
5
|
from collections.abc import Iterator
|
|
6
6
|
from pathlib import Path
|
|
7
|
-
from typing import TYPE_CHECKING, Any, Generic, Protocol, TypeVar, overload
|
|
7
|
+
from typing import TYPE_CHECKING, Any, Generic, Protocol, TypeVar, cast, overload
|
|
8
8
|
|
|
9
9
|
from google.protobuf.message import Message as ProtoMessage
|
|
10
10
|
|
|
@@ -15,7 +15,13 @@ from numbers_parser.constants import (
|
|
|
15
15
|
SUPPORTED_NUMBERS_VERSIONS,
|
|
16
16
|
)
|
|
17
17
|
from numbers_parser.generated import TSPArchiveMessages_pb2 as TSPArchiveMessages
|
|
18
|
-
from numbers_parser.iwafile import
|
|
18
|
+
from numbers_parser.iwafile import (
|
|
19
|
+
IWACompressedChunk,
|
|
20
|
+
IWAFile,
|
|
21
|
+
copy_object_to_iwa_file,
|
|
22
|
+
create_iwa_segment,
|
|
23
|
+
find_references,
|
|
24
|
+
)
|
|
19
25
|
from numbers_parser.iwork import IWork, IWorkHandler
|
|
20
26
|
|
|
21
27
|
if TYPE_CHECKING:
|
|
@@ -146,7 +152,6 @@ class ObjectStore(IWorkHandler):
|
|
|
146
152
|
iwa_file: str,
|
|
147
153
|
object_dict: dict[str, Any],
|
|
148
154
|
cls: type[_ProtoT],
|
|
149
|
-
append: bool = False,
|
|
150
155
|
) -> tuple[int, _ProtoT]:
|
|
151
156
|
"""
|
|
152
157
|
Create and store an object with its IWA segment.
|
|
@@ -159,19 +164,14 @@ class ObjectStore(IWorkHandler):
|
|
|
159
164
|
new_id = self.new_message_id()
|
|
160
165
|
iwa_segment = create_iwa_segment(new_id, cls, object_dict)
|
|
161
166
|
|
|
162
|
-
if iwa_pathname is None
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
chunks = {"chunks": [{"archives": [iwa_segment.to_dict()]}]}
|
|
166
|
-
self._archive_store[iwa_pathname] = IWAFile.from_dict(chunks)
|
|
167
|
-
else:
|
|
168
|
-
iwa = self._archive_store[iwa_pathname]
|
|
169
|
-
iwa.chunks[0].archives.append(iwa_segment)
|
|
167
|
+
if iwa_pathname is None:
|
|
168
|
+
iwa_pathname = iwa_file.format(new_id) + ".iwa"
|
|
169
|
+
self._archive_store[iwa_pathname] = IWAFile([IWACompressedChunk([iwa_segment])])
|
|
170
170
|
else:
|
|
171
171
|
iwa = self._archive_store[iwa_pathname]
|
|
172
172
|
iwa.chunks[0].archives.append(iwa_segment)
|
|
173
173
|
|
|
174
|
-
new_obj =
|
|
174
|
+
new_obj = cast("_ProtoT", iwa_segment.objects[0])
|
|
175
175
|
self._objects[new_id] = new_obj
|
|
176
176
|
self._object_to_filename_map[new_id] = iwa_pathname
|
|
177
177
|
|
|
@@ -189,24 +189,11 @@ class ObjectStore(IWorkHandler):
|
|
|
189
189
|
|
|
190
190
|
def remove_unreferenced_objects(self) -> None:
|
|
191
191
|
"""Remove objects from the ObjectStore that are not referenced."""
|
|
192
|
-
referenced_ids = {DOCUMENT_ID, PACKAGE_ID}
|
|
193
|
-
|
|
194
|
-
def find_references(msg: ProtoMessage) -> None:
|
|
195
|
-
"""Recursively find all TSP.Reference messages in protobuf."""
|
|
196
|
-
if hasattr(msg, "identifier") and msg.DESCRIPTOR.name == "Reference":
|
|
197
|
-
referenced_ids.add(msg.identifier)
|
|
198
|
-
|
|
199
|
-
for field_desc, value in msg.ListFields():
|
|
200
|
-
if field_desc.type != field_desc.TYPE_MESSAGE:
|
|
201
|
-
continue
|
|
202
|
-
if field_desc.is_repeated:
|
|
203
|
-
for item in value:
|
|
204
|
-
find_references(item)
|
|
205
|
-
else:
|
|
206
|
-
find_references(value)
|
|
207
|
-
|
|
192
|
+
referenced_ids: set[int] = {DOCUMENT_ID, PACKAGE_ID}
|
|
193
|
+
refs: list[int] = []
|
|
208
194
|
for obj in self._objects.values():
|
|
209
|
-
find_references(obj)
|
|
195
|
+
find_references(obj, refs)
|
|
196
|
+
referenced_ids.update(refs)
|
|
210
197
|
|
|
211
198
|
metadata = self.get_as(PACKAGE_ID, TSPArchiveMessages.PackageMetadata)
|
|
212
199
|
unreferenced_ids = set(self._objects.keys()) - referenced_ids
|
|
@@ -5,11 +5,13 @@ from __future__ import annotations
|
|
|
5
5
|
|
|
6
6
|
import logging
|
|
7
7
|
import struct
|
|
8
|
+
from enum import IntEnum
|
|
8
9
|
from functools import partial
|
|
9
10
|
from struct import unpack
|
|
10
11
|
from typing import TYPE_CHECKING, Any, cast
|
|
11
12
|
|
|
12
13
|
import snappy
|
|
14
|
+
from google.protobuf.descriptor import FieldDescriptor
|
|
13
15
|
from google.protobuf.internal.decoder import _DecodeVarint32 # type: ignore[attr-defined]
|
|
14
16
|
from google.protobuf.internal.encoder import _VarintBytes # type: ignore[attr-defined]
|
|
15
17
|
from google.protobuf.json_format import MessageToDict, ParseDict
|
|
@@ -75,6 +77,13 @@ class IWACompressedChunk: # noqa: PLW1641
|
|
|
75
77
|
def __init__(self, archives: list[IWAArchiveSegment]) -> None:
|
|
76
78
|
"""Initialize the instance state."""
|
|
77
79
|
self.archives = archives
|
|
80
|
+
self._archive_map: dict[int, IWAArchiveSegment] | None = None
|
|
81
|
+
|
|
82
|
+
def get_archive(self, obj_id: int) -> IWAArchiveSegment | None:
|
|
83
|
+
"""Return the archive segment with the given identifier, or None."""
|
|
84
|
+
if self._archive_map is None or len(self._archive_map) != len(self.archives):
|
|
85
|
+
self._archive_map = {a.header.identifier: a for a in self.archives}
|
|
86
|
+
return self._archive_map.get(obj_id)
|
|
78
87
|
|
|
79
88
|
def __eq__(self, other: object) -> bool: # pragma: no cover
|
|
80
89
|
"""Compare this instance with another value."""
|
|
@@ -388,6 +397,72 @@ def create_iwa_segment(
|
|
|
388
397
|
return IWAArchiveSegment.from_dict(archive_dict)
|
|
389
398
|
|
|
390
399
|
|
|
400
|
+
class _RefKind(IntEnum):
|
|
401
|
+
"""Classification of whether a protobuf descriptor can hold TSP.Reference values."""
|
|
402
|
+
|
|
403
|
+
NONE = 0
|
|
404
|
+
MAY_CONTAIN = 1
|
|
405
|
+
REFERENCE = 2
|
|
406
|
+
|
|
407
|
+
|
|
408
|
+
_TYPE_MESSAGE = FieldDescriptor.TYPE_MESSAGE
|
|
409
|
+
_REF_KIND_CACHE: dict[Any, _RefKind] = {}
|
|
410
|
+
|
|
411
|
+
|
|
412
|
+
def _ref_kind(desc: Any) -> _RefKind: # noqa: ANN401
|
|
413
|
+
"""Return whether a protobuf descriptor is or can contain a TSP.Reference."""
|
|
414
|
+
kind = _REF_KIND_CACHE.get(desc)
|
|
415
|
+
if kind is not None:
|
|
416
|
+
return kind
|
|
417
|
+
|
|
418
|
+
if desc.full_name == "TSP.Reference":
|
|
419
|
+
_REF_KIND_CACHE[desc] = _RefKind.REFERENCE
|
|
420
|
+
return _RefKind.REFERENCE
|
|
421
|
+
|
|
422
|
+
visited: set[Any] = {desc}
|
|
423
|
+
stack: list[Any] = [desc]
|
|
424
|
+
found = False
|
|
425
|
+
while stack:
|
|
426
|
+
current = stack.pop()
|
|
427
|
+
if current.extension_ranges:
|
|
428
|
+
found = True
|
|
429
|
+
break
|
|
430
|
+
for field in current.fields:
|
|
431
|
+
if field.type == _TYPE_MESSAGE and field.message_type is not None:
|
|
432
|
+
msg_type = field.message_type
|
|
433
|
+
if msg_type.full_name == "TSP.Reference":
|
|
434
|
+
found = True
|
|
435
|
+
break
|
|
436
|
+
if msg_type not in visited:
|
|
437
|
+
visited.add(msg_type)
|
|
438
|
+
stack.append(msg_type)
|
|
439
|
+
if found:
|
|
440
|
+
break
|
|
441
|
+
|
|
442
|
+
kind = _RefKind.MAY_CONTAIN if found else _RefKind.NONE
|
|
443
|
+
_REF_KIND_CACHE[desc] = kind
|
|
444
|
+
return kind
|
|
445
|
+
|
|
446
|
+
|
|
447
|
+
def _collect_references(msg: ProtoMessage, references: list[int]) -> None:
|
|
448
|
+
"""Recursively collect TSP.Reference identifiers from a protobuf message."""
|
|
449
|
+
for field, value in msg.ListFields():
|
|
450
|
+
if field.type != _TYPE_MESSAGE or field.message_type is None:
|
|
451
|
+
continue
|
|
452
|
+
kind = _ref_kind(field.message_type)
|
|
453
|
+
if kind is _RefKind.REFERENCE:
|
|
454
|
+
if field.is_repeated:
|
|
455
|
+
references.extend(item.identifier for item in value)
|
|
456
|
+
else:
|
|
457
|
+
references.append(value.identifier)
|
|
458
|
+
elif kind is _RefKind.MAY_CONTAIN:
|
|
459
|
+
if field.is_repeated:
|
|
460
|
+
for item in value:
|
|
461
|
+
_collect_references(item, references)
|
|
462
|
+
else:
|
|
463
|
+
_collect_references(value, references)
|
|
464
|
+
|
|
465
|
+
|
|
391
466
|
def find_references(
|
|
392
467
|
obj: ProtoMessage | ProtobufPatch,
|
|
393
468
|
references: list[int] | None = None,
|
|
@@ -399,36 +474,28 @@ def find_references(
|
|
|
399
474
|
target = obj.data if isinstance(obj, ProtobufPatch) else obj
|
|
400
475
|
if not hasattr(target, "DESCRIPTOR"):
|
|
401
476
|
return
|
|
402
|
-
|
|
477
|
+
|
|
478
|
+
kind = _ref_kind(target.DESCRIPTOR)
|
|
479
|
+
if kind is _RefKind.REFERENCE:
|
|
403
480
|
references.append(target.identifier) # type: ignore[attr-defined]
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
_, field = field_desc
|
|
407
|
-
if type(field).__name__ == "Reference":
|
|
408
|
-
references.append(field.identifier) # type: ignore[attr-defined]
|
|
409
|
-
elif "Repeated" in type(field).__name__:
|
|
410
|
-
for item in field:
|
|
411
|
-
find_references(item, references)
|
|
412
|
-
elif hasattr(field, "DESCRIPTOR"):
|
|
413
|
-
find_references(field, references)
|
|
481
|
+
elif kind is _RefKind.MAY_CONTAIN:
|
|
482
|
+
_collect_references(target, references)
|
|
414
483
|
|
|
415
484
|
|
|
416
485
|
def copy_object_to_iwa_file(iwa_file: IWAFile, obj: ProtoMessage, obj_id: int) -> None:
|
|
417
486
|
"""Copy object to iwa file."""
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
for reference in references:
|
|
431
|
-
msg_info.object_references.append(reference)
|
|
487
|
+
archive = iwa_file.chunks[0].get_archive(obj_id)
|
|
488
|
+
if archive is None:
|
|
489
|
+
return
|
|
490
|
+
|
|
491
|
+
target_obj = archive.objects[0]
|
|
492
|
+
if not isinstance(target_obj, ProtobufPatch) and target_obj is not obj:
|
|
493
|
+
target_obj.CopyFrom(obj)
|
|
494
|
+
|
|
495
|
+
references: list[int] = []
|
|
496
|
+
find_references(target_obj, references)
|
|
497
|
+
if references:
|
|
498
|
+
archive.header.message_infos[0].object_references[:] = references
|
|
432
499
|
|
|
433
500
|
|
|
434
501
|
def is_iwa_file(data: bytes) -> bool:
|
|
@@ -671,7 +671,6 @@ class NumbersModel(Cacheable):
|
|
|
671
671
|
f"Index/Tables/DataList-{parent_id}",
|
|
672
672
|
{"tsce_item": tsce_items},
|
|
673
673
|
TSTArchives.PopUpMenuModel,
|
|
674
|
-
True, # noqa: FBT003
|
|
675
674
|
)
|
|
676
675
|
return popup_menu_id
|
|
677
676
|
|
|
@@ -2420,36 +2419,47 @@ class NumbersModel(Cacheable):
|
|
|
2420
2419
|
storage_id = self.find_refs("AnnotationAuthorStorageArchive")[0]
|
|
2421
2420
|
storage = self.get_object(storage_id, TSKArchives.AnnotationAuthorStorageArchive)
|
|
2422
2421
|
|
|
2422
|
+
target_author_id = None
|
|
2423
2423
|
for author_ref in storage.annotation_author:
|
|
2424
2424
|
author = self.get_object(author_ref.identifier, TSKArchives.AnnotationAuthorArchive)
|
|
2425
2425
|
if author.name == author_name:
|
|
2426
|
-
|
|
2426
|
+
target_author_id = author_ref.identifier
|
|
2427
|
+
break
|
|
2427
2428
|
|
|
2428
|
-
|
|
2429
|
-
|
|
2430
|
-
|
|
2431
|
-
|
|
2432
|
-
|
|
2433
|
-
|
|
2434
|
-
|
|
2435
|
-
|
|
2436
|
-
|
|
2437
|
-
|
|
2438
|
-
|
|
2439
|
-
|
|
2429
|
+
if target_author_id is None:
|
|
2430
|
+
target_author_id, _ = self.objects.create_object_from_dict(
|
|
2431
|
+
"AnnotationAuthorStorage",
|
|
2432
|
+
{
|
|
2433
|
+
"name": author_name,
|
|
2434
|
+
"color": {
|
|
2435
|
+
"model": "rgb",
|
|
2436
|
+
"r": 0.0,
|
|
2437
|
+
"g": 0.0,
|
|
2438
|
+
"b": 0.0,
|
|
2439
|
+
"a": 1.0,
|
|
2440
|
+
"rgbspace": "srgb",
|
|
2441
|
+
},
|
|
2440
2442
|
},
|
|
2441
|
-
|
|
2442
|
-
|
|
2443
|
-
append=
|
|
2444
|
-
|
|
2445
|
-
|
|
2446
|
-
|
|
2447
|
-
self.
|
|
2448
|
-
|
|
2449
|
-
|
|
2450
|
-
|
|
2443
|
+
TSKArchives.AnnotationAuthorArchive,
|
|
2444
|
+
)
|
|
2445
|
+
storage.annotation_author.append(TSPMessages.Reference(identifier=target_author_id))
|
|
2446
|
+
|
|
2447
|
+
base_data_store = self.table_model(table_id).base_data_store
|
|
2448
|
+
|
|
2449
|
+
component = self.metadata_component_info(base_data_store.commentStorageTable.identifier)
|
|
2450
|
+
reference_exists = any(
|
|
2451
|
+
ref.object_identifier == target_author_id and ref.component_identifier == storage_id
|
|
2452
|
+
for ref in component.external_references
|
|
2451
2453
|
)
|
|
2452
|
-
|
|
2454
|
+
|
|
2455
|
+
if not reference_exists:
|
|
2456
|
+
self.add_component_reference(
|
|
2457
|
+
object_id=target_author_id,
|
|
2458
|
+
location=base_data_store.commentStorageTable.identifier,
|
|
2459
|
+
component_id=storage_id,
|
|
2460
|
+
)
|
|
2461
|
+
|
|
2462
|
+
return target_author_id
|
|
2453
2463
|
|
|
2454
2464
|
def add_comment_to_cell( # noqa: PLR0917
|
|
2455
2465
|
self,
|
|
@@ -2483,7 +2493,6 @@ class NumbersModel(Cacheable):
|
|
|
2483
2493
|
"storage_uuid": NumbersUUID().dict2,
|
|
2484
2494
|
},
|
|
2485
2495
|
TSDArchives.CommentStorageArchive,
|
|
2486
|
-
append=True,
|
|
2487
2496
|
)
|
|
2488
2497
|
new_comment_ref = TSPMessages.Reference(identifier=new_comment_id)
|
|
2489
2498
|
if reply:
|
|
@@ -8,6 +8,7 @@ import magic
|
|
|
8
8
|
import pytest
|
|
9
9
|
from pytest_console_scripts import ScriptRunner
|
|
10
10
|
|
|
11
|
+
import numbers_parser.generated.TSKArchives_pb2 as TSKArchives
|
|
11
12
|
from numbers_parser import (
|
|
12
13
|
RGB,
|
|
13
14
|
BackgroundImage,
|
|
@@ -1128,3 +1129,43 @@ def test_issue_266() -> None:
|
|
|
1128
1129
|
table = doc.default_table
|
|
1129
1130
|
for row in range(table.num_rows):
|
|
1130
1131
|
assert table.cell(row, 1).formatted_value == table.cell(row, 2).value
|
|
1132
|
+
|
|
1133
|
+
|
|
1134
|
+
def test_issue_283(configurable_save_file: Path) -> None:
|
|
1135
|
+
"""Test issue 286."""
|
|
1136
|
+
doc = Document("tests/data/issue-283.numbers")
|
|
1137
|
+
doc.sheets[0].tables[0].add_comment(0, 0, "comment on table 1", author="Bot")
|
|
1138
|
+
doc.sheets[1].tables[0].add_comment(0, 0, "comment on table 2", author="Bot")
|
|
1139
|
+
doc.save(configurable_save_file)
|
|
1140
|
+
|
|
1141
|
+
new_doc = Document(configurable_save_file)
|
|
1142
|
+
|
|
1143
|
+
assert new_doc.sheets[0].tables[0].cell(0, 0).comments[0].text == "comment on table 1"
|
|
1144
|
+
assert new_doc.sheets[0].tables[0].cell(0, 0).comments[0].author == "Bot"
|
|
1145
|
+
assert new_doc.sheets[1].tables[0].cell(0, 0).comments[0].text == "comment on table 2"
|
|
1146
|
+
assert new_doc.sheets[1].tables[0].cell(0, 0).comments[0].author == "Bot"
|
|
1147
|
+
|
|
1148
|
+
# The fix is invisible to the API, so look into the data storage.
|
|
1149
|
+
model = new_doc._model
|
|
1150
|
+
author_storage_id = model.find_refs("AnnotationAuthorStorageArchive")[0]
|
|
1151
|
+
author_storage = model.get_object(author_storage_id, TSKArchives.AnnotationAuthorStorageArchive)
|
|
1152
|
+
|
|
1153
|
+
bot_authors = [
|
|
1154
|
+
ref.identifier
|
|
1155
|
+
for ref in author_storage.annotation_author
|
|
1156
|
+
if model.get_object(ref.identifier, TSKArchives.AnnotationAuthorArchive).name == "Bot"
|
|
1157
|
+
]
|
|
1158
|
+
assert len(bot_authors) == 1
|
|
1159
|
+
bot_author_id = bot_authors[0]
|
|
1160
|
+
|
|
1161
|
+
for sheet_index in (0, 1):
|
|
1162
|
+
table_id = new_doc.sheets[sheet_index].tables[0]._table_id
|
|
1163
|
+
base_data_store = model.table_model(table_id).base_data_store
|
|
1164
|
+
component = model.metadata_component_info(base_data_store.commentStorageTable.identifier)
|
|
1165
|
+
author_refs = [
|
|
1166
|
+
ref
|
|
1167
|
+
for ref in component.external_references
|
|
1168
|
+
if ref.object_identifier == bot_author_id
|
|
1169
|
+
and ref.component_identifier == author_storage_id
|
|
1170
|
+
]
|
|
1171
|
+
assert len(author_refs) == 1, f"Missing author reference in sheet {sheet_index}"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TNArchives_sos_pb2.pyi
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSAArchives_sos_pb2.pyi
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCEArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCEArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCH3DArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCH3DArchives_pb2.pyi
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSDArchives_sos_pb2.pyi
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSKArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSKArchives_pb2.pyi
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPMessages_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSPMessages_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSSArchives_sos_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSTArchives_sos_pb2.pyi
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_pb2.pyi
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
{numbers_parser-4.23.0 → numbers_parser-4.23.1}/src/numbers_parser.egg-info/entry_points.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|