promnesia 1.3.20241021__py3-none-any.whl → 1.4.20250909__py3-none-any.whl

promnesia/common.py

@@ -7,19 +7,20 @@ import re
 import shutil
 import tempfile
 import warnings
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from contextlib import contextmanager
 from copy import copy
-from datetime import date, datetime
+from datetime import date, datetime, timezone
 from functools import lru_cache
 from glob import glob
 from pathlib import Path
 from subprocess import PIPE, Popen, run
 from timeit import default_timer as timer
 from types import ModuleType
-from typing import TYPE_CHECKING, Callable, NamedTuple, Optional, TypeVar, Union
+from typing import TYPE_CHECKING, NamedTuple, TypeAlias, TypeVar
+from zoneinfo import ZoneInfo
 
-import pytz
+import platformdirs
 from more_itertools import intersperse
 
 from .cannon import canonify
@@ -27,27 +28,28 @@ from .cannon import canonify
 _is_windows = os.name == 'nt'
 
 T = TypeVar('T')
-Res = Union[T, Exception]
+Res: TypeAlias = T | Exception
 
-PathIsh = Union[str, Path]
+PathIsh = str | Path
 
 Url = str
 SourceName = str
-DatetimeIsh = Union[datetime, date]
+DatetimeIsh = datetime | date
 Context = str
 Second = int
 
+
 # TODO hmm. arguably, source and context are almost same things...
 class Loc(NamedTuple):
     title: str
-    href: Optional[str] = None  # noqa: UP007  # looks like hypothesis doesn't like in on python <= 3.9
+    href: str | None = None
 
     @classmethod
-    def make(cls, title: str, href: str | None=None) -> Loc:
+    def make(cls, title: str, href: str | None = None) -> Loc:
         return cls(title=title, href=href)
 
     @classmethod
-    def file(cls, path: PathIsh, line: int | None=None, relative_to: Path | None=None) -> Loc:
+    def file(cls, path: PathIsh, line: int | None = None, relative_to: Path | None = None) -> Loc:
         lstr = '' if line is None else f':{line}'
         # todo loc should be url encoded? dunno.
         # or use line=? eh. I don't know. Just ask in issues.
@@ -55,11 +57,11 @@ class Loc(NamedTuple):
         # todo: handler has to be overridable by config. This is needed for docker, but also for a "as a service" install, where the sources would be available on some remote webserver
         # maybe it should be treated as a format string, so that {line} may be a part of the result or not.
         # for local usage, editor:///file:line works, but if the txt file is only available through http, it breaks.
-        #if get_config().MIME_HANDLER:
+        # if get_config().MIME_HANDLER:
         #   handler = get_config().MIME_HANDLER
-        #if True:
+        # if True:
         #    handler =  'editor:///home/koom/promnesia/docker/'
-        #else:
+        # else:
         handler = _detect_mime_handler()
 
         rel = Path(path)
@@ -67,13 +69,10 @@ class Loc(NamedTuple):
             try:
                 # making it relative is a bit nicer for display
                 rel = rel.relative_to(relative_to)
-            except Exception as e:
-                pass # todo log/warn?
+            except Exception:
+                pass  # todo log/warn?
         loc = f'{rel}{lstr}'
-        return cls.make(
-            title=loc,
-            href=f'{handler}{path}{lstr}'
-        )
+        return cls.make(title=loc, href=f'{handler}{path}{lstr}')
 
     # TODO need some uniform way of string conversion
     # but generally, it will be
@@ -89,7 +88,9 @@ def warn_once(message: str) -> None:
 
 
 def _warn_no_xdg_mime() -> None:
-    warn_once("No xdg-mime on your OS! If you're on OSX, perhaps you can help me! https://github.com/karlicoss/open-in-editor/issues/1")
+    warn_once(
+        "No xdg-mime on your OS! If you're on OSX, perhaps you can help me! https://github.com/karlicoss/open-in-editor/issues/1"
+    )
 
 
 @lru_cache(1)
@@ -101,7 +102,7 @@ def _detect_mime_handler() -> str:
             _warn_no_xdg_mime()
             return False
         if r.returncode > 0:
-            warnings.warn('xdg-mime failed') # hopefully rest is in stderr
+            warnings.warn('xdg-mime failed')  # hopefully rest is in stderr
             return False
         # todo not sure if should check=True or something
         handler = r.stdout.decode('utf8').strip()
