omdev 0.0.0.dev529__tar.gz → 0.0.0.dev531__tar.gz

{omdev-0.0.0.dev529/omdev.egg-info → omdev-0.0.0.dev531}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev529
+Version: 0.0.0.dev531
 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.dev529
+Requires-Dist: omlish==0.0.0.dev531
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev/dockerdev/gen.py

@@ -127,6 +127,8 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
             static_env={'NVM_VERSIONS': cfg.nvm_versions},
         ))
 
+    ops.append(fragment_section('uv'))
+
     if cfg.pyenv_version_keys:
         ops.append(fragment_section(
             'pyenv',

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev/dockerdev/resources/fragments/jdk.sh

@@ -1,7 +1,7 @@
 set -ex ;
 
 sudo apt install gnupg ca-certificates curl ;
-curl -s https://repos.azul.com/azul-repo.key | sudo gpg --dearmor -o /usr/share/keyrings/azul.gpg ;
+curl -s 'https://repos.azul.com/azul-repo.key' | sudo gpg --dearmor -o /usr/share/keyrings/azul.gpg ;
 echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | sudo tee /etc/apt/sources.list.d/zulu.list ;
 
 apt-get update ;

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev/dockerdev/resources/fragments/nvm.sh

@@ -1,6 +1,6 @@
 set -ex ;
 
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash ;
+curl -o- 'https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh' | bash ;
 
 export NVM_DIR="$HOME/.nvm" ;
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" ;

omdev-0.0.0.dev531/omdev/dockerdev/resources/fragments/uv.sh

@@ -0,0 +1,3 @@
+set -ex ;
+
+curl -LsSf 'https://astral.sh/uv/install.sh' | sh ;

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev/scripts/ci.py

@@ -95,7 +95,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='34691d4d0e5bab68f14e193a6200df040cfd0136'),
             dict(path='../../omlish/docker/ports.py', sha1='a3202c69b85bc4f1034479df3400fddc86130e5c'),
             dict(path='../../omlish/http/urllib.py', sha1='25431c5bdc7dd5cbecfcb8c0bdffaabf8c1691b9'),
-            dict(path='../../omlish/http/versions.py', sha1='dbd6ee1941150b1143096eac2b02eb29c0396d30'),
+            dict(path='../../omlish/http/versions.py', sha1='5b1659b81eb197c6880fbe78684a1348595ec804'),
             dict(path='../../omlish/io/pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
@@ -125,7 +125,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/pack/unpacking.py', sha1='f43dee9a2eee79cbbb90f0721ed234a2bc35daa7'),
             dict(path='../../omlish/argparse/cli.py', sha1='f4dc3cd353d14386b5da0306768700e396afd2b3'),
             dict(path='../../omlish/http/coro/io.py', sha1='6ccbbf6a1a6a702ce0f1dc24b4057e8264ef4641'),
-            dict(path='../../omlish/http/parsing.py', sha1='58579597eaf70a8ee409c2814481b3002a6acea1'),
+            dict(path='../../omlish/http/parsing.py', sha1='2ee187993274e697332c7df7b46a98382f4cee2a'),
             dict(path='../../omlish/lite/marshal.py', sha1='96348f5f2a26dc27d842d33cc3927e9da163436b'),
             dict(path='../../omlish/lite/maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
             dict(path='../../omlish/lite/runtime.py', sha1='2e752a27ae2bf89b1bb79b4a2da522a3ec360c70'),
@@ -622,6 +622,9 @@ class HttpVersion:
         self._str = f'HTTP/{major}.{minor}'
         self._short_str = f'{major}.{minor}'
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.major}, {self.minor})'
+
     def __hash__(self) -> int:
         return self._hash
 
@@ -4417,12 +4420,26 @@ class PreparedParsedHttpHeaders:
 
     authorization: ta.Optional[AuthorizationValue] = None
 
+    def __repr__(self) -> str:
+        return ''.join([
+            f'{self.__class__.__name__}(',
+            ', '.join([
+                f'{f.name}={v!r}'
+                for f in dc.fields(self)
+                if (v := getattr(self, f.name) is not None)
+            ]),
+            ')',
+        ])
+
 
 @dc.dataclass(frozen=True)
 class RawParsedHttpHeader:
     name: bytes
     value: bytes
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.name!r}, {self.value!r})'
+
 
 @dc.dataclass()
 class ParsedHttpMessage:

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev/scripts/lib/io/streams.py

