omlish 0.0.0.dev257__tar.gz → 0.0.0.dev259__tar.gz

{omlish-0.0.0.dev257/omlish.egg-info → omlish-0.0.0.dev259}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev257
+Version: 0.0.0.dev259
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -98,3 +98,4 @@ Requires-Dist: executing~=2.2; extra == "plus"
 Requires-Dist: orjson~=3.10; extra == "plus"
 Requires-Dist: pyyaml~=6.0; extra == "plus"
 Requires-Dist: wrapt~=1.17; extra == "plus"
+Dynamic: license-file

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev257'
-__revision__ = '62df4004126a5530d242ba70bd0dfdc429b20ae1'
+__version__ = '0.0.0.dev259'
+__revision__ = '5fb30c5ff443151db83d45b682f3eaf8d8427cb2'
 
 
 #

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/asyncs/anyio/__init__.py

@@ -71,4 +71,7 @@ from .utils import (  # noqa
     first,
 
     get_current_task,
+
+    call_with_task_group,
+    run_with_task_group,
 )

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/asyncs/anyio/utils.py

@@ -1,11 +1,13 @@
+import functools
 import typing as ta
 
-import anyio
+import anyio.abc
 import sniffio
 
 from ... import lang
 
 
+P = ta.ParamSpec('P')
 T = ta.TypeVar('T')
 
 
@@ -46,3 +48,26 @@ def get_current_task() -> anyio.TaskInfo | None:
         return anyio.get_current_task()
     except sniffio.AsyncLibraryNotFoundError:
         return None
+
+
+##
+
+
+async def call_with_task_group(
+        fn: ta.Callable[ta.Concatenate[anyio.abc.TaskGroup, P], ta.Awaitable[T]],
+        *args: ta.Any,
+        **kwargs: ta.Any,
+) -> T:
+    async with anyio.create_task_group() as tg:
+        return await fn(tg, *args, **kwargs)
+
+
+def run_with_task_group(
+        fn: ta.Callable[ta.Concatenate[anyio.abc.TaskGroup, P], ta.Awaitable[T]],
+        *args: ta.Any,
+        **kwargs: ta.Any,
+) -> T:
+    return anyio.run(
+        functools.partial(call_with_task_group, fn, *args),
+        **kwargs,
+    )

omlish-0.0.0.dev259/omlish/asyncs/buffers.py

@@ -0,0 +1,55 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import typing as ta
+
+from ..io.buffers import ReadableListBuffer
+
+
+##
+
+
+class AsyncBufferedReader:
+    def __init__(
+            self,
+            read: ta.Callable[[], ta.Awaitable[bytes]],
+    ) -> None:
+        super().__init__()
+
+        self._read = read
+
+        self._buf = ReadableListBuffer()
+
+    class Cancelled(Exception):  # noqa
+        pass
+
+    async def read_until(
+            self,
+            delim: bytes,
+            *,
+            canceller: ta.Optional[ta.Callable[[], bool]] = None,
+    ) -> bytes:
+        o = 0
+        while True:
+            if canceller is not None and canceller():
+                raise self.Cancelled
+            r = self._buf.read_until_(delim, o)
+            if isinstance(r, bytes):
+                return r
+            o = r
+            b = await self._read()
+            self._buf.feed(b)
+
+    async def read_exact(
+            self,
+            sz: int,
+            *,
+            canceller: ta.Optional[ta.Callable[[], bool]] = None,
+    ) -> bytes:
+        while True:
+            if canceller is not None and canceller():
+                raise self.Cancelled
+            r = self._buf.read(sz)
+            if r is not None:
+                return r
+            b = await self._read()
+            self._buf.feed(b)

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/io/buffers.py

@@ -182,15 +182,21 @@ class ReadableListBuffer:
             raise EOFError(f'ReadableListBuffer got {"no" if d is None else len(d)}, expected {sz}')
         return d
 
-    def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
+    def read_until_(self, delim: bytes = b'\n', start_buffer: int = 0) -> ta.Union[bytes, int]:
         if not (lst := self._lst):
-            return None
+            return 0
 
