omdev 0.0.0.dev179__py3-none-any.whl → 0.0.0.dev181__py3-none-any.whl

omdev/scripts/interp.py

@@ -78,7 +78,7 @@ UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 # ../../omlish/argparse/cli.py
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 # ../../omlish/lite/inject.py
 U = ta.TypeVar('U')
@@ -1050,13 +1050,6 @@ json_dump_compact: ta.Callable[..., bytes] = functools.partial(json.dump, **JSON
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)
 
 
-########################################
-# ../../../omlish/lite/logs.py
-
-
-log = logging.getLogger(__name__)
-
-
 ########################################
 # ../../../omlish/lite/maybes.py
 
@@ -1953,15 +1946,15 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
 
 
 @dc.dataclass(eq=False)
-class ArgparseCommand:
+class ArgparseCmd:
     name: str
-    fn: ArgparseCommandFn
+    fn: ArgparseCmdFn
     args: ta.Sequence[ArgparseArg] = ()  # noqa
 
     # _: dc.KW_ONLY
 
     aliases: ta.Optional[ta.Sequence[str]] = None
-    parent: ta.Optional['ArgparseCommand'] = None
+    parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
@@ -1976,7 +1969,7 @@ class ArgparseCommand:
 
         check.arg(callable(self.fn))
         check.arg(all(isinstance(a, ArgparseArg) for a in self.args))
-        check.isinstance(self.parent, (ArgparseCommand, type(None)))
+        check.isinstance(self.parent, (ArgparseCmd, type(None)))
         check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
@@ -1990,21 +1983,21 @@ class ArgparseCommand:
         return self.fn(*args, **kwargs)
 
 
-def argparse_command(
+def argparse_cmd(
         *args: ArgparseArg,
         name: ta.Optional[str] = None,
         aliases: ta.Optional[ta.Iterable[str]] = None,
-        parent: ta.Optional[ArgparseCommand] = None,
+        parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
-) -> ta.Any:  # ta.Callable[[ArgparseCommandFn], ArgparseCommand]:  # FIXME
+) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
-    check.isinstance(parent, (ArgparseCommand, type(None)))
+    check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
 
     def inner(fn):
-        return ArgparseCommand(
+        return ArgparseCmd(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
@@ -2059,7 +2052,7 @@ class ArgparseCli:
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
             bseen = set()  # type: ignore
             for k, v in bns.items():
-                if isinstance(v, (ArgparseCommand, ArgparseArg)):
+                if isinstance(v, (ArgparseCmd, ArgparseArg)):
                     check.not_in(v, bseen)
                     bseen.add(v)
                     objs[k] = v
@@ -2086,7 +2079,7 @@ class ArgparseCli:
         subparsers = parser.add_subparsers()
 
         for att, obj in objs.items():
-            if isinstance(obj, ArgparseCommand):
+            if isinstance(obj, ArgparseCmd):
                 if obj.parent is not None:
                     raise NotImplementedError
 
@@ -2148,7 +2141,7 @@ class ArgparseCli:
 
     #
 
-    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
         return cmd.__get__(self, type(self))
 
     def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
@@ -4205,9 +4198,15 @@ class InterpInspection:
 
 
 class InterpInspector:
-    def __init__(self) -> None:
+    def __init__(
+            self,
+            *,
+            log: ta.Optional[logging.Logger] = None,
+    ) -> None:
         super().__init__()
 
+        self._log = log
+
         self._cache: ta.Dict[str, ta.Optional[InterpInspection]] = {}
 
     _RAW_INSPECTION_CODE = """
@@ -4256,8 +4255,8 @@ class InterpInspector:
             try:
                 ret = await self._inspect(exe)
             except Exception as e:  # noqa
-                if log.isEnabledFor(logging.DEBUG):
-                    log.exception('Failed to inspect interp: %s', exe)
+                if self._log is not None and self._log.isEnabledFor(logging.DEBUG):
+                    self._log.exception('Failed to inspect interp: %s', exe)
                 ret = None
             self._cache[exe] = ret
             return ret
@@ -4397,12 +4396,14 @@ class SystemInterpProvider(InterpProvider):
             options: Options = Options(),
             *,
             inspector: ta.Optional[InterpInspector] = None,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
 
         self._options = options
 
         self._inspector = inspector
+        self._log = log
 
     #
 
@@ -4476,7 +4477,8 @@ class SystemInterpProvider(InterpProvider):
         lst = []
         for e in self.exes():
             if (ev := await self.get_exe_version(e)) is None:
-                log.debug('Invalid system version: %s', e)
+                if self._log is not None:
+                    self._log.debug('Invalid system version: %s', e)
                 continue
             lst.append((e, ev))
         return lst
@@ -4833,6 +4835,7 @@ class PyenvInterpProvider(InterpProvider):
             *,
             pyenv: Pyenv,
             inspector: InterpInspector,
+            log: ta.Optional[logging.Logger] = None,
     ) -> None:
         super().__init__()
 
@@ -4840,6 +4843,7 @@ class PyenvInterpProvider(InterpProvider):
 
         self._pyenv = pyenv
         self._inspector = inspector
+        self._log = log
 
     #
 
@@ -4884,7 +4888,8 @@ class PyenvInterpProvider(InterpProvider):
         ret: ta.List[PyenvInterpProvider.Installed] = []
         for vn, ep in await self._pyenv.version_exes():
             if (i := await self._make_installed(vn, ep)) is None:
-                log.debug('Invalid pyenv version: %s', vn)
+                if self._log is not None:
+                    self._log.debug('Invalid pyenv version: %s', vn)
                 continue
             ret.append(i)
         return ret
@@ -5034,7 +5039,7 @@ class InterpCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-d', '--debug', action='store_true'),
     )
@@ -5043,7 +5048,7 @@ class InterpCli(ArgparseCli):
         s = InterpSpecifier.parse(self.args.version)
         await r.list(s)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-p', '--provider'),
         argparse_arg('-d', '--debug', action='store_true'),