@@ -26,16 +26,16 @@ def __omlish_amalg__():  # noqa
             dict(path='errors.py', sha1='67ca85fd8741b5bfefe76c872ce1c30c18fab06f'),
             dict(path='../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
-            dict(path='types.py', sha1='8a12dc29f6e483dd8df5336c0d9b58a00b64e7ed'),
-            dict(path='base.py', sha1='67ae88ffabae21210b5452fe49c9a3e01ca164c5'),
+            dict(path='types.py', sha1='ab72e5d4a1e648ef79577be7d8c45853b1c5917d'),
+            dict(path='base.py', sha1='bdeaff419684dec34fd0dc59808a9686131992bc'),
             dict(path='framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
             dict(path='reading.py', sha1='7631635c46ab4b40bcaeb7c506cf15cb2d529a40'),
             dict(path='utils.py', sha1='476363dfce81e3177a66f066892ed3fcf773ead8'),
             dict(path='direct.py', sha1='83c33460e9490a77a00ae66251617ba98128b56b'),
-            dict(path='scanning.py', sha1='4c0323e0b11cd506f7b6b4cf28ea4d7c6064b9d3'),
-            dict(path='adapters.py', sha1='865338413829b97be23883f713d50eb7cb62617a'),
-            dict(path='linear.py', sha1='e1669b97cf16184d479fd4589862380730236737'),
-            dict(path='segmented.py', sha1='f855d67d88ed71bbe2bbeee09321534f0ef18e24'),
+            dict(path='scanning.py', sha1='6ab39887d0d2d3002201b786c4715e64804c66c8'),
+            dict(path='adapters.py', sha1='ce4fc01bd81bb6b3402dc71e46c37849a80e476d'),
+            dict(path='linear.py', sha1='b2d82224c6a3001eb8230d6a9c4de7cb3afe7d1c'),
+            dict(path='segmented.py', sha1='4aeb1c22b7b5994132f0b5906d70b3e53201776b'),
             dict(path='_amalg.py', sha1='9c88a055447d7b37da1b356e6a1e00b7c4a9a3cb'),
         ],
     )
@@ -492,6 +492,11 @@ class MutableByteStreamBuffer(ByteStreamBuffer, Abstract):
     Implementations may be linear (single `bytearray` + indices), segmented (multiple chunks), or adaptive.
     """
 
+    @property
+    @abc.abstractmethod
+    def max_size(self) -> ta.Optional[int]:
+        raise NotImplementedError
+
     @abc.abstractmethod
     def write(self, data: BytesLikeOrMemoryview, /) -> None:
         """
@@ -550,9 +555,7 @@ class MutableByteStreamBuffer(ByteStreamBuffer, Abstract):
 class BaseByteStreamBufferLike(ByteStreamBufferLike, Abstract):
     def _norm_slice(self, start: int, end: ta.Optional[int]) -> ta.Tuple[int, int]:
         s, e, _ = slice(start, end, 1).indices(len(self))
-        if e < s:
-            e = s
-        return s, e
+        return (s, s) if e < s else (s, e)
 
 
 ########################################
@@ -1385,6 +1388,10 @@ class ScanningByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer
         self._buf = buf
         self._scan_from_by_sub: dict[bytes, int] = {}
 
+    @property
+    def max_size(self) -> ta.Optional[int]:
+        return self._buf.max_size
+
     #
 
     def __len__(self) -> int:
@@ -1649,6 +1656,10 @@ class BytesIoByteStreamBuffer(MutableByteStreamBuffer):
         self._resv: ta.Optional[bytearray] = None
         self._resv_len = 0
 
+    @property
+    def max_size(self) -> ta.Optional[int]:
+        return None
+
     def __len__(self) -> int:
         return self._bio.getbuffer().nbytes - self._rpos
 
