omlish 0.0.0.dev287__py3-none-any.whl → 0.0.0.dev289__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev287'
-__revision__ = 'b5569962801bfa1ab3457339502eb364ee51bb0e'
+__version__ = '0.0.0.dev289'
+__revision__ = 'a15065b33f3bb10b44da2a9c680deade2370d3b9'
 
 
 #

omlish/configs/processing/__init__.py

@@ -0,0 +1,7 @@
+"""
+TODO:
+ - inline polymorph: 'ami: foo' -> 'image: {'ami': {'name': 'foo'}}
+ - parse duration and size settings, "512k" or "10 seconds"
+ - includes
+ - substitutions ("foo" : ${bar}, "foo" : Hello ${who})
+"""

omlish/dataclasses/api/fields/constructor.py

@@ -2,9 +2,11 @@ import collections
 import dataclasses as dc
 import typing as ta
 
+from .... import lang
 from ...specs import CoerceFn
 from ...specs import ReprFn
 from ...specs import ValidateFn
+from .metadata import _ExtraFieldParamsMetadata
 from .metadata import extra_field_params
 
 
@@ -29,14 +31,17 @@ def field(
         repr_fn: ReprFn | None = None,
         repr_priority: int | None = None,
 ) -> ta.Any:
-    efp = extra_field_params(
-        coerce=coerce,
-        validate=validate,
-        check_type=check_type,
-        override=override,
-        repr_fn=repr_fn,
-        repr_priority=repr_priority,
-    )
+    efp = extra_field_params(**{
+        **(metadata.get(_ExtraFieldParamsMetadata) or {} if metadata is not None else {}),
+        **lang.opt_kw(
+            coerce=coerce,
+            validate=validate,
+            check_type=check_type,
+            override=override,
+            repr_fn=repr_fn,
+            repr_priority=repr_priority,
+        ),
+    })
 
     md: ta.Any = metadata
     if md is None:

omlish/diag/pycharm.py

@@ -1,7 +1,6 @@
 import dataclasses as dc
 import json
 import os.path
-import plistlib
 import re
 import shutil
 import subprocess
@@ -13,10 +12,15 @@ from .. import lang
 
 
 if ta.TYPE_CHECKING:
-    docker = lang.proxy_import('..docker')
-else:
+    import plistlib
+
     from .. import docker
 
+else:
+    plistlib = lang.proxy_import('plistlib')
+
+    docker = lang.proxy_import('..docker')
+
 
 ##
 

omlish/dispatch/methods.py

@@ -186,7 +186,12 @@ def method(func=None, /, *, installable=False):  # noqa
     return Method(func, **kw)
 
 
-def install_method(mth: ta.Any, *, name: str | None = None) -> ta.Callable[[T], T]:
+def install_method(
+        mth: ta.Any,
+        *,
+        name: str | None = None,
+        on: type | None = None,
+) -> ta.Callable[[T], T]:
     mth = check.isinstance(mth, Method)
     if not mth._installable:  # noqa
         raise TypeError(f'Method not installable: {mth}')
