omlish 0.0.0.dev179__tar.gz → 0.0.0.dev181__tar.gz

{omlish-0.0.0.dev179/omlish.egg-info → omlish-0.0.0.dev181}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev179
+Version: 0.0.0.dev181
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev179'
-__revision__ = '40949c92a73910f364c60391f73bb2fcf9538caf'
+__version__ = '0.0.0.dev181'
+__revision__ = '4fd2912af095fc631208afe32a5d86f00406c595'
 
 
 #

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/argparse/all.py

@@ -5,9 +5,9 @@ from .cli import (  # noqa
     ArgparseArg as Arg,
     argparse_arg as arg,
 
-    ArgparseCommandFn as CommandFn,
-    ArgparseCommand as Command,
-    argparse_command as command,
+    ArgparseCmdFn as CmdFn,
+    ArgparseCmd as Cmd,
+    argparse_cmd as cmd,
 
     ArgparseCli as Cli,
 )

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/argparse/cli.py

@@ -21,7 +21,7 @@ from ..lite.reflect import is_optional_alias
 T = ta.TypeVar('T')
 
 
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 
 ##
@@ -47,15 +47,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:
@@ -70,7 +70,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)
@@ -84,21 +84,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,
@@ -153,7 +153,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
@@ -180,7 +180,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
 
@@ -242,7 +242,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]:

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/http/coro/fdio.py

@@ -7,7 +7,7 @@ from ...io.buffers import IncrementalWriteBuffer
 from ...io.buffers import ReadableListBuffer
 from ...io.fdio.handlers import SocketFdioHandler
 from ...lite.check import check
-from ...lite.socket import SocketAddress
+from ...sockets.addresses import SocketAddress
 from ..handlers import HttpHandler
 from .server import CoroHttpServer
 

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/http/coro/server.py

@@ -64,8 +64,8 @@ import time
 import typing as ta
 
 from ...lite.check import check
-from ...lite.socket import SocketAddress
-from ...lite.socket import SocketHandler
+from ...sockets.addresses import SocketAddress
+from ...sockets.handlers import SocketHandler
 from ..handlers import HttpHandler
 from ..handlers import HttpHandlerRequest
 from ..handlers import UnsupportedMethodHttpHandlerError

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/http/handlers.py

@@ -4,7 +4,7 @@ import dataclasses as dc
 import http.server
 import typing as ta
 
-from ..lite.socket import SocketAddress
+from ..sockets.addresses import SocketAddress
 from .parsing import HttpHeaders
 
 

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish/io/fdio/handlers.py

@@ -4,7 +4,7 @@ import socket
 import typing as ta
 
 from ...lite.check import check
-from ...lite.socket import SocketAddress
+from ...sockets.addresses import SocketAddress
 
 
 class FdioHandler(abc.ABC):

omlish-0.0.0.dev181/omlish/lite/__init__.py

@@ -0,0 +1,5 @@
+# @omlish-lite
+"""
+These are the 'core' lite modules. These generally have a 'full' equivalent, in which case non-lite code should prefer
+that.
+"""

{omlish-0.0.0.dev179/omlish/lite → omlish-0.0.0.dev181/omlish}/shlex.py

@@ -1,3 +1,4 @@
+# @omlish-lite
 import shlex
 
 

omlish-0.0.0.dev179/omlish/lite/socket.py → omlish-0.0.0.dev181/omlish/sockets/addresses.py

@@ -1,10 +1,10 @@
 # ruff: noqa: UP006 UP007
+# @omlish-lite
 """
 TODO:
  - SocketClientAddress family / tuple pairs
   + codification of https://docs.python.org/3/library/socket.html#socket-families
 """
-import abc
 import dataclasses as dc
 import socket
 import typing as ta
@@ -13,9 +13,6 @@ import typing as ta
 SocketAddress = ta.Any
 
 
-SocketHandlerFactory = ta.Callable[[SocketAddress, ta.BinaryIO, ta.BinaryIO], 'SocketHandler']
-
-
 ##
 
 
@@ -54,24 +51,3 @@ def get_best_socket_family(
     )
     ai = SocketAddressInfo(*next(iter(infos)))
     return ai.family, ai.sockaddr
-
-
-##
-
-
-class SocketHandler(abc.ABC):
-    def __init__(
-            self,
-            client_address: SocketAddress,
-            rfile: ta.BinaryIO,
-            wfile: ta.BinaryIO,
-    ) -> None:
-        super().__init__()
-
-        self._client_address = client_address
-        self._rfile = rfile
-        self._wfile = wfile
-
-    @abc.abstractmethod
-    def handle(self) -> None:
-        raise NotImplementedError

omlish-0.0.0.dev181/omlish/sockets/handlers.py

@@ -0,0 +1,30 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import abc
+import typing as ta
+
+from .addresses import SocketAddress
+
+
+SocketHandlerFactory = ta.Callable[[SocketAddress, ta.BinaryIO, ta.BinaryIO], 'SocketHandler']
+
+
+##
+
+
+class SocketHandler(abc.ABC):
+    def __init__(
+            self,
+            client_address: SocketAddress,
+            rfile: ta.BinaryIO,
+            wfile: ta.BinaryIO,
+    ) -> None:
+        super().__init__()
+
+        self._client_address = client_address
+        self._rfile = rfile
+        self._wfile = wfile
+
+    @abc.abstractmethod
+    def handle(self) -> None:
+        raise NotImplementedError

omlish-0.0.0.dev179/omlish/lite/socketserver.py → omlish-0.0.0.dev181/omlish/sockets/server.py

@@ -1,12 +1,13 @@
 # ruff: noqa: UP006 UP007
+# @omlish-lite
 import socket
 import socketserver
 import typing as ta
 
 from omlish.lite.check import check
 
-from .socket import SocketAddress
-from .socket import SocketHandlerFactory
+from .addresses import SocketAddress
+from .handlers import SocketHandlerFactory
 
 
 ##

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev179
+Version: 0.0.0.dev181
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/omlish.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ omlish/dynamic.py
 omlish/libc.py
 omlish/multiprocessing.py
 omlish/runmodule.py
+omlish/shlex.py
 omlish/subprocesses.py
 omlish/sync.py
 omlish/term.py
@@ -399,9 +400,6 @@ omlish/lite/reflect.py
 omlish/lite/resources.py
 omlish/lite/runtime.py
 omlish/lite/secrets.py
-omlish/lite/shlex.py
-omlish/lite/socket.py
-omlish/lite/socketserver.py
 omlish/lite/strings.py
 omlish/lite/typing.py
 omlish/logs/__init__.py
@@ -476,6 +474,10 @@ omlish/secrets/pwgen.py
 omlish/secrets/pwhash.py
 omlish/secrets/secrets.py
 omlish/secrets/subprocesses.py
+omlish/sockets/__init__.py
+omlish/sockets/addresses.py
+omlish/sockets/handlers.py
+omlish/sockets/server.py
 omlish/specs/__init__.py
 omlish/specs/jmespath/LICENSE
 omlish/specs/jmespath/__init__.py

{omlish-0.0.0.dev179 → omlish-0.0.0.dev181}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev179'
+version = '0.0.0.dev181'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev179/omlish/lite/__init__.py

@@ -1 +0,0 @@
-# @omlish-lite