Decouple blog models and BlogService from shared layer

Move Post/Author/Tag/PostAuthor/PostTag/PostUser models from
shared/models/ghost_content.py to blog/models/content.py so blog-domain
models no longer live in the shared layer. Replace the shared
SqlBlogService + BlogService protocol with a blog-local singleton
(blog_service), and switch entry_associations.py from direct DB access
to HTTP fetch_data("blog", "post-by-id") to respect the inter-service
boundary.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

blog/alembic/env.py

@@ -2,7 +2,7 @@ from alembic import context
 from shared.db.alembic_env import run_alembic
 
 MODELS = [
-    "shared.models.ghost_content",
+    "blog.models.content",
     "shared.models.kv",
     "shared.models.menu_item",
     "shared.models.menu_node",

blog/app.py

@@ -134,7 +134,7 @@ def create_app() -> "Quart":
     async def oembed():
         from urllib.parse import urlparse
         from quart import jsonify
-        from shared.services.registry import services
+        from services import blog_service
         from shared.infrastructure.urls import blog_url
         from shared.infrastructure.oembed import build_oembed_response
 
@@ -147,7 +147,7 @@ def create_app() -> "Quart":
         if not slug:
             return jsonify({"error": "could not extract slug"}), 404
 
-        post = await services.blog.get_post_by_slug(g.s, slug)
+        post = await blog_service.get_post_by_slug(g.s, slug)
         if not post:
             return jsonify({"error": "not found"}), 404
 

blog/bp/data/routes.py

@@ -9,7 +9,7 @@ from quart import Blueprint, g, jsonify, request
 
 from shared.infrastructure.data_client import DATA_HEADER
 from shared.contracts.dtos import dto_to_dict
-from shared.services.registry import services
+from services import blog_service
 
 
 def register() -> Blueprint:
@@ -36,7 +36,7 @@ def register() -> Blueprint:
     # --- post-by-slug ---
     async def _post_by_slug():
         slug = request.args.get("slug", "")
-        post = await services.blog.get_post_by_slug(g.s, slug)
+        post = await blog_service.get_post_by_slug(g.s, slug)
         if not post:
             return None
         return dto_to_dict(post)
@@ -46,7 +46,7 @@ def register() -> Blueprint:
     # --- post-by-id ---
     async def _post_by_id():
         post_id = int(request.args.get("id", 0))
-        post = await services.blog.get_post_by_id(g.s, post_id)
+        post = await blog_service.get_post_by_id(g.s, post_id)
         if not post:
             return None
         return dto_to_dict(post)
@@ -59,7 +59,7 @@ def register() -> Blueprint:
         if not ids_raw:
             return []
         ids = [int(x.strip()) for x in ids_raw.split(",") if x.strip()]
-        posts = await services.blog.get_posts_by_ids(g.s, ids)
+        posts = await blog_service.get_posts_by_ids(g.s, ids)
         return [dto_to_dict(p) for p in posts]
 
     _handlers["posts-by-ids"] = _posts_by_ids
@@ -69,7 +69,7 @@ def register() -> Blueprint:
         query = request.args.get("query", "")
         page = int(request.args.get("page", 1))
         per_page = int(request.args.get("per_page", 10))
-        posts, total = await services.blog.search_posts(g.s, query, page, per_page)
+        posts, total = await blog_service.search_posts(g.s, query, page, per_page)
         return {"posts": [dto_to_dict(p) for p in posts], "total": total}
 
     _handlers["search-posts"] = _search_posts

blog/bp/fragments/routes.py

@@ -125,7 +125,7 @@ def register():
                          data_app="blog")
 
     async def _link_card_handler():
-        from shared.services.registry import services
+        from services import blog_service
         from shared.infrastructure.urls import blog_url
 
         slug = request.args.get("slug", "")
@@ -137,7 +137,7 @@ def register():
             parts = []
             for s in slugs:
                 parts.append(f"<!-- fragment:{s} -->")
-                post = await services.blog.get_post_by_slug(g.s, s)
+                post = await blog_service.get_post_by_slug(g.s, s)
                 if post:
                     parts.append(_blog_link_card_sx(post, blog_url(f"/{post.slug}")))
             return "\n".join(parts)
@@ -145,7 +145,7 @@ def register():
         # Single mode
         if not slug:
             return ""
-        post = await services.blog.get_post_by_slug(g.s, slug)
+        post = await blog_service.get_post_by_slug(g.s, slug)
         if not post:
             return ""
         return _blog_link_card_sx(post, blog_url(f"/{post.slug}"))

blog/bp/post/admin/routes.py

@@ -264,7 +264,7 @@ def register():
 
     # Get associated entry IDs for this post
     post_id = g.post_data["post"]["id"]
