framework-m 0.5.2__tar.gz → 0.6.1__tar.gz

{framework_m-0.5.2 → framework_m-0.6.1}/.gitignore

@@ -113,8 +113,14 @@ yarn-error.log*
 
 # Generated Documentation
 docs/developer/generated/
-docs/developer/protocols/
+docs/developer/generated-core/
+docs/user/generated/
 docs/machine/
+docs/adr/index.md
+docs/adr/_sidebar.json
+docs/rfcs/index.md
+docs/rfcs/_sidebar.json
+docs/rfcs/_category_.json
 
 # Website
 website/.docusaurus/

{framework_m-0.5.2 → framework_m-0.6.1}/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## framework-m v0.6.1
+
+### Bug Fixes
+
+- remove hardcoded publishConfig registry (b197c97)
+
+
+## framework-m v0.6.0
+
+### Features
+
+- granular generation, flat sidebar, and monorepo sync (576fb81)
+- add configurable basename and stabilize frontend tests (b57e6a4)
+
+### Bug Fixes
+
+- shell integration gaps (6a31f82)
+- resolve broken links in docusaurus build (a162fd1)
+- correct hydration errors and refine routing logic (192dac2)
+
+
 ## framework-m v0.5.2
 
 ### Bug Fixes

{framework_m-0.5.2 → framework_m-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: framework-m
-Version: 0.5.2
+Version: 0.6.1
 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
@@ -17,8 +17,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.7.1
-Requires-Dist: framework-m-standard>=0.4.2
+Requires-Dist: framework-m-core>=0.9.0
+Requires-Dist: framework-m-standard>=0.6.0
 Description-Content-Type: text/markdown
 
 # Framework M
@@ -126,7 +126,7 @@ git clone https://gitlab.com/castlecraft/framework-m.git
 cd framework-m
 
 # Install dependencies
-uv sync --all-extras
+uv sync --all-packages --all-extras --all-groups
 
 # Run tests
 uv run pytest

{framework_m-0.5.2 → framework_m-0.6.1}/README.md

@@ -103,7 +103,7 @@ git clone https://gitlab.com/castlecraft/framework-m.git
 cd framework-m
 
 # Install dependencies
-uv sync --all-extras
+uv sync --all-packages --all-extras --all-groups
 
 # Run tests
 uv run pytest

{framework_m-0.5.2 → framework_m-0.6.1}/alembic/env.py

@@ -19,7 +19,7 @@ from alembic import context
 # Framework M imports for auto-generation support
 # Uncomment and customize based on your app:
 # from framework_m.core.registry import MetaRegistry
-# from framework_m.adapters.db import SchemaMapper
+# from framework_m_standard.adapters.db import SchemaMapper
 # from your_app.doctypes import *  # Import all DocTypes to register them
 
 # this is the Alembic Config object, which provides

{framework_m-0.5.2 → framework_m-0.6.1}/examples/run_server.py

@@ -12,13 +12,13 @@ Then test with:
 from typing import Any, ClassVar
 
 import uvicorn
+from framework_m_standard.adapters.web.meta_router import create_meta_router
+from framework_m_standard.adapters.web.meta_routes import meta_routes_router
+from framework_m_standard.adapters.web.rpc_routes import rpc_router
 from litestar import Litestar, Response
 from litestar.status_codes import HTTP_403_FORBIDDEN
 from litestar.types import ASGIApp, Receive, Scope, Send
 
-from framework_m.adapters.web.meta_router import create_meta_router
-from framework_m.adapters.web.meta_routes import meta_routes_router
-from framework_m.adapters.web.rpc_routes import rpc_router
 from framework_m.core.domain.base_doctype import BaseDocType, Field
 from framework_m.core.exceptions import PermissionDeniedError
 from framework_m.core.interfaces.auth_context import UserContext
@@ -133,4 +133,4 @@ if __name__ == "__main__":
     print("")
 
     app = create_test_app()
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host="0.0.0.0", port=8000)  # nosec B104

