omlish 0.0.0.dev317__py3-none-any.whl → 0.0.0.dev318__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev317'
-__revision__ = 'fde65227a86537b0442352985307b74b7376b98e'
+__version__ = '0.0.0.dev318'
+__revision__ = 'b80bceb394abe03974e4312775224ac1dbcb5b22'
 
 
 #
@@ -103,7 +103,7 @@ class Project(ProjectBase):
 
             'sqlean.py ~= 3.49',
 
-            'duckdb ~= 1.2',
+            'duckdb ~= 1.3',
         ],
 
         'templates': [

omlish/dataclasses/api/classes/conversion.py

@@ -12,6 +12,8 @@ from ...specs import FieldSpec
 def std_params_to_class_spec(
         p: StdParams,
         fields: ta.Sequence[FieldSpec],
+        *,
+        metadata: ta.Sequence[ta.Any] | None = None,
 ) -> ClassSpec:
     return ClassSpec(
         fields=fields,
@@ -27,4 +29,6 @@ def std_params_to_class_spec(
         kw_only=check.isinstance(p.kw_only, bool),
         slots=check.isinstance(p.slots, bool),
         weakref_slot=check.isinstance(p.weakref_slot, bool),
+
+        metadata=metadata,
     )

omlish/dataclasses/reflection.py

@@ -3,6 +3,7 @@ import typing as ta
 
 from .. import lang
 from .api.classes.conversion import std_params_to_class_spec
+from .api.classes.metadata import extract_cls_metadata
 from .api.classes.params import get_class_spec
 from .api.fields.conversion import std_field_to_field_spec
 from .concerns.fields import InitFields
@@ -49,9 +50,12 @@ class ClassReflection:
             for f in dc.fields(self._cls)  # noqa
         ]
 
+        cmd = extract_cls_metadata(self._cls, deep=True)
+
         cs = std_params_to_class_spec(
             p,
             fsl,
+            metadata=cmd.user_metadata or None,
         )
 
         return cs

omlish/diag/_pycharm/runhack.py

@@ -59,6 +59,9 @@ class _cached_nullary:  # noqa
 #
 
 
+_repr = repr
+
+
 def _attr_repr(obj, *atts):
     return f'{obj.__class__.__name__}({", ".join(f"{a}={getattr(obj, a)!r}" for a in atts)})'
 
@@ -127,6 +130,109 @@ class AsJson:
 ##
 
 
+class SysModule(AttrsClass, AsJson):
+    def __init__(
+            self,
+            name,  # type: str
+            *,
+            seq=None,  # type: int | None
+            repr=None,  # type: str | None  # noqa
+
+            origin=None,  # type: str | None
+            file=None,  # type: str | None
+    ) -> None:
+        super().__init__()
+
+        self._name = name
+
+        self._seq = seq
+        self._repr = repr
+
+        self._origin = origin
+        self._file = file
+
+    __attrs__ = (
+        'name',
+
+        'seq',
+        'repr',
+
+        'origin',
+        'file',
+    )
+
+    @property
+    def name(self):  # type: () -> str
+        return self._name
+
+    @property
+    def seq(self):  # type: () -> int | None
+        return self._seq
+
+    @property
+    def repr(self):  # type: () -> str | None
+        return self._repr
+
+    @property
+    def origin(self):  # type: () -> str | None
+        return self._origin
+
+    @property
+    def file(self):  # type: () -> str | None
+        return self._file
+
+    def as_json(self):  # type: () -> dict[str, object]
+        return self.attrs_dict()
+
+
+def build_sys_module(
+        name,  # type: str
+        mod,
+        *,
+        seq=None,  # type: int | None
+) -> SysModule:
+    kwargs = dict()  # type: dict
+    kwargs.update(
+        name=name,
+
+        seq=seq,
+        repr=_repr(mod),
+    )
+
+    try:
+        spec = mod.__spec__
+    except AttributeError:
+        pass
+    else:
+        if spec is not None:
+            kwargs.update(origin=spec.origin)
+
+    try:
+        file = mod.__file__
+    except AttributeError:
+        pass
+    else:
+        kwargs.update(file=file)
+
+    return SysModule(**kwargs)
+
+
+def build_sys_modules(dct=None):  # type: (dict[str, object] | None) -> list[SysModule]
+    if dct is None:
+        dct_ = sys.modules
+    else:
+        dct_ = dct  # type: ignore
+
+    lst = []  # type: list[SysModule]
+    for i, (n, m) in enumerate(dct_.items()):
+        lst.append(build_sys_module(n, m, seq=i))
+
+    return lst
+
+
+##
+
+
 class RunEnv(AttrsClass, AsJson):
     def __init__(
             self,
@@ -143,6 +249,7 @@ class RunEnv(AttrsClass, AsJson):
             pycharm_hosted=None,  # type: bool | None
 
             sys_path=None,  # type: list[str] | None
+            sys_modules=None,  # type: list[SysModule] | None
     ) -> None:
         super().__init__()
 
@@ -182,6 +289,10 @@ class RunEnv(AttrsClass, AsJson):
             sys_path = list(sys.path)
         self._sys_path = sys_path
 
+        if sys_modules is None:
+            sys_modules = build_sys_modules()
+        self._sys_modules = sys_modules
+
     __attrs__ = (
         'argv',
         'orig_argv',
@@ -195,6 +306,7 @@ class RunEnv(AttrsClass, AsJson):
         'pycharm_hosted',
 
         'sys_path',
+        'sys_modules',
     )
 
     @property
@@ -233,8 +345,15 @@ class RunEnv(AttrsClass, AsJson):
     def sys_path(self):  # type: () -> list[str]
         return self._sys_path
 
+    @property
+    def sys_modules(self):  # type: () -> list[SysModule]
+        return self._sys_modules
+
     def as_json(self):  # type: () -> dict[str, object]
-        return self.attrs_dict()
+        return {
+            **self.attrs_dict(),
+            'sys_modules': [m.as_json() for m in self.sys_modules],
+        }
 
 
 ##

{omlish-0.0.0.dev317.dist-info → omlish-0.0.0.dev318.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev317
+Version: 0.0.0.dev318
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -41,7 +41,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.49; extra == "all"
 Requires-Dist: sqlean.py~=3.49; extra == "all"
-Requires-Dist: duckdb~=1.2; extra == "all"
+Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
 Requires-Dist: pytest~=8.3; extra == "all"
@@ -89,7 +89,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.49; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
-Requires-Dist: duckdb~=1.2; extra == "sqldrivers"
+Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"

{omlish-0.0.0.dev317.dist-info → omlish-0.0.0.dev318.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=XvJduE7LyT8sT8wf4Tcj6mGwYJh0_bub6Rmk7aliJpA,3478
+omlish/__about__.py,sha256=kisuBtrw4R5wrzm5nluakJkzLD7HYXcYuB7zYWAgrQc,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -139,12 +139,12 @@ omlish/dataclasses/debug.py,sha256=giBiv6aXvX0IagwNCW64qBzNjfOFr3-VmgDy_KYlb-k,2
 omlish/dataclasses/errors.py,sha256=tyv3WR6az66uGGiq9FIuCHvy1Ef-G7zeMY7mMG6hy2Y,2527
 omlish/dataclasses/inspect.py,sha256=BlpPghVCU3w_YDnONEqqE99YHzJM2q3eoqe39YX25Ko,4596
 omlish/dataclasses/internals.py,sha256=vIGCZnStgD3ef4drYRtVOrxhxmAPa0vJpo4pXcDcQvM,3073
-omlish/dataclasses/reflection.py,sha256=5N4acL27xwSnQJvoks6ts2JseGfwL_P9D2gM9vqtAFM,2243
+omlish/dataclasses/reflection.py,sha256=FSSTiS7pGTmDrYNkS6fZzaMSe8qtSvDv5Pgz0T55qXg,2404
 omlish/dataclasses/specs.py,sha256=r9hpIWy83ODiB1n7wTf7JL5fiCeeT8fWbMvxs7c4e3g,6148
 omlish/dataclasses/utils.py,sha256=gv6za6oJYBr1VaeGd7oXqq9lhBs_sxkpC27XYzJggno,1870
 omlish/dataclasses/api/__init__.py,sha256=k5iS9QOwf_f4iOfGffYhnqDOcmEIwEUUTp00u11kIPM,455
 omlish/dataclasses/api/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/dataclasses/api/classes/conversion.py,sha256=x1Ayo5W3t8lVh10KGH_ZBJ_kK7HqcdI2LdJA6mR_WXQ,810
+omlish/dataclasses/api/classes/conversion.py,sha256=U3g5S-HefJrg4to1BF8XnlEWqMxFeGEqVt8o5OTQK-U,902
 omlish/dataclasses/api/classes/decorator.py,sha256=q-m05j6VhJ9_00TmrXBvwmv0_TFPTD8OURi1KbKo9-4,3933
 omlish/dataclasses/api/classes/make.py,sha256=Q_8ZVjhhFEUstIZA3Ht_vlGptYjTcJqX48qT57W7SZw,2820
 omlish/dataclasses/api/classes/metadata.py,sha256=ocUu75VWOdZA8-R7K95yPhQtS0sFZB1NtqCdzXyDNeQ,2769
@@ -214,7 +214,7 @@ omlish/diag/pycharm.py,sha256=Z2W-Viqw5xq08ZC4z36skpozfYw_qNNhWQx_GYr2D0k,4695
 omlish/diag/pydevd.py,sha256=UN55ZjkWLCVyHxE2CNRRYamuvSKfzWsn0D5oczRTXO4,7536
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/diag/_pycharm/runhack.py,sha256=O37sduvkx99uQaEg_XWLDBJlUxaqgd2LkjmdGaUT6e4,35432
+omlish/diag/_pycharm/runhack.py,sha256=f4R9SOH0nDfO2WqPh0xQ9-45qOLrtTVysS-hSwtbdOA,37864
 omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8VniF-EgE,235
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
@@ -853,9 +853,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev317.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev317.dist-info/METADATA,sha256=4Z0c7koet4xBZgji9URV0S85ozghSxQShBteed3cg4s,4416
-omlish-0.0.0.dev317.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-omlish-0.0.0.dev317.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev317.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev317.dist-info/RECORD,,
+omlish-0.0.0.dev318.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev318.dist-info/METADATA,sha256=-Nc1DXmiJNc5JokC60eHTE9VTgT6oMoXEf496J6i6UE,4416
+omlish-0.0.0.dev318.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+omlish-0.0.0.dev318.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev318.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev318.dist-info/RECORD,,