-    associated_entry_ids = await get_post_entry_ids(g.s, post_id)
+    associated_entry_ids = await get_post_entry_ids(post_id)
 
     html = await render_template(
       "_types/post/admin/_calendar_view.html",
@@ -293,7 +293,7 @@ def register():
     from sqlalchemy import select
 
     post_id = g.post_data["post"]["id"]
-    associated_entry_ids = await get_post_entry_ids(g.s, post_id)
+    associated_entry_ids = await get_post_entry_ids(post_id)
 
     # Load ALL calendars (not just this post's calendars)
     result = await g.s.execute(
@@ -332,7 +332,7 @@ def register():
     from quart import jsonify
 
     post_id = g.post_data["post"]["id"]
-    is_associated, error = await toggle_entry_association(g.s, post_id, entry_id)
+    is_associated, error = await toggle_entry_association(post_id, entry_id)
 
     if error:
       return jsonify({"message": error, "errors": {}}), 400
@@ -340,7 +340,7 @@ def register():
     await g.s.flush()
 
     # Return updated association status
-    associated_entry_ids = await get_post_entry_ids(g.s, post_id)
+    associated_entry_ids = await get_post_entry_ids(post_id)
 
     # Load ALL calendars
     result = await g.s.execute(
@@ -355,7 +355,7 @@ def register():
       await g.s.refresh(calendar, ["entries", "post"])
 
     # Fetch associated entries for nav display
-    associated_entries = await get_associated_entries(g.s, post_id)
+    associated_entries = await get_associated_entries(post_id)
 
     # Load calendars for this post (for nav display)
     calendars = (

blog/bp/post/services/markets.py

@@ -7,7 +7,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from shared.contracts.dtos import MarketPlaceDTO
 from shared.infrastructure.actions import call_action, ActionError
-from shared.services.registry import services
+from services import blog_service
 
 
 class MarketError(ValueError):
@@ -33,7 +33,7 @@ async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPl
         raise MarketError("Market name must not be empty.")
     slug = slugify(name)
 
-    post = await services.blog.get_post_by_id(sess, post_id)
+    post = await blog_service.get_post_by_id(sess, post_id)
     if not post:
         raise MarketError(f"Post {post_id} does not exist.")
 
@@ -57,7 +57,7 @@ async def create_market(sess: AsyncSession, post_id: int, name: str) -> MarketPl
 
 
 async def soft_delete_market(sess: AsyncSession, post_slug: str, market_slug: str) -> bool:
-    post = await services.blog.get_post_by_slug(sess, post_slug)
+    post = await blog_service.get_post_by_slug(sess, post_slug)
     if not post:
         return False
 

blog/models/__init__.py

@@ -1,4 +1,4 @@
-from .ghost_content import Post, Author, Tag, PostAuthor, PostTag
+from .content import Post, Author, Tag, PostAuthor, PostTag, PostUser
 from .snippet import Snippet
 from .tag_group import TagGroup, TagGroupTag
 

blog/models/content.py

@@ -0,0 +1,206 @@
+from datetime import datetime
+from typing import List, Optional
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import (
+    Integer,
+    String,
+    Text,
+    Boolean,
+    DateTime,
+    ForeignKey,
+    Column,
+    func,
+)
+from shared.db.base import Base  # whatever your Base is
+# from .author import Author  # make sure imports resolve
+# from ..app.blog.calendars.model import Calendar
+
+class Tag(Base):
+    __tablename__ = "tags"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
+
+    slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+
+    description: Mapped[Optional[str]] = mapped_column(Text())
+    visibility: Mapped[str] = mapped_column(String(32), default="public", nullable=False)
+    feature_image: Mapped[Optional[str]] = mapped_column(Text())
+
+    meta_title: Mapped[Optional[str]] = mapped_column(String(300))
+    meta_description: Mapped[Optional[str]] = mapped_column(Text())
+
+    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+
+    # NEW: posts relationship is now direct Post objects via PostTag
+    posts: Mapped[List["Post"]] = relationship(
+        "Post",
+        secondary="post_tags",
+        primaryjoin="Tag.id==post_tags.c.tag_id",
+        secondaryjoin="Post.id==post_tags.c.post_id",
+        back_populates="tags",
+        order_by="PostTag.sort_order",
+    )
+
+
+class Post(Base):
+    __tablename__ = "posts"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
+    uuid: Mapped[str] = mapped_column(String(64), unique=True, nullable=False, server_default=func.gen_random_uuid())
+    slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
+
+    title: Mapped[str] = mapped_column(String(500), nullable=False)
+
+    html: Mapped[Optional[str]] = mapped_column(Text())
+    plaintext: Mapped[Optional[str]] = mapped_column(Text())
+    mobiledoc: Mapped[Optional[str]] = mapped_column(Text())
+    lexical: Mapped[Optional[str]] = mapped_column(Text())
+
+    feature_image: Mapped[Optional[str]] = mapped_column(Text())
+    feature_image_alt: Mapped[Optional[str]] = mapped_column(Text())
+    feature_image_caption: Mapped[Optional[str]] = mapped_column(Text())
+
+    excerpt: Mapped[Optional[str]] = mapped_column(Text())
+    custom_excerpt: Mapped[Optional[str]] = mapped_column(Text())
+
+    visibility: Mapped[str] = mapped_column(String(32), default="public", nullable=False)
+    status: Mapped[str] = mapped_column(String(32), default="draft", nullable=False)
+    featured: Mapped[bool] = mapped_column(Boolean(), default=False, nullable=False)
+    is_page: Mapped[bool] = mapped_column(Boolean(), default=False, nullable=False)
+    email_only: Mapped[bool] = mapped_column(Boolean(), default=False, nullable=False)
+
+    canonical_url: Mapped[Optional[str]] = mapped_column(Text())
+    meta_title: Mapped[Optional[str]] = mapped_column(String(500))
+    meta_description: Mapped[Optional[str]] = mapped_column(Text())
+    og_image: Mapped[Optional[str]] = mapped_column(Text())
+    og_title: Mapped[Optional[str]] = mapped_column(String(500))
+    og_description: Mapped[Optional[str]] = mapped_column(Text())
+    twitter_image: Mapped[Optional[str]] = mapped_column(Text())
+    twitter_title: Mapped[Optional[str]] = mapped_column(String(500))
+    twitter_description: Mapped[Optional[str]] = mapped_column(Text())
+    custom_template: Mapped[Optional[str]] = mapped_column(String(191))
+
+    reading_time: Mapped[Optional[int]] = mapped_column(Integer())
+    comment_id: Mapped[Optional[str]] = mapped_column(String(191))
+
+    published_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
+    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), server_default=func.now())
+    deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+
+    user_id: Mapped[Optional[int]] = mapped_column(
+        Integer, index=True
+    )
+    publish_requested: Mapped[bool] = mapped_column(Boolean(), default=False, server_default="false", nullable=False)
+
+    primary_author_id: Mapped[Optional[int]] = mapped_column(
+        Integer, ForeignKey("authors.id", ondelete="SET NULL")
+    )
+    primary_tag_id: Mapped[Optional[int]] = mapped_column(
+        Integer, ForeignKey("tags.id", ondelete="SET NULL")
+    )
+
+    primary_author: Mapped[Optional["Author"]] = relationship(
+        "Author", foreign_keys=[primary_author_id]
+    )
+    primary_tag: Mapped[Optional[Tag]] = relationship(
+        "Tag", foreign_keys=[primary_tag_id]
+    )
+
+    # AUTHORS RELATIONSHIP (many-to-many via post_authors)
+    authors: Mapped[List["Author"]] = relationship(
+        "Author",
+        secondary="post_authors",
+        primaryjoin="Post.id==post_authors.c.post_id",
+        secondaryjoin="Author.id==post_authors.c.author_id",
+        back_populates="authors",
+        order_by="PostAuthor.sort_order",
+    )
+
+    # TAGS RELATIONSHIP (many-to-many via post_tags)
+    tags: Mapped[List[Tag]] = relationship(
+        "Tag",
+        secondary="post_tags",
+        primaryjoin="Post.id==post_tags.c.post_id",
+        secondaryjoin="Tag.id==post_tags.c.tag_id",
+        back_populates="posts",
+        order_by="PostTag.sort_order",
+    )
+
+class Author(Base):
+    __tablename__ = "authors"
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    ghost_id: Mapped[Optional[str]] = mapped_column(String(64), index=True, unique=True, nullable=True)
+
+    slug: Mapped[str] = mapped_column(String(191), index=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    email: Mapped[Optional[str]] = mapped_column(String(255))
+
+    profile_image: Mapped[Optional[str]] = mapped_column(Text())
+    cover_image: Mapped[Optional[str]] = mapped_column(Text())
+    bio: Mapped[Optional[str]] = mapped_column(Text())
+    website: Mapped[Optional[str]] = mapped_column(Text())
+    location: Mapped[Optional[str]] = mapped_column(Text())
+    facebook: Mapped[Optional[str]] = mapped_column(Text())
+    twitter: Mapped[Optional[str]] = mapped_column(Text())
+
+    created_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+    deleted_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
+
+    # backref to posts via post_authors
+    posts: Mapped[List[Post]] = relationship(
+        "Post",
+        secondary="post_authors",
+        primaryjoin="Author.id==post_authors.c.author_id",
+        secondaryjoin="Post.id==post_authors.c.post_id",
+        back_populates="authors",
+        order_by="PostAuthor.sort_order",
+    )
+
+class PostAuthor(Base):
+    __tablename__ = "post_authors"
+
+    post_id: Mapped[int] = mapped_column(
+        ForeignKey("posts.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    author_id: Mapped[int] = mapped_column(
+        ForeignKey("authors.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
+
+
+class PostTag(Base):
+    __tablename__ = "post_tags"
+
+    post_id: Mapped[int] = mapped_column(
+        ForeignKey("posts.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    tag_id: Mapped[int] = mapped_column(
+        ForeignKey("tags.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
+
+
+class PostUser(Base):
+    """Multi-author M2M: links posts to users (cross-DB, no FK on user_id)."""
+    __tablename__ = "post_users"
+
+    post_id: Mapped[int] = mapped_column(
+        ForeignKey("posts.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    user_id: Mapped[int] = mapped_column(
+        Integer, primary_key=True, index=True,
+    )
+    sort_order: Mapped[int] = mapped_column(Integer, default=0, nullable=False)

blog/models/ghost_content.py

@@ -1,3 +1,3 @@
-from shared.models.ghost_content import (  # noqa: F401
-    Tag, Post, Author, PostAuthor, PostTag,
+from .content import (  # noqa: F401
+    Tag, Post, Author, PostAuthor, PostTag, PostUser,
 )

blog/scripts/final_ghost_sync.py

@@ -29,7 +29,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "shared")
 from shared.db.base import Base  # noqa: E402
 from shared.db.session import get_session, get_account_session, _engine  # noqa: E402
 from shared.infrastructure.ghost_admin_token import make_ghost_admin_jwt  # noqa: E402
-from shared.models.ghost_content import Post, Author, Tag, PostUser, PostAuthor  # noqa: E402
+from blog.models.content import Post, Author, Tag, PostUser, PostAuthor  # noqa: E402
 from shared.models.user import User  # noqa: E402
 
 logging.basicConfig(

blog/services/__init__.py

@@ -1,6 +1,68 @@
 """Blog app service registration."""
 from __future__ import annotations
 
+from sqlalchemy import select, func
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from shared.contracts.dtos import PostDTO
+
+from models.content import Post
+
+
+def _post_to_dto(post: Post) -> PostDTO:
+    return PostDTO(
+        id=post.id,
+        slug=post.slug,
+        title=post.title,
+        status=post.status,
+        visibility=post.visibility,
+        is_page=post.is_page,
+        feature_image=post.feature_image,
+        html=post.html,
+        excerpt=post.excerpt,
+        custom_excerpt=post.custom_excerpt,
+        published_at=post.published_at,
+    )
+
+
+class SqlBlogService:
+    async def get_post_by_slug(self, session: AsyncSession, slug: str) -> PostDTO | None:
+        post = (
+            await session.execute(select(Post).where(Post.slug == slug))
+        ).scalar_one_or_none()
+        return _post_to_dto(post) if post else None
+
+    async def get_post_by_id(self, session: AsyncSession, id: int) -> PostDTO | None:
+        post = (
+            await session.execute(select(Post).where(Post.id == id))
+        ).scalar_one_or_none()
+        return _post_to_dto(post) if post else None
+
+    async def get_posts_by_ids(self, session: AsyncSession, ids: list[int]) -> list[PostDTO]:
+        if not ids:
+            return []
+        result = await session.execute(select(Post).where(Post.id.in_(ids)))
+        return [_post_to_dto(p) for p in result.scalars().all()]
+
+    async def search_posts(
+        self, session: AsyncSession, query: str, page: int = 1, per_page: int = 10,
+    ) -> tuple[list[PostDTO], int]:
+        if query:
+            count_stmt = select(func.count(Post.id)).where(Post.title.ilike(f"%{query}%"))
+            posts_stmt = select(Post).where(Post.title.ilike(f"%{query}%")).order_by(Post.title)
+        else:
+            count_stmt = select(func.count(Post.id))
+            posts_stmt = select(Post).order_by(Post.published_at.desc().nullslast())
+
+        total = (await session.execute(count_stmt)).scalar() or 0
+        offset = (page - 1) * per_page
+        result = await session.execute(posts_stmt.limit(per_page).offset(offset))
+        return [_post_to_dto(p) for p in result.scalars().all()], total
+
+
+# Module-level singleton — import this in blog code.
+blog_service = SqlBlogService()
+
 
 def register_domain_services() -> None:
     """Register services for the blog app.
@@ -8,12 +70,8 @@ def register_domain_services() -> None:
     Blog owns: Post, Tag, Author, PostAuthor, PostTag.
     Cross-app calls go over HTTP via call_action() / fetch_data().
     """
-    from shared.services.registry import services
-    from shared.services.blog_impl import SqlBlogService
-
-    services.blog = SqlBlogService()
-
     # Federation needed for AP shared infrastructure (activitypub blueprint)
+    from shared.services.registry import services
     if not services.has("federation"):
         from shared.services.federation_impl import SqlFederationService
         services.federation = SqlFederationService()