omlish 0.0.0.dev23__py3-none-any.whl → 0.0.0.dev25__py3-none-any.whl

omlish/dataclasses/impl/LICENSE

@@ -0,0 +1,279 @@
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands
+as a successor of a language called ABC.  Guido remains Python's
+principal author, although it includes many contributions from others.
+
+In 1995, Guido continued his work on Python at the Corporation for
+National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)
+in Reston, Virginia where he released several versions of the
+software.
+
+In May 2000, Guido and the Python core development team moved to
+BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
+year, the PythonLabs team moved to Digital Creations, which became
+Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
+https://www.python.org/psf/) was formed, a non-profit organization
+created specifically to own Python-related Intellectual Property.
+Zope Corporation was a sponsoring member of the PSF.
+
+All Python releases are Open Source (see https://opensource.org for
+the Open Source Definition).  Historically, most, but not all, Python
+releases have also been GPL-compatible; the table below summarizes
+the various releases.
+
+    Release         Derived     Year        Owner       GPL-
+                    from                                compatible? (1)
+
+    0.9.0 thru 1.2              1991-1995   CWI         yes
+    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
+    1.6             1.5.2       2000        CNRI        no
+    2.0             1.6         2000        BeOpen.com  no
+    1.6.1           1.6         2001        CNRI        yes (2)
+    2.1             2.0+1.6.1   2001        PSF         no
+    2.0.1           2.0+1.6.1   2001        PSF         yes
+    2.1.1           2.1+2.0.1   2001        PSF         yes
+    2.1.2           2.1.1       2002        PSF         yes
+    2.1.3           2.1.2       2002        PSF         yes
+    2.2 and above   2.1.1       2001-now    PSF         yes
+
+Footnotes:
+
+(1) GPL-compatible doesn't mean that we're distributing Python under
+    the GPL.  All Python licenses, unlike the GPL, let you distribute
+    a modified version without making your changes open source.  The
+    GPL-compatible licenses make it possible to combine Python with
+    other software that is released under the GPL; the others don't.
+
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+    because its license has a choice of law clause.  According to
+    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+    is "not incompatible" with the GPL.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+Python software and documentation are licensed under the
+Python Software Foundation License Version 2.
+
+Starting with Python 3.8.6, examples, recipes, and other code in
+the documentation are dual licensed under the PSF License Version 2
+and the Zero-Clause BSD license.
+
+Some software incorporated into Python is under different licenses.
+The licenses are listed with code falling under that license.
+
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation;
+All Rights Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions.  Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee.  This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party.  As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee.  Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement.  This Agreement together with
+Python 1.6.1 may be located on the internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013.  This
+Agreement may also be obtained from a proxy server on the internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee.  This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+        ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
+----------------------------------------------------------------------
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

omlish/dataclasses/impl/init.py

@@ -130,9 +130,17 @@ class InitBuilder:
             cas = ', '.join(p.name for p in csig.parameters.values())
             body_lines.append(f'if not {cn}({cas}): raise __dataclass_CheckError__')
 
-        for i, fn in enumerate(self._info.merged_metadata.get(Init, [])):
+        inits = self._info.merged_metadata.get(Init, [])
+        mro_dct = lang.build_mro_dict(self._info.cls)
+        mro_v_ids = set(map(id, mro_dct.values()))
+        props_by_fget_id = {id(v.fget): v for v in mro_dct.values() if isinstance(v, property) and v.fget is not None}
+        for i, obj in enumerate(inits):
+            if (obj_id := id(obj)) not in mro_v_ids and obj_id in props_by_fget_id:
+                obj = props_by_fget_id[obj_id].__get__
+            elif isinstance(obj, property):
+                obj = obj.__get__
             cn = f'__dataclass_init_{i}__'
-            locals[cn] = fn
+            locals[cn] = obj
             body_lines.append(f'{cn}({self._self_name})')
 
         if not body_lines:

omlish/dataclasses/impl/metadata.py

@@ -70,6 +70,6 @@ class Init(lang.Marker):
     pass
 
 
-def init(fn: ta.Callable):
-    _append_cls_md(Init, fn)
-    return fn
+def init(obj):
+    _append_cls_md(Init, obj)
+    return obj

omlish/dataclasses/impl/reflect.py

