omlish 0.0.0.dev304__tar.gz → 0.0.0.dev305__tar.gz

{omlish-0.0.0.dev304/omlish.egg-info → omlish-0.0.0.dev305}/PKG-INFO

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

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev304'
-__revision__ = '0ecc67df99993947b491b2d6d6163fd00b00202e'
+__version__ = '0.0.0.dev305'
+__revision__ = '13f1bfc223e6af63310421aa4ac6133b3f1e0110'
 
 
 #

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/dataclasses/__init__.py

@@ -60,6 +60,7 @@ from .api import (  # noqa
     extra_field_params,
     set_field_metadata,
     update_extra_field_params,
+    with_extra_field_params,
 )
 
 from .errors import (  # noqa
@@ -108,6 +109,10 @@ from .tools.modifiers import (  # noqa
     update_fields,
 )
 
+from .tools.only_ import (  # noqa
+    only,
+)
+
 from .tools.replace import (  # noqa
     deep_replace,
 )

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/dataclasses/api/__init__.py

@@ -18,6 +18,7 @@ from .fields.metadata import (  # noqa
     extra_field_params,
     set_field_metadata,
     update_extra_field_params,
+    with_extra_field_params,
 )
 
 from .fields.constructor import (  # noqa

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/dataclasses/api/fields/metadata.py

@@ -5,6 +5,7 @@ from .... import check
 from .... import lang
 from ...debug import DEBUG
 from ...specs import FieldSpec
+from ...tools.modifiers import field_modifier
 from ...utils import chain_mapping_proxy
 
 
@@ -92,3 +93,10 @@ def update_extra_field_params(
             **(fe if unless_non_default else {}),
         },
     })
+
+
+def with_extra_field_params(**kwargs: ta.Any) -> field_modifier:
+    @field_modifier
+    def inner(f: dc.Field) -> dc.Field:
+        return update_extra_field_params(f, **kwargs)
+    return inner

omlish-0.0.0.dev305/omlish/dataclasses/tools/only_.py

@@ -0,0 +1,45 @@
+import collections.abc
+import typing as ta
+
+from .iter import fields_dict
+
+
+##
+
+
+def _only_test(v: ta.Any) -> bool:
+    if v is None:
+        return False
+    elif isinstance(v, collections.abc.Iterable):
+        return bool(v)
+    else:
+        return True
+
+
+def only(
+        obj: ta.Any,
+        *flds: str,
+        all: bool = False,  # noqa
+        test: ta.Callable[[ta.Any], bool] = _only_test,
+) -> bool:
+    fdct = fields_dict(obj)
+    for fn in flds:
+        if fn not in fdct:
+            raise KeyError(fn)
+
+    rem = set(flds)
+    for fn, f in fdct.items():
+        if not f.compare and fn not in rem:
+            continue
+
+        v = getattr(obj, fn)
+        if test(v):
+            if fn in rem:
+                rem.remove(fn)
+            else:
+                return False
+
+    if rem and all:
+        return False
+
+    return True

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/diag/_pycharm/runhack.py

@@ -24,7 +24,10 @@ DEBUG_ENV_VAR = 'OMLISH_PYCHARM_RUNHACK_DEBUG'
 
 #
 
-_DEFAULT_PTH_FILE_NAME = 'omlish-pycharm-runhack.pth'
+# This hack must run first, before things like '__editable__.foo.pth' files installed by setuptools. pth file processing
+# is sorted by name, so prepend with underscores:
+#   https://github.com/python/cpython/blob/aeb3a6f61af53ed3fbf31f0b3704f49b71ac553c/Lib/site.py#L246
+_DEFAULT_PTH_FILE_NAME = '___omlish-pycharm-runhack.pth'
 
 _DEFAULT_DEBUG = False
 _DEFAULT_ENABLED = True

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/graphs/trees.py

@@ -19,6 +19,9 @@ NodeWalker = ta.Callable[[NodeT], ta.Iterable[NodeT]]
 NodeGenerator = ta.Generator[NodeT, None, None]
 
 
+##
+
+
 class NodeError(ta.Generic[NodeT], Exception):
     def __init__(self, node: NodeT, msg: str, *args, **kwargs) -> None:
         super().__init__(msg, *args, **kwargs)  # noqa
@@ -39,6 +42,9 @@ class UnknownNodeError(NodeError[NodeT]):
         super().__init__(node, f'Unknown node: {node!r}', *args, **kwargs)
 
 
