omlish 0.0.0.dev447__py3-none-any.whl → 0.0.0.dev493__py3-none-any.whl

omlish/logs/{standard.py → std/standard.py}

@@ -2,7 +2,6 @@
 # @omlish-lite
 """
 TODO:
- - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -13,9 +12,9 @@ import datetime
 import logging
 import typing as ta
 
-from .std.filters import TidLoggingFilter
-from .std.json import JsonLoggingFormatter
-from .std.proxy import ProxyLoggingHandler
+from .filters import TidLoggingFilter
+from .json import JsonLoggingFormatter
+from .proxy import ProxyLoggingHandler
 
 
 ##

omlish/logs/utils.py

@@ -11,13 +11,13 @@ from .protocols import LoggerLike
 ##
 
 
-def error_logging(log):  # noqa
+def exception_logging(log):  # noqa
     def outer(fn):
         @functools.wraps(fn)
         def inner(*args, **kwargs):
             try:
                 return fn(*args, **kwargs)
-            except Exception:
+            except Exception as e:  # noqa
                 log.exception('Error in %r', fn)
                 raise
 
@@ -26,6 +26,21 @@ def error_logging(log):  # noqa
     return outer
 
 
+def async_exception_logging(alog):  # noqa
+    def outer(fn):
+        @functools.wraps(fn)
+        async def inner(*args, **kwargs):
+            try:
+                return await fn(*args, **kwargs)
+            except Exception as e:  # noqa
+                await alog.exception('Error in %r', fn)
+                raise
+
+        return inner
+
+    return outer
+
+
 ##
 
 

omlish/manifests/loading.py

@@ -13,7 +13,7 @@ TODO:
    scan_root_dirs
   - currently the cli cant subprocess itself and keep manifests working
   - EnvVar cls is already lite
-
+ - can discover_packages deadlock with concurrent / multithreaded imports?
 """
 import dataclasses as dc
 import importlib.machinery
@@ -417,6 +417,7 @@ class ManifestLoader:
     def _read_package_file_text(cls, package_name: str, file_name: str) -> ta.Optional[str]:
         # importlib.resources.files actually imports the package - to avoid this, if possible, the file is read straight
         # off the filesystem.
+        # FIXME: find_spec *still* imports the parent package to get __path__ to feed to _find_spec...
         spec = importlib.util.find_spec(package_name)
         if (
                 spec is not None and

omlish/marshal/__init__.py

@@ -49,11 +49,17 @@ with _lang.auto_proxy_init(globals()):
 
     from .base.configs import (  # noqa
         Config,
+        Configs,
+
         ConfigRegistry,
     )
 
     from .base.contexts import (  # noqa
         BaseContext,
+
+        MarshalFactoryContext,
+        UnmarshalFactoryContext,
+
         MarshalContext,
         UnmarshalContext,
     )
@@ -108,19 +114,35 @@ with _lang.auto_proxy_init(globals()):
         IterableUnmarshaler,
     )
 
+    from .composite.optionals import (  # noqa
+        OptionalMarshaler,
+        OptionalUnmarshaler,
+    )
+
+    from .composite.unions.literals import (  # noqa
+        LITERAL_UNION_TYPES,
+        LiteralUnionMarshaler,
+        LiteralUnionMarshalerFactory,
+        LiteralUnionUnmarshaler,
+        LiteralUnionUnmarshalerFactory,
+    )
+
+    from .composite.unions.primitives import (  # noqa
+        PRIMITIVE_UNION_TYPES,
+        PrimitiveUnionMarshaler,
+        PrimitiveUnionMarshalerFactory,
+        PrimitiveUnionUnmarshaler,
+        PrimitiveUnionUnmarshalerFactory,
+    )
+
     from .composite.wrapped import (  # noqa
         WrappedMarshaler,
         WrappedUnmarshaler,
     )
 
-    from .factories.simple import (  # noqa
-        SimpleMarshalerFactory,
-        SimpleUnmarshalerFactory,
-    )
-
-    from .factories.match import (  # noqa
-        MarshalerFactoryMatchClass,
-        UnmarshalerFactoryMatchClass,
+    from .factories.method import (  # noqa
+        MarshalerFactoryMethodClass,
+        UnmarshalerFactoryMethodClass,
     )
 
     from .factories.moduleimport.configs import (  # noqa
@@ -192,6 +214,7 @@ with _lang.auto_proxy_init(globals()):
     )
 
     from .polymorphism.metadata import (  # noqa
+        AutoStripSuffix,
         FieldTypeTagging,
         Impl,
         Impls,
@@ -207,13 +230,8 @@ with _lang.auto_proxy_init(globals()):
     )
 
     from .polymorphism.unions import (  # noqa
-        PRIMITIVE_UNION_TYPES,
         PolymorphismUnionMarshalerFactory,
         PolymorphismUnionUnmarshalerFactory,
-        PrimitiveUnionMarshaler,
-        PrimitiveUnionMarshalerFactory,
-        PrimitiveUnionUnmarshaler,
-        PrimitiveUnionUnmarshalerFactory,
     )
 
     from .polymorphism.unmarshal import (  # noqa
@@ -225,6 +243,7 @@ with _lang.auto_proxy_init(globals()):
     from .singular.base64 import (  # noqa
         BASE64_MARSHALER_FACTORY,
         BASE64_UNMARSHALER_FACTORY,
+        Base64MarshalerUnmarshaler,
     )
 
     from .singular.primitives import (  # noqa
@@ -233,6 +252,7 @@ with _lang.auto_proxy_init(globals()):
 
     from .trivial.forbidden import (  # noqa
         ForbiddenTypeMarshalerFactory,
+        ForbiddenTypeMarshalerFactoryUnmarshalerFactory,
         ForbiddenTypeUnmarshalerFactory,
     )