omdev 0.0.0.dev352__py3-none-any.whl → 0.0.0.dev353__py3-none-any.whl

omdev/cli/install.py

@@ -19,7 +19,7 @@ import typing as ta
 
 
 DEFAULT_CLI_PKG = 'omdev-cli'
-DEFAULT_PY_VER = '3.12'
+DEFAULT_PY_VER = '3.13'
 
 
 @dc.dataclass(frozen=True)

omdev/scripts/ci.py

@@ -9450,7 +9450,11 @@ class CoroHttpServer:
 
     #
 
-    def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], None]:
+    @dc.dataclass(frozen=True)
+    class CoroHandleResult:
+        close_reason: ta.Literal['response', 'internal', None] = None
+
+    def coro_handle(self) -> ta.Generator[Io, ta.Optional[bytes], CoroHandleResult]:
         return self._coro_run_handler(self._coro_handle_one())
 
     class Close(Exception):  # noqa
@@ -9463,7 +9467,7 @@ class CoroHttpServer:
                 ta.Optional[bytes],
                 None,
             ],
-    ) -> ta.Generator[Io, ta.Optional[bytes], None]:
+    ) -> ta.Generator[Io, ta.Optional[bytes], CoroHandleResult]:
         i: ta.Optional[bytes]
         o: ta.Any = next(gen)
         while True:
@@ -9487,7 +9491,9 @@ class CoroHttpServer:
 
                     o.close()
                     if o.close_connection:
-                        break
+                        return self.CoroHandleResult(
+                            close_reason='response',
+                        )
                     o = None
 
                 else:
@@ -9496,9 +9502,11 @@ class CoroHttpServer:
                 try:
                     o = gen.send(i)
                 except self.Close:
-                    return
+                    return self.CoroHandleResult(
+                        close_reason='internal',
+                    )
                 except StopIteration:
-                    break
+                    return self.CoroHandleResult()
 
             except Exception:  # noqa
                 if hasattr(o, 'close'):
@@ -10813,16 +10821,32 @@ class CoroHttpServerSocketHandler(SocketHandler_):
             self,
             server_factory: CoroHttpServerFactory,
             *,
+            keep_alive: bool = False,
             log_handler: ta.Optional[ta.Callable[[CoroHttpServer, CoroHttpServer.AnyLogIo], None]] = None,
     ) -> None:
         super().__init__()
 
         self._server_factory = server_factory
+        self._keep_alive = keep_alive
         self._log_handler = log_handler
 
     def __call__(self, client_address: SocketAddress, fp: SocketIoPair) -> None:
         server = self._server_factory(client_address)
 
+        if self._keep_alive:
+            for i in itertools.count():  # noqa
+                res = self._handle_one(server, fp)
+                if res.close_reason is not None:
+                    break
+
+        else:
+            self._handle_one(server, fp)
+
+    def _handle_one(
+            self,
+            server: CoroHttpServer,
+            fp: SocketIoPair,
+    ) -> CoroHttpServer.CoroHandleResult:
         gen = server.coro_handle()
 
         o = next(gen)
@@ -10851,8 +10875,8 @@ class CoroHttpServerSocketHandler(SocketHandler_):
                     o = gen.send(i)
                 else:
                     o = next(gen)
-            except StopIteration:
-                break
+            except StopIteration as e:
+                return check.isinstance(e.value, CoroHttpServer.CoroHandleResult)
 
 
 ########################################
@@ -11666,6 +11690,7 @@ def make_simple_http_server(
         handler: HttpHandler,
         *,
         server_version: HttpProtocolVersion = HttpProtocolVersions.HTTP_1_1,
+        keep_alive: bool = False,
         ssl_context: ta.Optional['ssl.SSLContext'] = None,
         ignore_ssl_errors: bool = False,
         executor: ta.Optional[cf.Executor] = None,
@@ -11687,6 +11712,7 @@ def make_simple_http_server(
 
         socket_handler = CoroHttpServerSocketHandler(
             server_factory,
+            keep_alive=keep_alive,
         )
 
         #

{omdev-0.0.0.dev352.dist-info → omdev-0.0.0.dev353.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev352
+Version: 0.0.0.dev353
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,9 +10,9 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev352
+Requires-Dist: omlish==0.0.0.dev353
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev352.dist-info → omdev-0.0.0.dev353.dist-info}/RECORD

@@ -104,7 +104,7 @@ omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
 omdev/cli/clicli.py,sha256=LuOdHYh_YFULDxZCX6X0sB6JFpu6ogntVtN4WdT0o3Q,4481
-omdev/cli/install.py,sha256=Vy2-Qxgjua_80KLOAa7cUNn-WxtG7ebAmlkHfSTXkFM,4467
+omdev/cli/install.py,sha256=Vzdq66boPdbNBIC_ommPOc-fVd1gWqTTcF_Mh_JECi0,4467
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=SH88B81otsSYNM-PM3Ry1wgLLvyg2M6fBJkWOajWIWM,485
@@ -252,7 +252,7 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=flnF6i6PugpNKwbHKaHKZQ6K_7I158y1Xae8TyJmGRI,357027
+omdev/scripts/ci.py,sha256=PCCZi3PDF8X9uVym6F898TjSYKOmMTRbRw-8cJrrRRY,358020
 omdev/scripts/interp.py,sha256=HHEFZJCO-1r_DLNA2bwmCDgcQiXf6hnCZ_6OALpmHrk,155558
 omdev/scripts/pyproject.py,sha256=Y_QRE_6kxo_k6oobXz4hON3ctPX6NV9I5N4VNZtRKfo,265039
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
@@ -303,9 +303,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev352.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev352.dist-info/METADATA,sha256=BTgYhX0OjNbaJEehxMnyEyMrXCJrkVdvR8xEvjgmiQU,1674
-omdev-0.0.0.dev352.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev352.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev352.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev352.dist-info/RECORD,,
+omdev-0.0.0.dev353.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev353.dist-info/METADATA,sha256=QYh5HbxL0eEAMdVGKbHcyCf0aPCXgqCdwj35yRG1UKo,1674
+omdev-0.0.0.dev353.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev353.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev353.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev353.dist-info/RECORD,,