Merge pull request #1084 from onekey-sec/pyright-standard-type-checking-mode

Pyright enable standard type checking mode

Author: vlaci

pyproject.toml

@@ -177,7 +177,7 @@ exclude = [
   ".venv",
   "build",
 ]
-typeCheckingMode = "basic"
+typeCheckingMode = "standard"
 
 [build-system]
 build-backend = "hatchling.build"

unblob/extractors/command.py

@@ -102,9 +102,15 @@ def get_dependencies(self) -> list[str]:
         return [self._executable]
 
 
-class MultiFileCommand(Command, DirectoryExtractor):
+class MultiFileCommand(DirectoryExtractor):
+    def __init__(self, *args, **kwargs):
+        self._command = Command(*args, **kwargs)
+
     def extract(self, paths: list[Path], outdir: Path):
-        return super().extract(paths[0], outdir)
+        return self._command.extract(paths[0], outdir)
+
+    def get_dependencies(self) -> list[str]:
+        return self._command.get_dependencies()
 
 
 class InvalidCommandTemplate(ValueError):

unblob/file_utils.py

@@ -8,6 +8,7 @@
 import re
 import shutil
 import struct
+import sys
 import unicodedata
 from collections.abc import Iterable, Iterator
 from pathlib import Path
@@ -67,7 +68,7 @@ def from_path(cls, path: Path, access=mmap.ACCESS_READ):
             m.access = access
             return m
 
-    def seek(self, pos: int, whence: int = os.SEEK_SET) -> int:
+    def seek(self, pos: int, whence: int = os.SEEK_SET) -> int:  # pyright: ignore[reportIncompatibleMethodOverride]
         try:
             super().seek(pos, whence)
         except ValueError as e:
@@ -91,7 +92,7 @@ def size(self) -> int:
     def __enter__(self):
         return self
 
-    def __exit__(self, _exc_type, _exc_val, _exc_tb):
+    def __exit__(self, *args):
         self.close()
 
     def readable(self) -> bool:
@@ -100,8 +101,10 @@ def readable(self) -> bool:
     def writable(self) -> bool:
         return self.access in (mmap.ACCESS_WRITE, mmap.ACCESS_COPY)
 
-    def seekable(self) -> bool:
-        return True  # Memory-mapped files are always seekable
+    if sys.version_info < (3, 13):
+
+        def seekable(self) -> Literal[True]:
+            return True  # Memory-mapped files are always seekable
 
 
 class OffsetFile:

unblob/handlers/compression/_gzip_reader.py

@@ -15,7 +15,7 @@ def _add_read_data(self, data):
         self._crc = zlib.crc32(data, self._crc)
         self._stream_size = self._stream_size + len(data)
 
-    def read(self):
+    def read_all(self):
         uncompress = b""
 
         while True:
@@ -39,7 +39,7 @@ def read(self):
 
     def read_until_eof(self):
         while not self._decompressor.eof:
-            self.read()
+            self.read_all()
 
     @property
     def unused_data(self):

unblob/models.py

@@ -4,7 +4,7 @@
 from collections.abc import Iterable
 from enum import Enum
 from pathlib import Path
-from typing import Optional, TypeVar
+from typing import Generic, Optional, TypeVar, Union
 
 import attrs
 from structlog import get_logger
@@ -255,7 +255,8 @@ def get_output_dir(self) -> Optional[Path]:
 
 
 class _JSONEncoder(json.JSONEncoder):
-    def default(self, obj):
+    def default(self, o):
+        obj = o
         if attrs.has(type(obj)):
             extend_attr_output = True
             attr_output = attrs.asdict(obj, recurse=not extend_attr_output)
@@ -438,7 +439,10 @@ def extract(self, paths: list[Path], outdir: Path) -> Optional[ExtractResult]:
         return self.EXTRACTOR.extract(paths, outdir)
 
 
-class Handler(abc.ABC):
+TExtractor = TypeVar("TExtractor", bound=Union[None, Extractor])
+
+
+class Handler(abc.ABC, Generic[TExtractor]):
     """A file type handler is responsible for searching, validating and "unblobbing" files from Blobs."""
 
     NAME: str
@@ -447,12 +451,12 @@ class Handler(abc.ABC):
     # (e.g. tar magic is in the middle of the header)
     PATTERN_MATCH_OFFSET: int = 0
 
-    EXTRACTOR: Optional[Extractor]
+    EXTRACTOR: TExtractor
 
     @classmethod
     def get_dependencies(cls):
         """Return external command dependencies needed for this handler to work."""
-        if cls.EXTRACTOR:
+        if cls.EXTRACTOR is not None:
             return cls.EXTRACTOR.get_dependencies()
         return []