@@ -149,7 +149,7 @@ class ClassInfo:
 
     @cached.property
     def generic_mro_lookup(self) -> ta.Mapping[type, rfl.Type]:
-        return col.unique_map(((check.not_none(rfl.get_concrete_type(g)), g) for g in self.generic_mro), strict=True)
+        return col.make_map(((check.not_none(rfl.get_concrete_type(g)), g) for g in self.generic_mro), strict=True)
 
     @cached.property
     def generic_replaced_field_types(self) -> ta.Mapping[str, rfl.Type]:

omlish/dataclasses/utils.py

@@ -4,6 +4,8 @@ import types
 import typing as ta
 
 from .. import check
+from .impl.metadata import METADATA_ATTR
+from .impl.metadata import UserMetadata
 from .impl.params import DEFAULT_FIELD_EXTRAS
 from .impl.params import FieldExtras
 from .impl.params import get_field_extras
@@ -50,6 +52,13 @@ def chain_metadata(*mds: ta.Mapping) -> types.MappingProxyType:
     return types.MappingProxyType(collections.ChainMap(*mds))  # type: ignore  # noqa
 
 
+def update_class_metadata(cls: type[T], *args: ta.Any) -> type[T]:
+    check.isinstance(cls, type)
+    setattr(cls, METADATA_ATTR, md := getattr(cls, METADATA_ATTR, {}))
+    md.setdefault(UserMetadata, []).extend(args)
+    return cls
+
+
 def update_field_metadata(f: dc.Field, nmd: ta.Mapping) -> dc.Field:
     check.isinstance(f, dc.Field)
     f.metadata = chain_metadata(nmd, f.metadata)
