omlish 0.0.0.dev434__tar.gz → 0.0.0.dev436__tar.gz

{omlish-0.0.0.dev434/omlish.egg-info → omlish-0.0.0.dev436}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev434
+Version: 0.0.0.dev436
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev434'
-__revision__ = '17585e1a0390e30925b0e2c5e65944f8f99a9dc3'
+__version__ = '0.0.0.dev436'
+__revision__ = '97bde773ba1e7d8a5c4245f8d7ed6b0492842e64'
 
 
 #

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/configs/types.py

@@ -3,7 +3,7 @@
 import typing as ta
 
 
-ConfigMap = ta.Mapping[str, ta.Any]
+ConfigMap = ta.Mapping[str, ta.Any]  # ta.TypeAlias
 
 
 ##

omlish-0.0.0.dev436/omlish/daemons/__init__.py

@@ -0,0 +1,70 @@
+from .. import lang as _lang  # noqa
+
+
+with _lang.auto_proxy_init(globals()):
+    ##
+
+    from .daemon import (  # noqa
+        Daemon,
+    )
+
+    from .launching import (  # noqa
+        Launcher,
+    )
+
+    from .services import (  # noqa
+        Service,
+
+        ServiceTarget,
+        ServiceTargetRunner,
+
+        ServiceConfigTarget,
+        ServiceConfigTargetRunner,
+    )
+
+    from .spawning import (  # noqa
+        Spawning,
+        Spawn,
+        Spawner,
+        InProcessSpawner,
+        spawner_for,
+
+        MultiprocessingSpawning,
+        MultiprocessingSpawner,
+
+        ForkSpawning,
+        ForkSpawner,
+
+        ThreadSpawning,
+        ThreadSpawner,
+    )
+
+    from .targets import (  # noqa
+        Target,
+        TargetRunner,
+        target_runner_for,
+
+        FnTarget,
+        FnTargetRunner,
+
+        NameTarget,
+        NameTargetRunner,
+
+        ExecTarget,
+        ExecTargetRunner,
+    )
+
+    from .waiting import (  # noqa
+        Wait,
+        Waiter,
+        waiter_for,
+
+        SequentialWait,
+        SequentialWaiter,
+
+        FnWait,
+        FnWaiter,
+
+        ConnectWait,
+        ConnectWaiter,
+    )

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/dataclasses/errors.py

@@ -6,7 +6,7 @@ import typing as ta
 
 
 def _hands_off_repr(obj: ta.Any) -> str:
-    return f'{obj.__class__.__qualname__}@{hex(id(obj))[2:]}'
+    return f'{obj.__class__.__qualname__}@{id(obj):x}'
 
 
 def _fn_repr(fn: ta.Callable) -> str:

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/formats/json/stream/lexing.py

@@ -122,11 +122,17 @@ class JsonStreamLexer(GenMachine[str, Token]):
             include_space: bool = False,
             allow_comments: bool = False,
             include_comments: bool = False,
+            allow_single_quotes: bool = False,
+            string_literal_parser: ta.Callable[[str], str] | None = None,
     ) -> None:
         self._include_raw = include_raw
         self._include_space = include_space
         self._allow_comments = allow_comments
         self._include_comments = include_comments
+        self._allow_single_quotes = allow_single_quotes
+        if string_literal_parser is None:
+            string_literal_parser = json.loads
+        self._string_literal_parser = string_literal_parser
 
         self._ofs = 0
         self._line = 1
@@ -202,8 +208,8 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 yield self._make_tok(CONTROL_TOKENS[c], c, c, self.pos)
                 continue
 
-            if c == '"':
-                return self._do_string()
+            if c == '"' or (self._allow_single_quotes and c == "'"):
+                return self._do_string(c)
 
             if c.isdigit() or c == '-':
                 return self._do_number(c)
@@ -217,9 +223,9 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
             self._raise(f'Unexpected character: {c}')
 
