omdev 0.0.0.dev552__tar.gz → 0.0.0.dev553__tar.gz

{omdev-0.0.0.dev552/omdev.egg-info → omdev-0.0.0.dev553}/PKG-INFO

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

{omdev-0.0.0.dev552 → omdev-0.0.0.dev553}/omdev/ci/cli.py

@@ -8,8 +8,13 @@ Inputs:
 
 ==
 
-./python -m omdev.ci run --cache-dir omdev/ci/tests/cache omdev/ci/tests/project omlish-ci
-"""
+run --cache-dir omdev/ci/tests/cache -e CI=1 omdev/ci/tests/project omlish-ci pytest tests
+
+run --cache-dir omdev/ci/tests/cache --cache-served-docker --always-build -e CI=1 omdev/ci/tests/project omlish-ci pytest tests
+run --cache-dir omdev/ci/tests/cache --cache-served-docker --always-build --always-pull -e CI=1 omdev/ci/tests/project omlish-ci pytest tests
+
+run --cache-dir ~/.cache/omlish/ci . omlish-ci bash
+"""  # noqa
 import argparse
 import asyncio
 import itertools

{omdev-0.0.0.dev552 → omdev-0.0.0.dev553}/omdev/ci/docker/cacheserved/cache.py

@@ -143,6 +143,8 @@ class CacheServedDockerCache(DockerCache):
                     pull_cmd = [
                         'run',
                         '--rm',
+                        '--entrypoint',
+                        prc,
                         image_url,
                         prc,
                     ]

{omdev-0.0.0.dev552 → omdev-0.0.0.dev553}/omdev/ci/docker/dataserver.py

@@ -7,17 +7,17 @@ import threading
 import typing as ta
 
 from omlish.docker.ports import DockerPortRelay
-from omlish.http.coro.server.simple import make_simple_http_server
-from omlish.http.handlers import HttpHandler
-from omlish.http.handlers import LoggingHttpHandler
+from omlish.http.simple.handlers import LoggingSimpleHttpHandler
+from omlish.http.simple.handlers import SimpleHttpHandler
+from omlish.http.simple.pipelines.sync import make_simple_http_server
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import AsyncExitStacked
 from omlish.logs.protocols import LoggerLike
 from omlish.secrets.tempssl import generate_temp_localhost_ssl_cert
-from omlish.sockets.handlers.server import SocketServer
+from omlish.sockets.handlers.server import SocketHandlerServer
 
-from ...dataserver.http import DataServerHttpHandler
+from ...dataserver.http import DataServerSimpleHttpHandler
 from ...dataserver.server import DataServer
 
 
@@ -54,7 +54,7 @@ class AsyncioManagedSimpleHttpServer(AsyncExitStacked):
     def __init__(
             self,
             port: int,
-            handler: HttpHandler,
+            handler: SimpleHttpHandler,
             *,
             temp_ssl: bool = False,
     ) -> None:
@@ -70,7 +70,7 @@ class AsyncioManagedSimpleHttpServer(AsyncExitStacked):
         self._loop: ta.Optional[asyncio.AbstractEventLoop] = None
         self._thread: ta.Optional[threading.Thread] = None
         self._thread_exit_event = asyncio.Event()
-        self._server: ta.Optional[SocketServer] = None
+        self._server: ta.Optional[SocketHandlerServer] = None
 
     @cached_nullary
     def _ssl_context(self) -> ta.Optional['ssl.SSLContext']:
@@ -88,7 +88,7 @@ class AsyncioManagedSimpleHttpServer(AsyncExitStacked):
         return ssl_context
 
     @contextlib.contextmanager
-    def _make_server(self) -> ta.Iterator[SocketServer]:
+    def _make_server(self) -> ta.Iterator[SocketHandlerServer]:
         with make_simple_http_server(
                 self._port,
                 self._handler,
@@ -180,10 +180,10 @@ class DockerDataServer(AsyncExitStacked):
 
         #
 
-        handler: HttpHandler = DataServerHttpHandler(self._data_server)
+        handler: SimpleHttpHandler = DataServerSimpleHttpHandler(self._data_server)
 
         if self._handler_log is not None:
-            handler = LoggingHttpHandler(
+            handler = LoggingSimpleHttpHandler(
                 handler,
                 self._handler_log,
             )

{omdev-0.0.0.dev552 → omdev-0.0.0.dev553}/omdev/dataserver/http.py

@@ -7,10 +7,10 @@ TODO:
 """
 import typing as ta
 
-from omlish.http.handlers import HttpHandler_
-from omlish.http.handlers import HttpHandlerRequest
-from omlish.http.handlers import HttpHandlerResponse
-from omlish.http.handlers import HttpHandlerResponseStreamedData
+from omlish.http.simple.handlers import SimpleHttpHandler_
+from omlish.http.simple.handlers import SimpleHttpHandlerRequest
+from omlish.http.simple.handlers import SimpleHttpHandlerResponse
+from omlish.http.simple.handlers import SimpleHttpHandlerResponseStreamedData
 
 from .handlers import DataServerRequest
 from .server import DataServer
@@ -19,7 +19,7 @@ from .server import DataServer
 ##
 
 
-class DataServerHttpHandler(HttpHandler_):
+class DataServerSimpleHttpHandler(SimpleHttpHandler_):
     DEFAULT_READ_CHUNK_SIZE = 0x10000
 
     def __init__(
@@ -33,7 +33,7 @@ class DataServerHttpHandler(HttpHandler_):
         self._ps = ps
         self._read_chunk_size = read_chunk_size
 
-    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+    def __call__(self, req: SimpleHttpHandlerRequest) -> SimpleHttpHandlerResponse:
         p_req = DataServerRequest(
             req.method,
             req.path,
@@ -50,12 +50,12 @@ class DataServerHttpHandler(HttpHandler_):
                     finally:
                         p_body.close()
 
-                data = HttpHandlerResponseStreamedData(stream_data())
+                data = SimpleHttpHandlerResponseStreamedData(stream_data())
 
             else:
                 data = None
 
-            resp = HttpHandlerResponse(
+            resp = SimpleHttpHandlerResponse(
                 status=p_resp.status,
                 headers=p_resp.headers,
                 data=data,