omdev 0.0.0.dev492__tar.gz → 0.0.0.dev494__tar.gz

{omdev-0.0.0.dev492/omdev.egg-info → omdev-0.0.0.dev494}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev492
+Version: 0.0.0.dev494
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev492
+Requires-Dist: omlish==0.0.0.dev494
 Provides-Extra: all
 Requires-Dist: black~=25.12; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -27,7 +27,8 @@ Requires-Dist: mypy~=1.19; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.10; extra == "all"
+Requires-Dist: textual~=6.11; extra == "all"
+Requires-Dist: textual-dev~=1.8; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.12; extra == "black"
 Provides-Extra: c
@@ -46,7 +47,8 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.10; extra == "tui"
+Requires-Dist: textual~=6.11; extra == "tui"
+Requires-Dist: textual-dev~=1.8; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/omdev/__about__.py

@@ -44,7 +44,8 @@ class Project(ProjectBase):
 
         'tui': [
             'rich ~= 14.2',
-            'textual ~= 6.10',
+            'textual ~= 6.11',  # [syntax]
+            'textual-dev ~= 1.8',
         ],
     }
 

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/omdev/tui/apps/irc/commands.py

@@ -13,7 +13,7 @@ if ta.TYPE_CHECKING:
 ##
 
 
-class IrcCommand(abc.ABC):
+class IrcCommand(lang.Abstract):
     """Abstract base class for IRC commands."""
 
     def __init__(self) -> None:

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/omdev/tui/textual/__init__.py

@@ -224,8 +224,24 @@ with _lang.auto_proxy_init(globals()):
 
     ##
 
+    from textual_dev.client import DevtoolsClient  # noqa
+    from textual_dev.client import DevtoolsConnectionError  # noqa
+    from textual_dev.client import DevtoolsConsole  # noqa
+    from textual_dev.client import DevtoolsLog  # noqa
+
+    ##
+
     from . devtools import (  # noqa
-        setup_app_devtools,
+        DevtoolsConfig,
+        connect_devtools,
+
+        DevtoolsAppMixin,
+
+        DevtoolsSetup,
+        DevtoolsManager,
+
+        DevtoolsLoggingHandler,
+        set_root_logger_to_devtools,
     )
 
     from . import debug  # noqa
@@ -239,6 +255,10 @@ with _lang.auto_proxy_init(globals()):
         get_pending_writes_driver_class,
     )
 
