omlish 0.0.0.dev62__tar.gz → 0.0.0.dev64__tar.gz

{omlish-0.0.0.dev62/omlish.egg-info → omlish-0.0.0.dev64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev62
+Version: 0.0.0.dev64
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev62'
-__revision__ = 'a5ef2d1548d1cdfb856b4a7ff99fe61080ab791e'
+__version__ = '0.0.0.dev64'
+__revision__ = '65b4d26bc20b482253b288f29eebe58b9ae531dd'
 
 
 #
@@ -92,7 +92,7 @@ class Project(ProjectBase):
             # 'psycopg ~= 3.2',
 
             'pymysql ~= 1.1',
-            # 'mysql-connector-python ~= 9.0',
+            # 'mysql-connector-python ~= 9.1',
             # 'mysqlclient ~= 2.2',
 
             'aiomysql ~= 0.2',

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/argparse.py

@@ -70,7 +70,7 @@ def arg(*args, **kwargs) -> Arg:
 #
 
 
-CommandFn = ta.Callable[[], None]
+CommandFn = ta.Callable[[], int | None]
 
 
 @dc.dataclass(eq=False)
@@ -96,9 +96,9 @@ class Command:
     def __get__(self, instance, owner=None):
         if instance is None:
             return self
-        return dc.replace(self, fn=self.fn.__get__(instance, owner))
+        return dc.replace(self, fn=self.fn.__get__(instance, owner))  # noqa
 
-    def __call__(self, *args, **kwargs) -> None:
+    def __call__(self, *args, **kwargs) -> int | None:
         return self.fn(*args, **kwargs)
 
 
@@ -234,10 +234,10 @@ class Cli(metaclass=_CliMeta):
     def unknown_args(self) -> ta.Sequence[str]:
         return self._unknown_args
 
-    def _run_cmd(self, cmd: Command) -> None:
-        cmd.__get__(self, type(self))()
+    def _run_cmd(self, cmd: Command) -> int | None:
+        return cmd.__get__(self, type(self))()
 
-    def __call__(self) -> None:
+    def __call__(self) -> int | None:
         cmd = getattr(self.args, '_cmd', None)
 
         if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
@@ -249,6 +249,9 @@ class Cli(metaclass=_CliMeta):
 
         if cmd is None:
             self.get_parser().print_help()
-            return
+            return 0
 
-        self._run_cmd(cmd)
+        return self._run_cmd(cmd)
+
+    def call_and_exit(self) -> ta.NoReturn:
+        sys.exit(rc if isinstance(rc := self(), int) else 0)

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/bootstrap/main.py

@@ -83,7 +83,7 @@ def _add_arguments(parser: argparse.ArgumentParser) -> None:
             else:
                 raise TypeError(fld)
 
-            parser.add_argument(aname, action=_OrderedArgsAction, **kw)
+            parser.add_argument(aname.replace('_', '-'), action=_OrderedArgsAction, **kw)
 
 
 def _process_arguments(args: ta.Any) -> ta.Sequence[Bootstrap.Config]:

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/collections/indexed.py

@@ -13,7 +13,7 @@ class IndexedSeq(ta.Sequence[T]):
         super().__init__()
 
         self._lst = list(it)
-        self._idxs = (IdentityKeyDict if identity else dict)(map(reversed, enumerate(self._lst)))
+        self._idxs: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, e in enumerate(self._lst))  # noqa
         if len(self._idxs) != len(self._lst):
             raise ValueError(f'{len(self._idxs)} != {len(self._lst)}')
 
@@ -47,7 +47,7 @@ class IndexedSetSeq(ta.Sequence[ta.AbstractSet[T]]):
         super().__init__()
 
         self._lst = [(IdentitySet if identity else set)(e) for e in it]
-        self._idxs = (IdentityKeyDict if identity else dict)((e, i) for i, es in enumerate(self._lst) for e in es)
+        self._idxs: ta.Mapping[T, int] = (IdentityKeyDict if identity else dict)((e, i) for i, es in enumerate(self._lst) for e in es)  # noqa
         if len(self._idxs) != sum(map(len, self._lst)):
             raise ValueError(f'{len(self._idxs)} != {sum(map(len, self._lst))}')
 

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/docker/__init__.py

