framework-m 0.12.2__tar.gz → 0.13.0__tar.gz

{framework_m-0.12.2 → framework_m-0.13.0}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## framework-m v0.13.0
+
+### Features
+
+- Implement dual-mode migrations for Pyodide/WASM support (42a8650)
+
 ## framework-m v0.12.2
 
 ### Bug Fixes

{framework_m-0.12.2 → framework_m-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: framework-m
-Version: 0.12.2
+Version: 0.13.0
 Summary: A modular, metadata-driven business application framework
 Project-URL: Homepage, https://gitlab.com/castlecraft/framework-m
 Project-URL: Documentation, https://gitlab.com/castlecraft/framework-m#readme
@@ -18,8 +18,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: framework-m-core>=0.24.0
-Requires-Dist: framework-m-standard>=0.22.0
+Requires-Dist: framework-m-core>=0.25.0
+Requires-Dist: framework-m-standard>=0.23.0
 Description-Content-Type: text/markdown
 
 # Framework M

{framework_m-0.12.2 → framework_m-0.13.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "framework-m"
-version = "0.12.2"
+version = "0.13.0"
 description = "A modular, metadata-driven business application framework"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -21,8 +21,8 @@ classifiers = [
 ]
 
 dependencies = [
-    "framework-m-core>=0.24.0",
-    "framework-m-standard>=0.22.0",
+    "framework-m-core>=0.25.0",
+    "framework-m-standard>=0.23.0",
 ]
 
 [tool.uv.sources]
@@ -40,7 +40,7 @@ dev = [
     "testcontainers>=4.14.2",
     "httpx>=0.28.1",
     "aiosqlite>=0.22.1",
-    "framework-m-studio>=0.17.2",
+    "framework-m-studio>=0.17.3",
     # Release tools
     "python-semantic-release>=10.5.3",
     "build>=1.5.0",

{framework_m-0.12.2 → framework_m-0.13.0}/tests/integration/test_jobs_events_webhooks.py

@@ -96,42 +96,6 @@ class TestJobExecutionIntegration:
         assert status.result == {"result": "success"}
 
 
-# =============================================================================
-# Test: Scheduled Jobs Integration
-# =============================================================================
-
-
-class TestScheduledJobsIntegration:
-    """Integration tests for scheduled job execution."""
-
-    def test_cron_expression_builder(self) -> None:
-        """build_cron_expression should create valid cron strings."""
-        from framework_m_standard.adapters.jobs.taskiq_adapter import (
-            build_cron_expression,
-        )
-
-        # Every hour at minute 0
-        expr = build_cron_expression(minute=0)
-        assert expr == "0 * * * *"
-
-        # Every day at 9am
-        expr = build_cron_expression(minute=0, hour=9)
-        assert expr == "0 9 * * *"
-
-        # Every Monday at 2pm
-        expr = build_cron_expression(minute=0, hour=14, day_of_week=1)
-        assert expr == "0 14 * * 1"
-
-    def test_cron_schedule_registration(self) -> None:
-        """cron() should return schedule definition."""
-        from framework_m_standard.adapters.jobs.taskiq_adapter import cron
-
-        schedule = cron("daily_report", hour=6, minute=0)
-
-        assert schedule["task_name"] == "daily_report"
-        assert schedule["cron"] == "0 6 * * *"
-
-
 # =============================================================================
 # Test: Webhook Integration
 # =============================================================================

framework_m-0.13.0/tests/integration/test_nats_deduplication.py

@@ -0,0 +1,142 @@
+"""Integration tests for NATS JetStream deduplication.
+
+These tests require a NATS server with JetStream to be running.
+They will be skipped if a connection cannot be established.
+
+To run these tests, first start a NATS server:
+docker run -d --rm --name nats-test -p 4222:4222 nats:2.10-alpine --js
+"""
+
+import asyncio
+import contextlib
+import os
+from collections.abc import AsyncIterator
+from datetime import UTC, datetime
+from typing import Any
+from unittest.mock import AsyncMock
+
+import pytest
+from framework_m_core.interfaces.ticker import ScheduleDefinition
+from framework_m_core.jobs_registry import get_global_registry
+
+
+@pytest.fixture(scope="function", autouse=True)
+async def check_nats_is_available():
+    """Skips tests in this module if a NATS server is not available."""
+    import nats
+
+    nats_url = os.environ.get("NATS_URL", "nats://localhost:4222")
+    try:
+        # Use asyncio.wait_for for a robust timeout that doesn't depend on
+        # the nats.connect() keyword argument, which can cause issues.
+        nc = await asyncio.wait_for(nats.connect(nats_url), timeout=2)
+        await nc.close()
+    except Exception as e:
+        print(f"\nDEBUG: NATS connection failed with: {e}")
+        pytest.skip(
+            f"NATS server not available at {nats_url}. Skipping NATS integration tests."
+        )
+
+
+@pytest.fixture(scope="module")
+def nats_url() -> str:
+    """Returns the NATS URL from the environment or a default."""
+    return os.environ.get("NATS_URL", "nats://localhost:4222")
+
+
+@pytest.fixture
+async def setup_nats_broker(nats_url: str) -> AsyncIterator[AsyncMock]:
+    """Sets up a Taskiq broker and ensures the stream exists."""
+    import nats
+    from framework_m_standard.adapters.jobs.taskiq_adapter import create_taskiq_broker
+    from nats.js.errors import NotFoundError
+
+    # Ensure a clean state by deleting the stream before the test.
+    # This prevents issues where the stream exists from a previous run
+    # with a different configuration (e.g., without deduplication).
+    nc = await nats.connect(nats_url)
+    js = nc.jetstream()
+    with contextlib.suppress(NotFoundError):
+        await js.delete_stream(name="framework_m_jobs")
+    await asyncio.sleep(0.1)  # Give NATS time to process deletion
+
+    await nc.close()
+
+    broker = create_taskiq_broker(nats_url=nats_url, subject="framework_m_jobs.default")
+    await broker.startup()
+    yield broker
+    await broker.shutdown()
+
+    # Teardown: Ensure the stream is deleted after the test
+    nc = await nats.connect(nats_url)
+    js = nc.jetstream()
+    with contextlib.suppress(NotFoundError):
+        await js.delete_stream(name="framework_m_jobs")
+    await nc.close()
+
+
+class TestNatsDeduplication:
+    """Integration tests for NATS JetStream deduplication."""
+
+    @pytest.mark.asyncio
+    async def test_concurrent_ticker_deduplication(
+        self, setup_nats_broker: AsyncMock
+    ) -> None:
+        """Verify NATS deduplicates concurrent job enqueues from multiple tickers."""
+        from framework_m_standard.adapters.jobs.taskiq_adapter import (
+            TaskiqJobQueueAdapter,
+            TaskiqWorkerAdapter,
+            job,
+        )
+
+        # 1. Define a mock job that counts its invocations
+        invocation_count = 0
+
+        @job(name="dedup_test_job")  # type: ignore[misc]
+        async def dedup_test_job(**kwargs: Any) -> None:
+            nonlocal invocation_count
+            invocation_count += 1
+
+        # Register the job
+        registry = get_global_registry()
+        registry.register("dedup_test_job", dedup_test_job)
+
+        worker = None
+        try:
+            # 2. Create and start a worker to consume the job
+            worker = TaskiqWorkerAdapter(broker=setup_nats_broker, concurrency=1)
+            await worker.start()
+
+            # 3. Create multiple job queues simulating multiple tickers/workers
+            schedule = ScheduleDefinition(job_name="dedup_test_job", cron="* * * * *")
+            # Use a single queue adapter to avoid concurrent broker startup issues.
+            job_queue = TaskiqJobQueueAdapter(broker=setup_nats_broker)
+
+            # 4. Concurrently enqueue the same job with the same deduplication_id
+            # This simulates what multiple tickers would do at the same minute.
+            fixed_now = datetime(2024, 1, 1, 10, 30, 15, tzinfo=UTC)
+            current_minute = fixed_now.replace(second=0, microsecond=0)
+            timestamp = int(current_minute.timestamp())
+            deduplication_id = f"tick:{schedule.job_name}:{timestamp}"
+
+            enqueue_tasks = [
+                job_queue.enqueue(
+                    schedule.job_name,
+                    deduplication_id=deduplication_id,
+                    **schedule.kwargs,
+                )
+                for _ in range(3)
+            ]
+            await asyncio.gather(*enqueue_tasks)
+
+            # Give the worker time to process the single message that gets through
+            await asyncio.sleep(0.5)
+
+            # 5. Assert that the job was invoked exactly once
+            assert invocation_count == 1
+
+        finally:
+            # 6. Cleanup
+            if worker:
+                await worker.stop()
+            registry.reset()