@@ -79,9 +88,13 @@ def update_fields(
 
         else:
             for a in fields:
-                v = cls.__dict__[a]
-                if not isinstance(v, dc.Field):
-                    v = dc.field(default=v)
+                try:
+                    v = cls.__dict__[a]
+                except KeyError:
+                    v = dc.field()
+                else:
+                    if not isinstance(v, dc.Field):
+                        v = dc.field(default=v)
                 setattr(cls, a, fn(a, v))
 
         return cls

omlish/diag/pycharm.py

@@ -17,6 +17,16 @@ else:
 ##
 
 
+PYCHARM_HOSTED_ENV_VAR = 'PYCHARM_HOSTED'
+
+
+def is_pycharm_hosted() -> bool:
+    return PYCHARM_HOSTED_ENV_VAR in os.environ
+
+
+##
+
+
 PYCHARM_HOME = '/Applications/PyCharm.app'
 
 
@@ -45,6 +55,53 @@ def get_pycharm_version() -> str | None:
 ##
 
 
+def _import_pydevd_pycharm(*, version: str | None = None) -> ta.Any:
+    if (
+            'pydevd_pycharm' in sys.modules or
+            (version is None and lang.can_import('pydevd_pycharm'))
+    ):
+        # Can't unload, nothing we can do
+        import pydevd_pycharm  # noqa
+        return pydevd_pycharm
+
+    proc = subprocess.run([  # noqa
+        sys.executable,
+        '-m', 'pip',
+        'show',
+        'pydevd_pycharm',
+    ], stdout=subprocess.PIPE)
+
+    if not proc.returncode:
+        info = {
+            k: v.strip()
+            for l in proc.stdout.decode().splitlines()
+            if (s := l.strip())
+            for k, _, v in [s.partition(':')]
+        }
+
+        installed_version = info['Version']
+        if installed_version == version:
+            import pydevd_pycharm  # noqa
+            return pydevd_pycharm
+
+        subprocess.check_call([
+            sys.executable,
+            '-m', 'pip',
+            'uninstall', '-y',
+            'pydevd_pycharm',
+        ])
+
+    subprocess.check_call([
+        sys.executable,
+        '-m', 'pip',
+        'install',
+        'pydevd_pycharm' + (f'=={version}' if version is not None else ''),
+    ])
+
+    import pydevd_pycharm  # noqa
+    return pydevd_pycharm
+
+
 def pycharm_remote_debugger_attach(
         host: str | None,
         port: int,
@@ -56,25 +113,27 @@ def pycharm_remote_debugger_attach(
     # check.non_empty_str(version)
 
     if host is None:
-        if sys.platform == 'linux' and docker.is_likely_in_docker():
+        if (
+                sys.platform == 'linux' and
+                docker.is_likely_in_docker() and
+                docker.get_docker_host_platform() == 'darwin'
+        ):
             host = docker.DOCKER_FOR_MAC_HOSTNAME
         else:
             host = 'localhost'
 
-    try:
+    if ta.TYPE_CHECKING:
         import pydevd_pycharm  # noqa
-    except ImportError:
-        subprocess.check_call([
-            sys.executable,
-            '-mpip',
-            'install',
-            'pydevd-pycharm' + (f'~={version}' if version is not None else ''),
-        ])
+    else:
+        pydevd_pycharm = _import_pydevd_pycharm(version=version)
 
-    import pydevd_pycharm  # noqa
     pydevd_pycharm.settrace(
         host,
         port=port,
         stdoutToServer=True,
         stderrToServer=True,
     )
+
+
+if __name__ == '__main__':
+    print(get_pycharm_version())

omlish/docker.py

@@ -15,6 +15,7 @@ apil="application/vnd.docker.distribution.manifest.list.v2+json"
 curl -H "Accept: ${api}" -H "Accept: ${apil}" -H "Authorization: Bearer $token" -s "https://registry-1.docker.io/v2/${repo}/manifests/latest" | jq .
 """  # noqa
 import datetime
+import os
 import re
 import shlex
 import subprocess
@@ -38,15 +39,12 @@ else:
 
 
 @dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.CAMEL, unknown_field='x')
+@msh.update_fields_metadata(['id'], name='ID')
 class PsItem(lang.Final):
-    dc.metadata(msh.ObjectMetadata(
-        field_naming=msh.Naming.CAMEL,
-        unknown_field='x',
-    ))
-
     command: str
     created_at: datetime.datetime
-    id: str = dc.field(metadata={msh.FieldMetadata: msh.FieldMetadata(name='ID')})
+    id: str
     image: str
     labels: str
     local_volumes: str
@@ -101,12 +99,8 @@ def cli_ps() -> list[PsItem]:
 
 
 @dc.dataclass(frozen=True)
+@msh.update_object_metadata(field_naming=msh.Naming.CAMEL, unknown_field='x')
 class Inspect(lang.Final):
-    dc.metadata(msh.ObjectMetadata(
-        field_naming=msh.Naming.CAMEL,
-        unknown_field='x',
-    ))
-
     id: str
     created: datetime.datetime
 
@@ -186,3 +180,14 @@ def is_likely_in_docker() -> bool:
     with open('/proc/mounts') as f:  # type: ignore
         ls = f.readlines()
     return any(_LIKELY_IN_DOCKER_PATTERN.match(l) for l in ls)
+
+
+##
+
+
+# Set by pyproject, docker-dev script
+DOCKER_HOST_PLATFORM_KEY = 'DOCKER_HOST_PLATFORM'
+
+
+def get_docker_host_platform() -> str | None:
+    return os.environ.get(DOCKER_HOST_PLATFORM_KEY)

omlish/genmachine.py

@@ -1,5 +1,6 @@
 """
-https://github.com/pytransitions/transitions
+See:
+ - https://github.com/pytransitions/transitions
 """
 import typing as ta
 

omlish/graphs/trees.py

@@ -190,7 +190,7 @@ class BasicTreeAnalysis(ta.Generic[NodeT]):
         e: ta.Any
         d: ta.Any
         if identity:
-            e, d = id, col.unique_map(((id(n), n) for n, _ in pairs), strict=True)
+            e, d = id, col.make_map(((id(n), n) for n, _ in pairs), strict=True)
         else:
             e, d = lang.identity, lang.identity
         tsd = {e(n): {e(p)} for n, p in parents_by_node.items()}

omlish/lang/__init__.py

@@ -79,7 +79,7 @@ from .descriptors import (  # noqa
     unwrap_func,
     unwrap_func_with_partials,
     unwrap_method_descriptors,
-    update_wrapper_except_dict,
+    update_wrapper,
 )
 
 from .exceptions import (  # noqa
@@ -154,6 +154,18 @@ from .objects import (  # noqa
     super_meta,
 )
 
+from .resolving import (  # noqa
+    Resolvable,
+    ResolvableClassNameError,
+    get_cls_fqcn,
+    get_fqcn_cls,
+)
+
+from .resources import (  # noqa
+    RelativeResource,
+    get_relative_resources,
+)
+
 from .strings import (  # noqa
     BOOL_FALSE_STRINGS,
     BOOL_STRINGS,
@@ -190,6 +202,7 @@ from .typing import (  # noqa
     Func1,
     Func2,
     Func3,
+    SequenceNotStr,
     protocol_check,
     typed_lambda,
     typed_partial,

omlish/lang/cached.py

@@ -220,7 +220,7 @@ def cached_function(fn=None, **kwargs):  # noqa
 ##
 
 
-class _CachedProperty:
+class _CachedProperty(property):
     def __init__(
             self,
             fn,
@@ -229,9 +229,9 @@ class _CachedProperty:
             ignore_if=lambda _: False,
             clear_on_init=False,
     ):
-        super().__init__()
         if isinstance(fn, property):
             fn = fn.fget
+        super().__init__(fn)
         self._fn = fn
         self._ignore_if = ignore_if
         self._name = name
@@ -265,6 +265,9 @@ class _CachedProperty:
             return
         raise TypeError(self._name)
 
+    def __delete__(self, instance):
+        raise TypeError
+
 
 def cached_property(fn=None, **kwargs):  # noqa
     if fn is None:

omlish/lang/descriptors.py

@@ -91,21 +91,38 @@ def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functo
 ##
 
 
-WRAPPER_UPDATES_EXCEPT_DICT = tuple(a for a in functools.WRAPPER_UPDATES if a != '__dict__')
+def update_wrapper(
+        wrapper: T,
+        wrapped: ta.Any,
+        assigned: ta.Iterable[str] = functools.WRAPPER_ASSIGNMENTS,
+        updated: ta.Iterable[str] = functools.WRAPPER_UPDATES,
+        *,
+        filter: ta.Iterable[str] | None = None,  # noqa
+        getattr: ta.Callable = getattr,  # noqa
+        setattr: ta.Callable = setattr,  # noqa
+) -> T:
+    if filter:
+        if isinstance(filter, str):
+            filter = [filter]  # noqa
+        assigned = tuple(a for a in assigned if a not in filter)
+        updated = tuple(a for a in updated if a not in filter)
+
+    for attr in assigned:
+        try:
+            value = getattr(wrapped, attr)
+        except AttributeError:
+            pass
+        else:
+            setattr(wrapper, attr, value)
+
+    for attr in updated:
+        getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
 
+    # Issue #17482: set __wrapped__ last so we don't inadvertently copy it from the wrapped function when updating
+    # __dict__
+    setattr(wrapper, '__wrapped__', wrapped)
 
-def update_wrapper_except_dict(
-        wrapper,
-        wrapped,
-        assigned=functools.WRAPPER_ASSIGNMENTS,
-        updated=WRAPPER_UPDATES_EXCEPT_DICT,
-):
-    return functools.update_wrapper(
-        wrapper,
-        wrapped,
-        assigned=assigned,
-        updated=updated,
-    )
+    return wrapper
 
 
 ##
@@ -118,7 +135,7 @@ class _decorator_descriptor:  # noqa
     if not _DECORATOR_HANDLES_UNBOUND_METHODS:
         def __init__(self, wrapper, fn):
             self._wrapper, self._fn = wrapper, fn
-            update_wrapper_except_dict(self, fn)
+            update_wrapper(self, fn, filter='__dict__')
 
         def __get__(self, instance, owner=None):
             return functools.update_wrapper(functools.partial(self._wrapper, fn := self._fn.__get__(instance, owner)), fn)  # noqa
@@ -127,7 +144,7 @@ class _decorator_descriptor:  # noqa
         def __init__(self, wrapper, fn):
             self._wrapper, self._fn = wrapper, fn
             self._md = _has_method_descriptor(fn)
-            update_wrapper_except_dict(self, fn)
+            update_wrapper(self, fn, filter='__dict__')
 
         def __get__(self, instance, owner=None):
             fn = self._fn.__get__(instance, owner)
@@ -157,7 +174,7 @@ class _decorator_descriptor:  # noqa
 class _decorator:  # noqa
     def __init__(self, wrapper):
         self._wrapper = wrapper
-        update_wrapper_except_dict(self, wrapper)
+        update_wrapper(self, wrapper, filter='__dict__')
 
     def __repr__(self):
         return f'{self.__class__.__name__}<{self._wrapper}>'