Review feedback

Signed-off-by: Christian Vetter <christian.vetter@here.com>

Author: VeaaC

flatdata-py/flatdata/lib/archive_builder.py

@@ -120,13 +120,13 @@ def _write_index_schema(self, resource_name: str, schema: str) -> None:
         self._write_raw_data(
             f"{resource_name}_index.schema", bytes(schema, 'utf-8'))
 
-    def subarchive(self, name: str) -> None:
+    def subarchive(self, name: str) -> 'ArchiveBuilder':
         """
         Returns an archive builder for the sub-archive `name`.
         :raises $name_not_subarchive_error
         :param name: name of the sub-archive
         """
-        NotImplemented
+        raise NotImplementedError(f"subarchive '{name}' is not implemented")
 
     @classmethod
     def __validate_structure_fields(cls, name: str, struct: dict[str, Any], initializer: Any) -> None:

flatdata-py/flatdata/lib/file_resource_writer.py

@@ -46,9 +46,11 @@ def open(self, name: str, file_path: str) -> None:
     def write(self, data: bytes | bytearray) -> None:
         '''Write data to file'''
         if data:
-            self._file.write(data)  # type: ignore[union-attr]  # _file is set by open() before write() is called
+            assert self._file is not None, "write() called before open()"
+            self._file.write(data)
 
     def close(self) -> None:
         '''Flush data and close file'''
-        self._file.flush()  # type: ignore[union-attr]  # _file is set by open() before close() is called
-        self._file.close()  # type: ignore[union-attr]  # _file is set by open() before close() is called
+        assert self._file is not None, "close() called before open()"
+        self._file.flush()
+        self._file.close()

flatdata-py/flatdata/lib/resource_storage.py

@@ -34,7 +34,7 @@ def __init__(self, name: str, writer: Any = None, path: str = "", is_subarchive:
         if not path:
             raise ArchivePathNotProvidedError()
 
-        self.data: bytearray | bytes = bytearray()
+        self.data: bytearray | bytes | None = bytearray()
         self._valid: bool = True
         self._resource_writer: Any = None
 
@@ -54,24 +54,31 @@ def write(self, data: bytes | bytearray) -> None:
 
         :param data(bytearray): bytearray to be added to resource
         '''
+        assert self.data is not None, "write() called on closed resource"
         if data and isinstance(data, bytearray) or isinstance(data, bytes):
             self.data += data
 
-    def get_data(self) -> bytearray | bytes:
-        '''Returns resources data in bytearray'''
+    def get_data(self) -> bytearray | bytes | None:
+        '''Returns resources data in bytearray, or None if the resource is closed.'''
         return self.data
 
     def add_size(self) -> None:
         '''Calculate size of stored data and appends it to the begining'''
+        assert self.data is not None, "add_size() called on closed resource"
         self.data = int(len(self.data)).to_bytes(
             8, byteorder="little", signed=False) + self.data
 
     def add_padding(self) -> None:
         '''Add 8 byte zero padding at the end of data'''
+        assert self.data is not None, "add_padding() called on closed resource"
         self.data += b'\x00' * 8
 
     def __str__(self) -> str:
-        '''Facilitate print for debugging'''
+        '''Facilitate print for debugging.
+
+        Uses !r (repr) instead of implicit __format__ because format(bytes, '')
+        is deprecated in Python 3.12+ and raises TypeError in 3.14+.
+        '''
         return f'{self.data!r}'
 
     def close(self) -> None:
@@ -81,7 +88,7 @@ def close(self) -> None:
         '''
         if self._resource_writer:
             self._resource_writer.write(self.data)
-            self.data = None  # type: ignore[assignment]  # sentinel for closed resource; data lifecycle: bytearray → bytes → None
+            self.data = None
             self._resource_writer.close()
 
         self._valid = False