omdev 0.0.0.dev240__py3-none-any.whl → 0.0.0.dev242__py3-none-any.whl

omdev/ci/docker/imagepulling.py

@@ -4,9 +4,11 @@ import dataclasses as dc
 import typing as ta
 
 from omlish.lite.timing import log_timing_context
+from omlish.text.mangle import StringMangler
 
 from ..cache import FileCache
 from .cache import DockerCache
+from .cache import DockerCacheKey
 from .cmds import is_docker_image_present
 from .cmds import pull_docker_image
 
@@ -44,11 +46,9 @@ class DockerImagePullingImpl(DockerImagePulling):
         if not self._config.always_pull and (await is_docker_image_present(image)):
             return
 
-        dep_suffix = image
-        for c in '/:.-_':
-            dep_suffix = dep_suffix.replace(c, '-')
+        key_content = StringMangler.of('-', '/:._').mangle(image)
 
-        cache_key = f'docker-{dep_suffix}'
+        cache_key = DockerCacheKey(['docker'], key_content)
         if (
                 self._docker_cache is not None and
                 (await self._docker_cache.load_cache_docker_image(cache_key)) is not None

omdev/ci/docker/inject.py

@@ -9,29 +9,58 @@ from .buildcaching import DockerBuildCaching
 from .buildcaching import DockerBuildCachingImpl
 from .cache import DockerCache
 from .cache import DockerCacheImpl
+from .cacheserved.cache import CacheServedDockerCache
 from .imagepulling import DockerImagePulling
 from .imagepulling import DockerImagePullingImpl
+from .repositories import DockerImageRepositoryOpener
+from .repositories import DockerImageRepositoryOpenerImpl
 
 
 ##
 
 
 def bind_docker(
-    *,
-    build_caching_config: DockerBuildCachingImpl.Config,
-    image_pulling_config: DockerImagePullingImpl.Config = DockerImagePullingImpl.Config(),
+        *,
+        build_caching_config: DockerBuildCachingImpl.Config,
+        cache_served_docker_cache_config: ta.Optional[CacheServedDockerCache.Config] = None,
+        image_pulling_config: DockerImagePullingImpl.Config = DockerImagePullingImpl.Config(),
 ) -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = [
+    lst: ta.List[InjectorBindingOrBindings] = []
+
+    #
+
+    lst.extend([
         inj.bind(build_caching_config),
         inj.bind(DockerBuildCachingImpl, singleton=True),
         inj.bind(DockerBuildCaching, to_key=DockerBuildCachingImpl),
+    ])
+
+    #
+
+    if cache_served_docker_cache_config is not None:
+        lst.extend([
+            inj.bind(DockerImageRepositoryOpenerImpl, singleton=True),
+            inj.bind(DockerImageRepositoryOpener, to_key=DockerImageRepositoryOpenerImpl),
 
-        inj.bind(DockerCacheImpl, singleton=True),
-        inj.bind(DockerCache, to_key=DockerCacheImpl),
+            inj.bind(cache_served_docker_cache_config),
+            inj.bind(CacheServedDockerCache, singleton=True),
+            inj.bind(DockerCache, to_key=CacheServedDockerCache),
+        ])
 
+    else:
+        lst.extend([
+            inj.bind(DockerCacheImpl, singleton=True),
+            inj.bind(DockerCache, to_key=DockerCacheImpl),
+        ])
+
+    #
+
+    lst.extend([
         inj.bind(image_pulling_config),
         inj.bind(DockerImagePullingImpl, singleton=True),
         inj.bind(DockerImagePulling, to_key=DockerImagePullingImpl),
-    ]
+    ])
+
+    #
 
     return inj.as_bindings(*lst)

omdev/ci/github/client.py

@@ -213,7 +213,7 @@ class GithubCacheServiceV1BaseClient(GithubCacheClient, abc.ABC):
 
     #
 
-    KEY_PART_SEPARATOR = '--'
+    KEY_PART_SEPARATOR = '---'
 
     def fix_key(self, s: str, partial_suffix: bool = False) -> str:
         return self.KEY_PART_SEPARATOR.join([
@@ -230,7 +230,7 @@ class GithubCacheServiceV1BaseClient(GithubCacheClient, abc.ABC):
 
     def get_entry_url(self, entry: GithubCacheClient.Entry) -> ta.Optional[str]:
         entry1 = check.isinstance(entry, self.Entry)
-        return entry1.artifact.cache_key
+        return entry1.artifact.archive_location
 
     #
 

omdev/ci/github/inject.py

@@ -5,6 +5,7 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 
+from ..cache import DataCache
 from ..cache import FileCache
 from .cache import GithubCache
 
@@ -15,6 +16,7 @@ from .cache import GithubCache
 def bind_github() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(GithubCache, singleton=True),
+        inj.bind(DataCache, to_key=GithubCache),
         inj.bind(FileCache, to_key=GithubCache),
     ]
 

omdev/ci/inject.py

@@ -5,10 +5,13 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 
+from .cache import DataCache
 from .cache import DirectoryFileCache
 from .cache import FileCache
+from .cache import FileCacheDataCache
 from .ci import Ci
 from .docker.buildcaching import DockerBuildCachingImpl
+from .docker.cacheserved.cache import CacheServedDockerCache
 from .docker.imagepulling import DockerImagePullingImpl
 from .docker.inject import bind_docker
 from .github.inject import bind_github
@@ -24,6 +27,8 @@ def bind_ci(
         directory_file_cache_config: ta.Optional[DirectoryFileCache.Config] = None,
 
         github: bool = False,
+
+        cache_served_docker: bool = False,
 ) -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [  # noqa
         inj.bind(config),
@@ -37,6 +42,10 @@ def bind_ci(
             always_build=config.always_build,
         ),
 
+        cache_served_docker_cache_config=CacheServedDockerCache.Config(
+            #
+        ) if cache_served_docker else None,
+
         image_pulling_config=DockerImagePullingImpl.Config(
             always_pull=config.always_pull,
         ),
@@ -50,7 +59,13 @@ def bind_ci(
 
         if github:
             lst.append(bind_github())
+
         else:
-            lst.append(inj.bind(FileCache, to_key=DirectoryFileCache))
+            lst.extend([
+                inj.bind(FileCache, to_key=DirectoryFileCache),
+
+                inj.bind(FileCacheDataCache, singleton=True),
+                inj.bind(DataCache, to_key=FileCacheDataCache),
+            ])
 
     return inj.as_bindings(*lst)

omdev/dataserver/http.py

@@ -3,6 +3,7 @@
 TODO:
  - asyncio
  - chunked transfer - both output and urllib input
+ - range headers
 """
 import typing as ta
 

omdev/precheck/lite.py

@@ -68,6 +68,7 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
     @staticmethod
     def _load_file_module(fp: str) -> None:
         import os.path  # noqa
+        import sys  # noqa
         import types  # noqa
 
         fp = os.path.abspath(fp)
@@ -83,6 +84,8 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         mod.__builtins__ = __builtins__  # type: ignore
         mod.__spec__ = None
 
+        sys.modules[mn] = mod
+
         code = compile(src, fp, 'exec')
         exec(code, mod.__dict__, mod.__dict__)
 

omdev/scripts/bumpversion.py

@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 # @omlish-lite
 # @omlish-script
+"""
+TODO:
+ - https://github.com/mtkennerly/dunamai
+"""
 import argparse
 import re
 import string