-    def _do_string(self):
+    def _do_string(self, q: str):
         check.state(self._buf.tell() == 0)
-        self._buf.write('"')
+        self._buf.write(q)
 
         pos = self.pos
 
@@ -234,13 +240,13 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 self._raise(f'Unterminated string literal: {self._buf.getvalue()}')
 
             self._buf.write(c)
-            if c == '"' and last != '\\':
+            if c == q and last != '\\':
                 break
             last = c
 
         raw = self._flip_buf()
         try:
-            sv = json.loads(raw)
+            sv = self._string_literal_parser(raw)
         except json.JSONDecodeError as e:
             self._raise(f'Invalid string literal: {raw!r}', e)
 

omlish-0.0.0.dev436/omlish/formats/json/stream/utils.py

@@ -0,0 +1,85 @@
+r"""
+TODO:
+ - gson switches
+  - Strictness.LEGACY_STRICT
+   - JsonReader allows the literals true, false and null to have any capitalization, for example fAlSe or NULL
+   - JsonReader supports the escape sequence \', representing a ' (single-quote)
+   - JsonReader supports the escape sequence \LF (with LF being the Unicode character U+000A), resulting in a LF within
+     the read JSON string
+   - JsonReader allows unescaped control characters (U+0000 through U+001F)
+  - Strictness.LENIENT
+   - In lenient mode, all input that is accepted in legacy strict mode is accepted in addition to the following
+     departures from RFC 8259:
+   - Streams that start with the non-execute prefix, ")]'\n"}
+   - Streams that include multiple top-level values. With legacy strict or strict parsing, each stream must contain
+     exactly one top-level value.
+   - Numbers may be NaNs or infinities represented by NaN and (-)Infinity respectively.
+   - End of line comments starting with // or # and ending with a newline character.
+   - C-style comments starting with /* and ending with */. Such comments may not be nested.
+   - Names that are unquoted or 'single quoted'.
+   - Strings that are unquoted or 'single quoted'.
+   - Array elements separated by ; instead of ,.
+   - Unnecessary array separators. These are interpreted as if null was the omitted value.
+   - Names and values separated by = or => instead of :.
+   - Name/value pairs separated by ; instead of ,.
+"""
+import dataclasses as dc
+import typing as ta
+
+from .... import lang
+from .building import JsonValueBuilder
+from .lexing import JsonStreamLexer
+from .parsing import JsonStreamParser
+
+
+##
+
+
+@dc.dataclass(kw_only=True)
+class JsonStreamValueParser(lang.ExitStacked):
+    include_raw: bool = False
+    yield_object_lists: bool = False
+
+    json5: bool = False
+
+    #
+
+    _lex: JsonStreamLexer = dc.field(init=False)
+    _parse: JsonStreamParser = dc.field(init=False)
+    _build: JsonValueBuilder = dc.field(init=False)
+
+    def _enter_contexts(self) -> None:
+        self._lex = JsonStreamLexer(
+            include_raw=self.include_raw,
+            allow_comments=self.json5,
+            allow_single_quotes=self.json5,
+        )
+
+        self._parse = JsonStreamParser()
+
+        self._build = JsonValueBuilder(
+            yield_object_lists=self.yield_object_lists,
+        )
+
+    def feed(self, i: ta.Iterable[str]) -> ta.Iterator[ta.Any]:
+        for c in i:
+            for t in self._lex(c):
+                for e in self._parse(t):
+                    for v in self._build(e):  # noqa
+                        yield v
+
+
+def stream_parse_values(
+        i: ta.Iterable[str],
+        **kwargs: ta.Any,
+) -> ta.Generator[ta.Any]:
+    with JsonStreamValueParser(**kwargs) as p:
+        yield from p.feed(i)
+
+
+def stream_parse_one_value(
+        i: ta.Iterable[str],
+        **kwargs: ta.Any,
+) -> ta.Any:
+    with JsonStreamValueParser(**kwargs) as p:
+        return next(p.feed(i))

