omlish 0.0.0.dev218__tar.gz → 0.0.0.dev219__tar.gz

{omlish-0.0.0.dev218/omlish.egg-info → omlish-0.0.0.dev219}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev218
+Version: 0.0.0.dev219
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -18,7 +18,7 @@ Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.27; extra == "all"
 Requires-Dist: trio-asyncio~=0.15; extra == "all"
-Requires-Dist: lz4~=4.3; extra == "all"
+Requires-Dist: lz4~=4.4; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
 Requires-Dist: zstandard~=0.23; extra == "all"
 Requires-Dist: brotli~=1.1; extra == "all"
@@ -57,7 +57,7 @@ Requires-Dist: greenlet~=3.1; extra == "async"
 Requires-Dist: trio~=0.27; extra == "async"
 Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compress
-Requires-Dist: lz4~=4.3; extra == "compress"
+Requires-Dist: lz4~=4.4; extra == "compress"
 Requires-Dist: python-snappy~=0.7; extra == "compress"
 Requires-Dist: zstandard~=0.23; extra == "compress"
 Requires-Dist: brotli~=1.1; extra == "compress"

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev218'
-__revision__ = '0d15b9d5ec9832621506a90856baf7d140dd63ad'
+__version__ = '0.0.0.dev219'
+__revision__ = '5e741e0670fb75899653bd454587a1cf2add710f'
 
 
 #