@@ -110,11 +111,13 @@ def _detect_mime_handler() -> str:
     # 1. detect legacy 'emacs:' handler (so it doesn't break for existing users)
     result = None
     if exists('emacs'):
-        warnings.warn('''
+        warnings.warn(
+            '''
         'emacs:' handler is deprecated!
         Please use newer version at https://github.com/karlicoss/open-in-editor
         And remove the old one (most likely, rm ~/.local/share/applications/mimemacs.desktop && update-desktop-database ~/.local/share/applications).
-'''.rstrip())
+'''.rstrip()
+        )
         result = 'emacs:'
 
     # 2. now try to use newer editor:// thing
@@ -122,10 +125,12 @@ def _detect_mime_handler() -> str:
 
     # TODO would be nice to collect warnings and display at the end
     if not exists('editor'):
-        warnings.warn('''
+        warnings.warn(
+            '''
         You might want to install https://github.com/karlicoss/open-in-editor
         So you can jump to your text files straight from the browser
-'''.rstrip())
+'''.rstrip()
+        )
     else:
         result = 'editor://'
 
@@ -148,20 +153,22 @@ class Visit(NamedTuple):
     # spent: Optional[Second] = None
     debug: str | None = None
 
-Result = Union[Visit, Exception]
+
+Result = Visit | Exception
 Results = Iterable[Result]
 Extractor = Callable[[], Results]
 
 Extraction = Result  # TODO deprecate!
 
+
 class DbVisit(NamedTuple):
     norm_url: Url
     orig_url: Url
     dt: datetime
     locator: Loc
-    src: Optional[SourceName] = None  # noqa: UP007  # looks like hypothesis doesn't like in on python <= 3.9
-    context: Optional[Context] = None  # noqa: UP007  # looks like hypothesis doesn't like in on python <= 3.9
-    duration: Optional[Second] = None  # noqa: UP007  # looks like hypothesis doesn't like in on python <= 3.9
+    src: SourceName | None = None
+    context: Context | None = None
+    duration: Second | None = None
 
     @staticmethod
     def make(p: Visit, src: SourceName) -> Res[DbVisit]:
@@ -171,9 +178,9 @@ class DbVisit(NamedTuple):
                 dt = p.dt
             elif isinstance(p.dt, date):
                 # TODO that won't be with timezone..
-                dt = datetime.combine(p.dt, datetime.min.time()) # meh..
+                dt = datetime.combine(p.dt, datetime.min.time())  # meh..
             else:
-                raise AssertionError(f'unexpected date: {p.dt}, {type(p.dt)}')  # noqa: TRY301
+                raise TypeError(f'unexpected date: {p.dt}, {type(p.dt)}')  # noqa: TRY301
         except Exception as e:
             return e
 
@@ -201,32 +208,34 @@ from .logging import LazyLogger
 
 logger = LazyLogger('promnesia', level='DEBUG')
 
+
 def get_logger() -> logging.Logger:
     # deprecate? no need since logger is lazy already
     return logger
 
 
-
 # kinda singleton
 @lru_cache(1)
 def get_tmpdir() -> tempfile.TemporaryDirectory[str]:
-    # todo use appdirs?
+    # todo use platformdirs?
     tdir = tempfile.TemporaryDirectory(suffix="promnesia")
     return tdir
 
+
 # TODO use mypy literal?
 Syntax = str
 
 
 @lru_cache(None)
 def _get_urlextractor(syntax: Syntax):
-    from urlextract import URLExtract  # type: ignore
+    from urlextract import URLExtract  # type: ignore[import-untyped]
+
     u = URLExtract()
     # https://github.com/lipoja/URLExtract/issues/13
-    if syntax in {'org', 'orgmode', 'org-mode'}: # TODO remove hardcoding..
+    if syntax in {'org', 'orgmode', 'org-mode'}:  # TODO remove hardcoding..
         # handle org-mode links properly..
         u._stop_chars_right |= {'[', ']'}
-        u._stop_chars_left  |= {'[', ']'}
+        u._stop_chars_left |= {'[', ']'}
     elif syntax in {'md', 'markdown'}:
         pass
     # u._stop_chars_right |= {','}
@@ -244,19 +253,19 @@ def _sanitize(url: str) -> str:
     return url
 
 
