omlish 0.0.0.dev416__py3-none-any.whl → 0.0.0.dev418__py3-none-any.whl

omlish/marshal/polymorphism/metadata.py

@@ -2,7 +2,7 @@ import dataclasses as dc
 import typing as ta
 
 from ... import lang
-from ..base.registries import RegistryItem
+from ..base.configs import Config
 from ..naming import Naming
 from ..naming import translate_name
 
@@ -10,7 +10,7 @@ from ..naming import translate_name
 ##
 
 
-class TypeTagging(RegistryItem, lang.Abstract, lang.Sealed):
+class TypeTagging(Config, lang.Abstract, lang.Sealed):
     pass
 
 

omlish/marshal/standard.py

@@ -1,3 +1,9 @@
+"""
+FIXME:
+ - this is gross and temporary
+  - move to global registry somehow
+"""
+import threading
 import typing as ta
 
 from .base.types import MarshalerFactory
@@ -16,6 +22,10 @@ from .composite.optionals import OptionalMarshalerFactory
 from .composite.optionals import OptionalUnmarshalerFactory
 from .composite.special import SequenceNotStrMarshalerFactory
 from .composite.special import SequenceNotStrUnmarshalerFactory
+from .factories.invalidate import InvalidatableMarshalerFactory
+from .factories.invalidate import InvalidatableUnmarshalerFactory
+from .factories.moduleimport.factories import ModuleImportingMarshalerFactory
+from .factories.moduleimport.factories import ModuleImportingUnmarshalerFactory
 from .factories.multi import MultiMarshalerFactory
 from .factories.multi import MultiUnmarshalerFactory
 from .factories.recursive import RecursiveMarshalerFactory
@@ -45,24 +55,53 @@ from .trivial.any import ANY_UNMARSHALER_FACTORY
 ##
 
 
