omlish 0.0.0.dev469__py3-none-any.whl → 0.0.0.dev471__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev469'
-__revision__ = 'efea836fe350fa24e6b724d30d414b2d87ee1341'
+__version__ = '0.0.0.dev471'
+__revision__ = '2a1fe39e9894efdf0e28923ddd0067f441d9d964'
 
 
 #

omlish/http/all.py

@@ -7,16 +7,15 @@ with _lang.auto_proxy_init(globals()):
     from .clients.asyncs import (  # noqa
         AsyncStreamHttpResponse,
 
-        async_close_response,
-        async_closing_response,
-        async_read_response,
+        async_close_http_client_response,
+        async_closing_http_client_response,
+        async_read_http_client_response,
 
         AsyncHttpClient,
     )
 
     from .clients.base import (  # noqa
         DEFAULT_ENCODING,
-
         is_success_status,
 
         HttpRequest,
@@ -24,8 +23,12 @@ with _lang.auto_proxy_init(globals()):
         BaseHttpResponse,
         HttpResponse,
 
+        HttpClientContext,
+
         HttpClientError,
         HttpStatusError,
+
+        BaseHttpClient,
     )
 
     from .clients.default import (  # noqa
@@ -42,18 +45,35 @@ with _lang.auto_proxy_init(globals()):
 
     from .clients.httpx import (  # noqa
         HttpxHttpClient,
+
+        HttpxAsyncHttpClient,
+    )
+
+    from .clients.middleware import (  # noqa
+        HttpClientMiddleware,
+        AbstractMiddlewareHttpClient,
+
+        MiddlewareHttpClient,
+        MiddlewareAsyncHttpClient,
+
+        TooManyRedirectsHttpClientError,
+        RedirectHandlingHttpClientMiddleware,
     )
 
     from .clients.sync import (  # noqa
         StreamHttpResponse,
 
-        close_response,
-        closing_response,
-        read_response,
+        close_http_client_response,
+        closing_http_client_response,
+        read_http_client_response,
 
         HttpClient,
     )
 
+    from .clients.syncasync import (  # noqa
+        SyncAsyncHttpClient,
+    )
+
     from .clients.urllib import (  # noqa
         UrllibHttpClient,
     )

omlish/http/clients/asyncs.py

@@ -57,13 +57,13 @@ class AsyncStreamHttpResponse(BaseHttpResponse):
 
     async def close(self) -> None:
         if (c := self._closer) is not None:
-            await c()
+            await c()  # noqa
 
 
 #
 
 
-async def async_close_response(resp: BaseHttpResponse) -> None:
+async def async_close_http_client_response(resp: BaseHttpResponse) -> None:
     if isinstance(resp, HttpResponse):
         pass
 
@@ -75,7 +75,7 @@ async def async_close_response(resp: BaseHttpResponse) -> None:
 
 
 @contextlib.asynccontextmanager
-async def async_closing_response(resp: BaseHttpResponseT) -> ta.AsyncGenerator[BaseHttpResponseT, None]:
+async def async_closing_http_client_response(resp: BaseHttpResponseT) -> ta.AsyncGenerator[BaseHttpResponseT, None]:
     if isinstance(resp, HttpResponse):
         yield resp
         return
@@ -90,7 +90,7 @@ async def async_closing_response(resp: BaseHttpResponseT) -> ta.AsyncGenerator[B
         raise TypeError(resp)
 
 
-async def async_read_response(resp: BaseHttpResponse) -> HttpResponse:
+async def async_read_http_client_response(resp: BaseHttpResponse) -> HttpResponse:
     if isinstance(resp, HttpResponse):
         return resp
 
@@ -121,12 +121,12 @@ class AsyncHttpClient(BaseHttpClient, Abstract):
             context: ta.Optional[HttpClientContext] = None,
             check: bool = False,
     ) -> HttpResponse:
-        async with async_closing_response(await self.stream_request(
+        async with async_closing_http_client_response(await self.stream_request(
                 req,
                 context=context,
                 check=check,
         )) as resp:
-            return await async_read_response(resp)
+            return await async_read_http_client_response(resp)
 
     async def stream_request(
             self,
@@ -146,10 +146,10 @@ class AsyncHttpClient(BaseHttpClient, Abstract):
                     cause = resp.underlying
                 else:
                     cause = None
-                raise HttpStatusError(await async_read_response(resp)) from cause  # noqa
+                raise HttpStatusError(await async_read_http_client_response(resp)) from cause  # noqa
 
         except Exception:
-            await async_close_response(resp)
+            await async_close_http_client_response(resp)
             raise
 
         return resp

omlish/http/clients/middleware.py

@@ -23,7 +23,7 @@ from .base import HttpClientError
 from .base import HttpRequest
 from .sync import HttpClient
 from .sync import StreamHttpResponse
-from .sync import close_response
+from .sync import close_http_client_response
 
 
 BaseHttpClientT = ta.TypeVar('BaseHttpClientT', bound=BaseHttpClient)
@@ -84,6 +84,9 @@ class AbstractMiddlewareHttpClient(Abstract, ta.Generic[BaseHttpClientT]):
         return resp
 
 
+#
+
+
 class MiddlewareHttpClient(AbstractMiddlewareHttpClient[HttpClient], HttpClient):
     def _stream_request(self, ctx: HttpClientContext, req: HttpRequest) -> StreamHttpResponse:
         while True:
@@ -95,7 +98,7 @@ class MiddlewareHttpClient(AbstractMiddlewareHttpClient[HttpClient], HttpClient)
                 out = self._process_response(ctx, req, resp)
 
                 if isinstance(out, HttpRequest):
-                    close_response(resp)
+                    close_http_client_response(resp)
                     req = out
                     continue
 
@@ -106,7 +109,7 @@ class MiddlewareHttpClient(AbstractMiddlewareHttpClient[HttpClient], HttpClient)
                     raise TypeError(out)  # noqa
 
             except Exception:
-                close_response(resp)
+                close_http_client_response(resp)
                 raise
 
         raise RuntimeError

omlish/http/clients/sync.py

@@ -57,13 +57,13 @@ class StreamHttpResponse(BaseHttpResponse):
 
     def close(self) -> None:
         if (c := self._closer) is not None:
-            c()
+            c()  # noqa
 
 
 #
 
 
-def close_response(resp: BaseHttpResponse) -> None:
+def close_http_client_response(resp: BaseHttpResponse) -> None:
     if isinstance(resp, HttpResponse):
         pass
 
@@ -75,7 +75,7 @@ def close_response(resp: BaseHttpResponse) -> None:
 
 
 @contextlib.contextmanager
-def closing_response(resp: BaseHttpResponseT) -> ta.Iterator[BaseHttpResponseT]:
+def closing_http_client_response(resp: BaseHttpResponseT) -> ta.Iterator[BaseHttpResponseT]:
     if isinstance(resp, HttpResponse):
         yield resp
         return
@@ -88,7 +88,7 @@ def closing_response(resp: BaseHttpResponseT) -> ta.Iterator[BaseHttpResponseT]:
         raise TypeError(resp)
 
 
-def read_response(resp: BaseHttpResponse) -> HttpResponse:
+def read_http_client_response(resp: BaseHttpResponse) -> HttpResponse:
     if isinstance(resp, HttpResponse):
         return resp
 
@@ -119,12 +119,12 @@ class HttpClient(BaseHttpClient, Abstract):
             context: ta.Optional[HttpClientContext] = None,
             check: bool = False,
     ) -> HttpResponse:
-        with closing_response(self.stream_request(
+        with closing_http_client_response(self.stream_request(
                 req,
                 context=context,
                 check=check,
         )) as resp:
-            return read_response(resp)
+            return read_http_client_response(resp)
 
     def stream_request(
             self,
@@ -144,10 +144,10 @@ class HttpClient(BaseHttpClient, Abstract):
                     cause = resp.underlying
                 else:
                     cause = None
-                raise HttpStatusError(read_response(resp)) from cause  # noqa
+                raise HttpStatusError(read_http_client_response(resp)) from cause  # noqa
 
         except Exception:
-            close_response(resp)
+            close_http_client_response(resp)
             raise
 
         return resp

omlish/http/clients/syncasync.py

@@ -0,0 +1,43 @@
+# ruff: noqa: UP043 UP045
+# @omlish-lite
+import dataclasses as dc
+
+from .asyncs import AsyncHttpClient
+from .asyncs import AsyncStreamHttpResponse
+from .base import HttpClientContext
+from .base import HttpRequest
+from .sync import HttpClient
+from .sync import StreamHttpResponse
+
+
+##
+
+
+class SyncAsyncHttpClient(AsyncHttpClient):
+    def __init__(self, client: HttpClient) -> None:
+        super().__init__()
+
+        self._client = client
+
+    @dc.dataclass(frozen=True)
+    class _StreamAdapter:
+        ul: StreamHttpResponse
+
+        async def read1(self, /, n: int = -1) -> bytes:
+            return self.ul.stream.read1(n)
+
+        async def close(self) -> None:
+            self.ul.close()
+
+    async def _stream_request(self, ctx: HttpClientContext, req: HttpRequest) -> AsyncStreamHttpResponse:
+        resp = self._client.stream_request(req, context=ctx)
+        return AsyncStreamHttpResponse(
+            status=resp.status,
+            headers=resp.headers,
+            request=req,
+            underlying=resp,
+            **(dict(  # type: ignore
+                stream=(adapter := self._StreamAdapter(resp)),
+                _closer=adapter.close,
+            ) if resp.has_data else {}),
+        )

omlish/inject/__init__.py

@@ -57,8 +57,12 @@ with _lang.auto_proxy_init(globals()):
         Element,
         Elements,
         Elemental,
+
         as_elements,
         iter_elements,
+
+        CollectedElements,
+        collect_elements,
     )
 
     from .errors import (  # noqa

omlish/inject/elements.py

@@ -6,6 +6,12 @@ from .. import lang
 from .impl.origins import HasOriginsImpl
 
 
+if ta.TYPE_CHECKING:
+    from .impl import elements as _elements
+else:
+    _elements = lang.proxy_import('.impl.elements', __package__)
+
+
 ##
 
 
@@ -74,3 +80,14 @@ def iter_elements(*args: Elemental) -> ta.Iterator[Element]:
             yield from a
         else:
             raise TypeError(a)
+
+
+##
+
+
+class CollectedElements(lang.PackageSealed, lang.Abstract):
+    pass
+
+
+def collect_elements(es: Elements | CollectedElements) -> CollectedElements:
+    return _elements.collect_elements(es)

omlish/inject/impl/elements.py

@@ -27,6 +27,7 @@ from ... import collections as col
 from ... import lang
 from ..bindings import Binding
 from ..eagers import Eager
+from ..elements import CollectedElements
 from ..elements import Element
 from ..elements import Elements
 from ..errors import ConflictingKeyError
@@ -47,7 +48,7 @@ from .multis import make_multi_provider_impl
 from .origins import Origins
 from .origins import set_origins
 from .providers import ProviderImpl
-from .providers2 import make_provider_impl
+from .providersmap import make_provider_impl
 from .scopes import make_scope_impl
 
 
@@ -80,7 +81,7 @@ _NON_BINDING_ELEMENT_TYPES: tuple[type[Element], ...] = (
 )
 
 
-class ElementCollection(lang.Final):
+class ElementCollection(CollectedElements, lang.Final):
     def __init__(self, es: Elements) -> None:
         super().__init__()
 
@@ -208,6 +209,10 @@ class ElementCollection(lang.Final):
 
     ##
 
+    @lang.cached_function
+    def scope_binding_scopes(self) -> ta.Sequence[Scope]:
+        return [sb.scope for sb in self.elements_of_type(ScopeBinding)]
+
     @lang.cached_function
     def eager_keys_by_scope(self) -> ta.Mapping[Scope, ta.Sequence[Key]]:
         bim = self.binding_impl_map()
@@ -216,3 +221,13 @@ class ElementCollection(lang.Final):
             bi = bim[e.key]
             ret.setdefault(bi.scope, []).append(e.key)
         return ret
+
+
+##
+
+
+def collect_elements(es: Elements | CollectedElements) -> ElementCollection:
+    if isinstance(es, CollectedElements):
+        return check.isinstance(es, ElementCollection)
+    else:
+        return ElementCollection(es)

omlish/inject/impl/injector.py

@@ -2,14 +2,12 @@
 TODO:
  - ** can currently bind in a child/private scope shadowing an external parent binding **
  - better source tracking
- - cache/export ElementCollections lol
  - scope bindings, auto in root
  - injector-internal / blacklisted bindings (Injector itself, default scopes) without rebuilding ElementCollection
  - config - proxies, impl select, etc
   - config is probably shared with ElementCollection... but not 'bound', must be shared everywhere
   - InjectorRoot object?
  - ** eagers in any scope, on scope init/open
- - injection listeners
  - unions - raise on ambiguous - usecase: sql.AsyncEngineLike
  - multiple live request scopes on single injector - use private injectors?
  - more listeners - UnboundKeyListener
@@ -24,7 +22,7 @@ import weakref
 from ... import check
 from ... import lang
 from ...logs import all as logs
-from ..elements import Elements
+from ..elements import CollectedElements
 from ..errors import CyclicDependencyError
 from ..errors import UnboundKeyError
 from ..injector import AsyncInjector
@@ -33,7 +31,6 @@ from ..keys import Key
 from ..keys import as_key
 from ..listeners import ProvisionListener
 from ..listeners import ProvisionListenerBinding
-from ..scopes import ScopeBinding
 from ..scopes import Singleton
 from ..scopes import ThreadScope
 from ..types import Scope
@@ -61,14 +58,12 @@ DEFAULT_SCOPES: list[Scope] = [
 class AsyncInjectorImpl(AsyncInjector, lang.Final):
     def __init__(
             self,
-            ec: ElementCollection,
+            ec: CollectedElements,
             p: ta.Optional['AsyncInjectorImpl'] = None,
             *,
             internal_consts: dict[Key, ta.Any] | None = None,
     ) -> None:
-        super().__init__()
-
-        self._ec = check.isinstance(ec, ElementCollection)
+        self._ec = (ec := check.isinstance(ec, ElementCollection))
         self._p: AsyncInjectorImpl | None = check.isinstance(p, (AsyncInjectorImpl, None))
 
         self._internal_consts: dict[Key, ta.Any] = {
@@ -77,28 +72,31 @@ class AsyncInjectorImpl(AsyncInjector, lang.Final):
         }
 
         self._bim = ec.binding_impl_map()
+
         self._ekbs = ec.eager_keys_by_scope()
+
         self._pls: tuple[ProvisionListener, ...] = tuple(
             b.listener  # type: ignore[attr-defined]
             for b in itertools.chain(
                 ec.elements_of_type(ProvisionListenerBinding),
-                (p._pls if p is not None else ()),  # noqa
+                p._pls if p is not None else (),  # noqa
             )
         )
 
-        self._cs: weakref.WeakSet[AsyncInjectorImpl] | None = None  # noqa
         self._root: AsyncInjectorImpl = p._root if p is not None else self  # noqa
 
-        self.__cur_req: AsyncInjectorImpl._Request | None = None
-
-        ss = [
-            *DEFAULT_SCOPES,
-            *[sb.scope for sb in ec.elements_of_type(ScopeBinding)],
-        ]
         self._scopes: dict[Scope, ScopeImpl] = {
-            s: make_scope_impl(s) for s in ss
+            s: make_scope_impl(s)
+            for s in itertools.chain(
+                DEFAULT_SCOPES,
+                ec.scope_binding_scopes(),
+            )
         }
 
+    _cs: weakref.WeakSet['AsyncInjectorImpl'] | None = None  # noqa
+
+    __cur_req: ta.Optional['AsyncInjectorImpl._Request'] = None
+
     #
 
     _has_run_init: bool = False
@@ -259,7 +257,7 @@ class AsyncInjectorImpl(AsyncInjector, lang.Final):
         return obj(**kws)
 
 
-async def create_async_injector(es: Elements) -> AsyncInjector:
-    i = AsyncInjectorImpl(ElementCollection(es))
+async def create_async_injector(ce: CollectedElements) -> AsyncInjector:
+    i = AsyncInjectorImpl(ce)
     await i._init()  # noqa
     return i

omlish/inject/impl/inspect.py

@@ -75,6 +75,7 @@ def build_kwargs_target(
         skip_args: int = 0,
         skip_kwargs: ta.Iterable[str] | None = None,
         raw_optional: bool = False,
+        non_strict: bool = False,
 ) -> KwargsTarget:
     if isinstance(obj, KwargsTarget):
         return obj
@@ -93,11 +94,15 @@ def build_kwargs_target(
             continue
 
         if p.annotation is inspect.Signature.empty:
+            if non_strict:
+                continue
             if p.default is not inspect.Parameter.empty:
                 raise KeyError(f'{obj}, {p.name}')
             continue
 
         if p.kind not in (inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY):
+            if non_strict:
+                continue
             raise TypeError(sig)
 
         ann = p.annotation
@@ -122,7 +127,8 @@ def build_kwargs_target(
             k = dc.replace(k, tag=pt)
 
         if k in seen:
-            raise ConflictingKeyError(k)
+            if not non_strict:
+                raise ConflictingKeyError(k)
         seen.add(k)
 
         kws.append(Kwarg(

omlish/inject/impl/maysync.py

@@ -1,13 +1,12 @@
 import typing as ta
 
 from ... import lang
-from ..elements import Elements
+from ..elements import CollectedElements
 from ..injector import AsyncInjector
 from ..inspect import KwargsTarget
 from ..keys import Key
 from ..maysync import MaysyncInjector
 from ..sync import Injector
-from .elements import ElementCollection
 from .injector import AsyncInjectorImpl
 
 
@@ -30,10 +29,10 @@ class MaysyncInjectorImpl(MaysyncInjector, lang.Final):
         return lang.run_maysync(self._ai.inject(obj))
 
 
-def create_maysync_injector(es: Elements) -> MaysyncInjector:
+def create_maysync_injector(ce: CollectedElements) -> MaysyncInjector:
     si = MaysyncInjectorImpl()
     ai = AsyncInjectorImpl(
-        ElementCollection(es),
+        ce,
         internal_consts={
             Key(MaysyncInjector): si,
             Key(Injector): si,

omlish/inject/impl/sync.py

@@ -1,12 +1,11 @@
 import typing as ta
 
 from ... import lang
-from ..elements import Elements
+from ..elements import CollectedElements
 from ..injector import AsyncInjector
 from ..inspect import KwargsTarget
 from ..keys import Key
 from ..sync import Injector
-from .elements import ElementCollection
 from .injector import AsyncInjectorImpl
 
 
@@ -29,10 +28,10 @@ class InjectorImpl(Injector, lang.Final):
         return lang.sync_await(self._ai.inject(obj))
 
 
-def create_injector(es: Elements) -> Injector:
+def create_injector(ce: CollectedElements) -> Injector:
     si = InjectorImpl()
     ai = AsyncInjectorImpl(
-        ElementCollection(es),
+        ce,
         internal_consts={
             Key(Injector): si,
         },

omlish/inject/injector.py

@@ -1,9 +1,12 @@
 import abc
 import typing as ta
 
+from .. import check
 from .. import lang
+from .elements import CollectedElements
 from .elements import Elemental
 from .elements import as_elements
+from .elements import collect_elements
 from .inspect import KwargsTarget
 from .keys import Key
 
@@ -44,5 +47,31 @@ class AsyncInjector(lang.Abstract):
         return self.provide(target)
 
 
-def create_async_injector(*args: Elemental) -> ta.Awaitable[AsyncInjector]:
-    return _injector.create_async_injector(as_elements(*args))
+##
+
+
+@ta.final
+class _InjectorCreator(ta.Generic[T]):
+    def __init__(self, fac: ta.Callable[[CollectedElements], T]) -> None:
+        self._fac = fac
+
+    @ta.overload
+    def __call__(self, es: CollectedElements, /) -> T: ...
+
+    @ta.overload
+    def __call__(self, *es: Elemental) -> T: ...
+
+    def __call__(self, arg0, *argv):
+        ce: CollectedElements
+        if isinstance(arg0, CollectedElements):
+            check.arg(not argv)
+            ce = arg0
+        else:
+            ce = collect_elements(as_elements(arg0, *argv))
+        return self._fac(ce)
+
+
+##
+
+
+create_async_injector = _InjectorCreator[ta.Awaitable[AsyncInjector]](lambda ce: _injector.create_async_injector(ce))

omlish/inject/maysync.py

@@ -1,8 +1,7 @@
 import typing as ta
 
 from .. import lang
-from .elements import Elemental
-from .elements import as_elements
+from .injector import _InjectorCreator
 from .sync import Injector
 
 
@@ -25,5 +24,4 @@ class MaysyncInjector(Injector, lang.Abstract):
 ##
 
 
-def create_maysync_injector(*args: Elemental) -> MaysyncInjector:
-    return _maysync.create_maysync_injector(as_elements(*args))
+create_maysync_injector = _InjectorCreator[MaysyncInjector](lambda ce: _maysync.create_maysync_injector(ce))

omlish/inject/sync.py

@@ -2,8 +2,7 @@ import abc
 import typing as ta
 
 from .. import lang
-from .elements import Elemental
-from .elements import as_elements
+from .injector import _InjectorCreator
 from .inspect import KwargsTarget
 from .keys import Key
 
@@ -44,5 +43,7 @@ class Injector(lang.Abstract):
         return self.provide(target)
 
 
-def create_injector(*args: Elemental) -> Injector:
-    return _sync.create_injector(as_elements(*args))
+##
+
+
+create_injector = _InjectorCreator[Injector](lambda ce: _sync.create_injector(ce))

omlish/lang/imports/proxy.py

@@ -342,6 +342,8 @@ def proxy_import(
         spec: str,
         package: str | None = None,
         extras: ta.Iterable[str] | None = None,
+        *,
+        no_cache: bool = False,
 ) -> types.ModuleType:
     """'Legacy' proxy import mechanism."""
 
@@ -352,12 +354,19 @@ def proxy_import(
 
     def __getattr__(att):  # noqa
         nonlocal omod
+
         if omod is None:
             omod = importlib.import_module(spec, package=package)
             if extras:
                 for x in extras:
                     importlib.import_module(f'{spec}.{x}', package=package)
-        return getattr(omod, att)
+
+        v = getattr(omod, att)
+
+        if not no_cache:
+            setattr(lmod, att, v)
+
+        return v
 
     lmod = types.ModuleType(spec)
     lmod.__getattr__ = __getattr__  # type: ignore[method-assign]