+    from .logging2 import (  # noqa
+        translate_log_level,
+    )
+
     from .types import (  # noqa
         TopRightBottomLeft,
         trbl_to_dict,

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/omdev/tui/textual/app2.py

@@ -3,9 +3,14 @@ import typing as ta
 from textual.app import App as App_
 from textual.binding import BindingType  # noqa
 
+from .devtools import DevtoolsAppMixin
+
 
 ##
 
 
-class App(App_):
+class App(
+    DevtoolsAppMixin,
+    App_,
+):
     BINDINGS: ta.ClassVar[ta.Sequence[BindingType]] = App_.BINDINGS  # type: ignore[assignment]

omdev-0.0.0.dev494/omdev/tui/textual/devtools.py

@@ -0,0 +1,187 @@
+# ruff: noqa: UP037 UP045
+import inspect
+import logging
+import typing as ta
+
+import textual.constants
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .logging2 import translate_log_level
+
+
+with lang.auto_proxy_import(globals()):
+    from textual_dev import client as tx_dev_client
+    from textual_dev import redirect_output as tx_dev_redirect_output
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class DevtoolsConfig:
+    host: str = '127.0.0.1'
+
+    # https://github.com/Textualize/textual/blob/676045381b7178c3bc94b86901f20764e08aca49/src/textual/constants.py#L125
+    port: int = 8081
+
+    @classmethod
+    def from_env(cls) -> 'DevtoolsConfig':
+        return cls(
+            host=textual.constants.DEVTOOLS_HOST,
+            port=textual.constants.DEVTOOLS_PORT,
+        )
+
+
+async def connect_devtools(config: DevtoolsConfig) -> ta.Optional['tx_dev_client.DevtoolsClient']:
+    try:
+        from textual_dev.client import DevtoolsClient  # noqa
+    except ImportError:
+        # Dev dependencies not installed
+        return None
+
+    devtools = DevtoolsClient(
+        config.host,
+        config.port,
+    )
+
+    from textual_dev.client import DevtoolsConnectionError
+
+    try:
+        await devtools.connect()
+    except DevtoolsConnectionError as e:  # noqa
+        return None
+
+    return devtools
+
+
+##
+
+
+class DevtoolsAppMixin:
+    _skip_devtools_management: bool = False
+
+    def _install_devtools(self, devtools: 'tx_dev_client.DevtoolsClient') -> None:
+        check.none(getattr(self, 'devtools', None))
+        check.none(getattr(self, '_devtools_redirector', None))
+
+        # https://github.com/Textualize/textual/blob/676045381b7178c3bc94b86901f20764e08aca49/src/textual/app.py#L730-L741
+        setattr(self, 'devtools', devtools)
+        setattr(self, '_devtools_redirector', tx_dev_redirect_output.StdoutRedirector(devtools))
+
+        self._skip_devtools_management = True
+
+    async def _init_devtools(self) -> None:
+        if self._skip_devtools_management:
+            return
+
+        await super()._init_devtools()  # type: ignore  # noqa
+
+    async def _disconnect_devtools(self) -> None:
+        if self._skip_devtools_management:
+            return
+
+        await super()._disconnect_devtools()  # type: ignore  # noqa
+
+
+##
+
+
+class DevtoolsSetup(lang.Func1[DevtoolsAppMixin, None]):
+    pass
+
+
+class DevtoolsManager:
+    def __init__(
+            self,
+            config: DevtoolsConfig = DevtoolsConfig(),
+    ) -> None:
+        super().__init__()
+
+        self._config = config
+        self._devtools: ta.Optional['tx_dev_client.DevtoolsClient'] = None
+        self._setup: DevtoolsSetup | None = None
+
+    async def get_setup(self) -> DevtoolsSetup:
+        if self._setup is None:
+            check.none(self._devtools)
+
+            self._devtools = await connect_devtools(self._config)
+
+            self._setup = DevtoolsSetup(self._setup_app_dev_tools)
+
+        return self._setup
+
+    def _setup_app_dev_tools(self, app: DevtoolsAppMixin) -> None:
+        if (devtools := self._devtools) is None:
+            return
+
+        check.isinstance(app, DevtoolsAppMixin)._install_devtools(devtools)  # noqa
+
+    async def aclose(self) -> None:
+        if (devtools := self._devtools) is not None and devtools.is_connected:
+            await devtools.disconnect()
+
+
+##
+
+
+class DevtoolsLoggingHandler(logging.Handler):
+    """
+    TODO:
+     - reify caller from LogContextInfos
+     - queue worker, this blocks the asyncio thread lol
+    """
+
+    def __init__(
+            self,
+            devtools: ta.Optional['tx_dev_client.DevtoolsClient'],
+            prototype_handler: logging.Handler | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._devtools = devtools
+
+        if prototype_handler is not None:
+            self.setFormatter(prototype_handler.formatter)
+            for lf in prototype_handler.filters:
+                self.addFilter(lf)
+
+    def emit(self, record: logging.LogRecord) -> None:
+        if (devtools := self._devtools) is None or not devtools.is_connected:
+            return
+
+        msg = self.format(record)
+
+        caller = inspect.Traceback(
+            filename=record.filename,
+            lineno=record.lineno,
+            function=record.funcName,
+            code_context=None,
+            index=None,
+        )
+
+        group, verbosity = translate_log_level(record.levelno)
+
+        devtools.log(
+            tx_dev_client.DevtoolsLog(
+                msg,
+                caller=caller,
+            ),
+            group=group,
+            verbosity=verbosity,
+        )
+
+
+def set_root_logger_to_devtools(devtools: ta.Optional['tx_dev_client.DevtoolsClient']) -> None:
+    from omlish.logs.std.standard import _locking_logging_module_lock  # noqa
+    from omlish.logs.std.standard import StandardConfiguredLoggingHandler
+
+    with _locking_logging_module_lock():
+        std_handler = next((h for h in logging.root.handlers if isinstance(h, StandardConfiguredLoggingHandler)), None)
+
+        dt_handler = DevtoolsLoggingHandler(devtools, std_handler)
+
+        logging.root.handlers = [dt_handler]

omdev-0.0.0.dev494/omdev/tui/textual/logging2.py

@@ -0,0 +1,20 @@
+import logging
+
+from textual import LogGroup  # noqa
+from textual import LogVerbosity  # noqa
+
+
+##
+
+
+def translate_log_level(level: int) -> tuple[LogGroup, LogVerbosity]:
+    if level >= logging.ERROR:
+        return (LogGroup.ERROR, LogVerbosity.HIGH)
+    elif level >= logging.WARNING:
+        return (LogGroup.ERROR, LogVerbosity.HIGH)
+    elif level >= logging.INFO:
+        return (LogGroup.INFO, LogVerbosity.NORMAL)
+    elif level >= logging.DEBUG:
+        return (LogGroup.DEBUG, LogVerbosity.NORMAL)
+    else:
+        return (LogGroup.UNDEFINED, LogVerbosity.NORMAL)

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev492
+Version: 0.0.0.dev494
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev492
+Requires-Dist: omlish==0.0.0.dev494
 Provides-Extra: all
 Requires-Dist: black~=25.12; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -27,7 +27,8 @@ Requires-Dist: mypy~=1.19; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.10; extra == "all"
+Requires-Dist: textual~=6.11; extra == "all"
+Requires-Dist: textual-dev~=1.8; extra == "all"
 Provides-Extra: black
 Requires-Dist: black~=25.12; extra == "black"
 Provides-Extra: c
@@ -46,7 +47,8 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.10; extra == "tui"
+Requires-Dist: textual~=6.11; extra == "tui"
+Requires-Dist: textual-dev~=1.8; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/omdev.egg-info/SOURCES.txt

@@ -378,6 +378,7 @@ omdev/tui/textual/__init__.py
 omdev/tui/textual/app2.py
 omdev/tui/textual/devtools.py
 omdev/tui/textual/drivers2.py
+omdev/tui/textual/logging2.py
 omdev/tui/textual/types.py
 omdev/tui/textual/autocomplete/LICENSE
 omdev/tui/textual/autocomplete/__init__.py

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev492
+omlish==0.0.0.dev494
 
 [all]
 black~=25.12
@@ -12,7 +12,8 @@ mypy~=1.19
 gprof2dot~=2025.4
 segno~=1.6
 rich~=14.2
-textual~=6.10
+textual~=6.11
+textual-dev~=1.8
 
 [black]
 black~=25.12
@@ -38,4 +39,5 @@ segno~=1.6
 
 [tui]
 rich~=14.2
-textual~=6.10
+textual~=6.11
+textual-dev~=1.8

{omdev-0.0.0.dev492 → omdev-0.0.0.dev494}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev492'
+version = '0.0.0.dev494'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev492',
+    'omlish == 0.0.0.dev494',
 ]
 
 [project.optional-dependencies]
@@ -40,7 +40,8 @@ all = [
     'gprof2dot ~= 2025.4',
     'segno ~= 1.6',
     'rich ~= 14.2',
-    'textual ~= 6.10',
+    'textual ~= 6.11',
+    'textual-dev ~= 1.8',
 ]
 black = [
     'black ~= 25.12',
@@ -66,7 +67,8 @@ qr = [
 ]
 tui = [
     'rich ~= 14.2',
-    'textual ~= 6.10',
+    'textual ~= 6.11',
+    'textual-dev ~= 1.8',
 ]
 
 [project.entry-points]

omdev-0.0.0.dev492/omdev/tui/textual/devtools.py

@@ -1,33 +0,0 @@
-from textual.app import App
-
-from omlish import check
-
-
-##
-
-
-def setup_app_devtools(
-        app: App,
-        host: str = '127.0.0.1',
-        port: int | None = None,
-) -> bool:
-    if app.devtools is not None:
-        return False
-
-    check.none(app._devtools_redirector)  # noqa
-
-    try:
-        from textual_dev.client import DevtoolsClient  # noqa
-        from textual_dev.redirect_output import StdoutRedirector  # noqa
-    except ImportError:
-        # Dev dependencies not installed
-        return False
-
-    app.devtools = DevtoolsClient(
-        host,
-        port,
-    )
-
-    app._devtools_redirector = StdoutRedirector(app.devtools)  # noqa
-
-    return True