@@ -196,7 +201,12 @@ def install_method(mth: ta.Any, *, name: str | None = None) -> ta.Callable[[T],
         if a is None:
             a = fn.__name__
 
-        cls: type = check.not_none(mth._owner)  # noqa
+        owner: type = check.not_none(mth._owner)  # noqa
+        if on is None:
+            cls = owner
+        else:
+            cls = check.issubclass(on, owner)
+
         check.arg(not hasattr(cls, a))
         setattr(cls, a, fn)
 

omlish/metadata.py

@@ -125,7 +125,7 @@ class DecoratorObjectMetadata(ObjectMetadata, lang.Abstract):
             tts = tuple(object_metadata_target_types)
             for tt in tts:
                 check.issubclass(tt, _VALID_OBJECT_METADATA_TARGET_TYPES)
-            setattr(cls, '_OBJECT_METADATA_TARGET_TYPES', tts)
+            cls._OBJECT_METADATA_TARGET_TYPES = tts
 
     def __call__(self, obj: T) -> T:
         tgt: ta.Any = obj

omlish/text/minja.py

@@ -18,19 +18,6 @@ from ..lite.maybes import Maybe
 ##
 
 
-class MinjaTemplate:
-    def __init__(self, fn: ta.Callable) -> None:
-        super().__init__()
-
-        self._fn = fn
-
-    def __call__(self, **kwargs: ta.Any) -> str:
-        return self._fn(**kwargs)
-
-
-##
-
-
 @dc.dataclass(frozen=True)
 class MinjaTemplateParam:
     name: str
@@ -59,6 +46,28 @@ class MinjaTemplateParam:
         return cls(name, dfl)
 
 
+class MinjaTemplate:
+    def __init__(
+            self,
+            fn: ta.Callable,
+            params: ta.Sequence[MinjaTemplateParam],
+    ) -> None:
+        super().__init__()
+
+        self._fn = fn
+        self._params = params
+
+    @property
+    def params(self) -> ta.Sequence[MinjaTemplateParam]:
+        return self._params
+
+    def __call__(self, **kwargs: ta.Any) -> str:
+        return self._fn(**kwargs)
+
+
+##
+
+
 class MinjaTemplateCompiler:
     """
     Compiles a template string into a Python function. The returned function takes a dictionary 'context' and returns
@@ -261,7 +270,10 @@ class MinjaTemplateCompiler:
             rendered.ns,
         )
 
-        return MinjaTemplate(render_fn)
+        return MinjaTemplate(
+            render_fn,
+            self._params,
+        )
 
 
 ##

omlish/text/templating.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - find_vars
+"""
 import abc
 import dataclasses as dc
 import string
@@ -94,7 +98,7 @@ class MinjaTemplater(Templater):
 
 @dc.dataclass(frozen=True)
 class JinjaTemplater(Templater):
-    tmpl: jinja2.Template
+    tmpl: 'jinja2.Template'
 
     def render(self, ctx: Templater.Context) -> str:
         return self.tmpl.render(**(ctx.env or {}))
@@ -104,7 +108,7 @@ class JinjaTemplater(Templater):
             cls,
             src: str,
             *,
-            env: jinja2.Environment | None = None,
+            env: ta.Optional['jinja2.Environment'] = None,
             **kwargs: ta.Any,
     ) -> 'JinjaTemplater':
         if env is None:

{omlish-0.0.0.dev287.dist-info → omlish-0.0.0.dev289.dist-info}/METADATA

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