{framework_m-0.5.2 → framework_m-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "framework-m"
-version = "0.5.2"
+version = "0.6.1"
 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.7.1",
-    "framework-m-standard>=0.4.2",
+    "framework-m-core>=0.9.0",
+    "framework-m-standard>=0.6.0",
 ]
 
 [tool.uv.sources]
@@ -39,7 +39,7 @@ dev = [
     "testcontainers>=3.7.0",
     "httpx>=0.27.0",
     "aiosqlite>=0.20.0",
-    "framework-m-studio>=0.5.2",
+    "framework-m-studio>=0.7.0",
     # Release tools
     "python-semantic-release>=9.0.0",
     "build>=1.0.0",

framework_m-0.6.1/tests/adapters/auth/test_oauth_adapter.py

@@ -0,0 +1,137 @@
+"""Tests for OAuthAdapter (Indie Mode OAuth2 via authlib).
+
+TDD scope (work-item-20 / section 1):
+- Authorization URL generation for common providers (Google/GitHub).
+- Callback handling that hydrates framework models for linking/auth context.
+"""
+
+from __future__ import annotations
+
+import asyncio
+from urllib.parse import parse_qs, urlparse
+
+import pytest
+
+
+@pytest.mark.asyncio
+async def test_oauth_adapter_generates_google_authorization_url() -> None:
+    """OAuthAdapter should generate a valid Google authorization URL."""
+    from framework_m_standard.adapters.auth.oauth import OAuthAdapter
+
+    adapter = OAuthAdapter(
+        provider_name="google",
+        client_id="google-client-id",
+        client_secret="google-client-secret",
+        authorization_url="https://accounts.google.com/o/oauth2/v2/auth",
+        token_url="https://oauth2.googleapis.com/token",
+        userinfo_url="https://www.googleapis.com/oauth2/v3/userinfo",
+        scope="openid email profile",
+    )
+
+    url = await adapter.get_authorization_url(
+        state="state-123",
+        redirect_uri="https://app.example.com/api/v1/auth/oauth/google/callback",
+    )
+
+    parsed = urlparse(url)
+    query = parse_qs(parsed.query)
+
+    assert parsed.scheme == "https"
+    assert parsed.netloc == "accounts.google.com"
+    assert query["client_id"][0] == "google-client-id"
+    assert query["state"][0] == "state-123"
+    assert query["redirect_uri"][0].endswith("/oauth/google/callback")
+
+
+@pytest.mark.asyncio
+async def test_oauth_adapter_generates_github_authorization_url() -> None:
+    """OAuthAdapter should generate a valid GitHub authorization URL."""
+    from framework_m_standard.adapters.auth.oauth import OAuthAdapter
+
+    adapter = OAuthAdapter(
+        provider_name="github",
+        client_id="github-client-id",
+        client_secret="github-client-secret",
+        authorization_url="https://github.com/login/oauth/authorize",
+        token_url="https://github.com/login/oauth/access_token",
+        userinfo_url="https://api.github.com/user",
+        scope="read:user user:email",
+        emails_url="https://api.github.com/user/emails",
+    )
+
+    url = await adapter.get_authorization_url(
+        state="state-456",
+        redirect_uri="https://app.example.com/api/v1/auth/oauth/github/callback",
+    )
+
+    parsed = urlparse(url)
+    query = parse_qs(parsed.query)
+
+    assert parsed.scheme == "https"
+    assert parsed.netloc == "github.com"
+    assert query["client_id"][0] == "github-client-id"
+    assert query["state"][0] == "state-456"
+    assert query["scope"][0] == "read:user user:email"
+
+
+@pytest.mark.asyncio
+async def test_oauth_adapter_handle_callback_hydrates_social_account_and_user_context(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """handle_callback should exchange code, fetch profile, and hydrate models."""
+    from framework_m_core.interfaces.oauth import OAuth2Token, OAuth2UserInfo
+    from framework_m_standard.adapters.auth.oauth import OAuthAdapter
+
+    adapter = OAuthAdapter(
+        provider_name="google",
+        client_id="google-client-id",
+        client_secret="google-client-secret",
+        authorization_url="https://accounts.google.com/o/oauth2/v2/auth",
+        token_url="https://oauth2.googleapis.com/token",
+        userinfo_url="https://www.googleapis.com/oauth2/v3/userinfo",
+        scope="openid email profile",
+    )
+
+    async def fake_exchange_code(*, code: str, redirect_uri: str) -> OAuth2Token:
+        assert code == "oauth-code-123"
+        assert redirect_uri.endswith("/oauth/google/callback")
+        return await asyncio.sleep(
+            0, result=OAuth2Token(access_token="token-abc", token_type="Bearer")
+        )
+
+    async def fake_get_user_info(token: OAuth2Token) -> OAuth2UserInfo:
+        assert token.access_token == "token-abc"
+        return await asyncio.sleep(
+            0,
+            result=OAuth2UserInfo(
+                provider="google",
+                provider_user_id="provider-user-1",
+                email="jane@example.com",
+                display_name="Jane Doe",
+                avatar_url="https://cdn.example.com/avatar.png",
+            ),
+        )
+
+    monkeypatch.setattr(adapter, "exchange_code", fake_exchange_code)
+    monkeypatch.setattr(adapter, "get_user_info", fake_get_user_info)
+
+    result = await adapter.handle_callback(
+        code="oauth-code-123",
+        redirect_uri="https://app.example.com/api/v1/auth/oauth/google/callback",
+        local_user_id="user-123",
+    )
+
+    assert result.token.access_token == "token-abc"
+    assert result.user_info.provider_user_id == "provider-user-1"
+
+    social_account = result.social_account
+    assert social_account.provider == "google"
+    assert social_account.provider_user_id == "provider-user-1"
+    assert social_account.user_id == "user-123"
+    assert social_account.email == "jane@example.com"
+
+    user_context = result.user_context
+    assert user_context.id == "user-123"
+    assert user_context.email == "jane@example.com"
+    assert user_context.name == "Jane Doe"
+    assert "User" in user_context.roles

{framework_m-0.5.2 → framework_m-0.6.1}/tests/adapters/read_model/test_projector.py

@@ -7,8 +7,7 @@ from typing import Any
 from unittest.mock import AsyncMock
 
 import pytest
-
-from framework_m.core.interfaces.event_bus import Event
+from framework_m_core.interfaces.event_bus import Event
 
 
 class TestProjectorProtocolStructure:
@@ -16,19 +15,19 @@ class TestProjectorProtocolStructure:
 
     def test_projector_protocol_exists(self) -> None:
         """Projector should be importable from adapters."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         assert Projector is not None
 
     def test_projector_has_handle_method(self) -> None:
         """Projector should define handle() method for events."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         assert hasattr(Projector, "handle")
 
     def test_projector_has_subscribe_method(self) -> None:
         """Projector should define subscribe() for event bus registration."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         assert hasattr(Projector, "subscribe")
 
@@ -36,7 +35,7 @@ class TestProjectorProtocolStructure:
         """Projector should define event_patterns for topics to subscribe to."""
         from unittest.mock import AsyncMock
 
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         mock_read_model = AsyncMock()
         projector = Projector(read_model=mock_read_model)
@@ -66,7 +65,7 @@ class TestProjectorEventHandling:
         self, mock_read_model: Any
     ) -> None:
         """handle() should delegate to read_model.project()."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         projector = Projector(read_model=mock_read_model)
         event = Event(type="doc.created", data={"doctype": "Invoice", "id": "123"})
@@ -80,7 +79,7 @@ class TestProjectorEventHandling:
         self, mock_read_model: Any, mock_event_bus: Any
     ) -> None:
         """subscribe() should register event patterns with event bus."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         projector = Projector(
             read_model=mock_read_model,
@@ -97,7 +96,7 @@ class TestProjectorEventHandling:
         self, mock_read_model: Any, mock_event_bus: Any
     ) -> None:
         """subscribe() should store subscription IDs for later unsubscribe."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         projector = Projector(
             read_model=mock_read_model,
@@ -114,7 +113,7 @@ class TestProjectorEventHandling:
         self, mock_read_model: Any, mock_event_bus: Any
     ) -> None:
         """unsubscribe() should remove all event bus subscriptions."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         projector = Projector(
             read_model=mock_read_model,
@@ -141,7 +140,7 @@ class TestProjectorFiltering:
     @pytest.mark.asyncio
     async def test_handle_filters_by_doctype(self, mock_read_model: Any) -> None:
         """handle() should filter events by doctype if configured."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         projector = Projector(
             read_model=mock_read_model,
