corio 2.2.1a0__tar.gz → 2.2.2__tar.gz

{corio-2.2.1a0 → corio-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corio
-Version: 2.2.1a0
+Version: 2.2.2
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Author-email: Frontmatter AI <innovative.fowler@mask.pro.fmtr.dev>
 License-Expression: Apache-2.0
@@ -39,7 +39,10 @@ Requires-Dist: logfire[fastapi]; extra == "dev"
 Requires-Dist: tomlkit; extra == "dev"
 Requires-Dist: pyrage; extra == "dev"
 Requires-Dist: dotenv; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
@@ -255,6 +258,8 @@ Requires-Dist: logfire[fastapi]; extra == "infra"
 Requires-Dist: tomlkit; extra == "infra"
 Requires-Dist: pyrage; extra == "infra"
 Requires-Dist: dotenv; extra == "infra"
+Requires-Dist: pytest; extra == "infra"
+Requires-Dist: pytest-cov; extra == "infra"
 Provides-Extra: vcs
 Requires-Dist: pygit2; extra == "vcs"
 Provides-Extra: tasmota
@@ -313,6 +318,7 @@ Requires-Dist: logfire[fastapi]; extra == "all"
 Requires-Dist: tomlkit; extra == "all"
 Requires-Dist: pyrage; extra == "all"
 Requires-Dist: dotenv; extra == "all"
+Requires-Dist: pytest; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
 Requires-Dist: dask[bag]; extra == "all"
 Requires-Dist: distributed; extra == "all"

{corio-2.2.1a0 → corio-2.2.2}/corio/entrypoint.py

@@ -1,7 +1,7 @@
 from pydantic_settings import CliSubCommand
 
 from corio import dm
-from corio import secrets
+from corio import sec
 from corio import sets
 
 
@@ -78,7 +78,7 @@ class RemoteDebugTest(dm.Base):
 
 
 class Cli(sets.Base, cli_parse_args=True):
-    secrets: CliSubCommand[secrets.Cli]
+    secrets: CliSubCommand[sec.Cli]
     docs: CliSubCommand[Docs]
     pyproject: CliSubCommand[Pyproject]
     ep_test: CliSubCommand[EpTest]

{corio-2.2.1a0 → corio-2.2.2}/corio/infra/incrementor_pyproject.py

@@ -1,12 +1,15 @@
 from copy import deepcopy
 from functools import cached_property
 from itertools import chain
+from packaging.requirements import Requirement, InvalidRequirement
+from packaging.utils import canonicalize_name
 
 from corio.constants import Constants
 from corio.infra.releaser import Incrementor
 from corio.iterator import dedupe
 from corio.logs import logger
-from corio.path import Path
+from corio.path import Path, PackagePaths
+from corio.path.path import Metadata
 from corio.toml import ensure_table
 
 
@@ -25,6 +28,86 @@ class IncrementorPyproject(Incrementor):
     def name_command(self) -> str:
         return self.paths.name_ns.replace(".", self.ENTRYPOINT_COMMAND_SEP)
 
+    @cached_property
+    def editables(self) -> dict[str, Metadata]:
+        data = self.path.read_toml()
+        sources = data.get("tool", {}).get("uv", {}).get("sources", {})
+
+        editables = {}
+        for key, source in sources.items():
+            if not isinstance(source, dict):
+                continue
+            if not source.get("editable"):
+                continue
+
+            source_path = source.get("path")
+            if not source_path:
+                logger.warning(f'Editable source "{key}" is missing "path". Skipping.')
+                continue
+            path_repo = (self.paths.repo / str(source_path)).resolve()
+            if not path_repo.exists():
+                continue
+
+            try:
+                paths = PackagePaths(path_repo)
+            except Exception as exception:
+                logger.warning(f'Failed to resolve editable source at "{path_repo}". Skipping. {exception!r}')
+                continue
+
+            metadata = paths.metadata
+            if metadata.version_obj.prerelease and not self.versions.is_pre:
+                raise ValueError(
+                    f'Editable dependency "{paths.name_ns}" is pre-release '
+                    f'({metadata.version_obj.prerelease}) while "{self.paths.name_ns}" is release. Refusing to pin.'
+                )
+
+            editables[paths.name_ns] = metadata
+            editables[canonicalize_name(paths.name_ns)] = metadata
+
+        return editables
+
+    def _pin_editable(self, dep: str) -> str:
+        try:
+            requirement = Requirement(dep)
+        except InvalidRequirement:
+            return dep
+
+        if requirement.specifier:
+            return dep
+        if requirement.url:
+            return dep
+
+        metadata = self.editables.get(requirement.name)
+        if metadata is None:
+            metadata = self.editables.get(canonicalize_name(requirement.name))
+        if metadata is None:
+            return dep
+
+        extras = ""
+        if requirement.extras:
+            extras = f"[{','.join(sorted(requirement.extras))}]"
+
+        marker = ""
+        if requirement.marker:
+            marker = f"; {requirement.marker}"
+
+        pinned = f"{requirement.name}{extras}=={metadata.version}{marker}"
+        logger.info(f'Pinning editable dependency "{dep}" -> "{pinned}".')
+        return pinned
+
+    def _process_deps(self, deps: str|list[str]) -> str|list[str]:
+
+        if isinstance(deps, list):
+            deps=[self._process_deps(dep) for dep in deps]
+            deps=dedupe(deps)
+            return deps
+
+        dep=deps
+        dep=self._pin_editable(dep)
+
+        return dep
+
+
     def apply(self) -> Path | list[Path] | None:
         if not self.path.exists():
             logger.info(f'pyproject.toml not found: "{self.path}". Skipping.')
@@ -43,6 +126,7 @@ class IncrementorPyproject(Incrementor):
         self.path.write_toml(data)
         return self.path
 
+
     @property
     def _author(self) -> str:
         if self.paths.metadata.is_client:
@@ -106,36 +190,23 @@ class IncrementorPyproject(Incrementor):
                     values_resolved += resolve_values(value)
             return values_resolved
 
-        install = dedupe(resolve_values("install")) if "install" in dependencies else []
+
         extras = {key: dedupe(resolve_values(key)) for key in dependencies}
-        extras.pop("install", None)
+        install = extras.pop("install", [])
         extras["all"] = dedupe(list(chain.from_iterable(extras.values())))
         return install, extras
 
-    def _get_dependencies(self, data) -> dict[str, list[str]]:
-        table = data
-        for key in self.DEPENDENCIES_SECTION_PATH:
-            if key not in table:
-                return {}
-            table = table[key]
-
-        if table is None:
-            return {}
-        return {str(key): [str(value) for value in values] for key, values in table.items()}
 
     def _enrich_toml(self, data):
-        old = self.versions.old
-        new = self._bump(old)
-        if old != new:
-            logger.info(f'Incrementing version "{self.path}" {old} {Constants.ARROW_RIGHT} {new}...')
-        self.paths.metadata.version = str(new)
+        version = str(self.version)
+        logger.info(f'Applying release version "{version}" to "{self.path}"...')
 
         metadata = ensure_table(data, ("tool", "corio", "metadata"))
-        metadata["version"] = self.paths.metadata.version
+        metadata["version"] = version
 
         project = ensure_table(data, ("project",))
         project["name"] = self.paths.name_ns
-        project["version"] = self.paths.metadata.version
+        project["version"] = version
         project["description"] = self.paths.metadata.description
         project["keywords"] = self.paths.metadata.keywords
         project["readme"] = self.paths.readme.name
@@ -146,18 +217,32 @@ class IncrementorPyproject(Incrementor):
         elif "license-files" in project:
             del project["license-files"]
 
-        dependencies = self._get_dependencies(data)
-        if dependencies:
-            install, extras = self._flatten_dependencies(dependencies)
+
+        deps_corio = data.get("tool", {}).get("corio", {}).get("dependencies", None)
+        if deps_corio is not None:
+            install, extras = self._flatten_dependencies(deps_corio)
             project["dependencies"] = install
             project["optional-dependencies"] = extras
-
-            if "dev" in extras:
-                dependency_groups = ensure_table(data, ("dependency-groups",))
-                dependency_groups["dev"] = list(extras["dev"])
         else:
             logger.info(f'No dependencies section found in "{self.path}". Skipping dependency enrichment.')
 
+
+        deps = project.get("dependencies")
+        if deps is not None:
+            project["dependencies"] = self._process_deps(deps)
+
+        optionals = project.get("optional-dependencies")
+        if optionals is not None:
+            optionals = {
+                key: self._process_deps(values)
+                for key, values in optionals.items()
+            }
+            project["optional-dependencies"] = optionals
+
+            if "dev" in optionals:
+                dependency_groups = ensure_table(data, ("dependency-groups",))
+                dependency_groups["dev"] = list(optionals["dev"])
+
         urls = ensure_table(project, ("urls",))
         urls["Homepage"] = self.repo_url
 
@@ -187,11 +272,3 @@ class IncrementorPyproject(Incrementor):
             del setuptools["script-files"]
 
         return data
-
-    def _bump(self, version):
-        if self.versions.pinned:
-            return self.versions.pinned
-
-        if version.prerelease:
-            return version.bump_prerelease()
-        return version.bump_patch()

{corio-2.2.1a0 → corio-2.2.2}/corio/infra/releaser.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from functools import cached_property
 
 import build
@@ -17,7 +18,7 @@ from corio import https as https
 from corio.constants import Constants
 from corio.infra.project import Project
 from corio.inherit import Inherit
-from corio.logs import logger
+from corio.logs import logger, sanitize
 from corio.path import Path
 
 
@@ -47,6 +48,15 @@ class Releaser(Inherit[Project]):
         if increment:
             self.repo.fetch()
             self.increment()
+
+        is_passed = self.tester.run()
+        if not is_passed:
+            if self.versions.is_pre:
+                logger.warning(f"Tests failed, but release is pre-release ({self.version.prerelease}). Continuing.")
+            else:
+                raise RuntimeError("Tests failed. Aborting release.")
+
+        if increment:
             self.repo.push()
             self.repo.fetch()
 
@@ -149,6 +159,7 @@ class Releaser(Inherit[Project]):
 
         return IndexList[Incrementor](
             [
+                IncrementorVersion(self),
                 IncrementorPyproject(self),
                 IncrementorHomeAssistantAddon(self),
                 IncrementorChangelog(self),
@@ -174,6 +185,10 @@ class Releaser(Inherit[Project]):
 
         return releases
 
+    @cached_property
+    def tester(self):
+        return Tester(self)
+
     def release(self):
         for release in self.releases:
             release.release()
@@ -200,6 +215,27 @@ class Incrementor(Inherit[Releaser]):
         raise NotImplementedError
 
 
+class IncrementorVersion(Incrementor):
+    @logger.instrument('Incrementing release version in-memory for "{self.paths.name_ns}"...')
+    def apply(self) -> Path | list[Path] | None:
+        old = self.versions.old
+        if self.versions.pinned:
+            new = self.versions.pinned
+        elif old.prerelease:
+            new = old.bump_prerelease()
+        else:
+            new = old.bump_patch()
+
+        if old != new:
+            logger.info(f'Incrementing runtime version {old} {Constants.ARROW_RIGHT} {new}...')
+
+        self.paths.metadata.version = str(new)
+        return None
+
+
+
+
+
 class IncrementorHomeAssistantAddon(Incrementor):
     DESC = 'Home Assistant Add-On config file'
 
@@ -529,3 +565,141 @@ class ReleaseDocumentation(Release):
 
         with self.paths.repo.chdir:
             self.deploy()
+
+
+class Tester(Inherit[Releaser]):
+    TEST_FILENAME_PREFIX = "test_"
+    TEST_FILENAME_SUFFIX = ".py"
+    TOX_REQUIRES = ["tox>=4.22", "tox-uv>=1"]
+
+    @cached_property
+    def path_config_dir(self) -> Path:
+        return Path.temp() / f"{self.name}-tox"
+
+    @cached_property
+    def path_config(self) -> Path:
+        return self.path_config_dir / "tox.toml"
+
+    @cached_property
+    def dependencies(self) -> dict[str, list[str]]:
+        data = self.paths.pyproject_repo.read_toml()
+        table = data.get("tool", {}).get("corio", {}).get("dependencies", {})
+        dependencies = {
+            str(key): [str(value) for value in values]
+            for key, values in table.items()
+            if isinstance(values, list)
+        }
+        return dependencies
+
+    @cached_property
+    def modules(self) -> list[str]:
+        if not self.paths.tests.exists():
+            return []
+
+        modules = []
+        for path in sorted(self.paths.tests.glob(f"{self.TEST_FILENAME_PREFIX}*{self.TEST_FILENAME_SUFFIX}")):
+            module = path.stem.removeprefix(self.TEST_FILENAME_PREFIX)
+            if module:
+                modules.append(module)
+        return modules
+
+
+    def get_env(self, name: str, path_tests: Path, extras: list[str]) -> dict:
+        if path_tests.is_relative_to(self.paths.repo):
+            path_tests = path_tests.relative_to(self.paths.repo)
+        env = {
+            "description": f"Run {name} tests.",
+            "extras": extras,
+            "commands": [["python", "-m", "pytest", "-q", str(path_tests)]],
+        }
+        return env
+
+    @cached_property
+    def env(self) -> dict:
+        return self.get_env(name=self.paths.name_ns, path_tests=self.paths.tests, extras=["test"])
+
+    @cached_property
+    def envs(self) -> dict[str, dict]:
+        if not self.paths.metadata.test_envs:
+            if not self.modules:
+                return {}
+            return {self.paths.name_ns: self.env}
+
+        envs = {}
+        extras_available = set(self.dependencies.keys())
+
+        for module in self.modules:
+            extras = ["test"]
+            if module in extras_available:
+                extras.insert(0, module)
+
+            path_test = self.paths.tests / f"{self.TEST_FILENAME_PREFIX}{module}{self.TEST_FILENAME_SUFFIX}"
+            name = f"{self.paths.name_ns}.{module}"
+            envs[name] = self.get_env(name=name, path_tests=path_test, extras=extras)
+
+        return envs
+
+    @cached_property
+    def data(self) -> dict:
+        data = {
+            "requires": self.TOX_REQUIRES,
+            "env_list": list(self.envs.keys()),
+            "env": self.envs,
+        }
+        return data
+
+    def write_config(self):
+        self.path_config_dir.mkdir(parents=True, exist_ok=True)
+        self.path_config.write_toml(self.data)
+
+    def run_subprocess(self) -> int:
+        command = [
+            "uvx",
+            "--with",
+            "tox-uv",
+            "tox",
+            "-c",
+            str(self.path_config),
+            "--root",
+            str(self.paths.repo),
+            "--workdir",
+            str(self.paths.repo / ".tox"),
+            "run",
+        ]
+
+        process = subprocess.Popen(
+            command,
+            cwd=self.paths.repo,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            bufsize=1,
+        )
+
+        assert process.stdout is not None
+        for line in process.stdout:
+            logger.info(sanitize(line))
+
+        code = process.wait()
+        return code
+
+    @logger.instrument('Running test suite for "{self.paths.name_ns}"...')
+    def run(self) -> bool:
+        if not self.envs:
+            logger.warning(f'No tests found under "{self.paths.tests}". Skipping.')
+            return True
+
+        logger.info(f'Generating temporary tox config: "{self.path_config}"')
+        self.write_config()
+        try:
+            code = self.run_subprocess()
+        finally:
+            self.path_config.unlink(missing_ok=True)
+            shutil.rmtree(self.path_config_dir, ignore_errors=True)
+
+        if code == 0:
+            logger.info("All test environments passed.")
+            return True
+
+        logger.error(f"Test suite failed with exit code {code}.")
+        return False

{corio-2.2.1a0 → corio-2.2.2}/corio/infra/stack.py

@@ -6,7 +6,7 @@ from corio.docker import DockerClient
 from corio.infra.project import Project
 from corio.inherit import Inherit
 from corio.iterator import IndexList
-from corio.logs import logger
+from corio.logs import logger, sanitize
 from corio.merging import merge
 from corio.path import Path, PackagePaths
 
@@ -114,7 +114,7 @@ class Stack(Inherit[Project]):
                 progress="plain",
                 stream_logs=True,
         ):
-            logger.info(line.rstrip())
+            logger.info(sanitize(line))
 
 
 class Development(Stack):
@@ -177,8 +177,8 @@ class ProductionPublic(ProductionPrivate):
         for tag in self.tags_public:
             with logger.span(f'Pushing image "{tag}"'):
                 for tag, line_bytes in self.client.push(tag, stream_logs=True):
-                    line = line_bytes.decode().rstrip()
-                    logger.info(line.rstrip())
+                    line = line_bytes.decode()
+                    logger.info(sanitize(line))
 
         self
 

{corio-2.2.1a0 → corio-2.2.2}/corio/logs.py

@@ -12,6 +12,16 @@ else:
 
 LEVEL_DEFAULT = logging.DEBUG if env.IS_DEV else logging.INFO
 
+
+def sanitize(message: str) -> str:
+    """
+
+    Sanitize a log line for brace-style formatters.
+
+    """
+    return message.rstrip().replace("{", "{{").replace("}", "}}")
+
+
 def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=Constants.ORG_NAME,
                stream=STREAM_DEFAULT, environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """

{corio-2.2.1a0 → corio-2.2.2}/corio/path/path.py

@@ -484,6 +484,7 @@ class Metadata:
 
     is_pypi: bool = False
     is_dockerhub: bool = False
+    test_envs: bool = False
 
     @classmethod
     def read(cls, path: Path) -> Self:
@@ -762,6 +763,15 @@ class PackagePaths(FromCallerMixin):
 
         return self.repo / Constants.SCRIPTS_DIR
 
+    @property
+    def tests(self) -> Path:
+        """
+
+        Path of package tests.
+
+        """
+        return self.path / "tests"
+
     def __repr__(self) -> str:
         """
 

{corio-2.2.1a0 → corio-2.2.2}/corio/pyproject.package.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [tool.corio.dependencies]
 dev = ["logging", "version.dev", "debug", "sets", "yaml", "db.document", "infra"]
 install = []
-test = ["pytest-cov"]
+test = ["pytest", "pytest-cov"]
 yaml = ["yamlscript", "pyyaml"]
 logging = ["logfire", "version"]
 parallel = ["dask[bag]", "distributed", "bokeh"]
@@ -56,7 +56,7 @@ ha = ["env.io"]
 "ha.api" = ["ha", "homeassistant_api", "aiohasupervisor"]
 doc = ["mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav"]
 youtube = ["pytubefix"]
-infra = ["version.dev", "logging", "setup", "doc", "sets", "build", "twine", "packaging", "vcs", "docker.client", "merging", "http", "api", "tomlkit", "secrets", "cli"]
+infra = ["version.dev", "logging", "setup", "doc", "sets", "build", "twine", "packaging", "vcs", "docker.client", "merging", "http", "api", "tomlkit", "secrets", "cli", "test"]
 vcs = ["pygit2"]
 tasmota = ["decode-config", "esptool"]
 encrypt = ["pyrage"]
@@ -64,7 +64,7 @@ secrets = ["encrypt", "env.io", "yaml", "logging", "sets", "vcs"]
 cli = ["sets", "logging"]
 
 [tool.corio.metadata]
-version = "2.2.1-alpha000"
+version = "2.2.2"
 port = 0
 base = "python"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
@@ -77,6 +77,7 @@ services = []
 keywords = []
 is_pypi = true
 is_dockerhub = false
+test_envs = true
 
 [tool.corio.metadata.setup]
 
@@ -93,7 +94,7 @@ corio = ["pyproject.package.toml"]
 
 [project]
 name = "corio"
-version = "2.2.1-alpha000"
+version = "2.2.2"
 description = "Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML"
 readme = "README.md"
 dependencies = []
@@ -102,8 +103,8 @@ license-files = ["LICENSE"]
 keywords = []
 
 [project.optional-dependencies]
-dev = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv"]
-test = ["pytest-cov"]
+dev = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest", "pytest-cov"]
+test = ["pytest", "pytest-cov"]
 yaml = ["yamlscript", "pyyaml"]
 logging = ["logfire"]
 parallel = ["dask[bag]", "distributed", "bokeh"]
@@ -154,13 +155,13 @@ ha = ["dotenv"]
 "ha.api" = ["dotenv", "homeassistant_api", "aiohasupervisor"]
 doc = ["mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav"]
 youtube = ["pytubefix"]
-infra = ["semver", "logfire", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv"]
+infra = ["semver", "logfire", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest", "pytest-cov"]
 vcs = ["pygit2"]
 tasmota = ["decode-config", "esptool"]
 encrypt = ["pyrage"]
 secrets = ["pyrage", "dotenv", "yamlscript", "pyyaml", "logfire", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "pygit2"]
 cli = ["pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "logfire"]
-all = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest-cov", "dask[bag]", "distributed", "bokeh", "tokenizers", "faker", "sre_yield", "contexttimer", "Unidecode", "tinynetrc", "huggingface_hub", "peft", "transformers[sentencepiece]", "torchvision", "torchaudio", "cuda-bindings==13.2.0", "cuda-pathfinder==1.5.4", "cuda-toolkit==13.0.2", "nvidia-cublas==13.1.0.3", "nvidia-cuda-cupti==13.0.85", "nvidia-cuda-nvrtc==13.0.88", "nvidia-cuda-runtime==13.0.96", "nvidia-cudnn-cu13==9.19.0.56", "nvidia-cufft==12.0.0.61", "nvidia-cufile==1.15.1.6", "nvidia-curand==10.4.0.35", "nvidia-cusolver==12.0.4.66", "nvidia-cusparse==12.6.3.3", "nvidia-cusparselt-cu13==0.8.0", "nvidia-nccl-cu13==2.28.9", "nvidia-nvjitlink==13.0.88", "nvidia-nvshmem-cu13==3.4.5", "nvidia-nvtx==13.0.85", "torch==2.11.0", "triton==3.6.0", "openai", "pydantic-ai-slim[logfire,openai]", "ollama", "json_repair", "sentence_transformers", "pandas", "tabulate", "openpyxl", "odfpy", "deepdiff", "html2text", "flet[all] <0.80.0", "flet-video", "flet-webview", "google-auth", "google-auth-oauthlib", "google-auth-httplib2", "google-api-python-client", "diskcache", "cachetools", "pymupdf", "pymupdf4llm", "appdirs", "filetype", "dnspython[doh]", "regex", "playwright", "aiomqtt", "av", "homeassistant_api", "aiohasupervisor", "pytubefix", "decode-config", "esptool"]
+all = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest", "pytest-cov", "dask[bag]", "distributed", "bokeh", "tokenizers", "faker", "sre_yield", "contexttimer", "Unidecode", "tinynetrc", "huggingface_hub", "peft", "transformers[sentencepiece]", "torchvision", "torchaudio", "cuda-bindings==13.2.0", "cuda-pathfinder==1.5.4", "cuda-toolkit==13.0.2", "nvidia-cublas==13.1.0.3", "nvidia-cuda-cupti==13.0.85", "nvidia-cuda-nvrtc==13.0.88", "nvidia-cuda-runtime==13.0.96", "nvidia-cudnn-cu13==9.19.0.56", "nvidia-cufft==12.0.0.61", "nvidia-cufile==1.15.1.6", "nvidia-curand==10.4.0.35", "nvidia-cusolver==12.0.4.66", "nvidia-cusparse==12.6.3.3", "nvidia-cusparselt-cu13==0.8.0", "nvidia-nccl-cu13==2.28.9", "nvidia-nvjitlink==13.0.88", "nvidia-nvshmem-cu13==3.4.5", "nvidia-nvtx==13.0.85", "torch==2.11.0", "triton==3.6.0", "openai", "pydantic-ai-slim[logfire,openai]", "ollama", "json_repair", "sentence_transformers", "pandas", "tabulate", "openpyxl", "odfpy", "deepdiff", "html2text", "flet[all] <0.80.0", "flet-video", "flet-webview", "google-auth", "google-auth-oauthlib", "google-auth-httplib2", "google-api-python-client", "diskcache", "cachetools", "pymupdf", "pymupdf4llm", "appdirs", "filetype", "dnspython[doh]", "regex", "playwright", "aiomqtt", "av", "homeassistant_api", "aiohasupervisor", "pytubefix", "decode-config", "esptool"]
 
 [[project.authors]]
 name = "Frontmatter AI"
@@ -173,4 +174,4 @@ Homepage = "https://github.com/fmtr/corio"
 corio = "corio.entrypoint:main"
 
 [dependency-groups]
-dev = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv"]
+dev = ["logfire", "semver", "pydevd-pycharm~=251.25410.159", "pydantic-settings", "pydantic", "pydantic-extra-types", "pycountry", "yamlscript", "pyyaml", "beanie", "setuptools", "mkdocs", "mkdocs-material", "mkdocstrings[python]", "mike", "mkdocs-include-dir-to-nav", "build", "twine", "packaging", "pygit2", "python-on-whales", "deepmerge", "httpx", "httpx_retries", "logfire[httpx]", "fastapi", "uvicorn[standard]", "logfire[fastapi]", "tomlkit", "pyrage", "dotenv", "pytest", "pytest-cov"]

corio-2.2.2/corio/tests/test_caching.py

@@ -0,0 +1,39 @@
+from contextlib import nullcontext
+
+import corio.caching as caching_module
+from corio.caching import Disk, TLRU
+
+
+def test_disk_nested_dump(tmp_path):
+    cache = Disk(tmp_path / "cache")
+
+    cache.setdefault("svc", Disk)["enabled"] = True
+    cache["count"] = 2
+
+    dumped = cache.dump()
+    assert dumped["count"] == 2
+    assert dumped["svc"]["enabled"] is True
+
+
+def test_tlru_expire_with_custom_timer(monkeypatch):
+    class DummyLogger:
+        @staticmethod
+        def span(_):
+            return nullcontext()
+
+        @staticmethod
+        def debug(_):
+            return None
+
+    monkeypatch.setattr(caching_module, "logger", DummyLogger())
+
+    now = [0]
+    cache = TLRU(maxsize=4, timer=lambda: now[0], ttu_static=5, desc="test")
+    cache["k1"] = "v1"
+
+    assert "k1" in cache
+    now[0] = 6
+    expired = cache.expire()
+
+    assert expired == [("k1", "v1")]
+    assert "k1" not in cache