bvandeusen
839d6902ad
CI & Build / Python lint (push) Successful in 3s
CI & Build / Plugin hooks (push) Successful in 8s
CI & Build / integration (push) Successful in 15s
CI & Build / TypeScript typecheck (push) Successful in 33s
CI & Build / Python tests (push) Successful in 42s
CI & Build / Build & push image (push) Successful in 29s
Milestone #254 step 2 (#2287). `resolve_tokens` flattens a system's inheritance chain into its effective token set — walk to the root, deepest wins by token name. Pure and duck-typed, so a test states a whole hierarchy in literals and the service hands the same function ORM rows. **Provenance is stored as the contest, not the winner.** A ResolvedToken carries every system that offered a value, per mode, deepest first — `[0]` won and `[1:]` are what it shadowed. "Which system supplied this?" and "what did it override?" are then two reads of one list and cannot disagree, where a winner plus a separate provenance field would be two things to keep in step. **Merging is per (name, MODE), and that is the storage decision paying off.** A system that deepens one accent for light backgrounds while leaving dark alone owns `base` and still inherits `dark`. A token-level "overridden here" flag would have to lie about one of them, and the two-column shape could not have represented it at all. Metadata cascades separately by the same deepest-wins rule, with one exception: `order_index` treats 0 as UNSTATED rather than "first", because 0 is the column default. Reading it as a real value would let a colour-only override drag its token to the top of its group — a visible reshuffle in return for a change that touched nothing structural. One fix to step 1 while wiring this up: `_parent_map` is now scoped to the SYSTEM'S OWNER rather than the caller. A caller reading through a shared project owns no link in the chain, so the caller-scoped version would have handed them an empty forest and truncated the cascade to a single system — a page rendering with plausible wrong values and no error anywhere. The ACL already grants read along the whole chain; this is the loading side keeping that promise, and it now has a test naming the shared-project case. `BASE_MODE` moves from the model to the cascade module, where it belongs: it is a resolution rule, not a storage fact, and design_cascade.py deliberately imports nothing so both access.py and the service can depend on it.
47 lines
2.1 KiB
Python
47 lines
2.1 KiB
Python
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
|
from sqlalchemy.orm import DeclarativeBase
|
|
|
|
from scribe.config import Config
|
|
|
|
engine = create_async_engine(
|
|
Config.DATABASE_URL,
|
|
echo=False,
|
|
pool_pre_ping=True,
|
|
pool_recycle=1800,
|
|
)
|
|
async_session = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
|
|
|
|
|
|
class Base(DeclarativeBase):
|
|
pass
|
|
|
|
|
|
from scribe.models.base import CreatedAtMixin, TimestampMixin # noqa: E402, F401
|
|
|
|
|
|
from scribe.models.note import Note, TaskPriority, TaskStatus # noqa: E402, F401
|
|
from scribe.models.setting import Setting # noqa: E402, F401
|
|
from scribe.models.user import User # noqa: E402, F401
|
|
from scribe.models.app_log import AppLog # noqa: E402, F401
|
|
from scribe.models.password_reset import PasswordResetToken # noqa: E402, F401
|
|
from scribe.models.invitation import InvitationToken # noqa: E402, F401
|
|
from scribe.models.embedding import NoteEmbedding # noqa: E402, F401
|
|
from scribe.models.retrieval_log import RetrievalLog # noqa: E402, F401
|
|
from scribe.models.note_usage import NoteUsageEvent # noqa: E402, F401
|
|
from scribe.models.project import Project # noqa: E402, F401
|
|
from scribe.models.milestone import Milestone # noqa: E402, F401
|
|
from scribe.models.task_log import TaskLog # noqa: E402, F401
|
|
from scribe.models.note_draft import NoteDraft # noqa: E402, F401
|
|
from scribe.models.note_version import NoteVersion # noqa: E402, F401
|
|
from scribe.models.group import Group, GroupMembership # noqa: E402, F401
|
|
from scribe.models.share import NoteShare, ProjectShare # noqa: E402, F401
|
|
from scribe.models.notification import Notification # noqa: E402, F401
|
|
from scribe.models.api_key import ApiKey # noqa: E402, F401
|
|
from scribe.models.user_profile import UserProfile # noqa: E402, F401
|
|
from scribe.models.rulebook import ( # noqa: E402, F401
|
|
Rulebook, RulebookTopic, Rule, project_rulebook_subscriptions,
|
|
)
|
|
from scribe.models.repo_binding import RepoBinding # noqa: E402, F401
|
|
from scribe.models.system import System, RecordSystem # noqa: E402, F401
|
|
from scribe.models.design_system import DesignSystem, DesignToken # noqa: E402, F401
|