{omlish-0.0.0.dev287.dist-info → omlish-0.0.0.dev289.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=i-F-KstjC74KdNV4E5DhZUVUlbu5XeNyaWrDZaDrQtw,3444
+omlish/__about__.py,sha256=HbhZmTysZ2WI-rCErh6ZBDj_chq-_Q4au1A12QYY1v4,3444
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -8,7 +8,7 @@ omlish/datetimes.py,sha256=iFqCki3MKmBq_ZX-03cW4KE6AsR_pUJCWML2ifBLtdU,2157
 omlish/defs.py,sha256=-4UuZoJUUNO_bZ6eSSdhR4CK4NKN2Wwr1FfUvfTF--8,4918
 omlish/dynamic.py,sha256=zy0oO70_Vlh5dW8Nwav_O9bhIzQ6L16UgSuKR6y43VU,6526
 omlish/libc.py,sha256=8K4c66YV1ziJerl5poAAYCmsV-VSsHkT3EHhPW04ufg,15639
-omlish/metadata.py,sha256=HvZ6ItMpEmnE-X2d5Q6J17sBiG_qOyWB8DJrS9RFZpY,3604
+omlish/metadata.py,sha256=-noAyXT-7wV0SXul6wV1fPe7EYKxluuuYh1VmM39IPk,3593
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/shlex.py,sha256=rlbgHWxjwpkCBRphOPqSIN_KD6qWJMLldNJUILulKT0,253
 omlish/sync.py,sha256=-2gVJZFl8hvp7jvrnX8GcZVOecqAym6AcyK1QtMR9Ic,2979
@@ -185,7 +185,7 @@ omlish/configs/formats.py,sha256=RJw4Rzp7vlTd5YyAvpAoruQnk45v8dGPtPWwqH7aYyE,530
 omlish/configs/nginx.py,sha256=XuX9yyb0_MwkJ8esKiMS9gFkqHUPza_uCprhnWykNy8,2051
 omlish/configs/shadow.py,sha256=-R5nbevC4pFgqDPYOCCIqNcusgXsMWlRIUOEG0HBoJg,2228
 omlish/configs/types.py,sha256=t5_32MVRSKxbxor1hl1wRGKYm75F6Atisd_RYsN5ELU,103
-omlish/configs/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/configs/processing/__init__.py,sha256=eUBm0L6oZuwwM4vEuYx0pcCNdSTXaF7luur7jQz1qoc,210
 omlish/configs/processing/all.py,sha256=L23FOGn24As3jcB3B11R7PcHWXbYjkItrNq5ZEylPjA,784
 omlish/configs/processing/flattening.py,sha256=1duZH5zbrGuoYqaJco5LN5qx6e76QP5pHbIyItkQsFY,5021
 omlish/configs/processing/inheritance.py,sha256=lFD8eWRE0cG0Z3-eCu7pMsP2skWhUNaoAtWi9fNfn8k,1218
@@ -219,7 +219,7 @@ omlish/dataclasses/api/classes/metadata.py,sha256=2YafXunxqbqnHIdp5gsiGLyH7cWg9F
 omlish/dataclasses/api/classes/params.py,sha256=qmHuGC4vB8o-7cnRXllVz_WNprx2fsyrNzPY2mYC5FM,1680
 omlish/dataclasses/api/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/dataclasses/api/fields/building.py,sha256=YVAJZ2c318vK0YWz9VU8_MdjA5qNjqsI3N85K-bD0TI,3314
-omlish/dataclasses/api/fields/constructor.py,sha256=dRnVR5srD-8nNaMxdkWh0oFPINwOu-D7n4QItI6AWPs,1310
+omlish/dataclasses/api/fields/constructor.py,sha256=T2GeczTz9uy2EOTDlU4VJoiXp-I6jvlxnYXChvQqHxk,1533
 omlish/dataclasses/api/fields/conversion.py,sha256=Pye4KOON78CBgDzwTqNb5fx8wE7uvlKcwVfQ2nhDzrM,5134
 omlish/dataclasses/api/fields/metadata.py,sha256=4hGRvG96qPNeipbnHlnbDNWqCANGCuE9BmjKUzTEzRQ,1689
 omlish/dataclasses/concerns/__init__.py,sha256=4Goga5wAOAbK6KcoHWC8jDC8M9ywgH7PfmXXxgCYCC8,208
@@ -277,7 +277,7 @@ omlish/diag/lsof.py,sha256=DnowqvKYah-WCuBHS3DAcZCvlsWJdM9kYNFq97UZDDA,9127
 omlish/diag/procfs.py,sha256=KaGTAA2Gj8eEEp7MjClRe4aimwzd-HDABThFzvq2cBQ,9684
 omlish/diag/procstats.py,sha256=UkqxREqfd-38xPYZ9T1SIJISz5ARQCEhTtOZrxtm2dE,777
 omlish/diag/ps.py,sha256=b7ai9O4mGZliNFvBu6PdQfMmct4qpcMTygEf1ISHBLQ,1666
-omlish/diag/pycharm.py,sha256=7-r_F-whXt8v-0dehxAX-MeMFPM3iZXX9IfeL0GfUtk,4643
+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
@@ -292,7 +292,7 @@ omlish/dispatch/_dispatch3.py,sha256=9Zjd7bINAC3keiaBdssc4v5dY0-8OI6XooV2DR9U7Z0
 omlish/dispatch/dispatch.py,sha256=KA5l49AiGLRjp4J7RDJW9RiDp9WUD1ewR1AOPEF8g38,3062
 omlish/dispatch/functions.py,sha256=cwNzGIg2ZIalEgn9I03cnJVbMTHjWloyDTaowlO3UPs,1524
 omlish/dispatch/impls.py,sha256=K_okKvpZml4NkTHJmTVyMQSrIaIJcqTEgkreGwukaOw,1895
-omlish/dispatch/methods.py,sha256=7jNKvwGNW9CJRTMDZyedmrWJN7Y9-ToI7YOAQ8VJu5Q,6786
+omlish/dispatch/methods.py,sha256=K5w9Bb4jjCEpz3H95VMsv8ITXSO_7F6Jp5K5Fcd4gjQ,6955
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
@@ -816,10 +816,10 @@ omlish/text/glyphsplit.py,sha256=HI8TWDUaF_tJG5RnIdIjtUH_lYnjYZ7KZBANSxOXGZc,380
 omlish/text/indent.py,sha256=LOQgHskHMLVrRC6HLL9uIWay517dpvPEYQK0Igm-wm8,1341
 omlish/text/linecache.py,sha256=hRYlEhD63ZfA6_ZOTkQIcnON-3W56QMAhcG3vEJqj9M,1858
 omlish/text/mangle.py,sha256=d7j2_HPxoxF5VrLD1TShOSfnhBLH_-lQe_OH2kl0yHg,2790
-omlish/text/minja.py,sha256=e7XiY8IvF4Df-7hxhdC_qizHm9T4SIbFJR7enUg_Zmc,7252
+omlish/text/minja.py,sha256=FH2xcZUby-yB1CQwCUGmpvHmE1nCmfNX1h0Nm6ix8ck,7515
 omlish/text/parts.py,sha256=Q9NvoyEGQKIWgiPD4D_Qc66cWAuyEKE033dT9m7c3Wk,6662
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
-omlish/text/templating.py,sha256=UyYIs0wMigCDws0XfO3mYkJFH0-tO1IBaxWL7v2J3pw,2417
+omlish/text/templating.py,sha256=azhKpvkDR2uby8k3AJ8Y6GpdKVQUb7Xt_cGbDz6dkTM,2454
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
 omlish/typedvalues/__init__.py,sha256=c3IQmRneMmH6JRcafprqmBILWD89b-IyIll6MgahGCI,562
@@ -830,9 +830,9 @@ omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,
 omlish/typedvalues/marshal.py,sha256=Rr-4DZ90BoD5Z9gT18QhZH2yMA3-gPJBK8GUrGkp8VA,4245
 omlish/typedvalues/reflect.py,sha256=y_7IY8_4cLVRvD3ug-_-cDaO5RtzC1rLVFzkeAPALf8,683
 omlish/typedvalues/values.py,sha256=Q_5IiQM3Vka4wGVd-scaslb4-oCMjFcIOksIrKE-JIM,1229
-omlish-0.0.0.dev287.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev287.dist-info/METADATA,sha256=2lOtfXV-sPk2hcxlOFk_TruhqdiAsg_MTdrhMSxI0o0,4316
-omlish-0.0.0.dev287.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev287.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev287.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev287.dist-info/RECORD,,
+omlish-0.0.0.dev289.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev289.dist-info/METADATA,sha256=qBFa2LeCS8dTuxmfIIrmiUFQBzIm5bR_MqfY2GlweLc,4316
+omlish-0.0.0.dev289.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev289.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev289.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev289.dist-info/RECORD,,