muscles-data 0.2.1__tar.gz → 0.2.2__tar.gz

{muscles_data-0.2.1 → muscles_data-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: muscles-data
-Version: 0.2.1
+Version: 0.2.2
 Summary: Framework-level named data resources and typed ports for Muscles
 Author-email: "Denis B." <denis@butko.info>
 License: MIT

{muscles_data-0.2.1 → muscles_data-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "muscles-data"
-version = "0.2.1"
+version = "0.2.2"
 description = "Framework-level named data resources and typed ports for Muscles"
 readme = "README.md"
 license = {text = "MIT"}

{muscles_data-0.2.1 → muscles_data-0.2.2}/src/muscles/data/migrations.py

@@ -1,12 +1,13 @@
 """Storage-neutral migration source registration and dependency ordering."""
 from dataclasses import dataclass
 from contextlib import nullcontext
+from fnmatch import fnmatchcase
 from importlib import import_module
 from importlib.util import find_spec, module_from_spec
 import hashlib
 from pathlib import Path
+from pathlib import PurePosixPath
 import pkgutil
-import re
 import sys
 from types import ModuleType
 from typing import Callable, ContextManager, Protocol
@@ -16,14 +17,50 @@ class MigrationBackend(Protocol):
     def upgrade(self, target: str = "head") -> None: ...
 
 
-def discover_migration_modules(package_name: str) -> tuple[ModuleType, ...]:
-    """Load owned Python migration files in name order, binding code to its checksum."""
+def discover_migration_modules(
+    package_name: str | None = None,
+    *,
+    pattern: str = "m[0-9]*.py",
+) -> tuple[ModuleType, ...]:
+    """Load matching Python migration files in name order, binding code to its checksum.
+
+    When ``package_name`` is omitted, the calling package is used. A filename
+    pattern without a directory searches its ``migrations`` subpackage; a
+    directory in ``pattern`` selects that subpackage, e.g. ``migrate/000[0-9]_*.py``.
+    ``package_name`` remains available for callers outside an owning package.
+    """
+    if not isinstance(pattern, str) or not pattern:
+        raise ValueError("A migration filename pattern is required")
+    relative_pattern = PurePosixPath(pattern)
+    if relative_pattern.is_absolute() or ".." in relative_pattern.parts:
+        raise ValueError("Migration pattern must be a relative package path")
+    filename_pattern = relative_pattern.name
+    module_pattern = filename_pattern[:-3] if filename_pattern.endswith(".py") else filename_pattern
+    if not module_pattern:
+        raise ValueError("A migration filename pattern is required")
+
+    if package_name is None:
+        caller_package = sys._getframe(1).f_globals.get("__package__")
+        if not isinstance(caller_package, str) or not caller_package:
+            raise ValueError("Could not infer the calling package for migration discovery")
+        package_name = caller_package
+        if not relative_pattern.parent.parts:
+            package_name = f"{package_name}.migrations"
+    if relative_pattern.parent.parts:
+        subpackage = ".".join(relative_pattern.parent.parts)
+        if any(not part.isidentifier() for part in relative_pattern.parent.parts):
+            raise ValueError("Migration pattern directories must be Python package names")
+        package_name = f"{package_name}.{subpackage}"
+
     package = import_module(package_name)
     paths = getattr(package, "__path__", None)
     if paths is None:
         raise ValueError("Migration module discovery requires a Python package")
-    names = sorted(item.name for item in pkgutil.iter_modules(paths)
-                   if not item.ispkg and re.match(r"^m[0-9]", item.name))
+    names = sorted(
+        item.name
+        for item in pkgutil.iter_modules(paths)
+        if not item.ispkg and fnmatchcase(item.name, module_pattern)
+    )
     modules = []
     for name in names:
         qualified = f"{package_name}.{name}"

{muscles_data-0.2.1 → muscles_data-0.2.2}/src/muscles_data.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: muscles-data
-Version: 0.2.1
+Version: 0.2.2
 Summary: Framework-level named data resources and typed ports for Muscles
 Author-email: "Denis B." <denis@butko.info>
 License: MIT

{muscles_data-0.2.1 → muscles_data-0.2.2}/tests/test_migrations.py

@@ -147,3 +147,52 @@ def test_discovery_loads_only_ordered_migration_modules(monkeypatch, tmp_path):
     (package / "m001_first.py").write_text("revision = 'changed'\n", encoding="utf-8")
     with pytest.raises(ValueError, match="changed"):
         discover_migration_modules("sample_migrations")
+
+
+def test_discovery_accepts_custom_filename_pattern(monkeypatch, tmp_path):
+    package = tmp_path / "custom_migrations"
+    migration_package = package / "migrate"
+    migration_package.mkdir(parents=True)
+    (package / "__init__.py").write_text("", encoding="utf-8")
+    (migration_package / "__init__.py").write_text("", encoding="utf-8")
+    (migration_package / "0002_second.py").write_text("revision = '002'\n", encoding="utf-8")
+    (migration_package / "0001_first.py").write_text("revision = '001'\n", encoding="utf-8")
+    (migration_package / "helper.py").write_text(
+        "raise RuntimeError('must not be loaded')\n", encoding="utf-8"
+    )
+    monkeypatch.syspath_prepend(str(tmp_path))
+
+    modules = discover_migration_modules(
+        "custom_migrations.migrate", pattern="000[0-9]_*.py"
+    )
+
+    assert [module.revision for module in modules] == ["001", "002"]
+
+
+def test_discovery_infers_calling_package_and_migrations_directory(monkeypatch, tmp_path):
+    package = tmp_path / "inferred_migrations"
+    migrations = package / "migrations"
+    migrations.mkdir(parents=True)
+    custom_migrations = package / "migrate"
+    custom_migrations.mkdir()
+    (package / "__init__.py").write_text("", encoding="utf-8")
+    (package / "loader.py").write_text(
+        "from muscles.data.migrations import discover_migration_modules\n"
+        "def load_default():\n"
+        "    return discover_migration_modules(pattern='m000[0-9]_*.py')\n"
+        "def load_custom():\n"
+        "    return discover_migration_modules(pattern='migrate/000[0-9]_*.py')\n",
+        encoding="utf-8",
+    )
+    (migrations / "__init__.py").write_text("", encoding="utf-8")
+    (migrations / "m0001_initial.py").write_text("revision = '001'\n", encoding="utf-8")
+    (custom_migrations / "__init__.py").write_text("", encoding="utf-8")
+    (custom_migrations / "0001_initial.py").write_text("revision = '001-custom'\n", encoding="utf-8")
+    monkeypatch.syspath_prepend(str(tmp_path))
+
+    from importlib import import_module
+
+    loader = import_module("inferred_migrations.loader")
+
+    assert [module.revision for module in loader.load_default()] == ["001"]
+    assert [module.revision for module in loader.load_custom()] == ["001-custom"]