-def iter_urls(s: str, *, syntax: Syntax='') -> Iterable[Url]:
+def iter_urls(s: str, *, syntax: Syntax = '') -> Iterable[Url]:
     urlextractor = _get_urlextractor(syntax=syntax)
     # note: it also has get_indices, might be useful
     for u in urlextractor.gen_urls(s):
         yield _sanitize(u)
 
 
-def extract_urls(s: str, *, syntax: Syntax='') -> list[Url]:
+def extract_urls(s: str, *, syntax: Syntax = '') -> list[Url]:
     return list(iter_urls(s=s, syntax=syntax))
 
 
 def from_epoch(ts: int) -> datetime:
-    return datetime.fromtimestamp(ts, tz=pytz.utc)
+    return datetime.fromtimestamp(ts, tz=timezone.utc)
 
 
 def join_tags(tags: Iterable[str]) -> str:
@@ -287,10 +296,7 @@ class PathWithMtime(NamedTuple):
 PreExtractor = Callable[..., Results]
 
 
-PreSource = Union[
-    PreExtractor,
-    ModuleType,   # module with 'index' functon defined in it
-]
+PreSource = PreExtractor | ModuleType  # module with 'index' functon defined in it
 
 
 # todo not sure about this...
@@ -322,7 +328,7 @@ def _get_index_function(sourceish: PreSource) -> PreExtractor:
 class Source:
     # TODO make sure it works with empty src?
     # TODO later, make it properly optional?
-    def __init__(self, ff: PreSource, *args, src: SourceName='', name: SourceName='', **kwargs) -> None:
+    def __init__(self, ff: PreSource, *args, src: SourceName = '', name: SourceName = '', **kwargs) -> None:
         # NOTE: in principle, would be nice to make the Source countructor to be as dumb as possible
         # so we could move _get_index_function inside extractor lambda
         # but that way we get nicer error reporting
@@ -356,6 +362,7 @@ class Source:
         # TODO deprecated!
         return self.name
 
+
 # TODO deprecated
 Indexer = Source
 
@@ -364,6 +371,7 @@ Indexer = Source
 # NOTE: used in configs...
 def last(path: PathIsh, *parts: str) -> Path:
     import os.path
+
     pp = os.path.join(str(path), *parts)  # noqa: PTH118
     return Path(max(glob(pp, recursive=True)))  # noqa: PTH207
 
@@ -390,22 +398,21 @@ def slugify(x: str) -> str:
 
 
 # todo cache?
-def appdirs():
+def _platformdirs() -> platformdirs.PlatformDirs:
     under_test = os.environ.get('PYTEST_CURRENT_TEST') is not None
     # todo actually use test name?
     name = 'promnesia-test' if under_test else 'promnesia'
-    import appdirs as ad  # type: ignore[import-untyped]
-    return ad.AppDirs(appname=name)
+    return platformdirs.PlatformDirs(appname=name)
 
 
 def default_output_dir() -> Path:
     # TODO: on Windows, there are two extra subdirectories (<AppAuthor>\<AppName>)
     # perhaps makes sense to create it here with parents to avoid issues downstream?
-    return Path(appdirs().user_data_dir)
+    return Path(_platformdirs().user_data_dir)
 
 
 def default_cache_dir() -> Path:
-    return Path(appdirs().user_cache_dir)
+    return Path(_platformdirs().user_cache_dir)
 
 
 # make it lazy, otherwise it might crash on module import (e.g. on Windows)
@@ -414,15 +421,15 @@ def default_cache_dir() -> Path:
 def _magic() -> Callable[[PathIsh], str | None]:
     logger = get_logger()
     try:
-        import magic  # type: ignore
+        import magic  # type: ignore[import-not-found]
     except Exception as e:
         logger.exception(e)
         defensive_msg: str | None = None
         if isinstance(e, ModuleNotFoundError) and e.name == 'magic':
             defensive_msg = "python-magic is not detected. It's recommended for better file type detection (pip3 install --user python-magic). See https://github.com/ahupp/python-magic#installation"
         elif isinstance(e, ImportError):