@@ -24,4 +24,6 @@ from .helpers import (  # noqa
 from .hub import (  # noqa
     HubRepoInfo,
     get_hub_repo_info,
+    select_latest_tag,
+    split_tag_suffix,
 )

omlish-0.0.0.dev64/omlish/docker/hub.py

@@ -0,0 +1,161 @@
+import typing as ta
+import urllib.error
+import urllib.request
+
+from .. import check
+from .. import dataclasses as dc
+from ..formats import json
+
+
+##
+
+
+def _tag_sort_key(s: str) -> tuple:
+    l = []
+    for p in s.split('.'):
+        v: ta.Any
+        try:
+            v = int(p)
+        except ValueError:
+            v = s
+        l.append((not isinstance(v, int), v))
+    return tuple(l)
+
+
+DEFAULT_TAG_SUFFIX_DELIM = '-+'
+
+
+def split_tag_suffix(
+        tag: str,
+        suffix_delim: ta.Iterable[str] = DEFAULT_TAG_SUFFIX_DELIM,
+) -> tuple[str, str | None]:
+    for d in suffix_delim:
+        if d in tag:
+            p, _, s = tag.partition(d)
+            return p, s
+    return tag, None
+
+
+def select_latest_tag(
+        tags: ta.Iterable[str],
+        *,
+        base: str | None = None,
+        suffix: str | None = None,
+        suffix_delim: ta.Iterable[str] = '-+',
+) -> str:
+    check.not_isinstance(tags, str)
+
+    tags_by_sfx: dict[str | None, set[tuple[tuple, str]]] = {}
+    for t in tags:
+        p, s = split_tag_suffix(t, suffix_delim)
+        tags_by_sfx.setdefault(s, set()).add((_tag_sort_key(p), t))
+
+    if base is not None:
+        bp, bs = split_tag_suffix(base, suffix_delim)
+        if suffix is None:
+            suffix = bs
+        base_key = _tag_sort_key(bp)
+    else:
+        base_key = None
+
+    sl = sorted(tags_by_sfx[suffix])
+
+    if base_key is not None:
+        sl = [(k, t) for k, t in sl if k[0] == base_key[0]]
+
+    return sl[-1][1]
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class HubRepoInfo:
+    repo: str
+    tags: ta.Sequence[str]
+    manifests: ta.Mapping[str, ta.Mapping[str, ta.Any]]
+
+
+def get_hub_repo_info(
+        repo: str,
+        *,
+        auth_url: str = 'https://auth.docker.io/',
+        api_url: str = 'https://registry-1.docker.io/v2/',
+        tags: ta.Iterable[str] | None = None,
+        handled_codes: ta.Container[int] | None = (401, 404),
+) -> HubRepoInfo | None:
+    """
+    https://stackoverflow.com/a/39376254
+
+    ==
+
+    repo=library/nginx
+    token=$(
+        curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${repo}:pull" \
+        | jq -r '.token' \
+    )
+    curl -H "Authorization: Bearer $token" -s "https://registry-1.docker.io/v2/${repo}/tags/list" | jq
+    curl \
+        -H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+        -H "Accept: application/vnd.docker.distribution.manifest.list.v2+json" \
+        -H "Authorization: Bearer $token" \
+        -s "https://registry-1.docker.io/v2/${repo}/manifests/latest" \
+    | jq .
+    """
+    if tags is not None:
+        check.not_isinstance(tags, str)
+    else:
+        tags = []
+
+    auth_url = auth_url.rstrip('/')
+    api_url = api_url.rstrip('/')
+
+    if '/' not in repo:
+        repo = '_/' + repo
+    if repo.startswith('_/'):
+        repo = 'library' + repo[1:]
+
+    #
+
+    def req_json(url: str, **kwargs: ta.Any) -> ta.Any:
+        with urllib.request.urlopen(urllib.request.Request(url, **kwargs)) as resp:  # noqa
+            return json.loads(resp.read().decode('utf-8'))
+
+    #
+
+    token_dct = req_json(f'{auth_url}/token?service=registry.docker.io&scope=repository:{repo}:pull')
+    token = token_dct['token']
+
+    req_hdrs = {'Authorization': f'Bearer {token}'}
+
+    #
+
+    try:
+        tags_resp = req_json(
+            f'{api_url}/{repo}/tags/list',
+            headers=req_hdrs,
+        )
+    except urllib.error.HTTPError as ue:
+        if ue.code in (handled_codes or ()):
+            return None
+        else:
+            raise
+
+    tags_dct = tags_resp.get('tags', {})
+
+    manis = {}
+    for tag in tags:
+        mani = req_json(
+            f'{api_url}/{repo}/manifests/latest',
+            headers={
+                **req_hdrs,
+                'Accept': 'application/vnd.docker.distribution.manifest.v2+json',
+            },
+        )
+        manis[tag] = mani
+
+    return HubRepoInfo(
+        repo,
+        tags_dct,
+        manis,
+    )

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/formats/yaml.py

@@ -225,6 +225,14 @@ def load_all(stream, Loader):  # noqa
             yield loader.get_data()
 
 
+def safe_load(stream):  # noqa
+    return load(stream, yaml.SafeLoader)
+
+
+def safe_load_all(stream):  # noqa  # noqa
+    return load_all(stream, yaml.SafeLoader)
+
+
 def full_load(stream):  # noqa
     return load(stream, yaml.FullLoader)
 

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/lang/classes/simple.py

@@ -14,6 +14,17 @@ V = ta.TypeVar('V')
 ##
 
 
+class SimpleMetaDict(dict):
+    def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
+        for k, v in m.items():
+            self[k] = v
+        for k, v in kwargs.items():  # type: ignore
+            self[k] = v
+
+
+##
+
+
 class _NamespaceMeta(abc.ABCMeta):
     def __new__(mcls, name, bases, namespace):
         if bases:
@@ -23,9 +34,14 @@ class _NamespaceMeta(abc.ABCMeta):
         return super().__new__(mcls, name, bases, namespace)
 
     def __iter__(cls) -> ta.Iterator[tuple[str, ta.Any]]:
-        for a in dir(cls):
-            if not a.startswith('_'):
-                yield (a, getattr(cls, a))
+        seen: set[str] = set()
+        for bcls in reversed(cls.__mro__):
+            for a in bcls.__dict__:
+                if a in seen:
+                    continue
+                seen.add(a)
+                if not a.startswith('_'):
+                    yield (a, getattr(cls, a))
 
     def __getitem__(cls, n: str) -> ta.Any:
         return getattr(cls, n)
@@ -75,17 +91,6 @@ class Marker(NotInstantiable, metaclass=_MarkerMeta):
 ##
 
 
-class SimpleMetaDict(dict):
-    def update(self, m: ta.Mapping[K, V], **kwargs: V) -> None:  # type: ignore
-        for k, v in m.items():
-            self[k] = v
-        for k, v in kwargs.items():  # type: ignore
-            self[k] = v
-
-
-##
-
-
 _SINGLETON_INSTANCE_ATTR = '__singleton_instance__'
 _SINGLETON_LOCK = threading.RLock()
 

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/lang/descriptors.py

@@ -97,15 +97,15 @@ def update_wrapper(
         assigned: ta.Iterable[str] = functools.WRAPPER_ASSIGNMENTS,
         updated: ta.Iterable[str] = functools.WRAPPER_UPDATES,
         *,
-        filter: ta.Iterable[str] | None = None,  # noqa
+        exclude: ta.Iterable[str] | None = None,
         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)
+    if exclude:
+        if isinstance(exclude, str):
+            exclude = [exclude]  # noqa
+        assigned = tuple(a for a in assigned if a not in exclude)
+        updated = tuple(a for a in updated if a not in exclude)
 
     for attr in assigned:
         try:
@@ -135,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(self, fn, filter='__dict__')
+            update_wrapper(self, fn, exclude='__dict__')
 
         def __get__(self, instance, owner=None):
             return functools.update_wrapper(functools.partial(self._wrapper, fn := self._fn.__get__(instance, owner)), fn)  # noqa
@@ -144,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(self, fn, filter='__dict__')
+            update_wrapper(self, fn, exclude='__dict__')
 
         def __get__(self, instance, owner=None):
             fn = self._fn.__get__(instance, owner)
@@ -174,7 +174,7 @@ class _decorator_descriptor:  # noqa
 class _decorator:  # noqa
     def __init__(self, wrapper):
         self._wrapper = wrapper
-        update_wrapper(self, wrapper, filter='__dict__')
+        update_wrapper(self, wrapper, exclude='__dict__')
 
     def __repr__(self):
         return f'{self.__class__.__name__}<{self._wrapper}>'

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/lang/strings.py

@@ -14,7 +14,7 @@ def prefix_delimited(s: StrOrBytesT, p: StrOrBytesT, d: StrOrBytesT) -> StrOrByt
 
 
 def prefix_lines(s: StrOrBytesT, p: StrOrBytesT) -> StrOrBytesT:
-    return prefix_delimited(s, p, '\n' if isinstance(s, str) else b'\n')
+    return prefix_delimited(s, p, '\n' if isinstance(s, str) else b'\n')  # type: ignore
 
 
 def indent_lines(s: StrOrBytesT, num: StrOrBytesT) -> StrOrBytesT:

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/omlish/lite/marshal.py

@@ -246,29 +246,30 @@ def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
 
 
 def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    if isinstance(ty, type) and abc.ABC in ty.__bases__:
-        impls = [  # type: ignore
-            PolymorphicObjMarshaler.Impl(
-                ity,
-                ity.__qualname__,
-                get_obj_marshaler(ity),
+    if isinstance(ty, type):
+        if abc.ABC in ty.__bases__:
+            impls = [  # type: ignore
+                PolymorphicObjMarshaler.Impl(
+                    ity,
+                    ity.__qualname__,
+                    get_obj_marshaler(ity),
+                )
+                for ity in deep_subclasses(ty)
+                if abc.ABC not in ity.__bases__
+            ]
+            return PolymorphicObjMarshaler(
+                {i.ty: i for i in impls},
+                {i.tag: i for i in impls},
+            )
+
+        if issubclass(ty, enum.Enum):
+            return EnumObjMarshaler(ty)
+
+        if dc.is_dataclass(ty):
+            return DataclassObjMarshaler(
+                ty,
+                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
             )
-            for ity in deep_subclasses(ty)
-            if abc.ABC not in ity.__bases__
-        ]
-        return PolymorphicObjMarshaler(
-            {i.ty: i for i in impls},
-            {i.tag: i for i in impls},
-        )
-
-    if isinstance(ty, type) and issubclass(ty, enum.Enum):
-        return EnumObjMarshaler(ty)
-
-    if dc.is_dataclass(ty):
-        return DataclassObjMarshaler(
-            ty,
-            {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
-        )
 
     if is_generic_alias(ty):
         try:

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev62
+Version: 0.0.0.dev64
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev62 → omlish-0.0.0.dev64}/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.dev62'
+version = '0.0.0.dev64'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev62/omlish/docker/hub.py

@@ -1,75 +0,0 @@
-import typing as ta
-import urllib.request
-
-from .. import dataclasses as dc
-from ..formats import json
-
-
-@dc.dataclass(frozen=True)
-class HubRepoInfo:
-    repo: str
-    tags: ta.Mapping[str, ta.Any]
-    latest_manifests: ta.Mapping[str, ta.Any]
-
-
-def get_hub_repo_info(
-        repo: str,
-        *,
-        auth_url: str = 'https://auth.docker.io/',
-        api_url: str = 'https://registry-1.docker.io/v2/',
-) -> HubRepoInfo:
-    """
-    https://stackoverflow.com/a/39376254
-
-    ==
-
-    repo=library/nginx
-    token=$(
-        curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${repo}:pull" \
-        | jq -r '.token' \
-    )
-    curl -H "Authorization: Bearer $token" -s "https://registry-1.docker.io/v2/${repo}/tags/list" | jq
-    curl \
-        -H "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-        -H "Accept: application/vnd.docker.distribution.manifest.list.v2+json" \
-        -H "Authorization: Bearer $token" \
-        -s "https://registry-1.docker.io/v2/${repo}/manifests/latest" \
-    | jq .
-    """
-
-    auth_url = auth_url.rstrip('/')
-    api_url = api_url.rstrip('/')
-
-    #
-
-    def req_json(url: str, **kwargs: ta.Any) -> ta.Any:
-        with urllib.request.urlopen(urllib.request.Request(url, **kwargs)) as resp:  # noqa
-            return json.loads(resp.read().decode('utf-8'))
-
-    #
-
-    token_dct = req_json(f'{auth_url}/token?service=registry.docker.io&scope=repository:{repo}:pull')
-    token = token_dct['token']
-
-    req_hdrs = {'Authorization': f'Bearer {token}'}
-
-    #
-
-    tags_dct = req_json(
-        f'{api_url}/{repo}/tags/list',
-        headers=req_hdrs,
-    )
-
-    latest_mani_dct = req_json(
-        f'{api_url}/{repo}/manifests/latest',
-        headers={
-            **req_hdrs,
-            'Accept': 'application/vnd.docker.distribution.manifest.v2+json',
-        },
-    )
-
-    return HubRepoInfo(
-        repo,
-        tags_dct,
-        latest_mani_dct,
-    )