@@ -42,7 +42,7 @@ class Project(ProjectBase):
         ],
 
         'compress': [
-            'lz4 ~= 4.3',
+            'lz4 ~= 4.4',
             # 'lz4 @ git+https://github.com/wrmsr/python-lz4@wrmsr_20240830_GIL_NOT_USED'
 
             'python-snappy ~= 0.7',

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/http/coro/server.py

@@ -65,7 +65,7 @@ import typing as ta
 
 from ...lite.check import check
 from ...sockets.addresses import SocketAddress
-from ...sockets.handlers import SocketHandler  # noqa
+from ...sockets.handlers import SocketHandler_
 from ...sockets.io import SocketIoPair
 from ..handlers import HttpHandler
 from ..handlers import HttpHandlerRequest
@@ -557,7 +557,7 @@ class CoroHttpServer:
 ##
 
 
-class CoroHttpServerSocketHandler:  # SocketHandler
+class CoroHttpServerSocketHandler(SocketHandler_):
     def __init__(
             self,
             server_factory: CoroHttpServerFactory,

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/http/handlers.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+import abc
 import dataclasses as dc
 import http.server
 import typing as ta
@@ -45,3 +46,9 @@ class HttpHandlerError(Exception):
 
 class UnsupportedMethodHttpHandlerError(Exception):
     pass
+
+
+class HttpHandler_(abc.ABC):  # noqa
+    @abc.abstractmethod
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+        raise NotImplementedError

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/http/sessions.py

@@ -9,8 +9,8 @@ import typing as ta
 import zlib
 
 from .. import lang
-from .. import secrets as sec
 from ..funcs import pairs as fpa
+from ..secrets import all as sec
 from .cookies import dump_cookie
 from .cookies import parse_cookie
 from .json import JSON_TAGGER

omlish-0.0.0.dev219/omlish/http/simple.py

@@ -0,0 +1,101 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import concurrent.futures as cf
+import contextlib
+import functools
+import typing as ta
+
+from ..lite.check import check
+from ..sockets.addresses import SocketAndAddress
+from ..sockets.bind import CanSocketBinder
+from ..sockets.bind import SocketBinder
+from ..sockets.server.handlers import ExecutorSocketServerHandler
+from ..sockets.server.handlers import SocketHandlerSocketServerHandler
+from ..sockets.server.handlers import SocketServerHandler
+from ..sockets.server.handlers import SocketWrappingSocketServerHandler
+from ..sockets.server.handlers import StandardSocketServerHandler
+from ..sockets.server.server import SocketServer
+from ..sockets.server.threading import ThreadingSocketServerHandler
+from .coro.server import CoroHttpServer
+from .coro.server import CoroHttpServerSocketHandler
+from .handlers import HttpHandler
+from .parsing import HttpRequestParser
+from .versions import HttpProtocolVersion
+from .versions import HttpProtocolVersions
+
+
+if ta.TYPE_CHECKING:
+    import ssl
+
+
+@contextlib.contextmanager
+def make_simple_http_server(
+        bind: CanSocketBinder,
+        handler: HttpHandler,
+        *,
+        server_version: HttpProtocolVersion = HttpProtocolVersions.HTTP_1_1,
+        ssl_context: ta.Optional['ssl.SSLContext'] = None,
+        executor: ta.Optional[cf.Executor] = None,
+        use_threads: bool = False,
+) -> ta.Iterator[SocketServer]:
+    check.arg(not (executor is not None and use_threads))
+
+    #
+
+    with contextlib.ExitStack() as es:
+        server_factory = functools.partial(
+            CoroHttpServer,
+            handler=handler,
+            parser=HttpRequestParser(
+                server_version=server_version,
+            ),
+        )
+
+        socket_handler = CoroHttpServerSocketHandler(
+            server_factory,
+        )
+
+        #
+
+        server_handler: SocketServerHandler = SocketHandlerSocketServerHandler(
+            socket_handler,
+        )
+
+        #
+
+        if ssl_context is not None:
+            server_handler = SocketWrappingSocketServerHandler(
+                server_handler,
+                SocketAndAddress.socket_wrapper(functools.partial(
+                    ssl_context.wrap_socket,
+                    server_side=True,
+                )),
+            )
+
+        #
+
+        server_handler = StandardSocketServerHandler(
+            server_handler,
+        )
+
+        #
+
+        if executor is not None:
+            server_handler = ExecutorSocketServerHandler(
+                server_handler,
+                executor,
+            )
+
+        elif use_threads:
+            server_handler = es.enter_context(ThreadingSocketServerHandler(
+                server_handler,
+            ))
+
+        #
+
+        server = es.enter_context(SocketServer(
+            SocketBinder.of(bind),
+            server_handler,
+        ))
+
+        yield server

omlish-0.0.0.dev218/omlish/secrets/__init__.py → omlish-0.0.0.dev219/omlish/secrets/all.py

@@ -14,11 +14,3 @@ from .secrets import (  # noqa
     secret_field,
     secret_repr,
 )
-
-
-##
-
-
-from ..lang.imports import _register_conditional_import  # noqa
-
-_register_conditional_import('..marshal', '.marshal', __package__)

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/secrets/secrets.py

@@ -335,3 +335,9 @@ class EnvVarSecrets(Secrets):
             return dct.pop(ekey)
         else:
             return dct[ekey]
+
+
+##
+
+
+lang.imports._register_conditional_import('..marshal', '.marshal', __package__)  # noqa

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sockets/addresses.py

@@ -5,7 +5,7 @@ TODO:
  - codification of https://docs.python.org/3/library/socket.html#socket-families
 """
 import dataclasses as dc
-import socket
+import socket as socket_
 import typing as ta
 
 
@@ -19,15 +19,15 @@ SocketAddress = ta.Any
 class SocketAddressInfoArgs:
     host: ta.Optional[str]
     port: ta.Union[str, int, None]
-    family: socket.AddressFamily = socket.AddressFamily.AF_UNSPEC
+    family: socket_.AddressFamily = socket_.AddressFamily.AF_UNSPEC
     type: int = 0
     proto: int = 0
-    flags: socket.AddressInfo = socket.AddressInfo(0)
+    flags: socket_.AddressInfo = socket_.AddressInfo(0)
 
 
 @dc.dataclass(frozen=True)
 class SocketAddressInfo:
-    family: socket.AddressFamily
+    family: socket_.AddressFamily
     type: int
     proto: int
     canonname: ta.Optional[str]
@@ -35,28 +35,40 @@ class SocketAddressInfo:
 
 
 class SocketFamilyAndAddress(ta.NamedTuple):
-    family: socket.AddressFamily
+    family: socket_.AddressFamily
     address: SocketAddress
 
 
 def get_best_socket_family(
         host: ta.Optional[str],
         port: ta.Union[str, int, None],
-        family: ta.Union[int, socket.AddressFamily] = socket.AddressFamily.AF_UNSPEC,
+        family: ta.Union[int, socket_.AddressFamily] = socket_.AddressFamily.AF_UNSPEC,
 ) -> SocketFamilyAndAddress:
     """https://github.com/python/cpython/commit/f289084c83190cc72db4a70c58f007ec62e75247"""
 
-    infos = socket.getaddrinfo(
+    infos = socket_.getaddrinfo(
         host,
         port,
         family,
-        type=socket.SOCK_STREAM,
-        flags=socket.AI_PASSIVE,
+        type=socket_.SOCK_STREAM,
+        flags=socket_.AI_PASSIVE,
     )
     ai = SocketAddressInfo(*next(iter(infos)))
     return SocketFamilyAndAddress(ai.family, ai.sockaddr)
 
 
 class SocketAndAddress(ta.NamedTuple):
-    socket: socket.socket
+    socket: socket_.socket
     address: SocketAddress
+
+    def wrap_socket(self, fn: ta.Callable[[socket_.socket], socket_.socket]):
+        return self._replace(socket=fn(self.socket))
+
+    @classmethod
+    def socket_wrapper(
+            cls,
+            fn: ta.Callable[[socket_.socket], socket_.socket],
+    ) -> ta.Callable[['SocketAndAddress'], 'SocketAndAddress']:
+        def inner(conn):
+            return conn.wrap_socket(fn)
+        return inner

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sockets/bind.py

@@ -20,6 +20,8 @@ from omlish.sockets.addresses import SocketAndAddress
 
 SocketBinderT = ta.TypeVar('SocketBinderT', bound='SocketBinder')
 SocketBinderConfigT = ta.TypeVar('SocketBinderConfigT', bound='SocketBinder.Config')
+CanSocketBinderConfig = ta.Union['SocketBinder.Config', int, ta.Tuple[str, int], str]  # ta.TypeAlias
+CanSocketBinder = ta.Union['SocketBinder', CanSocketBinderConfig]  # ta.TypeAlias
 
 
 ##
@@ -38,33 +40,29 @@ class SocketBinder(abc.ABC, ta.Generic[SocketBinderConfigT]):
         #
 
         @classmethod
-        def new(
-                cls,
-                target: ta.Union[
-                    int,
-                    ta.Tuple[str, int],
-                    str,
-                ],
-        ) -> 'SocketBinder.Config':
-            if isinstance(target, int):
+        def of(cls, obj: CanSocketBinderConfig) -> 'SocketBinder.Config':
+            if isinstance(obj, SocketBinder.Config):
+                return obj
+
+            elif isinstance(obj, int):
                 return TcpSocketBinder.Config(
-                    port=target,
+                    port=obj,
                 )
 
-            elif isinstance(target, tuple):
-                host, port = target
+            elif isinstance(obj, tuple):
+                host, port = obj
                 return TcpSocketBinder.Config(
                     host=host,
                     port=port,
                 )
 
-            elif isinstance(target, str):
+            elif isinstance(obj, str):
                 return UnixSocketBinder.Config(
-                    file=target,
+                    file=obj,
                 )
 
             else:
-                raise TypeError(target)
+                raise TypeError(obj)
 
     #
 
@@ -76,13 +74,16 @@ class SocketBinder(abc.ABC, ta.Generic[SocketBinderConfigT]):
     #
 
     @classmethod
-    def new(cls, target: ta.Any) -> 'SocketBinder':
+    def of(cls, obj: CanSocketBinder) -> 'SocketBinder':
+        if isinstance(obj, SocketBinder):
+            return obj
+
         config: SocketBinder.Config
-        if isinstance(target, SocketBinder.Config):
-            config = target
+        if isinstance(obj, SocketBinder.Config):
+            config = obj
 
         else:
-            config = SocketBinder.Config.new(target)
+            config = SocketBinder.Config.of(obj)
 
         if isinstance(config, TcpSocketBinder.Config):
             return TcpSocketBinder(config)

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sockets/handlers.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+import abc
 import typing as ta
 
 from .addresses import SocketAddress
@@ -10,3 +11,9 @@ SocketHandler = ta.Callable[[SocketAddress, 'SocketIoPair'], None]  # ta.TypeAli
 
 
 ##
+
+
+class SocketHandler_(abc.ABC):  # noqa
+    @abc.abstractmethod
+    def __call__(self, addr: SocketAddress, f: SocketIoPair) -> None:
+        raise NotImplementedError

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sockets/server/handlers.py

@@ -1,5 +1,7 @@
-# @omlish-lite
 # ruff: noqa: UP006 UP007
+# @omlish-lite
+import abc
+import concurrent.futures as cf
 import dataclasses as dc
 import socket
 import typing as ta
@@ -16,8 +18,17 @@ SocketServerHandler = ta.Callable[[SocketAndAddress], None]  # ta.TypeAlias
 ##
 
 
+class SocketServerHandler_(abc.ABC):  # noqa
+    @abc.abstractmethod
+    def __call__(self, conn: SocketAndAddress) -> None:
+        raise NotImplementedError
+
+
+##
+
+
 @dc.dataclass(frozen=True)
-class StandardSocketServerHandler:
+class StandardSocketServerHandler(SocketServerHandler_):
     handler: SocketServerHandler
 
     timeout: ta.Optional[float] = None
@@ -46,7 +57,7 @@ class StandardSocketServerHandler:
 
 
 @dc.dataclass(frozen=True)
-class CallbackWrappedSocketServerHandler:
+class CallbackWrappedSocketServerHandler(SocketServerHandler_):
     handler: SocketServerHandler
 
     before_handle: ta.Optional[SocketServerHandler] = None
@@ -83,7 +94,7 @@ class CallbackWrappedSocketServerHandler:
 
 
 @dc.dataclass(frozen=True)
-class SocketHandlerSocketServerHandler:
+class SocketHandlerSocketServerHandler(SocketServerHandler_):
     handler: SocketHandler
 
     r_buf_size: int = -1
@@ -97,3 +108,27 @@ class SocketHandlerSocketServerHandler:
         )
 
         self.handler(conn.address, fp)
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class SocketWrappingSocketServerHandler(SocketServerHandler_):
+    handler: SocketServerHandler
+    wrapper: ta.Callable[[SocketAndAddress], SocketAndAddress]
+
+    def __call__(self, conn: SocketAndAddress) -> None:
+        wrapped_conn = self.wrapper(conn)
+        self.handler(wrapped_conn)
+
+
+#
+
+@dc.dataclass(frozen=True)
+class ExecutorSocketServerHandler(SocketServerHandler_):
+    handler: SocketServerHandler
+    executor: cf.Executor
+
+    def __call__(self, conn: SocketAndAddress) -> None:
+        self.executor.submit(self.handler, conn)

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sockets/server/server.py

@@ -7,6 +7,7 @@ import threading
 import typing as ta
 
 from ..bind import SocketBinder
+from ..io import close_socket_immediately
 from .handlers import SocketServerHandler
 
 
@@ -104,7 +105,14 @@ class SocketServer(abc.ABC):
 
                             return
 
-                        self._handler(conn)
+                        try:
+                            self._handler(conn)
+
+                        except Exception as exc:  # noqa
+                            if (on_error := self._on_error) is not None:
+                                on_error(exc)
+
+                            close_socket_immediately(conn.socket)
 
                     yield bool(ready)
 

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sql/alchemy/secrets.py

@@ -2,7 +2,7 @@
 TODO:
  - sync/async...
 """
-from ... import secrets as sec
+from ..secrets import all as sec
 
 
 class SqlFunctionSecrets(sec.Secrets):

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish/sql/dbs.py

@@ -3,7 +3,7 @@ import urllib.parse
 
 from .. import dataclasses as dc
 from .. import lang
-from .. import secrets as sec
+from ..secrets import all as sec
 
 
 ##

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev218
+Version: 0.0.0.dev219
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -18,7 +18,7 @@ Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.27; extra == "all"
 Requires-Dist: trio-asyncio~=0.15; extra == "all"
-Requires-Dist: lz4~=4.3; extra == "all"
+Requires-Dist: lz4~=4.4; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
 Requires-Dist: zstandard~=0.23; extra == "all"
 Requires-Dist: brotli~=1.1; extra == "all"
@@ -57,7 +57,7 @@ Requires-Dist: greenlet~=3.1; extra == "async"
 Requires-Dist: trio~=0.27; extra == "async"
 Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compress
-Requires-Dist: lz4~=4.3; extra == "compress"
+Requires-Dist: lz4~=4.4; extra == "compress"
 Requires-Dist: python-snappy~=0.7; extra == "compress"
 Requires-Dist: zstandard~=0.23; extra == "compress"
 Requires-Dist: brotli~=1.1; extra == "compress"

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish.egg-info/SOURCES.txt

@@ -318,6 +318,7 @@ omlish/http/jwt.py
 omlish/http/multipart.py
 omlish/http/parsing.py
 omlish/http/sessions.py
+omlish/http/simple.py
 omlish/http/sse.py
 omlish/http/versions.py
 omlish/http/wsgi.py
@@ -511,6 +512,7 @@ omlish/reflect/ops.py
 omlish/reflect/subst.py
 omlish/reflect/types.py
 omlish/secrets/__init__.py
+omlish/secrets/all.py
 omlish/secrets/crypto.py
 omlish/secrets/marshal.py
 omlish/secrets/openssl.py

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/omlish.egg-info/requires.txt

@@ -5,7 +5,7 @@ sniffio~=1.3
 greenlet~=3.1
 trio~=0.27
 trio-asyncio~=0.15
-lz4~=4.3
+lz4~=4.4
 python-snappy~=0.7
 zstandard~=0.23
 brotli~=1.1
@@ -39,7 +39,7 @@ trio~=0.27
 trio-asyncio~=0.15
 
 [compress]
-lz4~=4.3
+lz4~=4.4
 python-snappy~=0.7
 zstandard~=0.23
 brotli~=1.1

{omlish-0.0.0.dev218 → omlish-0.0.0.dev219}/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.dev218'
+version = '0.0.0.dev219'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -29,7 +29,7 @@ all = [
     'greenlet ~= 3.1',
     'trio ~= 0.27',
     'trio-asyncio ~= 0.15',
-    'lz4 ~= 4.3',
+    'lz4 ~= 4.4',
     'python-snappy ~= 0.7',
     'zstandard ~= 0.23',
     'brotli ~= 1.1',
@@ -70,7 +70,7 @@ async = [
     'trio-asyncio ~= 0.15',
 ]
 compress = [
-    'lz4 ~= 4.3',
+    'lz4 ~= 4.4',
     'python-snappy ~= 0.7',
     'zstandard ~= 0.23',
     'brotli ~= 1.1',