omlish 0.0.0.dev287__tar.gz → 0.0.0.dev289__tar.gz

{omlish-0.0.0.dev287/omlish.egg-info → omlish-0.0.0.dev289}/PKG-INFO

@@ -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 → omlish-0.0.0.dev289}/omlish/__about__.py

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

omlish-0.0.0.dev289/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-0.0.0.dev287 → omlish-0.0.0.dev289}/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-0.0.0.dev287 → omlish-0.0.0.dev289}/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-0.0.0.dev287 → omlish-0.0.0.dev289}/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-0.0.0.dev287 → omlish-0.0.0.dev289}/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-0.0.0.dev287 → omlish-0.0.0.dev289}/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-0.0.0.dev287 → omlish-0.0.0.dev289}/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 → omlish-0.0.0.dev289/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev289}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev287'
+version = '0.0.0.dev289'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',