-            emsg = getattr(e, 'msg', '') # make mypy happy
-            if 'failed to find libmagic' in emsg: # probably the actual library is missing?...
+            emsg = getattr(e, 'msg', '')  # make mypy happy
+            if 'failed to find libmagic' in emsg:  # probably the actual library is missing?...
                 defensive_msg = "couldn't import magic. See https://github.com/ahupp/python-magic#installation"
         if defensive_msg is not None:
             logger.warning(defensive_msg)
@@ -439,6 +446,7 @@ def _magic() -> Callable[[PathIsh], str | None]:
 @lru_cache(1)
 def _mimetypes():
     import mimetypes
+
     mimetypes.init()
     return mimetypes
 
@@ -475,7 +483,7 @@ def find_args(root: Path, *, follow: bool, ignore: Sequence[str] = ()) -> list[s
         *prune_dir_args,
         '-type', 'f',
         *ignore_file_args
-    ]
+    ]  # fmt: skip
 
 
 def fdfind_args(root: Path, *, follow: bool, ignore: Sequence[str] = ()) -> list[str]:
@@ -495,10 +503,10 @@ def fdfind_args(root: Path, *, follow: bool, ignore: Sequence[str] = ()) -> list
         '--type', 'f',
         '.',
         str(root),
-    ]
+    ]  # fmt: skip
 
 
-def traverse(root: Path, *, follow: bool=True, ignore: Sequence[str] = ()) -> Iterable[Path]:
+def traverse(root: Path, *, follow: bool = True, ignore: Sequence[str] = ()) -> Iterable[Path]:
     if not root.is_dir():
         yield root
         return
@@ -517,12 +525,14 @@ def traverse(root: Path, *, follow: bool=True, ignore: Sequence[str] = ()) -> It
 
     cmd = ['find', *find_args(root, follow=follow, ignore=ignore)]
     # try to use fd.. it cooperates well with gitignore etc, also faster than find
-    for x in ('fd', 'fd-find', 'fdfind'): # has different names on different dists..
+    for x in ('fd', 'fd-find', 'fdfind'):  # has different names on different dists..
         if shutil.which(x):
             cmd = [x, *fdfind_args(root, follow=follow, ignore=ignore)]
             break
     else:
-        warnings.warn("'fdfind' is recommended for the best indexing performance. See https://github.com/sharkdp/fd#installation. Falling back to 'find'")
+        warnings.warn(
+            "'fdfind' is recommended for the best indexing performance. See https://github.com/sharkdp/fd#installation. Falling back to 'find'"
+        )
 
     logger.debug('running: %s', cmd)
     # TODO split by \0?
@@ -539,6 +549,7 @@ def traverse(root: Path, *, follow: bool=True, ignore: Sequence[str] = ()) -> It
 def get_system_zone() -> str:
     try:
         import tzlocal
+
         return tzlocal.get_localzone_name()
     except Exception as e:
         logger.exception(e)
@@ -547,14 +558,15 @@ def get_system_zone() -> str:
 
 
 @lru_cache(1)
-def get_system_tz() -> pytz.BaseTzInfo:
+def get_system_tz() -> ZoneInfo:
     zone = get_system_zone()
     try:
-        return pytz.timezone(zone)
+        return ZoneInfo(zone)
     except Exception as e:
         logger.exception(e)
         logger.error("Unknown time zone %s. Falling back to UTC. Please report this as a bug!", zone)
-        return pytz.utc
+        return ZoneInfo('UTC')
+
 
 # used in misc/install_server.py
 def root() -> Path:
@@ -576,7 +588,7 @@ def user_config_file() -> Path:
     if "PROMNESIA_CONFIG" in os.environ:
         return Path(os.environ["PROMNESIA_CONFIG"])
     else:
-        return Path(appdirs().user_config_dir) / 'config.py'
+        return Path(_platformdirs().user_config_dir) / 'config.py'
 
 
 def default_config_path() -> Path:
@@ -591,7 +603,7 @@ def default_config_path() -> Path:
 
 
 @contextmanager
-def measure(tag: str='', *, logger: logging.Logger, unit: str='ms'):
+def measure(tag: str = '', *, logger: logging.Logger, unit: str = 'ms'):
     before = timer()
     yield lambda: timer() - before
     after = timer()

promnesia/compare.py

@@ -14,25 +14,29 @@ from .database.load import row_to_db_visit
 # TODO include latest too?
 # from cconfig import ignore, filtered
 
+
 def get_logger():
     return logging.getLogger('promnesia-db-changes')
 