@@ -1782,18 +1793,18 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
     def __init__(
             self,
             *,
-            max_bytes: ta.Optional[int] = None,
+            max_size: ta.Optional[int] = None,
             initial_capacity: int = 0,
             compact_threshold: int = 0x10000,
     ) -> None:
         super().__init__()
 
-        self._max_bytes = None if max_bytes is None else int(max_bytes)
+        self._max_size = None if max_size is None else int(max_size)
 
         if initial_capacity < 0:
             raise ValueError(initial_capacity)
-        if self._max_bytes is not None and initial_capacity > self._max_bytes:
-            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_bytes')
+        if self._max_size is not None and initial_capacity > self._max_size:
+            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_size')
 
         if compact_threshold < 0:
             raise ValueError(compact_threshold)
@@ -1812,6 +1823,10 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
         else:
             self._ba = bytearray()
 
+    @property
+    def max_size(self) -> ta.Optional[int]:
+        return self._max_size
+
     _rpos = 0
     _wpos = 0
 
@@ -1847,8 +1862,8 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
 
         bl = len(data)
 
-        if self._max_bytes is not None and len(self) + bl > self._max_bytes:
-            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_bytes')
+        if self._max_size is not None and len(self) + bl > self._max_size:
+            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_size')
 
         # If buffer is logically empty but backing store might still be large (e.g. compaction skipped),
         # keep indices reset and just append.
@@ -1892,8 +1907,8 @@ class LinearByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffer):
         if not n:
             return
 
-        if self._max_bytes is not None and len(self) + n > self._max_bytes:
-            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_bytes')
+        if self._max_size is not None and len(self) + n > self._max_size:
+            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_size')
 
         # Append only what was written.
         self.write(memoryview(b)[:n])
@@ -2115,7 +2130,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
     def __init__(
             self,
             *,
-            max_bytes: ta.Optional[int] = None,
+            max_size: ta.Optional[int] = None,
             chunk_size: int = 0,
             chunk_compact_threshold: float = .25,
     ) -> None:
@@ -2123,7 +2138,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
 
         self._segs: ta.List[ta.Union[bytes, bytearray]] = []
 
-        self._max_bytes = None if max_bytes is None else int(max_bytes)
+        self._max_size = None if max_size is None else int(max_size)
 
         if chunk_size < 0:
             raise ValueError(chunk_size)
@@ -2136,6 +2151,10 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
         self._active: ta.Optional[bytearray] = None
         self._active_used = 0
 
+    @property
+    def max_size(self) -> ta.Optional[int]:
+        return self._max_size
+
     _head_off = 0
     _len = 0
 
@@ -2206,7 +2225,7 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
             if len(mv):
                 out.append(mv)
 
-        return tuple(out)
+        return out
 
     #
 
@@ -2268,8 +2287,8 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
 
         dl = len(data)
 
-        if self._max_bytes is not None and self._len + dl > self._max_bytes:
-            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_bytes')
+        if self._max_size is not None and self._len + dl > self._max_size:
+            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_size')
 
         if self._chunk_size <= 0:
             self._segs.append(data)
@@ -2341,8 +2360,8 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
             self._reserved_len = 0
             self._reserved_in_active = False
 
-            if self._max_bytes is not None and self._len + n > self._max_bytes:
-                raise BufferTooLargeByteStreamBufferError('buffer exceeded max_bytes')
+            if self._max_size is not None and self._len + n > self._max_size:
+                raise BufferTooLargeByteStreamBufferError('buffer exceeded max_size')
 
             if n:
                 self._active_used += n