-STANDARD_MARSHALER_FACTORIES: list[MarshalerFactory] = [
-    PRIMITIVE_MARSHALER_FACTORY,
-    NewtypeMarshalerFactory(),
-    OptionalMarshalerFactory(),
-    PrimitiveUnionMarshalerFactory(),
-    DataclassMarshalerFactory(),
-    NamedtupleMarshalerFactory(),
-    EnumMarshalerFactory(),
-    LiteralMarshalerFactory(),
-    NUMBERS_MARSHALER_FACTORY,
-    UUID_MARSHALER_FACTORY,
-    DATETIME_MARSHALER_FACTORY,
-    MaybeMarshalerFactory(),
-    MappingMarshalerFactory(),
-    SequenceNotStrMarshalerFactory(),
-    IterableMarshalerFactory(),
-    ANY_MARSHALER_FACTORY,
-]
+class StandardFactories(ta.NamedTuple):
+    marshaler_factories: ta.Sequence[MarshalerFactory]
+    unmarshaler_factories: ta.Sequence[UnmarshalerFactory]
+
+
+DEFAULT_STANDARD_FACTORIES = StandardFactories(
+    (
+        PRIMITIVE_MARSHALER_FACTORY,
+        NewtypeMarshalerFactory(),
+        OptionalMarshalerFactory(),
+        PrimitiveUnionMarshalerFactory(),
+        DataclassMarshalerFactory(),
+        NamedtupleMarshalerFactory(),
+        EnumMarshalerFactory(),
+        LiteralMarshalerFactory(),
+        NUMBERS_MARSHALER_FACTORY,
+        UUID_MARSHALER_FACTORY,
+        DATETIME_MARSHALER_FACTORY,
+        MaybeMarshalerFactory(),
+        MappingMarshalerFactory(),
+        SequenceNotStrMarshalerFactory(),
+        IterableMarshalerFactory(),
+        ANY_MARSHALER_FACTORY,
+    ),
+
+    (
+        PRIMITIVE_UNMARSHALER_FACTORY,
+        NewtypeUnmarshalerFactory(),
+        OptionalUnmarshalerFactory(),
+        PrimitiveUnionUnmarshalerFactory(),
+        DataclassUnmarshalerFactory(),
+        NamedtupleUnmarshalerFactory(),
+        EnumUnmarshalerFactory(),
+        LiteralUnmarshalerFactory(),
+        NUMBERS_UNMARSHALER_FACTORY,
+        UUID_UNMARSHALER_FACTORY,
+        DATETIME_UNMARSHALER_FACTORY,
+        MaybeUnmarshalerFactory(),
+        MappingUnmarshalerFactory(),
+        SequenceNotStrUnmarshalerFactory(),
+        IterableUnmarshalerFactory(),
+        ANY_UNMARSHALER_FACTORY,
+    ),
+)
+
+
+##
 
 
 def new_standard_marshaler_factory(
@@ -70,38 +109,32 @@ def new_standard_marshaler_factory(
         first: ta.Iterable[MarshalerFactory] | None = None,
         last: ta.Iterable[MarshalerFactory] | None = None,
 ) -> MarshalerFactory:
-    return TypeCacheMarshalerFactory(
-        RecursiveMarshalerFactory(
-            MultiMarshalerFactory([
-                *(first if first is not None else []),
-                *STANDARD_MARSHALER_FACTORIES,
-                *(last if last is not None else []),
-            ]),
-        ),
-    )
+    gl: ta.Any = None
 
+    def fi_fn():
+        nonlocal gl
+        gl = DEFAULT_STANDARD_FACTORIES
 
-##
+        fi: MarshalerFactory = MultiMarshalerFactory([
+            *(first if first is not None else []),
+            *gl.marshaler_factories,
+            *(last if last is not None else []),
+        ])
+
+        fi = RecursiveMarshalerFactory(fi)
+
+        fi = TypeCacheMarshalerFactory(fi)
 
+        return fi
 
-STANDARD_UNMARSHALER_FACTORIES: list[UnmarshalerFactory] = [
-    PRIMITIVE_UNMARSHALER_FACTORY,
-    NewtypeUnmarshalerFactory(),
-    OptionalUnmarshalerFactory(),
-    PrimitiveUnionUnmarshalerFactory(),
-    DataclassUnmarshalerFactory(),
-    NamedtupleUnmarshalerFactory(),
-    EnumUnmarshalerFactory(),
-    LiteralUnmarshalerFactory(),
-    NUMBERS_UNMARSHALER_FACTORY,
-    UUID_UNMARSHALER_FACTORY,
-    DATETIME_UNMARSHALER_FACTORY,
-    MaybeUnmarshalerFactory(),
-    MappingUnmarshalerFactory(),
-    SequenceNotStrUnmarshalerFactory(),
-    IterableUnmarshalerFactory(),
-    ANY_UNMARSHALER_FACTORY,
-]
+    fo: MarshalerFactory = (iv := InvalidatableMarshalerFactory(
+        fi_fn,
+        lambda: DEFAULT_STANDARD_FACTORIES is not gl,
+    ))
+
+    fo = ModuleImportingMarshalerFactory(fo, iv.invalidate)
+
+    return fo
 
 
 def new_standard_unmarshaler_factory(
@@ -109,33 +142,67 @@ def new_standard_unmarshaler_factory(
         first: ta.Iterable[UnmarshalerFactory] | None = None,
         last: ta.Iterable[UnmarshalerFactory] | None = None,
 ) -> UnmarshalerFactory:
-    return TypeCacheUnmarshalerFactory(
-        RecursiveUnmarshalerFactory(
-            MultiUnmarshalerFactory([
-                *(first if first is not None else []),
-                *STANDARD_UNMARSHALER_FACTORIES,
-                *(last if last is not None else []),
-            ]),
-        ),
-    )
+    gl: ta.Any = None
+
+    def fi_fn():
+        nonlocal gl
+        gl = DEFAULT_STANDARD_FACTORIES
+
+        fi: UnmarshalerFactory = MultiUnmarshalerFactory([
+            *(first if first is not None else []),
+            *gl.unmarshaler_factories,
+            *(last if last is not None else []),
+        ])
+
+        fi = RecursiveUnmarshalerFactory(fi)
+
+        fi = TypeCacheUnmarshalerFactory(fi)
+
+        return fi
+
+    fo: UnmarshalerFactory = (iv := InvalidatableUnmarshalerFactory(
+        fi_fn,
+        lambda: DEFAULT_STANDARD_FACTORIES is not gl,
+    ))
+
+    fo = ModuleImportingUnmarshalerFactory(fo, iv.invalidate)
+
+    return fo
 
 
 ##
 
 
+_GLOBAL_LOCK = threading.RLock()
+
+
 def install_standard_factories(
         *factories: MarshalerFactory | UnmarshalerFactory,
 ) -> None:
-    for f in factories:
-        k = False
+    with _GLOBAL_LOCK:
+        global DEFAULT_STANDARD_FACTORIES
+
+        m_lst: list[MarshalerFactory] = list(DEFAULT_STANDARD_FACTORIES.marshaler_factories)
+        u_lst: list[UnmarshalerFactory] = list(DEFAULT_STANDARD_FACTORIES.unmarshaler_factories)
+
+        for f in factories:
+            k = False
+
+            if isinstance(f, MarshalerFactory):
+                m_lst[0:0] = [f]
+                k = True
+
+            if isinstance(f, UnmarshalerFactory):
+                u_lst[0:0] = [f]
+                k = True
 
-        if isinstance(f, MarshalerFactory):
-            STANDARD_MARSHALER_FACTORIES[0:0] = [f]
-            k = True
+            if not k:
+                raise TypeError(f)
 
-        if isinstance(f, UnmarshalerFactory):
-            STANDARD_UNMARSHALER_FACTORIES[0:0] = [f]
-            k = True
+        new = StandardFactories(
+            tuple(m_lst),
+            tuple(u_lst),
+        )
 
-        if not k:
-            raise TypeError(f)
+        if new != DEFAULT_STANDARD_FACTORIES:
+            DEFAULT_STANDARD_FACTORIES = new

omlish/secrets/all.py

@@ -16,12 +16,3 @@ from .secrets import (  # noqa
 )
 
 ref = SecretRef
-
-
-##
-
-
-from .. import lang as _lang  # noqa
-
-# FIXME: only happens when 'all' is imported lol
-_lang.register_conditional_import('..marshal', '.marshal', __package__)

omlish/secrets/secrets.py

@@ -20,6 +20,10 @@ import typing as ta
 
 from .. import dataclasses as dc
 from .. import lang
+from .. import marshal as msh
+
+
+msh.register_global_module_import('.marshal', __package__)
 
 
 log = logging.getLogger(__name__)
@@ -341,9 +345,3 @@ class EnvVarSecrets(Secrets):
             return dct.pop(ekey)
         else:
             return dct[ekey]
-
-
-##
-
-
-lang.register_conditional_import('..marshal', '.marshal', __package__)

omlish/specs/jsonrpc/__init__.py

@@ -36,6 +36,6 @@ from .types import (  # noqa
 ##
 
 
-from ... import lang as _lang
+from ... import marshal as _msh
 
-_lang.register_conditional_import('...marshal', '.marshal', __package__)
+_msh.register_global_module_import('._marshal', __package__)

omlish/specs/jsonschema/__init__.py

@@ -69,6 +69,6 @@ from .types import (  # noqa
 ##
 
 
-from ... import lang as _lang
+from ... import marshal as _msh
 
-_lang.register_conditional_import('...marshal', '.marshal', __package__)
+_msh.register_global_module_import('._marshal', __package__)

omlish/specs/openapi/__init__.py

@@ -6,6 +6,6 @@ from .openapi import (  # noqa
 ##
 
 
-from ... import lang as _lang
+from ... import marshal as _msh
 
-_lang.register_conditional_import('...marshal', '.marshal', __package__)
+_msh.register_global_module_import('._marshal', __package__)

omlish/sql/queries/__init__.py

@@ -112,8 +112,10 @@ Q = StdBuilder()
 ##
 
 
-from ... import lang as _lang  # noqa
+from ... import marshal as _msh  # noqa
+
+_msh.register_global_module_import('._marshal', __package__)
 
-_lang.register_conditional_import('...marshal', '.marshal', __package__)
+from ... import lang as _lang  # noqa
 
 _lang.trigger_conditional_imports(__package__)

omlish/sql/tabledefs/__init__.py

@@ -6,6 +6,6 @@ from .tabledefs import (  # noqa
 ##
 
 
-from ... import lang as _lang
+from ... import marshal as _msh
 
-_lang.register_conditional_import('...marshal', '.marshal', __package__)
+_msh.register_global_module_import('._marshal', __package__)

omlish/text/templating.py

@@ -9,16 +9,18 @@ import string
 import typing as ta
 
 from .. import lang
-from .minja import MinjaTemplate
-from .minja import MinjaTemplateParam
-from .minja import compile_minja_template
 
 
 if ta.TYPE_CHECKING:
     import jinja2
+
+    from . import minja
+
 else:
     jinja2 = lang.proxy_import('jinja2')
 
+    minja = lang.proxy_import('.minja', __package__)
+
 
 ##
 
@@ -97,7 +99,7 @@ pep292_templater = Pep292Templater.from_string
 
 @dc.dataclass(frozen=True)
 class MinjaTemplater(Templater):
-    tmpl: MinjaTemplate
+    tmpl: 'minja.MinjaTemplate'
 
     ENV_IDENT: ta.ClassVar[str] = 'env'
 
@@ -110,12 +112,12 @@ class MinjaTemplater(Templater):
             src: str,
             **ns: ta.Any,
     ) -> 'MinjaTemplater':
-        tmpl = compile_minja_template(
+        tmpl = minja.compile_minja_template(
             src,
             [
-                MinjaTemplateParam(cls.ENV_IDENT),
+                minja.MinjaTemplateParam(cls.ENV_IDENT),
                 *[
-                    MinjaTemplateParam.new(k, v)
+                    minja.MinjaTemplateParam.new(k, v)
                     for k, v in ns.items()
                 ],
             ],

omlish/typedvalues/__init__.py

@@ -1,54 +1,61 @@
-from .accessor import (  # noqa
-    TypedValuesAccessor,
-)
+from .. import lang as _lang
+
+
+with _lang.auto_proxy_init(globals()) as _api_cap:
+    ##
 
-from .collection import (  # noqa
-    DuplicateUniqueTypedValueError,
+    from .accessor import (  # noqa
+        TypedValuesAccessor,
+    )
 
-    TypedValues,
+    from .collection import (  # noqa
+        DuplicateUniqueTypedValueError,
 
-    collect,
-    as_collection,
-)
+        TypedValues,
 
-from .consumer import (  # noqa
-    UnconsumedTypedValuesError,
+        collect,
+        as_collection,
+    )
 
-    TypedValuesConsumer,
+    from .consumer import (  # noqa
+        UnconsumedTypedValuesError,
 
-    consume,
-)
+        TypedValuesConsumer,
 
-from .generic import (  # noqa
-    TypedValueGeneric,
-)
+        consume,
+    )
 
-from .holder import (  # noqa
-    TypedValueHolder,
-)
+    from .generic import (  # noqa
+        TypedValueGeneric,
+    )
 
-from .of_ import (  # noqa
-    of,
-)
+    from .holder import (  # noqa
+        TypedValueHolder,
+    )
 
-from .reflect import (  # noqa
-    reflect_typed_values_impls,
-)
+    from .of_ import (  # noqa
+        of,
+    )
 
-from .values import (  # noqa
-    TypedValue,
+    from .reflect import (  # noqa
+        reflect_typed_values_impls,
+    )
 
-    UniqueTypedValue,
+    from .values import (  # noqa
+        TypedValue,
 
-    ScalarTypedValue,
+        UniqueTypedValue,
 
-    UniqueScalarTypedValue,
-)
+        ScalarTypedValue,
+
+        UniqueScalarTypedValue,
+    )
 
 
 ##
 
 
-from .. import lang as _lang
+from .. import marshal as _msh
+
 
-_lang.register_conditional_import('..marshal', '.marshal', __package__)
+_msh.register_global_module_import('.marshal', __package__)

{omlish-0.0.0.dev416.dist-info → omlish-0.0.0.dev418.dist-info}/METADATA

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