omlish 0.0.0.dev352__tar.gz → 0.0.0.dev354__tar.gz

{omlish-0.0.0.dev352/omlish.egg-info → omlish-0.0.0.dev354}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,7 +10,7 @@ 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
 Provides-Extra: all
 Requires-Dist: anyio~=4.9; extra == "all"

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/README.md

@@ -92,7 +92,7 @@ Core utilities and foundational code. It's relatively large but completely self-
 
 - **[reflect](reflect)** - Reflection utilities, including primarily a formalization of stdlib type annotations for use
   at runtime, decoupled from stdlib impl detail. Keeping this working is notoriously difficult across python versions
-  (one of the primary reasons for only supporting 3.12+).
+  (one of the primary reasons for only supporting 3.13+).
 
 - **[sql](sql)** - A collection of SQL utilities, including:
 
@@ -123,7 +123,7 @@ Core utilities and foundational code. It's relatively large but completely self-
 
 # Lite code
 
-A subset of this codebase is written in a 'lite' style. While most of the code is written for python 3.12+, 'lite' code
+A subset of this codebase is written in a 'lite' style. While most of the code is written for python 3.13+, 'lite' code
 is written for 3.8+, and is written in a style conducive to
 [amalgamation](https://github.com/wrmsr/omlish/tree/master/omdev#amalgamation) in which multiple python source files are
 stitched together into one single self-contained python script.
@@ -137,7 +137,7 @@ Code written in this style has notable differences from standard code, including
   their contents. Where non-lite code would `from .. import x; x.y`, lite code would `from ..x import y; y`. As a result
   there are frequently 'api' non-instantiated namespace classes serving the purpose of modules - just handy bags of
   stuff with shortened names.
-- As lite code is tested in 3.8+ but core code requires 3.12+, packages containing lite code can't import anything
+- As lite code is tested in 3.8+ but core code requires 3.13+, packages containing lite code can't import anything
   non-lite in their (and their ancestors') `__init__.py`'s. Furthermore, `__init__.py` files are omitted outright in
   amalgamation, so they effectively must be empty in any package containing any lite code. As a result there are
   frequently [`all.py`](configs/all.py) files in mixed-lite packages which serve the purpose of `__init__.py` for

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/.manifests.json

@@ -125,7 +125,7 @@
     "module": ".formats.json5.codec",
     "attr": "_JSON5_LAZY_CODEC",
     "file": "omlish/formats/json5/codec.py",
-    "line": 25,
+    "line": 54,
     "value": {
       "$.codecs.base.LazyLoadedCodec": {
         "mod_name": "omlish.formats.json5.codec",

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev352'
-__revision__ = '538038adb75dc291a13579ef39744033ae4c6fc2'
+__version__ = '0.0.0.dev354'
+__revision__ = '9da8dde3429b10e7a8aa903485f9b20b0aa95e30'
 
 
 #
@@ -10,7 +10,7 @@ class ProjectBase:
     authors = [{'name': 'wrmsr'}]
     urls = {'source': 'https://github.com/wrmsr/omlish'}
     license = {'text': 'BSD-3-Clause'}
-    requires_python = '>=3.12'
+    requires_python = '>=3.13'
 
     version = __version__
 

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/formats/json/literals.py

@@ -77,22 +77,46 @@ def encode_string(
         lq: str | None = None,
         rq: str | None = None,
         escape_map: ta.Mapping[str, str] | None = None,
+        ensure_ascii: bool = False,
 ) -> str:
     """Return a JSON representation of a Python string."""
 
+    s = _convert_to_string(s)
+
+    lq, rq = _handle_encode_quote_args(q, lq, rq)
+
     if escape_map is None:
         escape_map = ESCAPE_MAP
 
-    s = _convert_to_string(s)
+    if ensure_ascii:
+        pat = _ESCAPE_ASCII_PAT
 
-    def replace(m):
-        return escape_map[m.group(0)]
+        def replace(m):
+            s = m.group(0)
 
-    lq, rq = _handle_encode_quote_args(q, lq, rq)
+            try:
+                return escape_map[s]
+
+            except KeyError:
+                n = ord(s)
+                if n < 0x10000:
+                    return f'\\u{n:04x}'
+
+                # surrogate pair
+                n -= 0x10000
+                s1 = 0xD800 | ((n >> 10) & 0x3FF)
+                s2 = 0xDC00 | (n & 0x3FF)
+                return f'\\u{s1:04x}\\u{s2:04x}'
+
+    else:
+        pat = _ESCAPE_PAT
+
+        def replace(m):
+            return escape_map[m.group(0)]
 
     return ''.join([
         lq,
-        _ESCAPE_PAT.sub(replace, s),
+        pat.sub(replace, s),
         rq,
     ])
 
@@ -107,35 +131,14 @@ def encode_string_ascii(
 ) -> str:
     """Return an ASCII-only JSON representation of a Python string."""
 
-    if escape_map is None:
-        escape_map = ESCAPE_MAP
-
-    s = _convert_to_string(s)
-
-    def replace(m):
-        s = m.group(0)
-
-        try:
-            return escape_map[s]
-
-        except KeyError:
-            n = ord(s)
-            if n < 0x10000:
-                return f'\\u{n:04x}'
-
-            # surrogate pair
-            n -= 0x10000
-            s1 = 0xD800 | ((n >> 10) & 0x3FF)
-            s2 = 0xDC00 | (n & 0x3FF)
-            return f'\\u{s1:04x}\\u{s2:04x}'
-
-    lq, rq = _handle_encode_quote_args(q, lq, rq)
-
-    return ''.join([
-        lq,
-        str(_ESCAPE_ASCII_PAT.sub(replace, s)),
-        rq,
-    ])
+    return encode_string(
+        s,
+        q,
+        lq=lq,
+        rq=rq,
+        escape_map=escape_map,
+        ensure_ascii=True,
+    )
 
 
 ##

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/formats/json5/__init__.py

@@ -1,5 +1,7 @@
 from .codec import (  # noqa
     dumps,
+    dumps_pretty,
+    dumps_compact,
     loads,
 )
 

omlish-0.0.0.dev354/omlish/formats/json5/codec.py

@@ -0,0 +1,55 @@
+import typing as ta
+
+from ... import lang
+from .. import json
+from ..codecs import make_object_lazy_loaded_codec
+from ..codecs import make_str_object_codec
+
+
+if ta.TYPE_CHECKING:
+    from . import parsing
+    from . import rendering
+else:
+    parsing = lang.proxy_import('.parsing', __package__)
+    rendering = lang.proxy_import('.rendering', __package__)
+
+
+##
+
+
+def dumps(
+        obj: ta.Any,
+        *,
+        multiline_strings: bool = False,
+        **kwargs: ta.Any,
+) -> str:
+    if multiline_strings:
+        return rendering.Json5Renderer.render_str(
+            obj,
+            multiline_strings=True,
+            **kwargs,
+        )
+
+    else:
+        return json.dumps(obj, **kwargs)
+
+
+def dumps_pretty(obj: ta.Any, **kwargs: ta.Any) -> str:
+    return dumps(obj, **json.PRETTY_KWARGS, **kwargs)
+
+
+def dumps_compact(obj: ta.Any, **kwargs: ta.Any) -> str:
+    return dumps(obj, **json.COMPACT_KWARGS, **kwargs)
+
+
+def loads(s: str, **kwargs: ta.Any) -> ta.Any:
+    return parsing.parse(s, **kwargs)
+
+
+##
+
+
+JSON5_CODEC = make_str_object_codec('json5', dumps, loads)
+
+# @omlish-manifest
+_JSON5_LAZY_CODEC = make_object_lazy_loaded_codec(__name__, 'JSON5_CODEC', JSON5_CODEC)

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/http/coro/fdio.py

@@ -39,7 +39,13 @@ class CoroHttpServerConnectionFdioHandler(SocketFdioHandler):
             addr,
             handler=self._handler,
         )
-        self._srv_coro: ta.Optional[ta.Generator[CoroHttpServer.Io, ta.Optional[bytes], None]] = self._coro_srv.coro_handle()  # noqa
+        self._srv_coro: ta.Optional[
+            ta.Generator[
+                CoroHttpServer.Io,
+                ta.Optional[bytes],
+                CoroHttpServer.CoroHandleResult,
+            ],
+        ] = self._coro_srv.coro_handle()
 
         self._cur_io: ta.Optional[CoroHttpServer.Io] = None
         self._next_io()

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/http/coro/server.py

@@ -417,7 +417,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
@@ -430,7 +434,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:
@@ -454,7 +458,9 @@ class CoroHttpServer:
 
                     o.close()
                     if o.close_connection:
-                        break
+                        return self.CoroHandleResult(
+                            close_reason='response',
+                        )
                     o = None
 
                 else:
@@ -463,9 +469,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'):

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/http/coro/simple.py

@@ -39,6 +39,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,
@@ -60,6 +61,7 @@ def make_simple_http_server(
 
         socket_handler = CoroHttpServerSocketHandler(
             server_factory,
+            keep_alive=keep_alive,
         )
 
         #

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/http/coro/sockets.py

@@ -1,7 +1,9 @@
 # ruff: noqa: UP006 UP007 UP045
 # @omlish-lite
+import itertools
 import typing as ta
 
+from ...lite.check import check
 from ...sockets.addresses import SocketAddress
 from ...sockets.handlers import SocketHandler_
 from ...sockets.io import SocketIoPair
@@ -17,16 +19,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)
@@ -55,5 +73,5 @@ 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)

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/lang/__init__.py

@@ -146,6 +146,11 @@ from .contextmanagers import (  # noqa
 )
 
 from .datetimes import (  # noqa
+    ISO_FMT,
+    ISO_FMT_US,
+    ISO_FMT_NTZ,
+    ISO_FMT_US_NTZ,
+
     utcnow,
     utcfromtimestamp,
 )

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/lang/datetimes.py

@@ -4,6 +4,16 @@ import datetime
 ##
 
 
+ISO_FMT = '%Y-%m-%dT%H:%M:%S%z'
+ISO_FMT_US = '%Y-%m-%dT%H:%M:%S.%f%z'
+
+ISO_FMT_NTZ = '%Y-%m-%dT%H:%M:%S'
+ISO_FMT_US_NTZ = '%Y-%m-%dT%H:%M:%S.%f'
+
+
+#
+
+
 def utcnow() -> datetime.datetime:
     return datetime.datetime.now(tz=datetime.UTC)
 

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/lang/outcomes.py

@@ -203,7 +203,7 @@ class Outcome(abc.ABC, ta.Generic[ValueT_co]):
 class Value(Outcome[ValueT_co], ta.Generic[ValueT_co]):
     """Concrete :class:`Outcome` subclass representing a regular value."""
 
-    _value: ValueT_co
+    _value: ValueT_co  # type: ignore[misc]  # FIXME: Cannot use a covariant type variable as a parameter
 
     def __repr__(self) -> str:
         return f'Value({self._value!r})'

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/lang/sys.py

@@ -4,7 +4,7 @@ import sys
 ##
 
 
-REQUIRED_PYTHON_VERSION = (3, 12)
+REQUIRED_PYTHON_VERSION = (3, 13)
 
 
 def check_runtime_version() -> None:

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/omlish/os/linux.py

@@ -19,7 +19,7 @@ ID=ubuntu
 ID_LIKE=debian
 UBUNTU_CODENAME=jammy
 
-➜  omlish git:(master) docker run -i python:3.12 cat /etc/os-release
+➜  omlish git:(master) docker run -i python:3.13 cat /etc/os-release
 PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"
 NAME="Debian GNU/Linux"
 VERSION_ID="12"

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev352
+Version: 0.0.0.dev354
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -10,7 +10,7 @@ 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
 Provides-Extra: all
 Requires-Dist: anyio~=4.9; extra == "all"

{omlish-0.0.0.dev352 → omlish-0.0.0.dev354}/pyproject.toml

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

omlish-0.0.0.dev352/omlish/formats/json5/codec.py

@@ -1,26 +0,0 @@
-import typing as ta
-
-from .. import json
-from ..codecs import make_object_lazy_loaded_codec
-from ..codecs import make_str_object_codec
-from .parsing import parse
-
-
-##
-
-
-def dumps(obj: ta.Any) -> str:
-    return json.dumps(obj)
-
-
-def loads(s: str) -> ta.Any:
-    return parse(s)
-
-
-##
-
-
-JSON5_CODEC = make_str_object_codec('json5', dumps, loads)
-
-# @omlish-manifest
-_JSON5_LAZY_CODEC = make_object_lazy_loaded_codec(__name__, 'JSON5_CODEC', JSON5_CODEC)