@@ -2357,8 +2376,8 @@ class SegmentedByteStreamBuffer(BaseByteStreamBufferLike, MutableByteStreamBuffe
         self._reserved_len = 0
         self._reserved_in_active = False
 
-        if self._max_bytes is not None and self._len + n > self._max_bytes:
-            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_bytes')
+        if self._max_size is not None and self._len + n > self._max_size:
+            raise BufferTooLargeByteStreamBufferError('buffer exceeded max_size')
 
         if not n:
             return

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev/tui/apps/irc/app.py

@@ -10,6 +10,7 @@ TODO:
 import shlex
 import typing as ta
 
+from omlish import check
 from omlish import lang
 
 from ... import textual as tx
@@ -90,7 +91,7 @@ class IrcApp(tx.App):
         self._window_order: list[str] = ['system']
         self._current_window_idx: int = 0
         self._current_channel: str | None = None
-        self._startup_commands: ta.Sequence[str] = startup_commands or []
+        self._startup_commands: ta.Sequence[str] = check.not_isinstance(startup_commands or [], str)
 
     @property
     def client(self) -> IrcClient | None:

omdev-0.0.0.dev531/omdev/tui/apps/irc/main.py

@@ -0,0 +1,84 @@
+import os.path
+import tomllib
+import typing as ta
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import marshal as msh
+from omlish.argparse import all as argparse
+
+from ....home.paths import get_home_paths
+from .app import IrcApp
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Config:
+    autoexec: ta.Sequence[str] | None = None
+
+
+def load_config(cfg_file: str | None = None) -> Config | None:
+    if cfg_file is not None:
+        check.state(os.path.exists(cfg_file), 'Config file does not exist')
+
+    else:
+        cfg_file = os.path.join(get_home_paths().config_dir, 'irc.toml')
+        if not os.path.exists(cfg_file):
+            return None
+
+    with open(cfg_file) as f:
+        cfg_src = f.read()
+
+    cfg_dct = tomllib.loads(cfg_src)
+    return msh.unmarshal(cfg_dct, Config)
+
+
+##
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser(description='Simple IRC client using Textual')
+
+    parser.add_argument(
+        '-x',
+        action='append',
+        dest='commands',
+        help='Execute slash command on startup (can be specified multiple times)',
+    )
+
+    parser.add_argument('-c', '--config', help='Specify config file')
+    parser.add_argument('-C', '--no-config', action='store_true', help='Disable config file')
+
+    args = parser.parse_args()
+
+    #
+
+    cfg: Config | None = None
+    if not args.no_config:
+        cfg = load_config(args.config)
+
+    #
+
+    autoexec: list[str] = []
+
+    if cfg is not None:
+        if isinstance(cfg.autoexec, str):
+            autoexec.append(cfg.autoexec)
+        elif cfg.autoexec:
+            autoexec.extend(cfg.autoexec)
+
+    if args.commands:
+        autoexec.extend(args.commands)
+
+    #
+
+    app = IrcApp(
+        startup_commands=autoexec,
+    )
+    app.run()
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev529
+Version: 0.0.0.dev531
 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.dev529
+Requires-Dist: omlish==0.0.0.dev531
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev.egg-info/SOURCES.txt

@@ -186,6 +186,7 @@ omdev/dockerdev/resources/fragments/nvm.sh
 omdev/dockerdev/resources/fragments/pyenv.sh
 omdev/dockerdev/resources/fragments/rust.sh
 omdev/dockerdev/resources/fragments/sshd.sh
+omdev/dockerdev/resources/fragments/uv.sh
 omdev/dockerdev/resources/fragments/vcpkg.sh
 omdev/dockerdev/resources/fragments/zig.sh
 omdev/git/__init__.py

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev529
+omlish==0.0.0.dev531
 
 [all]
 black~=26.1

{omdev-0.0.0.dev529 → omdev-0.0.0.dev531}/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.dev529'
+version = '0.0.0.dev531'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev529',
+    'omlish == 0.0.0.dev531',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev529/omdev/tui/apps/irc/main.py

@@ -1,26 +0,0 @@
-from omlish.argparse import all as argparse
-
-from .app import IrcApp
-
-
-##
-
-
-def _main() -> None:
-    parser = argparse.ArgumentParser(description='Simple IRC client using Textual')
-    parser.add_argument(
-        '-x',
-        action='append',
-        dest='commands',
-        help='Execute slash command on startup (can be specified multiple times)',
-    )
-    args = parser.parse_args()
-
-    app = IrcApp(
-        startup_commands=args.commands,
-    )
-    app.run()
-
-
-if __name__ == '__main__':
-    _main()