+#
+
+
 class BasicTreeAnalysis(ta.Generic[NodeT]):
     def __init__(
             self,

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/lang/__init__.py

@@ -231,6 +231,7 @@ from .maybes import (  # noqa
 )
 
 from .objects import (  # noqa
+    Identity,
     SimpleProxy,
     anon_object,
     arg_repr,
@@ -269,6 +270,12 @@ from .params import (  # noqa
     param_render,
 )
 
+from .recursion import (  # noqa
+    LimitedRecursionError,
+    recursion_limiting,
+    recursion_limiting_context,
+)
+
 from .resolving import (  # noqa
     Resolvable,
     ResolvableClassNameError,

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/lang/cached/function.py

@@ -15,6 +15,8 @@ TODO:
    - and must be transient?
  - use __transient_dict__ to support common state nuking
  - use __set_name__ ?
+ - on_compute
+ - max_recursion?
 """
 import dataclasses as dc
 import functools
@@ -201,6 +203,9 @@ class _CachedFunction(ta.Generic[T], Abstract):
         except KeyError:
             pass
 
+        def call_value_fn():
+            return self._value_fn(*args, **kwargs)
+
         if self._lock is not None:
             with self._lock:
                 try:
@@ -208,10 +213,10 @@ class _CachedFunction(ta.Generic[T], Abstract):
                 except KeyError:
                     pass
 
-                value = self._value_fn(*args, **kwargs)
+                value = call_value_fn()
 
         else:
-            value = self._value_fn(*args, **kwargs)
+            value = call_value_fn()
 
         self._values[k] = value
         return value

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/lang/objects.py

@@ -222,3 +222,31 @@ class _AnonObject:
 
 def anon_object(**attrs: ta.Any) -> ta.Any:
     return _AnonObject(**attrs)
+
+
+##
+
+
+class Identity(ta.Generic[T]):
+    def __init__(self, obj: T) -> None:
+        super().__init__()
+
+        self._obj = obj
+
+    def __bool__(self):
+        raise TypeError
+
+    @property
+    def obj(self) -> T:
+        return self._obj
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self._obj!r})'
+
+    def __hash__(self) -> int:
+        return id(self._obj)
+
+    def __eq__(self, other):
+        if type(other) is not type(self):
+            return NotImplemented
+        return self._obj is other._obj  # noqa

omlish-0.0.0.dev305/omlish/lang/recursion.py

@@ -0,0 +1,109 @@
+import contextlib
+import dataclasses as dc
+import functools
+import threading
+import typing as ta
+
+
+T = ta.TypeVar('T')
+P = ta.ParamSpec('P')
+
+
+##
+
+
+_LOCK = threading.RLock()
+
+_LOCAL: threading.local
+
+
+def _local() -> threading.local:
+    global _LOCAL
+
+    try:
+        return _LOCAL
+    except NameError:
+        pass
+
+    with _LOCK:
+        try:
+            return _LOCAL
+        except NameError:
+            pass
+
+        _LOCAL = threading.local()
+        return _LOCAL
+
+
+def _depth_map() -> dict[ta.Any, int]:
+    lo = _local()
+    try:
+        return lo.depth_map
+    except AttributeError:
+        dm = lo.depth_map = {}
+        return dm
+
+
+##
+
+
+@dc.dataclass()
+class LimitedRecursionError(RecursionError):
+    key: ta.Any
+    depth: int
+
+
+@contextlib.contextmanager
+def recursion_limiting_context(key: ta.Any, limit: int | None) -> ta.Iterator[int | None]:
+    if limit is None:
+        yield None
+        return
+
+    dm = _depth_map()
+
+    try:
+        pd: int | None = dm[key]
+    except KeyError:
+        pd = None
+    else:
+        if not isinstance(pd, int) and pd > 0:  # type: ignore[operator]
+            raise RuntimeError
+
+    if pd is not None and pd >= limit:
+        raise LimitedRecursionError(key, pd)
+
+    nd = (pd or 0) + 1
+    dm[key] = nd
+
+    try:
+        yield nd
+
+    finally:
+        if dm.get(key) != nd:
+            raise RuntimeError
+
+        if pd is not None:
+            dm[key] = pd
+        else:
+            del dm[key]
+
+
+##
+
+
+def recursion_limiting(limit: int | None) -> ta.Callable[[ta.Callable[P, T]], ta.Callable[P, T]]:
+    def outer(fn):
+        if not callable(fn):
+            raise TypeError(fn)
+
+        if limit is None:
+            return fn
+
+        @functools.wraps(fn)
+        def inner(*args, **kwargs):
+            with recursion_limiting_context(fn, limit):
+                return fn(*args, **kwargs)
+
+        return inner
+
+    return outer

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/marshal/__init__.py

@@ -82,9 +82,9 @@ from .objects.dataclasses import (  # noqa
 )
 
 from .objects.helpers import (  # noqa
-    update_field_metadata,
     update_fields_metadata,
     update_object_metadata,
+    with_field_metadata,
 )
 
 from .objects.marshal import (  # noqa

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/marshal/objects/helpers.py

@@ -11,7 +11,7 @@ T = ta.TypeVar('T')
 ##
 
 
-def update_field_metadata(**kwargs: ta.Any) -> dc.field_modifier:
+def with_field_metadata(**kwargs: ta.Any) -> dc.field_modifier:
     @dc.field_modifier
     def inner(f: dc.Field) -> dc.Field:
         return dc.set_field_metadata(f, {

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/api/__init__.py

@@ -35,9 +35,16 @@ from .errors import (  # noqa
 )
 
 from .funcs import (  # noqa
+    exec,  # noqa
+
     query,
     query_all,
-    exec,  # noqa
+    query_first,
+    query_opt_first,
+    query_one,
+    query_opt_one,
+    query_scalar,
+    query_maybe_scalar,
 )
 
 from .queries import (  # noqa

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/api/base.py

@@ -30,7 +30,7 @@ class Querier(ContextCloser, lang.Abstract):
 ##
 
 
-class Rows(ContextCloser, lang.Abstract):
+class Rows(ContextCloser, ta.Iterator[Row], lang.Abstract):
     @property
     @abc.abstractmethod
     def columns(self) -> Columns:

omlish-0.0.0.dev305/omlish/sql/api/funcs.py

@@ -0,0 +1,115 @@
+import typing as ta
+
+from ... import check
+from ... import lang
+from .asquery import as_query
+from .base import Querier
+from .base import Rows
+from .queries import QueryMode
+from .rows import Row
+
+
+##
+
+
+def exec(  # noqa
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> None:
+    q = as_query(
+        obj,
+        *args,
+        mode=QueryMode.EXEC,
+        querier=querier,
+    )
+
+    with querier.query(q):
+        pass
+
+
+##
+
+
+def query(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> Rows:
+    q = as_query(
+        obj,
+        *args,
+        mode=QueryMode.QUERY,
+        querier=querier,
+    )
+
+    return querier.query(q)
+
+
+#
+
+
+def query_all(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> list[Row]:
+    with query(querier, obj, *args) as rows:
+        return list(rows)
+
+
+def query_first(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> Row:
+    with query(querier, obj, *args) as rows:
+        return next(rows)
+
+
+def query_opt_first(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> Row | None:
+    with query(querier, obj, *args) as rows:
+        return next(rows, None)
+
+
+def query_one(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> Row:
+    with query(querier, obj, *args) as rows:
+        return check.single(rows)
+
+
+def query_opt_one(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> Row | None:
+    with query(querier, obj, *args) as rows:
+        return check.opt_single(rows)
+
+
+def query_scalar(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> ta.Any:
+    row = query_one(querier, obj, *args)
+    return check.single(row.values)
+
+
+def query_maybe_scalar(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> lang.Maybe[ta.Any]:
+    row = query_opt_one(querier, obj, *args)
+    if row is not None:
+        return lang.just(check.single(row.values))
+    else:
+        return lang.empty()

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/qualifiedname.py

@@ -1,23 +1,31 @@
 import collections.abc
-import dataclasses as dc
 import typing as ta
 
+from .. import dataclasses as dc
+from .. import lang
+
 
 ##
 
 
+def coerce_parts(parts: ta.Sequence[str]) -> tuple[str, ...]:
+    if not parts:
+        raise ValueError
+    if isinstance(parts, str):
+        raise TypeError(parts)
+    if not isinstance(parts, tuple):
+        parts = tuple(parts)
+    if not all(parts) and all(isinstance(p, str) for p in parts):
+        raise ValueError(parts)
+    return parts
+
+
+#
+
+
 @dc.dataclass(frozen=True)
-class QualifiedName(ta.Sequence[str]):
-    parts: ta.Sequence[str]
-
-    def __post_init__(self) -> None:
-        if not (
-                self.parts and
-                not isinstance(self.parts, str) and
-                all(self.parts) and
-                all(isinstance(p, str) for p in self.parts)
-        ):
-            raise ValueError(self)
+class QualifiedName(ta.Sequence[str], lang.Final):
+    parts: ta.Sequence[str] = dc.field() | dc.with_extra_field_params(coerce=coerce_parts)
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}([{", ".join(map(repr, self.parts))}])'

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/queries/__init__.py

@@ -1,5 +1,6 @@
 from .base import (  # noqa
     Builder,
+    HasQn,
     Node,
     NodeComparisonTypeError,
     Value,
@@ -56,6 +57,8 @@ from .params import (  # noqa
 from .relations import (  # noqa
     CanRelation,
     CanTable,
+    Join,
+    JoinKind,
     Relation,
     RelationBuilder,
     Table,

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/queries/base.py

@@ -1,8 +1,10 @@
+import abc
 import types
 import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
+from ..qualifiedname import QualifiedName
 
 
 ##
@@ -45,6 +47,10 @@ class Node(
     def __ne__(self, other) -> ta.NoReturn:
         raise NodeComparisonTypeError(type(self))
 
+    @ta.final
+    def __bool__(self) -> ta.NoReturn:
+        raise TypeError
+
     #
 
     @dc.dataclass(frozen=True)
@@ -130,3 +136,13 @@ class Node(
 
 class Builder(lang.Abstract):
     pass
+
+
+##
+
+
+class HasQn(lang.Abstract):
+    @property
+    @abc.abstractmethod
+    def qn(self) -> QualifiedName:
+        raise NotImplementedError

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/queries/idents.py

@@ -1,9 +1,16 @@
+"""
+TODO:
+ - clamp down on as_ident / CanIdent - no strs allowed
+"""
 import abc
 import functools
 import typing as ta
 
+from ... import cached
 from ... import lang
+from ..qualifiedname import QualifiedName
 from .base import Builder
+from .base import HasQn
 from .base import Node
 
 
@@ -17,9 +24,13 @@ class IdentLike(abc.ABC):  # noqa
 ##
 
 
-class Ident(Node, IdentLike, lang.Final):
+class Ident(Node, IdentLike, HasQn, lang.Final):
     s: str
 
+    @cached.property
+    def qn(self) -> QualifiedName:
+        return QualifiedName((self.s,))
+
 
 ##
 

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/queries/names.py

@@ -2,9 +2,12 @@ import abc
 import functools
 import typing as ta
 
+from ... import cached
 from ... import check
 from ... import dataclasses as dc
 from ... import lang
+from ..qualifiedname import QualifiedName
+from .base import HasQn
 from .base import Node
 from .idents import CanIdent
 from .idents import Ident
@@ -27,9 +30,13 @@ def _coerce_name_parts(o: ta.Iterable[Ident]) -> ta.Sequence[Ident]:
     return check.not_empty(tuple(check.isinstance(e, Ident) for e in o))
 
 
-class Name(Node, NameLike, lang.Final):
+class Name(Node, NameLike, HasQn, lang.Final):
     ps: ta.Sequence[Ident] = dc.xfield(coerce=_coerce_name_parts)
 
+    @cached.property
+    def qn(self) -> QualifiedName:
+        return QualifiedName(tuple(p.s for p in self.ps))
+
 
 ##
 

{omlish-0.0.0.dev304 → omlish-0.0.0.dev305}/omlish/sql/queries/relations.py

@@ -39,11 +39,8 @@ class JoinKind(enum.Enum):
     DEFAULT = enum.auto()
     INNER = enum.auto()
     LEFT = enum.auto()
-    LEFT_OUTER = enum.auto()
     RIGHT = enum.auto()
-    RIGHT_OUTER = enum.auto()
     FULL = enum.auto()
-    FULL_OUTER = enum.auto()
     CROSS = enum.auto()
     NATURAL = enum.auto()
 
@@ -95,21 +92,12 @@ class RelationBuilder(MultiBuilder):
     def left_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
         return self.join(JoinKind.LEFT, l, r, *cs)
 
-    def left_outer_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
-        return self.join(JoinKind.LEFT_OUTER, l, r, *cs)
-
     def right_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
         return self.join(JoinKind.RIGHT, l, r, *cs)
 
-    def right_outer_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
-        return self.join(JoinKind.RIGHT_OUTER, l, r, *cs)
-
     def full_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
         return self.join(JoinKind.FULL, l, r, *cs)
 
-    def full_outer_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
-        return self.join(JoinKind.FULL_OUTER, l, r, *cs)
-
     def cross_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
         return self.join(JoinKind.CROSS, l, r, *cs)