-        for i, d in enumerate(lst):
-            if (p := d.find(delim)) >= 0:
+        i = start_buffer
+        while i < len(lst):
+            if (p := lst[i].find(delim)) >= 0:
                 return self._chop(i, p + len(delim))
+            i += 1
 
-        return None
+        return i
+
+    def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
+        r = self.read_until_(delim)
+        return r if isinstance(r, bytes) else None
 
 
 class IncrementalWriteBuffer:

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/lang/__init__.py

@@ -69,7 +69,13 @@ from .clsdct import (  # noqa
     is_possibly_cls_dct,
 )
 
-from .cmp import (  # noqa
+from .collections import (  # noqa
+    empty_map,
+    merge_dicts,
+    yield_dict_init,
+)
+
+from .comparison import (  # noqa
     Infinity,
     InfinityType,
     NegativeInfinity,
@@ -77,12 +83,6 @@ from .cmp import (  # noqa
     cmp,
 )
 
-from .collections import (  # noqa
-    empty_map,
-    merge_dicts,
-    yield_dict_init,
-)
-
 from .contextmanagers import (  # noqa
     AsyncContextManager,
     ContextManaged,

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonrpc/types.py

@@ -117,13 +117,11 @@ def error(id: Id, error: Error) -> Response:  # noqa
 ##
 
 
-Message: ta.TypeAlias = Request | Response | Error
+Message: ta.TypeAlias = Request | Response
 
 
 def detect_message_type(dct: ta.Mapping[str, ta.Any]) -> type[Message]:
     if 'method' in dct:
         return Request
-    elif 'code' in dct:
-        return Error
     else:
         return Response

{omlish-0.0.0.dev257/omlish/specs/jsonschema/keywords → omlish-0.0.0.dev259/omlish/specs/jsonschema}/__init__.py

@@ -1,38 +1,49 @@
-from .base import (  # noqa
+from .keywords.base import (  # noqa
     Keyword,
     Keywords,
+    KnownKeyword,
 )
 
-from .core import (  # noqa
+from .keywords.core import (  # noqa
     CoreKeyword,
+    Defs,
     Id,
     Ref,
     SchemaKeyword,
 )
 
-from .metadata import (  # noqa
+from .keywords.format import (  # noqa
+    Format,
+    FormatKeyword,
+)
+
+from .keywords.metadata import (  # noqa
     Description,
     MetadataKeyword,
     Title,
 )
 
-from .parse import (  # noqa
+from .keywords.parse import (  # noqa
     DEFAULT_KEYWORD_SUPERTYPES,
     DEFAULT_KEYWORD_TYPES,
     DEFAULT_KEYWORD_TYPES_BY_TAG,
-    DEFAULT_PARSER,
-    Parser,
+    DEFAULT_KEYWORD_PARSER,
+    KeywordParser,
     build_keyword_types_by_tag,
     parse_keyword,
     parse_keywords,
 )
 
-from .render import (  # noqa
+from .keywords.render import (  # noqa
     render_keyword,
     render_keywords,
 )
 
-from .validation import (  # noqa
+from .keywords.unknown import (  # noqa
+    UnknownKeyword,
+)
+
+from .keywords.validation import (  # noqa
     ExclusiveMaximum,
     ExclusiveMinimum,
     Items,
@@ -46,3 +57,8 @@ from .validation import (  # noqa
     UniqueItems,
     ValidationKeyword,
 )
+
+from .types import (  # noqa
+    JsonType,
+    TYPE_SETS_BY_JSON_TYPE,
+)

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/keywords/base.py

@@ -17,14 +17,33 @@ KeywordT = ta.TypeVar('KeywordT', bound='Keyword')
 class Keyword(lang.Abstract):
     tag: ta.ClassVar[str]
 
-    def __init_subclass__(cls, *, tag: str | None = None, **kwargs: ta.Any) -> None:
+
+##
+
+
+class KnownKeyword(Keyword, lang.Abstract):
+    aliases: ta.ClassVar[frozenset[str]]
+
+    tag_and_aliases: ta.ClassVar[frozenset[str]]
+
+    def __init_subclass__(
+            cls,
+            *,
+            tag: str | None = None,
+            aliases: ta.Iterable[str] | None = None,
+            **kwargs: ta.Any,
+    ) -> None:
         super().__init_subclass__(**kwargs)
-        check.not_in('tag', dir(cls))
+        check.empty(set(dir(cls)) & {'tag', 'aliases', 'tag_and_aliases'})
         if not lang.is_abstract_class(cls):
             check.issubclass(cls, lang.Final)
+            check.not_isinstance(aliases, str)
             cls.tag = check.non_empty_str(tag)
+            cls.aliases = frozenset(aliases or ())
+            cls.tag_and_aliases = frozenset([cls.tag, *cls.aliases])
         else:
-            check.none(tag)
+            for a in (tag, aliases):
+                check.none(a)
 
 
 ##

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/keywords/core.py

@@ -1,12 +1,13 @@
 from .... import lang
-from .base import Keyword
+from .base import KnownKeyword
 from .base import StrKeyword
+from .base import StrToKeywordsKeyword
 
 
 ##
 
 
-class CoreKeyword(Keyword, lang.Abstract, lang.Sealed):
+class CoreKeyword(KnownKeyword, lang.Abstract, lang.Sealed):
     pass
 
 
@@ -23,3 +24,7 @@ class SchemaKeyword(StrKeyword, CoreKeyword, lang.Final, tag='$schema'):
 
 class Ref(StrKeyword, CoreKeyword, lang.Final, tag='$ref'):
     pass
+
+
+class Defs(StrToKeywordsKeyword, CoreKeyword, lang.Final, tag='$defs', aliases=['definitions']):
+    pass

omlish-0.0.0.dev259/omlish/specs/jsonschema/keywords/format.py

@@ -0,0 +1,17 @@
+from .... import lang
+from .base import KnownKeyword
+from .base import StrKeyword
+
+
+##
+
+
+class FormatKeyword(KnownKeyword, lang.Abstract, lang.Sealed):
+    pass
+
+
+##
+
+
+class Format(StrKeyword, FormatKeyword, lang.Final, tag='format'):
+    pass

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/keywords/metadata.py

@@ -1,12 +1,12 @@
 from .... import lang
-from .base import Keyword
+from .base import KnownKeyword
 from .base import StrKeyword
 
 
 ##
 
 
-class MetadataKeyword(Keyword, lang.Abstract, lang.Sealed):
+class MetadataKeyword(KnownKeyword, lang.Abstract, lang.Sealed):
     pass
 
 

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/keywords/parse.py

@@ -1,4 +1,3 @@
-import operator
 import typing as ta
 
 from .... import check
@@ -8,12 +7,15 @@ from .base import BooleanKeyword
 from .base import Keyword
 from .base import Keywords
 from .base import KeywordsKeyword
+from .base import KnownKeyword
 from .base import NumberKeyword
 from .base import StrKeyword
 from .base import StrOrStrsKeyword
 from .base import StrToKeywordsKeyword
 from .core import CoreKeyword
+from .format import FormatKeyword
 from .metadata import MetadataKeyword
+from .unknown import UnknownKeyword
 from .validation import ValidationKeyword
 
 
@@ -23,38 +25,49 @@ KeywordT = ta.TypeVar('KeywordT', bound=Keyword)
 ##
 
 
-def build_keyword_types_by_tag(keyword_types: ta.Iterable[type[Keyword]]) -> ta.Mapping[str, type[Keyword]]:
-    return col.make_map_by(operator.attrgetter('tag'), keyword_types, strict=True)
+def build_keyword_types_by_tag(keyword_types: ta.Iterable[type[KnownKeyword]]) -> ta.Mapping[str, type[KnownKeyword]]:
+    return col.make_map(((t, kt) for kt in keyword_types for t in kt.tag_and_aliases), strict=True)
 
 
-DEFAULT_KEYWORD_SUPERTYPES: ta.AbstractSet = frozenset([
+DEFAULT_KEYWORD_SUPERTYPES: ta.AbstractSet[type[KnownKeyword]] = frozenset([
     CoreKeyword,
+    FormatKeyword,
     MetadataKeyword,
     ValidationKeyword,
 ])
 
-DEFAULT_KEYWORD_TYPES: ta.AbstractSet = frozenset(lang.flatten(
+DEFAULT_KEYWORD_TYPES: ta.AbstractSet[type[KnownKeyword]] = frozenset(lang.flatten(
     lang.deep_subclasses(st, concrete_only=True) for st in DEFAULT_KEYWORD_SUPERTYPES
 ))
 
-DEFAULT_KEYWORD_TYPES_BY_TAG: ta.Mapping[str, type[Keyword]] = build_keyword_types_by_tag(DEFAULT_KEYWORD_TYPES)
+DEFAULT_KEYWORD_TYPES_BY_TAG: ta.Mapping[str, type[KnownKeyword]] = build_keyword_types_by_tag(DEFAULT_KEYWORD_TYPES)
 
 
 ##
 
 
-class Parser:
+class KeywordParser:
     def __init__(
             self,
-            keyword_types: ta.Iterable[type[Keyword]] | ta.Mapping[str, type[Keyword]] = DEFAULT_KEYWORD_TYPES_BY_TAG,
+            *,
+            keyword_types: ta.Union[  # noqa
+                ta.Iterable[type[KnownKeyword]],
+                ta.Mapping[str, type[KnownKeyword]],
+                None,
+            ] = None,
+            allow_unknown: bool = False,
     ) -> None:
         super().__init__()
 
-        if isinstance(keyword_types, ta.Mapping):
+        if keyword_types is None:
+            self._keyword_types_by_tag = DEFAULT_KEYWORD_TYPES_BY_TAG
+        elif isinstance(keyword_types, ta.Mapping):
             self._keyword_types_by_tag = keyword_types
         else:
             self._keyword_types_by_tag = build_keyword_types_by_tag(keyword_types)
 
+        self._allow_unknown = allow_unknown
+
     def parse_keyword(self, cls: type[KeywordT], v: ta.Any) -> KeywordT:
         if issubclass(cls, BooleanKeyword):
             return cls(check.isinstance(v, bool))  # type: ignore
@@ -76,26 +89,37 @@ class Parser:
             return cls(ss)  # type: ignore
 
         elif issubclass(cls, KeywordsKeyword):
-            return cls(parse_keywords(v))  # type: ignore
+            return cls(self.parse_keywords(v))  # type: ignore
 
         elif issubclass(cls, StrToKeywordsKeyword):
-            return cls({k: parse_keywords(mv) for k, mv in v.items()})  # type: ignore
+            return cls({k: self.parse_keywords(mv) for k, mv in v.items()})  # type: ignore
 
         else:
             raise TypeError(cls)
 
     def parse_keywords(self, dct: ta.Mapping[str, ta.Any]) -> Keywords:
         lst: list[Keyword] = []
+
         for k, v in dct.items():
-            cls = self._keyword_types_by_tag[k]
-            lst.append(self.parse_keyword(cls, v))
+            try:
+                cls = self._keyword_types_by_tag[k]
+
+            except KeyError:
+                if not self._allow_unknown:
+                    raise
+
+                lst.append(UnknownKeyword(k, v))
+
+            else:
+                lst.append(self.parse_keyword(cls, v))
+
         return Keywords(lst)
 
 
 ##
 
 
-DEFAULT_PARSER = Parser()
+DEFAULT_KEYWORD_PARSER = KeywordParser()
 
-parse_keyword = DEFAULT_PARSER.parse_keyword
-parse_keywords = DEFAULT_PARSER.parse_keywords
+parse_keyword = DEFAULT_KEYWORD_PARSER.parse_keyword
+parse_keywords = DEFAULT_KEYWORD_PARSER.parse_keywords

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/keywords/render.py

@@ -8,6 +8,10 @@ from .base import NumberKeyword
 from .base import StrKeyword
 from .base import StrOrStrsKeyword
 from .base import StrToKeywordsKeyword
+from .unknown import UnknownKeyword
+
+
+##
 
 
 def render_keyword(kw: Keyword) -> dict[str, ta.Any]:
@@ -32,6 +36,9 @@ def render_keyword(kw: Keyword) -> dict[str, ta.Any]:
     elif isinstance(kw, StrToKeywordsKeyword):
         return {kw.tag: {k: render_keywords(v) for k, v in kw.m.items()}}
 
+    elif isinstance(kw, UnknownKeyword):
+        return {kw.tag: kw.value}
+
     else:
         raise TypeError(kw)
 

omlish-0.0.0.dev259/omlish/specs/jsonschema/keywords/unknown.py

@@ -0,0 +1,14 @@
+import typing as ta
+
+from .... import dataclasses as dc
+from .... import lang
+from .base import Keyword
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class UnknownKeyword(Keyword, lang.Final):
+    tag: str  # type: ignore[misc]
+    value: ta.Any

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/keywords/validation.py

@@ -1,7 +1,7 @@
 from .... import lang
 from .base import BooleanKeyword
-from .base import Keyword
 from .base import KeywordsKeyword
+from .base import KnownKeyword
 from .base import NumberKeyword
 from .base import StrOrStrsKeyword
 from .base import StrToKeywordsKeyword
@@ -10,7 +10,7 @@ from .base import StrToKeywordsKeyword
 ##
 
 
-class ValidationKeyword(Keyword, lang.Abstract, lang.Sealed):
+class ValidationKeyword(KnownKeyword, lang.Abstract, lang.Sealed):
     pass
 
 

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish/specs/jsonschema/types.py

@@ -2,6 +2,9 @@ import enum
 import typing as ta
 
 
+##
+
+
 class JsonType(enum.Enum):
     NULL = enum.auto()
     BOOLEAN = enum.auto()

omlish-0.0.0.dev259/omlish/specs/openapi/__init__.py

@@ -0,0 +1,11 @@
+from .openapi import (  # noqa
+    Openapi,
+)
+
+
+##
+
+
+from ...lang.imports import _register_conditional_import  # noqa
+
+_register_conditional_import('...marshal', '.marshal', __package__)

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev257
+Version: 0.0.0.dev259
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -98,3 +98,4 @@ Requires-Dist: executing~=2.2; extra == "plus"
 Requires-Dist: orjson~=3.10; extra == "plus"
 Requires-Dist: pyyaml~=6.0; extra == "plus"
 Requires-Dist: wrapt~=1.17; extra == "plus"
+Dynamic: license-file

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/omlish.egg-info/SOURCES.txt

@@ -103,6 +103,7 @@ omlish/asyncs/__init__.py
 omlish/asyncs/all.py
 omlish/asyncs/asyncs.py
 omlish/asyncs/bridge.py
+omlish/asyncs/buffers.py
 omlish/asyncs/flavors.py
 omlish/asyncs/trio.py
 omlish/asyncs/trio_asyncio.py
@@ -419,8 +420,8 @@ omlish/iterators/unique.py
 omlish/lang/__init__.py
 omlish/lang/attrs.py
 omlish/lang/clsdct.py
-omlish/lang/cmp.py
 omlish/lang/collections.py
+omlish/lang/comparison.py
 omlish/lang/contextmanagers.py
 omlish/lang/datetimes.py
 omlish/lang/descriptors.py
@@ -637,9 +638,11 @@ omlish/specs/jsonschema/types.py
 omlish/specs/jsonschema/keywords/__init__.py
 omlish/specs/jsonschema/keywords/base.py
 omlish/specs/jsonschema/keywords/core.py
+omlish/specs/jsonschema/keywords/format.py
 omlish/specs/jsonschema/keywords/metadata.py
 omlish/specs/jsonschema/keywords/parse.py
 omlish/specs/jsonschema/keywords/render.py
+omlish/specs/jsonschema/keywords/unknown.py
 omlish/specs/jsonschema/keywords/validation.py
 omlish/specs/jsonschema/schemas/__init__.py
 omlish/specs/jsonschema/schemas/draft202012/__init__.py

{omlish-0.0.0.dev257 → omlish-0.0.0.dev259}/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.dev257'
+version = '0.0.0.dev259'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev257/omlish/specs/openapi/__init__.py

@@ -1,5 +0,0 @@
-from . import marshal  # noqa
-
-from .openapi import (  # noqa
-    Openapi,
-)