App, cmds, lib: Fix Any returns from typed functions

Add type annotations and casts to functions that were returning Any
where a specific type was declared, satisfying the new warn_return_any
mypy rule.

Fixes:
- log.py: get_caller_pos return type via cast
- AsyncRunner.py: cast T for fut.result()
- util.py: cast for getattr result, str() for args.username
- FileContext.py: verbose_default bool annotation
- SSHClient.py: cast SSHClient for dynamic import
- lib/App.py: cast ArgumentParser, add return types to inner funcs
- pm/rpm.py, dpkg.py: cast Iterable[Package]
- App.py: cast for self.args.func(), add return types to inner funcs
- BaseCmdPkgRelations.py: cast str for args.delimiter

Assisted-by: unsloth/Qwen3.6-35B-A3B-GGUF:IQ4_NL and pi.dev 0.81.1
Signed-off-by: Jan Lindemann <jan@janware.com>

src/python/jw/pkg/lib/ec/Curl.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import override, TYPE_CHECKING
+from typing import Any, override, TYPE_CHECKING
 
 from ..FileContext import FileContext as Base
 
@@ -13,7 +13,11 @@ if TYPE_CHECKING:
 class Curl(Base):
 
     def __init__(
-        self, uri: str | Uri, *args, ec: ExecContext | None = None, **kwargs
+        self,
+        uri: str | Uri,
+        *args: Any,
+        ec: ExecContext | None = None,
+        **kwargs: Any
     ) -> None:
 
         def __local() -> Local:

src/python/jw/pkg/lib/ec/Local.py

@@ -7,20 +7,20 @@ import pwd
 import sys
 
 from functools import cache
-from typing import override, TYPE_CHECKING
+from typing import TYPE_CHECKING, override
 
 from ..base import Result, StatResult
 from ..ExecContext import ExecContext as Base
 from ..log import ERR, NOTICE, log
 
 if TYPE_CHECKING:
-    from typing import Any
+    from typing import Any, Callable
 
     from ..Uri import Uri
 
 class Local(Base):
 
-    def __init__(self, uri: str | Uri = 'local', *args, **kwargs) -> None:
+    def __init__(self, uri: str | Uri = 'local', *args: Any, **kwargs: Any) -> None:
         super().__init__(uri, *args, **kwargs)
 
     @cache
@@ -43,9 +43,12 @@ class Local(Base):
             if verbose:
                 log(prio, log_prefix, *args)
 
-        def __make_pty_reader(collector: list[bytes], enc_for_verbose: str):
+        def __make_pty_reader(
+            collector: list[bytes],
+            enc_for_verbose: str,
+        ) -> Callable[[int], bytes]:
 
-            def _read(fd):
+            def _read(fd: int) -> bytes:
                 ret = os.read(fd, 1024)
                 if not ret:
                     return ret
@@ -65,7 +68,7 @@ class Local(Base):
             if interactive:
                 import pty
 
-                def _spawn():
+                def _spawn() -> int:
                     # Apply env in PTY mode by temporarily updating os.environ
                     # around spawn.
                     if mod_env:
@@ -115,7 +118,9 @@ class Local(Base):
             stdout_log_enc = sys.stdout.encoding or 'utf-8'
             stderr_log_enc = sys.stderr.encoding or 'utf-8'
 
-            async def read_stream(stream, prio, collector: list[bytes], log_enc: str):
+            async def read_stream(
+                stream: Any, prio: int, collector: list[bytes], log_enc: str
+            ) -> None:
                 buf = b''
                 while True:
                     chunk = await stream.read(4096)

src/python/jw/pkg/lib/ec/SSHClient.py

@@ -5,7 +5,7 @@ import os
 import pwd
 
 from enum import Flag, auto
-from typing import TYPE_CHECKING, override
+from typing import TYPE_CHECKING, Any, cast, override
 
 from ..ExecContext import ExecContext
 from ..log import DEBUG, ERR, INFO, NOTICE, get_caller_pos, log, log_m
@@ -22,7 +22,9 @@ class SSHClient(ExecContext):
         ModEnv = auto()
         Wd = auto()
 
-    def __init__(self, uri: Uri | str, caps: Caps = Caps(0), *args, **kwargs) -> None:
+    def __init__(
+        self, uri: Uri | str, caps: Caps = Caps(0), *args: Any, **kwargs: Any
+    ) -> None:
         uri = Uri.pimp(uri)
         if uri.username is None:
             uri.set_username(pwd.getpwuid(os.getuid()).pw_name)