omlish-0.0.0.dev434/omlish/formats/json/stream/utils.py → omlish-0.0.0.dev436/omlish/formats/json5/stream.py

@@ -1,10 +1,33 @@
+"""
+TODO:
+
+Objects:
+ - Object keys may be an ECMAScript 5.1 IdentifierName.
+ - Objects may have a single trailing comma.
+Arrays:
+ - Arrays may have a single trailing comma.
+Strings:
+ - Strings may be single quoted.
+ - Strings may span multiple lines by escaping new line characters.
+ - Strings may include character escapes.
+Numbers:
+ - Numbers may be hexadecimal.
+ - Numbers may have a leading or trailing decimal point.
+ - Numbers may be IEEE 754 positive infinity, negative infinity, and NaN.
+ - Numbers may begin with an explicit plus sign.
+Comments:
+ + Single and multi-line comments are allowed.
+White Space:
+ - Additional white space characters are allowed.
+"""
 import dataclasses as dc
 import typing as ta
 
-from .... import lang
-from .building import JsonValueBuilder
-from .lexing import JsonStreamLexer
-from .parsing import JsonStreamParser
+from ... import lang
+from ..json.stream.building import JsonValueBuilder
+from ..json.stream.lexing import JsonStreamLexer
+from ..json.stream.parsing import JsonStreamParser
+from .literals import parse_string_literal
 
 
 ##
@@ -15,8 +38,6 @@ class JsonStreamValueParser(lang.ExitStacked):
     include_raw: bool = False
     yield_object_lists: bool = False
 
-    allow_comments: bool = False
-
     #
 
     _lex: JsonStreamLexer = dc.field(init=False)
@@ -26,7 +47,9 @@ class JsonStreamValueParser(lang.ExitStacked):
     def _enter_contexts(self) -> None:
         self._lex = JsonStreamLexer(
             include_raw=self.include_raw,
-            allow_comments=self.allow_comments,
+            allow_comments=True,
+            allow_single_quotes=True,
+            string_literal_parser=parse_string_literal,
         )
 
         self._parse = JsonStreamParser()

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/funcs/genmachine.py

@@ -45,7 +45,7 @@ class GenMachine(ta.Generic[I, O]):
     _gen: MachineGen | None
 
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}@{hex(id(self))[2:]}<{self.state}>'
+        return f'{self.__class__.__name__}@{id(self):x}<{self.state}>'
 
     #
 

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/http/coro/server/server.py

@@ -77,7 +77,7 @@ from ...versions import HttpProtocolVersion
 from ...versions import HttpProtocolVersions
 
 
-CoroHttpServerFactory = ta.Callable[[SocketAddress], 'CoroHttpServer']
+CoroHttpServerFactory = ta.Callable[[SocketAddress], 'CoroHttpServer']  # ta.TypeAlias
 
 
 ##

omlish-0.0.0.dev436/omlish/iterators/__init__.py

@@ -0,0 +1,29 @@
+from .. import lang as _lang  # noqa
+
+
+with _lang.auto_proxy_init(globals()):
+    ##
+
+    from .iterators import (  # noqa
+        PeekIterator,
+        PrefetchIterator,
+        ProxyIterator,
+        RetainIterator,
+    )
+
+    from .recipes import (  # noqa
+        sliding_window,
+    )
+
+    from .tools import (  # noqa
+        expand_indexed_pairs,
+        merge_on,
+        take,
+        unzip,
+    )
+
+    from .unique import (  # noqa
+        UniqueItem,
+        UniqueIterator,
+        UniqueStats,
+    )

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/lite/attrops.py