+
 # TODO return error depending on severity?
 
 
 T = TypeVar('T')
 
+
 def eliminate_by(sa: Sequence[T], sb: Sequence[T], key):
     def make_dict(s: Sequence[T]) -> dict[str, list[T]]:
         res: dict[str, list[T]] = {}
         for a in s:
             k = key(a)
-            ll = res.get(k, None)
+            ll = res.get(k)
             if ll is None:
                 ll = []
                 res[k] = ll
             ll.append(a)
         return res
+
     da = make_dict(sa)
     db = make_dict(sb)
     ka = set(da.keys())
@@ -43,11 +47,11 @@ def eliminate_by(sa: Sequence[T], sb: Sequence[T], key):
     for k in ka.union(kb):
         la = da.get(k, [])
         lb = db.get(k, [])
-        common.update(la[:min(len(la), len(lb))])
+        common.update(la[: min(len(la), len(lb))])
         if len(la) > len(lb):
-            onlya.update(la[len(lb):])
+            onlya.update(la[len(lb) :])
         if len(lb) > len(la):
-            onlyb.update(lb[len(la):])
+            onlyb.update(lb[len(la) :])
 
     return onlya, common, onlyb
 
@@ -61,7 +65,7 @@ def compare(before: list[DbVisit], after: list[DbVisit], between: str, *, log=Tr
     umap: dict[Url, list[DbVisit]] = {}
     for a in after:
         url = a.norm_url
-        xx = umap.get(url, []) # TODO canonify here?
+        xx = umap.get(url, [])  # TODO canonify here?
         xx.append(a)
         umap[url] = xx
 
@@ -71,14 +75,13 @@ def compare(before: list[DbVisit], after: list[DbVisit], between: str, *, log=Tr
             logger.error('between %s missing %s', between, b)
             print('ignoreline "{}", # {} {}'.format('exid', b.norm_url, b.src), file=sys.stderr)
 
-
     # the idea is that we eliminate items simultaneously from both sets
     eliminations = [
         ('identity'               , lambda x: x),
         ('without dt'             , lambda x: x._replace(src='', dt='')),
         ('without context'        , lambda x: x._replace(src='',        context='', locator='')),
         ('without dt and context' , lambda x: x._replace(src='', dt='', context='', locator='')),
-    ]
+    ]  # fmt: skip
     for ename, ekey in eliminations:
         logger.info('eliminating by %s', ename)
         logger.info('before: %d, after: %d', len(before), len(after))
@@ -94,6 +97,7 @@ def compare(before: list[DbVisit], after: list[DbVisit], between: str, *, log=Tr
 
     return errors
 
+
 def setup_parser(p):
     # TODO better name?
     p.add_argument('--intermediate-dir', type=Path)
@@ -107,7 +111,7 @@ def get_files(args):
         int_dir = args.intermediate_dir
         assert int_dir.exists()
         files = sorted(int_dir.glob('*.sqlite*'))
-        files = files[-args.last:]
+        files = files[-args.last :]
     else:
         files = [Path(p) for p in args.paths]
     return files
@@ -135,9 +139,10 @@ def compare_files(*files: Path, log=True) -> Iterator[tuple[str, DbVisit]]:
     for f in files:
         logger.info('processing %r', f)
         name = f.name
-        this_dts = name[0: name.index('.')] # can't use stem due to multiple extensions..
+        this_dts = name[0 : name.index('.')]  # can't use stem due to multiple extensions..
 
         from promnesia.server import _get_stuff  # TODO ugh
+
         engine, table = _get_stuff(PathWithMtime.make(f))
 
         with engine.connect() as conn:
@@ -151,6 +156,6 @@ def compare_files(*files: Path, log=True) -> Iterator[tuple[str, DbVisit]]:
         last = vis
         last_dts = this_dts
 
+
 if __name__ == '__main__':
     main()
-

promnesia/config.py

@@ -4,10 +4,10 @@ import importlib
 import importlib.util
 import os
 import warnings
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from pathlib import Path
 from types import ModuleType
-from typing import Callable, NamedTuple, Union
+from typing import NamedTuple
 
 from .common import DbVisit, PathIsh, Res, Source, default_cache_dir, default_output_dir
 
@@ -17,37 +17,37 @@ HookT = Callable[[Res[DbVisit]], Iterable[Res[DbVisit]]]
 ModuleName = str
 
 # something that can be converted into a proper Source
-ConfigSource = Union[Source, ModuleName, ModuleType]
+ConfigSource = Source | ModuleName | ModuleType
 
 
 class Config(NamedTuple):
     # TODO remove default from sources once migrated
-    SOURCES: list[ConfigSource] = []
+    SOURCES: list[ConfigSource] = []  # noqa: RUF012
 
     # if not specified, uses user data dir
     OUTPUT_DIR: PathIsh | None = None
 
     CACHE_DIR: PathIsh | None = ''
-    FILTERS: list[str] = []
+    FILTERS: list[str] = []  # noqa: RUF012
 
     HOOK: HookT | None = None
 
     #
     # NOTE: INDEXERS is deprecated, use SOURCES instead
-    INDEXERS: list[ConfigSource] = []
-    #MIME_HANDLER: Optional[str] = None # TODO
+    INDEXERS: list[ConfigSource] = []  # noqa: RUF012
+    # MIME_HANDLER: Optional[str] = None # TODO
 
     @property
     def sources(self) -> Iterable[Res[Source]]:
-        idx = self.INDEXERS
-
         if len(self.INDEXERS) > 0:
             warnings.warn("'INDEXERS' is deprecated. Please use 'SOURCES'!", DeprecationWarning)
 
         raw = self.SOURCES + self.INDEXERS
 
         if len(raw) == 0:
-            raise RuntimeError("Please specify SOURCES in the config! See https://github.com/karlicoss/promnesia#setup for more information")
+            raise RuntimeError(
+                "Please specify SOURCES in the config! See https://github.com/karlicoss/promnesia#setup for more information"
+            )
 
         for r in raw:
             if isinstance(r, ModuleName):
@@ -72,8 +72,8 @@ class Config(NamedTuple):
         cd = self.CACHE_DIR
         cpath: Path | None
         if cd is None:
-            cpath = None # means 'disabled' in cachew
-        elif cd == '': # meh.. but need to make it None friendly..
+            cpath = None  # means 'disabled' in cachew
+        elif cd == '':  # meh.. but need to make it None friendly..
             cpath = default_cache_dir()
         else:
             cpath = Path(cd)
@@ -97,12 +97,14 @@ class Config(NamedTuple):
     def hook(self) -> HookT | None:
         return self.HOOK
 
+
 instance: Config | None = None
 
 
 def has() -> bool:
     return instance is not None
 
+
 def get() -> Config:
     assert instance is not None, "Expected config to be set, but it's not"
     return instance
@@ -124,9 +126,12 @@ def import_config(config_file: PathIsh) -> Config:
 
     # todo just exec??
     name = p.stem
-    spec = importlib.util.spec_from_file_location(name, p); assert spec is not None
-    mod = importlib.util.module_from_spec(spec); assert mod is not None
-    loader = spec.loader; assert loader is not None
+    spec = importlib.util.spec_from_file_location(name, p)
+    assert spec is not None
+    mod = importlib.util.module_from_spec(spec)
+    assert mod is not None
+    loader = spec.loader
+    assert loader is not None
     loader.exec_module(mod)
 
     d = {}
@@ -148,7 +153,7 @@ def use_cores() -> int | None:
         return None
     try:
         return int(cs)
-    except ValueError: # any other value means 'use all
+    except ValueError:  # any other value means 'use all
         return 0
 
 
@@ -158,5 +163,5 @@ def extra_fd_args() -> list[str]:
     Can be used to pass --ignore-file parameter
     '''
     v = os.environ.get('PROMNESIA_FD_EXTRA_ARGS', '')
-    extra = v.split() # eh, hopefully splitting that way is ok...
+    extra = v.split()  # eh, hopefully splitting that way is ok...
     return extra

promnesia/database/dump.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import sqlite3
 from collections.abc import Iterable
 from pathlib import Path
-from typing import Optional
 
 from more_itertools import chunked
 from sqlalchemy import (
@@ -51,7 +50,7 @@ def begin_immediate_transaction(conn):
     conn.exec_driver_sql('BEGIN IMMEDIATE')
 
 
-Stats = dict[Optional[SourceName], int]
+Stats = dict[SourceName | None, int]
 
 
 # returns critical warnings