@@ -165,7 +164,7 @@ class TestProjectorFiltering:
         self, mock_read_model: Any
     ) -> None:
         """handle() should process all events if no doctype_filter."""
-        from framework_m.adapters.read_model.projector import Projector
+        from framework_m_standard.adapters.read_model.projector import Projector
 
         projector = Projector(read_model=mock_read_model)
 
@@ -183,6 +182,6 @@ class TestProjectorExports:
 
     def test_exported_from_adapters_read_model(self) -> None:
         """Projector should be importable from adapters.read_model."""
-        from framework_m.adapters.read_model import Projector
+        from framework_m_standard.adapters.read_model import Projector
 
         assert Projector is not None

{framework_m-0.5.2 → framework_m-0.6.1}/tests/conftest.py

@@ -7,11 +7,15 @@ This module provides shared fixtures for testing Framework M:
 - Database fixtures for integration testing
 """
 
+import os
 from collections.abc import AsyncGenerator
 from datetime import UTC, datetime
 from typing import Any
 
 import pytest
+from framework_m_core.container import Container
+from framework_m_core.domain.base_controller import BaseController
+from framework_m_core.registry import MetaRegistry
 from sqlalchemy import MetaData
 from sqlalchemy.ext.asyncio import (
     AsyncEngine,
@@ -21,9 +25,14 @@ from sqlalchemy.ext.asyncio import (
 )
 
 from framework_m import DocType, Field
-from framework_m.core.container import Container
-from framework_m.core.domain.base_controller import BaseController
-from framework_m.core.registry import MetaRegistry
+
+
+def pytest_configure(config: Any) -> None:
+    """Configure environment for testing."""
+    # Ensure a default JWT secret is available to satisfy fail-fast validation
+    if not os.environ.get("FRAMEWORK_M_JWT_SECRET"):
+        os.environ["FRAMEWORK_M_JWT_SECRET"] = "test-secret-min-32-chars-long-security"
+
 
 # =============================================================================
 # Sample DocTypes for Testing
@@ -210,7 +219,7 @@ async def clean_tables(
 ) -> AsyncGenerator[MetaData, None]:
     """Create a clean metadata and drop all tables after test."""
     # Reset table registry before each test
-    from framework_m.adapters.db.table_registry import TableRegistry
+    from framework_m_standard.adapters.db.table_registry import TableRegistry
 
     table_registry = TableRegistry()
     table_registry.reset()

{framework_m-0.5.2 → framework_m-0.6.1}/tests/core/interfaces/test_read_model.py

@@ -7,8 +7,7 @@ from typing import Any
 from unittest.mock import AsyncMock
 
 import pytest
-
-from framework_m.core.interfaces.event_bus import Event
+from framework_m_core.interfaces.event_bus import Event
 
 
 class TestReadModelProtocolStructure:
@@ -107,7 +106,7 @@ class TestReadModelExports:
 
     def test_exported_from_interfaces_init(self) -> None:
         """ReadModelProtocol should be exported from core.interfaces."""
-        from framework_m.core.interfaces import ReadModelProtocol
+        from framework_m_core.interfaces import ReadModelProtocol
 
         assert ReadModelProtocol is not None
 

{framework_m-0.5.2 → framework_m-0.6.1}/tests/integration/test_api_endpoints.py

@@ -7,16 +7,15 @@ Covers: validation, permissions, RLS filtering, immutable docs.
 from typing import Any, ClassVar
 
 import pytest
+from framework_m_core.domain.base_doctype import BaseDocType, Field
+from framework_m_core.exceptions import PermissionDeniedError
+from framework_m_core.interfaces.auth_context import UserContext
+from framework_m_core.registry import MetaRegistry
 from litestar import Litestar, Response
 from litestar.status_codes import HTTP_403_FORBIDDEN
 from litestar.testing import TestClient
 from litestar.types import ASGIApp, Receive, Scope, Send
 
-from framework_m.core.domain.base_doctype import BaseDocType, Field
-from framework_m.core.exceptions import PermissionDeniedError
-from framework_m.core.interfaces.auth_context import UserContext
-from framework_m.core.registry import MetaRegistry
-
 # =============================================================================
 # Test DocTypes
 # =============================================================================
@@ -104,7 +103,7 @@ class TestCrudEndpointValidation:
     @pytest.fixture
     def app(self) -> Litestar:
         """Create test app with CRUD routes."""
-        from framework_m.adapters.web.meta_router import create_meta_router
+        from framework_m_standard.adapters.web.meta_router import create_meta_router
 
         router = create_meta_router()
         return Litestar(
@@ -154,7 +153,7 @@ class TestCrudEndpointPermissions:
     @pytest.fixture
     def app_employee(self) -> Litestar:
         """Create test app with Employee role."""
-        from framework_m.adapters.web.meta_router import create_meta_router
+        from framework_m_standard.adapters.web.meta_router import create_meta_router
 
         router = create_meta_router()
         return Litestar(
@@ -168,7 +167,7 @@ class TestCrudEndpointPermissions:
     @pytest.fixture
     def app_admin(self) -> Litestar:
         """Create test app with Admin role."""
-        from framework_m.adapters.web.meta_router import create_meta_router
+        from framework_m_standard.adapters.web.meta_router import create_meta_router
 
         router = create_meta_router()
         return Litestar(
@@ -216,7 +215,7 @@ class TestCrudRlsFiltering:
     @pytest.fixture
     def app_user1(self) -> Litestar:
         """Create test app for user 1."""
-        from framework_m.adapters.web.meta_router import create_meta_router
+        from framework_m_standard.adapters.web.meta_router import create_meta_router
 
         router = create_meta_router()
         return Litestar(
@@ -250,7 +249,7 @@ class TestRpcEndpointIntegration:
     @pytest.fixture
     def app(self) -> Litestar:
         """Create test app with RPC routes."""
-        from framework_m.adapters.web.rpc_routes import rpc_router
+        from framework_m_standard.adapters.web.rpc_routes import rpc_router
 
         return Litestar(
             route_handlers=[rpc_router],
@@ -265,8 +264,8 @@ class TestRpcEndpointIntegration:
 
     def test_rpc_function_callable(self, client: TestClient[Litestar]) -> None:
         """Should be able to call registered RPC function."""
-        from framework_m.core.decorators import rpc
-        from framework_m.core.rpc_registry import RpcRegistry
+        from framework_m_core.decorators import rpc
+        from framework_m_core.rpc_registry import RpcRegistry
 
         registry = RpcRegistry.get_instance()
 

{framework_m-0.5.2 → framework_m-0.6.1}/tests/integration/test_child_table_integration.py

@@ -13,10 +13,9 @@ from typing import ClassVar
 from uuid import uuid4
 
 import pytest
+from framework_m_core.domain.base_doctype import BaseDocType
 from pydantic import Field
 
-from framework_m.core.domain.base_doctype import BaseDocType
-
 # ============================================================================
 # Test DocTypes
 # ============================================================================

{framework_m-0.5.2 → framework_m-0.6.1}/tests/integration/test_crud_flow.py

@@ -8,18 +8,18 @@ from __future__ import annotations
 from collections.abc import AsyncGenerator
 
 import pytest
-from sqlalchemy import MetaData
-
-from framework_m import DocType, Field
-from framework_m.adapters.db import (
+from framework_m_core.registry import MetaRegistry
+from framework_m_standard.adapters.db import (
     ConnectionFactory,
     RepositoryFactory,
     SessionFactory,
     TableRegistry,
     initialize_database,
 )
-from framework_m.adapters.db.schema_mapper import SchemaMapper
-from framework_m.core.registry import MetaRegistry
+from framework_m_standard.adapters.db.schema_mapper import SchemaMapper
+from sqlalchemy import MetaData
+
+from framework_m import DocType, Field
 
 # =============================================================================
 # Test DocType