@@ -212,7 +212,7 @@ class AttrOps(ta.Generic[T]):
             return (
                 f'{o.__class__.__module__ + "." if self._with_module else ""}'
                 f'{o.__class__.__qualname__ if self._use_qualname else o.__class__.__name__}'
-                f'{("@" + hex(id(o))[2:]) if self._with_id else ""}'
+                f'{("@" + hex(id(o))[2:]) if self._with_id else ""}'  # noqa
                 f'({vs})'
             )
 

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/lite/inject.py

@@ -21,12 +21,12 @@ T = ta.TypeVar('T')
 U = ta.TypeVar('U')
 
 
-InjectorKeyCls = ta.Union[type, ta.NewType]
+InjectorKeyCls = ta.Union[type, ta.NewType]  # ta.TypeAlias
 
-InjectorProviderFn = ta.Callable[['Injector'], ta.Any]
-InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']
+InjectorProviderFn = ta.Callable[['Injector'], ta.Any]  # ta.TypeAlias
+InjectorProviderFnMap = ta.Mapping['InjectorKey', 'InjectorProviderFn']  # ta.TypeAlias
 
-InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']
+InjectorBindingOrBindings = ta.Union['InjectorBinding', 'InjectorBindings']  # ta.TypeAlias
 
 
 ###

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/marshal/__init__.py

@@ -1,14 +1,24 @@
 # ruff: noqa: I001
 """
 TODO:
- - redacted
- - strongly typed MarshalerFactory base class?
- - strongly typed Composite/Cached Marshaler/Unmarshaler factories - footgun
- - streaming? Start/EndObject, etc..
- - lang.Marker - class name, handle type[Foo]
-  - can't disambiguate from str - can't coexist in bare union
- - factories being free MatchFns does more harm than good - in practice these are such big guns you want to write a
-   class body if only ceremonially
+ - streaming?
+ - datatypes
+  - redacted
+  - lang.Marker - class name, handle type[Foo]
+  - pathlib.Path
+  - decimal.Decimal
+  - datetime.date, datetime.time
+  - ipaddress
+  - numpy types
+ - jackson switches
+  - accept_case_insensitive_enums
+  - accept_case_insensitive_properties
+  - accept_case_insensitive_values
+  - allow_coercion_of_scalars
+  - use_base_type_as_default_impl
+ - codegen
+ - context-local switches
+  - mutable_collections
  - simple lite interop like inj - alt ObjMarshalerManager impl for Context
 
 See:
@@ -16,6 +26,8 @@ See:
  - https://github.com/jcrist/msgspec
  - https://github.com/Fatal1ty/mashumaro
  - https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serializers.md#custom-serializers
+ - https://github.com/yukinarit/pyserde
+ - https://github.com/FasterXML/jackson
 """
 from .. import dataclasses as _dc  # noqa
 

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/os/atomics.py

@@ -11,7 +11,7 @@ from ..lite.attrops import attr_repr
 from ..lite.check import check
 
 
-AtomicPathSwapKind = ta.Literal['dir', 'file']
+AtomicPathSwapKind = ta.Literal['dir', 'file']  # ta.TypeAlias
 AtomicPathSwapState = ta.Literal['open', 'committed', 'aborted']  # ta.TypeAlias
 
 

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/reflect/ops.py

@@ -1,3 +1,12 @@
+"""
+TODO:
+ - visitor / transformer
+  - gson had an ObjectNavigator:
+   - https://github.com/google/gson/blob/f291c4d33ea5fcc52afcfa5713e519e663378bda/gson/src/main/java/com/google/gson/ObjectNavigator.java
+   - removed in 25c6ae177b1ca56db7f3c29eb574bdd032a06165
+ - uniform collection isinstance - items() for mappings, iter() for other
+ - also check instance type in isinstance not just items lol
+"""  # noqa
 import dataclasses as dc
 import typing as ta
 

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/reflect/types.py

@@ -9,12 +9,8 @@ give it some guiding North Star to make all of its decisions for it, and to add
 meet, join, solve, ...), but it's quite a bit of work and not a priority at the moment.
 
 TODO:
- - visitor / transformer
- - uniform collection isinstance - items() for mappings, iter() for other
- - also check instance type in isinstance not just items lol
- - ta.Generic in mro causing trouble - omit? no longer 1:1
- - cache this shit, esp generic_mro shit
-  - cache __hash__ in Generic/Union
+ - !! cache this shit !!
+  - especially generic_mro shit
 """
 import dataclasses as dc
 import threading
@@ -22,6 +18,7 @@ import types
 import typing as ta
 
 from ..lite.abstract import Abstract
+from ..lite.dataclasses import dataclass_cache_hash
 
 
 _NoneType = types.NoneType  # type: ignore
@@ -51,6 +48,7 @@ if not isinstance(_Protocol, type) or not issubclass(_Protocol, _Generic):
 ##
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class _Special:
     name: str
@@ -68,6 +66,7 @@ class _Special:
         )
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class _LazySpecial:
     name: str
@@ -297,6 +296,7 @@ TYPES: tuple[type, ...] = (
 ##
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class Union(TypeInfo):
     args: frozenset[Type]
@@ -320,6 +320,7 @@ class Union(TypeInfo):
 GenericLikeCls = ta.TypeVar('GenericLikeCls')
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class GenericLike(TypeInfo, Abstract, ta.Generic[GenericLikeCls]):
     cls: GenericLikeCls
@@ -363,6 +364,7 @@ class Protocol(GenericLike[ta.Any]):
 #
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class NewType(TypeInfo):
     obj: ta.Any
@@ -372,6 +374,7 @@ class NewType(TypeInfo):
 #
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class Annotated(TypeInfo):
     ty: Type
@@ -383,6 +386,7 @@ class Annotated(TypeInfo):
 #
 
 
+@dataclass_cache_hash()
 @dc.dataclass(frozen=True)
 class Literal(TypeInfo):
     args: tuple[ta.Any, ...]
@@ -417,6 +421,15 @@ _TRIVIAL_TYPES: set[ta.Any] = {
 }
 
 
+# TODO: speed up is_type: `if obj.__class__ in _NOT_SUBCLASSED_SPECIAL_TYPES: return True`
+# _NOT_SUBCLASSED_SPECIAL_TYPES: set[type] = {
+#     type(ta.Any),
+#     _UnionGenericAlias,
+#     ta.NewType,
+# }
+# TODO: static_init(for t in _NOT_SUBCLASSED_SPECIAL_TYPES: if (sts := t.__subclasses__()): raise TypeError)
+
+
 class Reflector:
     def __init__(
             self,

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/sockets/addresses.py

@@ -9,7 +9,7 @@ import socket as socket_
 import typing as ta
 
 
-SocketAddress = ta.Any
+SocketAddress = ta.Any  # ta.TypeAlias
 
 
 ##

omlish-0.0.0.dev436/omlish/sql/__init__.py

@@ -0,0 +1,24 @@
+# ruff: noqa: I001
+from .. import lang as _lang
+
+
+with _lang.auto_proxy_init(globals()):
+    ##
+
+    from . import api  # noqa
+
+    from .dbs import (  # noqa
+        DbLoc,
+        DbSpec,
+        DbType,
+        DbTypes,
+        HostDbLoc,
+        UrlDbLoc,
+    )
+
+    from .qualifiedname import (  # noqa
+        QualifiedName,
+        qn,
+    )
+
+    from . import queries  # noqa

{omlish-0.0.0.dev434 → omlish-0.0.0.dev436}/omlish/sql/queries/params.py

@@ -16,7 +16,7 @@ class Param(lang.Final):
         if self.n is not None:
             return f'{self.__class__.__name__}({self.n!r})'
         else:
-            return f'{self.__class__.__name__}(@{hex(id(self))[2:]})'
+            return f'{self.__class__.__name__}(@{id(self):x})'
 
     def __eq__(self, other):
         if not isinstance(other, Param):