@@ -54,13 +56,13 @@ class SSHClient(ExecContext):
         log_prefix: str,
     ) -> Result:
 
-        def __log(prio: int, *args, **kwargs):
+        def __log(prio: int, *args: Any, **kwargs: Any) -> None:
             caller = kwargs.get('caller')
             if caller is None:
                 kwargs['caller'] = get_caller_pos(1)
             log(prio, log_prefix, *args, **kwargs)
 
-        def __log_block(prio: int, title: str, block: str | None):
+        def __log_block(prio: int, title: str, block: str | None) -> None:
             if self.__caps & self.Caps.LogOutput:
                 return
             if block is None:
@@ -112,8 +114,10 @@ class SSHClient(ExecContext):
         return self.uri.password
 
 def ssh_client(  # export
-    *args, type: str | list[str] | None = None, **kwargs
-) -> SSHClient:
+    *args: Any,
+    type: str | list[str] | None = None,
+    **kwargs: Any
+) -> 'SSHClient':
     from importlib import import_module
 
     errors: list[str] = []
@@ -130,7 +134,7 @@ def ssh_client(  # export
             ret = getattr(import_module(f'jw.pkg.lib.ec.ssh.{name}'),
                           name)(*args, **kwargs)
             log(INFO, f'Using SSH-client "{name}"')
-            return ret
+            return cast('SSHClient', ret)
         except Exception as e:
             msg = f"Can't instantiate SSH client class {name} ({str(e)})"
             errors.append(msg)

src/python/jw/pkg/lib/ec/ssh/AsyncSSH.py

@@ -1,4 +1,3 @@
-from typing import Any, override
 import asyncio
 import os
 import shlex
@@ -6,8 +5,12 @@ import shutil
 import signal
 import sys
 
+from typing import Any, override
+
 import asyncssh  # type: ignore[import-not-found, unused-ignore]
 
+from asyncssh import SSHReader  # type: ignore[import-not-found, unused-ignore]
+
 from ...base import Result
 from ...log import DEBUG, ERR, NOTICE, log
 from ..SSHClient import SSHClient as Base
@@ -22,10 +25,10 @@ class AsyncSSH(Base):
         uri: str,
         *,
         client_keys: list[str] | None = None,
-        known_hosts = _USE_DEFAULT_KNOWN_HOSTS,
+        known_hosts: Any = _USE_DEFAULT_KNOWN_HOSTS,
         term_type: str | None = None,
         connect_timeout: float | None = 30.0,
-        **kwargs,
+        **kwargs: Any,
     ) -> None:
 
         super().__init__(
@@ -121,8 +124,8 @@ class AsyncSSH(Base):
 
     async def _read_stream(
         self,
-        stream,
-        prio,
+        stream: SSHReader[bytes],
+        prio: int,
         collector: list[bytes],
         *,
         verbose: bool,
@@ -222,7 +225,7 @@ class AsyncSSH(Base):
                 stdout_parts.append(chunk)
                 _write_local(chunk)
 
-        def _on_winch(*_args) -> None:
+        def _on_winch(*_args: Any) -> None:
 
             try:
                 proc.change_terminal_size(*self._get_local_term_size())

src/python/jw/pkg/lib/ec/ssh/Exec.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import os
 
-from typing import override, TYPE_CHECKING
+from typing import Any, override, TYPE_CHECKING
 
 from ...base import InputMode
 from ...util import run_cmd
@@ -14,12 +14,12 @@ if TYPE_CHECKING:
 
 class Exec(Base):
 
-    def __init__(self, uri, *args, **kwargs) -> None:
+    def __init__(self, uri: Any, *args: Any, **kwargs: Any) -> None:
         self.__askpass: str | None = None
         self.__askpass_orig: dict[str, str | None] = dict()
         super().__init__(uri = uri, caps = self.Caps.ModEnv, **kwargs)
 
-    def __del__(self):
+    def __del__(self) -> None:
         for key, val in self.__askpass_orig.items():
             if val is None:
                 del os.environ[key]

src/python/jw/pkg/lib/ec/ssh/Paramiko.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import override, TYPE_CHECKING
+from typing import Any, override, TYPE_CHECKING
 
 # Tolerate missing paramiko imports. jw-pkg is designed to work with what it
 # finds.
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 
 class Paramiko(Base):
 
-    def __init__(self, uri, *args, **kwargs) -> None:
+    def __init__(self, uri: Any, *args: Any, **kwargs: Any) -> None:
         kwargs['caps'] = (self.Caps.ModEnv, )
         super().__init__(uri, *args, **kwargs)
         self.__timeout: float | None = None  # Untested