MetaList 0.3.1__tar.gz → 0.3.2__tar.gz

{metalist-0.3.1/metalist.egg-info → metalist-0.3.2}/PKG-INFO

@@ -1,29 +1,31 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.3.1
+Version: 0.3.2
 Summary: A minimalist single-user note-taking app with SSR, fast in-memory tree operations, and efficient sync.
 Project-URL: Homepage, https://github.com/evolvingstuff/metalist
 Project-URL: Repository, https://github.com/evolvingstuff/metalist
 Project-URL: Issues, https://github.com/evolvingstuff/metalist/issues
 Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: argon2-cffi==23.1.0
-Requires-Dist: cryptography==42.0.5
-Requires-Dist: fastapi==0.110.0
+Requires-Dist: argon2-cffi==25.1.0
+Requires-Dist: cryptography==50.0.0
+Requires-Dist: fastapi==0.141.1
+Requires-Dist: httpx==0.28.1
 Requires-Dist: latex2mathml==3.81.0
-Requires-Dist: loguru==0.7.2
-Requires-Dist: Mako==1.3.2
-Requires-Dist: mutagen==1.47.0
-Requires-Dist: pydantic==2.9.2
-Requires-Dist: python-multipart==0.0.9
-Requires-Dist: starlette==0.36.3
+Requires-Dist: loguru==0.7.3
+Requires-Dist: Mako==1.3.12
+Requires-Dist: mutagen==1.48.1
+Requires-Dist: pydantic==2.13.4
+Requires-Dist: python-multipart==0.0.32
+Requires-Dist: starlette==1.3.1
+Requires-Dist: tqdm==4.70.0
 Requires-Dist: tree-sitter==0.25.2
 Requires-Dist: tree-sitter-javascript==0.25.0
-Requires-Dist: uvicorn==0.27.1
+Requires-Dist: uvicorn==0.52.0
 Provides-Extra: dev
-Requires-Dist: hypothesis==6.112.0; extra == "dev"
-Requires-Dist: pytest==8.0.0; extra == "dev"
-Requires-Dist: pytest-cov==4.1.0; extra == "dev"
+Requires-Dist: hypothesis==6.164.0; extra == "dev"
+Requires-Dist: pytest==9.1.1; extra == "dev"
+Requires-Dist: pytest-cov==7.1.0; extra == "dev"
 
 # MetaList
 
@@ -261,7 +263,7 @@ This repo now packages itself under the PyPI distribution name `metalist`. Curre
 
 Recommended release path:
 1. In the existing PyPI project `metalist`, configure GitHub Trusted Publishing for `evolvingstuff/metalist` and the workflow file `.github/workflows/publish-pypi.yml`.
-2. Push a tag such as `v0.3.1`.
+2. Push a tag such as `v0.3.2`.
 3. After the GitHub Actions workflow completes, users can run it with `uvx metalist`, install it persistently with `uv tool install metalist`, or install it with `pip install metalist`.
 
 If `--input` is omitted, a file picker opens (when `tkinter` is available).

{metalist-0.3.1 → metalist-0.3.2}/README.md

@@ -234,7 +234,7 @@ This repo now packages itself under the PyPI distribution name `metalist`. Curre
 
 Recommended release path:
 1. In the existing PyPI project `metalist`, configure GitHub Trusted Publishing for `evolvingstuff/metalist` and the workflow file `.github/workflows/publish-pypi.yml`.
-2. Push a tag such as `v0.3.1`.
+2. Push a tag such as `v0.3.2`.
 3. After the GitHub Actions workflow completes, users can run it with `uvx metalist`, install it persistently with `uv tool install metalist`, or install it with `pip install metalist`.
 
 If `--input` is omitted, a file picker opens (when `tkinter` is available).

{metalist-0.3.1 → metalist-0.3.2}/app/api/routes/auth.py

@@ -408,7 +408,16 @@ def _verify_namespace_password(*, namespace: str, password: str) -> None:
         raise HTTPException(status_code=401, detail="Invalid password")
 
 
-def _run_hydration() -> None:
+def _run_hydration(*, rebuild_required: bool) -> None:
+    hydration_state.set_phase(
+        phase="database_check",
+        message="Database is up to date",
+        total=1,
+    )
+    hydration_state.update(1)
+    if not rebuild_required:
+        hydration_state.finish()
+        return
     session = SafeSession()
     try:
         prefetched_rows = populate_cache_from_db(session)
@@ -431,7 +440,7 @@ def _on_hydration_done(future: Future) -> None:
         hydration_state.fail(str(error))
 
 
-def _start_hydration(first_load: bool) -> None:
+def _start_hydration(*, first_load: bool, rebuild_required: bool) -> None:
     global _hydration_future
     with _hydration_lock:
         if _hydration_future is not None and not _hydration_future.done():
@@ -440,7 +449,10 @@ def _start_hydration(first_load: bool) -> None:
             first_load=first_load,
             message="Preparing encrypted data",
         )
-        _hydration_future = _hydration_executor.submit(_run_hydration)
+        _hydration_future = _hydration_executor.submit(
+            _run_hydration,
+            rebuild_required=rebuild_required,
+        )
         _hydration_future.add_done_callback(_on_hydration_done)
 
 
@@ -449,7 +461,7 @@ def _build_hydration_status() -> HydrationStatusResponse:
     if not auth_cache_state.cache_refresh_needed() and snapshot["status"] == "idle":
         snapshot["status"] = "ready"
         snapshot["phase"] = "complete"
-        snapshot["message"] = "Hydration complete"
+        snapshot["message"] = "Workspace ready"
         snapshot["overall_percent"] = 100
     return HydrationStatusResponse(**snapshot)
 
@@ -624,6 +636,7 @@ def login(
         raise HTTPException(status_code=401, detail="Invalid password")
 
     dek = auth.unwrap_dek_for_password(payload.password)
+    auth.run_authenticated_database_migrations(dek=dek)
 
     set_session_dek(dek)
     ensure_rules_decrypted_and_compiled(token="")
@@ -632,17 +645,13 @@ def login(
     reminder_store.ensure_decrypted(token="")
     search_history_store.ensure_decrypted(token="")
 
-    needs_hydration = auth_cache_state.cache_refresh_needed()
-    if not note_store.loaded:
-        needs_hydration = True
-
     token = token_service.create_token(_client_info(request), tab_id, dek=dek)
     set_auth_cookie(request=request, response=response, token=token)
     login_rate_limiter.record_success(rate_limit_key)
     clear_all_locks()
     return LoginResponse(
         message="Login successful",
-        hydration_required=needs_hydration,
+        hydration_required=True,
     )
 
 
@@ -746,6 +755,11 @@ def auth_status(
     database_user_version = database_user_version_row[0]
     if not isinstance(database_user_version, int) or database_user_version < 0:
         raise RuntimeError(f"Invalid database user_version: {database_user_version!r}")
+    client_preferences: dict[str, str] = {}
+    if not bool(settings and settings.encryption_enabled):
+        client_preferences = load_client_preferences(token="")
+    elif token is not None:
+        client_preferences = load_client_preferences(token=token)
     return {
         "version": VERSION,
         "database_user_version": database_user_version,
@@ -760,14 +774,13 @@ def auth_status(
         "cache_ready": not auth_cache_state.cache_refresh_needed(),
         "namespace": ACTIVE_NAMESPACE,
         "link_title_revision": link_title_store.get_revision(),
-        "client_preferences": load_client_preferences(),
+        "client_preferences": client_preferences,
     }
 
 
 @router.get("/client-state", response_model=ClientStateResponse)
 def get_client_state(token: Annotated[str, Depends(_require_auth)]):
-    del token
-    payload = load_client_state()
+    payload = load_client_state(token=token)
     return ClientStateResponse(**payload)
 
 
@@ -777,8 +790,7 @@ def put_client_preferences(
     payload: ClientPreferencesUpdateRequest,
     token: Annotated[str, Depends(_require_auth)],
 ):
-    del token
-    normalized = save_client_preferences(preferences=payload.preferences)
+    normalized = save_client_preferences(preferences=payload.preferences, token=token)
     return ClientPreferencesResponse(preferences=normalized)
 
 
@@ -788,8 +800,10 @@ def put_command_palette_usage(
     payload: CommandPaletteUsageUpdateRequest,
     token: Annotated[str, Depends(_require_auth)],
 ):
-    del token
-    normalized = save_command_palette_usage(usage_state=payload.command_palette_usage)
+    normalized = save_command_palette_usage(
+        usage_state=payload.command_palette_usage,
+        token=token,
+    )
     return CommandPaletteUsageResponse(command_palette_usage=normalized)
 
 
@@ -1067,8 +1081,10 @@ def hydrate_cache(
     if not note_store.loaded:
         needs_hydration = True
 
-    if needs_hydration:
-        _start_hydration(first_load=auth_cache_state.cache_refresh_needed())
+    _start_hydration(
+        first_load=auth_cache_state.cache_refresh_needed(),
+        rebuild_required=needs_hydration,
+    )
 
     return _build_hydration_status()
 

{metalist-0.3.1 → metalist-0.3.2}/app/config.py

@@ -5,8 +5,9 @@ from app.server_runtime import resolve_api_prefix
 from app.server_runtime import resolve_database_runtime_config
 from app.server_runtime import resolve_default_database_path
 from app.server_runtime import resolve_v1_api_prefix
+from app.version import __version__
 
-VERSION = "0.3.0"
+VERSION = __version__
 
 
 def _env_flag(name: str, default: bool) -> bool:

metalist-0.3.2/app/db/migrations.py

@@ -0,0 +1,166 @@
+"""Ordered, transactional database migrations for namespace databases."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+import sqlite3
+
+from app.services.encryption import EncryptionService
+
+
+CURRENT_DATABASE_VERSION = 1
+
+
+@dataclass(frozen=True, slots=True)
+class MigrationResult:
+    initial_version: int
+    final_version: int
+    applied_versions: tuple[int, ...]
+    rewritten_payload_count: int
+
+
+_CLIENT_STATE_PAYLOADS = (
+    (
+        "client_preferences_json",
+        "client_preferences_encryption_nonce",
+        "client_preferences_encryption_tag",
+    ),
+    (
+        "command_palette_usage_json",
+        "command_palette_usage_encryption_nonce",
+        "command_palette_usage_encryption_tag",
+    ),
+    (
+        "tag_prefix_settings_json",
+        "tag_prefix_settings_encryption_nonce",
+        "tag_prefix_settings_encryption_tag",
+    ),
+)
+
+
+def read_database_version(connection: sqlite3.Connection) -> int:
+    row = connection.execute("PRAGMA user_version").fetchone()
+    if row is None:
+        raise RuntimeError("Database user_version PRAGMA returned no row")
+    version = row[0]
+    if not isinstance(version, int) or version < 0:
+        raise RuntimeError(f"Invalid database user_version: {version!r}")
+    return version
+
+
+def _table_columns(connection: sqlite3.Connection, *, table: str) -> set[str]:
+    return {
+        str(row[1])
+        for row in connection.execute(f"PRAGMA table_info({table})").fetchall()
+    }
+
+
+def _assert_client_state_schema(connection: sqlite3.Connection) -> None:
+    columns = _table_columns(connection, table="app_settings")
+    required = {column for payload in _CLIENT_STATE_PAYLOADS for column in payload}
+    missing = sorted(required - columns)
+    if missing:
+        raise RuntimeError(f"Database migration requires missing columns: {missing}")
+
+
+def _rewrite_payload_for_encrypted_namespace(
+    *,
+    connection: sqlite3.Connection,
+    encryption_service: EncryptionService,
+    value_column: str,
+    nonce_column: str,
+    tag_column: str,
+) -> int:
+    row = connection.execute(
+        f"SELECT {value_column}, {nonce_column}, {tag_column} FROM app_settings WHERE id = 1"
+    ).fetchone()
+    if row is None:
+        raise RuntimeError("Database migration requires app_settings row id=1")
+    value, nonce, tag = row
+    if (nonce is None) != (tag is None):
+        raise RuntimeError(f"{value_column} has incomplete encryption metadata")
+    if value is None or value == "":
+        if nonce is not None:
+            raise RuntimeError(f"{value_column} has encryption metadata without a payload")
+        return 0
+    if not isinstance(value, str):
+        raise RuntimeError(f"{value_column} must be stored as text")
+    if nonce is not None:
+        encryption_service.decrypt_from_storage(value, nonce, tag)
+        return 0
+    ciphertext, next_nonce, next_tag = encryption_service.encrypt_for_storage(value)
+    connection.execute(
+        f"""
+        UPDATE app_settings
+        SET {value_column} = ?, {nonce_column} = ?, {tag_column} = ?
+        WHERE id = 1
+        """,
+        (ciphertext, next_nonce, next_tag),
+    )
+    return 1
+
+
+def _migration_0_to_1(
+    *,
+    connection: sqlite3.Connection,
+    encryption_enabled: bool,
+    encryption_service: EncryptionService | None,
+) -> int:
+    _assert_client_state_schema(connection)
+    if not encryption_enabled:
+        return 0
+    if encryption_service is None or encryption_service.dek is None:
+        raise RuntimeError("Database migration 0→1 requires the namespace DEK")
+    rewritten_count = 0
+    for value_column, nonce_column, tag_column in _CLIENT_STATE_PAYLOADS:
+        rewritten_count += _rewrite_payload_for_encrypted_namespace(
+            connection=connection,
+            encryption_service=encryption_service,
+            value_column=value_column,
+            nonce_column=nonce_column,
+            tag_column=tag_column,
+        )
+    return rewritten_count
+
+
+_MIGRATIONS: dict[
+    int,
+    Callable[..., int],
+] = {
+    0: _migration_0_to_1,
+}
+
+
+def run_database_migrations(
+    *,
+    connection: sqlite3.Connection,
+    encryption_enabled: bool,
+    encryption_service: EncryptionService | None,
+) -> MigrationResult:
+    initial_version = read_database_version(connection)
+    if initial_version > CURRENT_DATABASE_VERSION:
+        raise RuntimeError(
+            f"Database version {initial_version} is newer than supported version "
+            f"{CURRENT_DATABASE_VERSION}"
+        )
+    version = initial_version
+    applied_versions: list[int] = []
+    rewritten_payload_count = 0
+    while version < CURRENT_DATABASE_VERSION:
+        if version not in _MIGRATIONS:
+            raise RuntimeError(f"No database migration registered from version {version}")
+        rewritten_payload_count += _MIGRATIONS[version](
+            connection=connection,
+            encryption_enabled=encryption_enabled,
+            encryption_service=encryption_service,
+        )
+        version += 1
+        connection.execute(f"PRAGMA user_version = {version}")
+        applied_versions.append(version)
+    return MigrationResult(
+        initial_version=initial_version,
+        final_version=version,
+        applied_versions=tuple(applied_versions),
+        rewritten_payload_count=rewritten_payload_count,
+    )

{metalist-0.3.1 → metalist-0.3.2}/app/db/schema.py

@@ -64,7 +64,14 @@ CREATE TABLE IF NOT EXISTS {APP_SETTINGS_TABLE} (
     backup_settings_encryption_nonce BLOB,
     backup_settings_encryption_tag BLOB,
     client_preferences_json TEXT,
+    client_preferences_encryption_nonce BLOB,
+    client_preferences_encryption_tag BLOB,
     command_palette_usage_json TEXT,
+    command_palette_usage_encryption_nonce BLOB,
+    command_palette_usage_encryption_tag BLOB,
+    tag_prefix_settings_json TEXT,
+    tag_prefix_settings_encryption_nonce BLOB,
+    tag_prefix_settings_encryption_tag BLOB,
     session_timeout_minutes INTEGER,
     created_at TEXT NOT NULL,
     updated_at TEXT NOT NULL
@@ -210,7 +217,14 @@ def initialize_schema(connection: Connection) -> None:
             "backup_settings_encryption_nonce": "BLOB",
             "backup_settings_encryption_tag": "BLOB",
             "client_preferences_json": "TEXT",
+            "client_preferences_encryption_nonce": "BLOB",
+            "client_preferences_encryption_tag": "BLOB",
             "command_palette_usage_json": "TEXT",
+            "command_palette_usage_encryption_nonce": "BLOB",
+            "command_palette_usage_encryption_tag": "BLOB",
+            "tag_prefix_settings_json": "TEXT",
+            "tag_prefix_settings_encryption_nonce": "BLOB",
+            "tag_prefix_settings_encryption_tag": "BLOB",
             "session_timeout_minutes": "INTEGER",
         },
     )

{metalist-0.3.1 → metalist-0.3.2}/app/db/settings_sql.py

@@ -51,7 +51,22 @@ def fetch_settings(connection: GuardedConnection | sqlite3.Connection) -> Option
         "backup_settings_encryption_nonce": row["backup_settings_encryption_nonce"],
         "backup_settings_encryption_tag": row["backup_settings_encryption_tag"],
         "client_preferences_json": row["client_preferences_json"],
+        "client_preferences_encryption_nonce": row["client_preferences_encryption_nonce"],
+        "client_preferences_encryption_tag": row["client_preferences_encryption_tag"],
         "command_palette_usage_json": row["command_palette_usage_json"],
+        "command_palette_usage_encryption_nonce": row[
+            "command_palette_usage_encryption_nonce"
+        ],
+        "command_palette_usage_encryption_tag": row[
+            "command_palette_usage_encryption_tag"
+        ],
+        "tag_prefix_settings_json": row["tag_prefix_settings_json"],
+        "tag_prefix_settings_encryption_nonce": row[
+            "tag_prefix_settings_encryption_nonce"
+        ],
+        "tag_prefix_settings_encryption_tag": row[
+            "tag_prefix_settings_encryption_tag"
+        ],
         "session_timeout_minutes": row["session_timeout_minutes"],
         "created_at": datetime.fromisoformat(row["created_at"]),
         "updated_at": datetime.fromisoformat(row["updated_at"]),
@@ -168,6 +183,8 @@ def update_client_preferences_json(
     connection: GuardedConnection | sqlite3.Connection,
     *,
     client_preferences_json: str,
+    client_preferences_encryption_nonce: bytes | None,
+    client_preferences_encryption_tag: bytes | None,
 ) -> None:
     if not isinstance(client_preferences_json, str):
         raise TypeError("client_preferences_json must be a string")
@@ -177,11 +194,15 @@ def update_client_preferences_json(
         f"""
         UPDATE {APP_SETTINGS_TABLE}
         SET client_preferences_json = ?,
+            client_preferences_encryption_nonce = ?,
+            client_preferences_encryption_tag = ?,
             updated_at = ?
         WHERE id = 1
         """,
         (
             client_preferences_json,
+            client_preferences_encryption_nonce,
+            client_preferences_encryption_tag,
             _serialize_datetime(datetime.now(timezone.utc)),
         ),
     )
@@ -191,6 +212,8 @@ def update_command_palette_usage_json(
     connection: GuardedConnection | sqlite3.Connection,
     *,
     command_palette_usage_json: str,
+    command_palette_usage_encryption_nonce: bytes | None,
+    command_palette_usage_encryption_tag: bytes | None,
 ) -> None:
     if not isinstance(command_palette_usage_json, str):
         raise TypeError("command_palette_usage_json must be a string")
@@ -200,11 +223,44 @@ def update_command_palette_usage_json(
         f"""
         UPDATE {APP_SETTINGS_TABLE}
         SET command_palette_usage_json = ?,
+            command_palette_usage_encryption_nonce = ?,
+            command_palette_usage_encryption_tag = ?,
             updated_at = ?
         WHERE id = 1
         """,
         (
             command_palette_usage_json,
+            command_palette_usage_encryption_nonce,
+            command_palette_usage_encryption_tag,
+            _serialize_datetime(datetime.now(timezone.utc)),
+        ),
+    )
+
+
+def update_tag_prefix_settings_json(
+    connection: GuardedConnection | sqlite3.Connection,
+    *,
+    tag_prefix_settings_json: str,
+    tag_prefix_settings_encryption_nonce: bytes | None,
+    tag_prefix_settings_encryption_tag: bytes | None,
+) -> None:
+    if not isinstance(tag_prefix_settings_json, str):
+        raise TypeError("tag_prefix_settings_json must be a string")
+
+    conn = _conn(connection)
+    conn.execute(
+        f"""
+        UPDATE {APP_SETTINGS_TABLE}
+        SET tag_prefix_settings_json = ?,
+            tag_prefix_settings_encryption_nonce = ?,
+            tag_prefix_settings_encryption_tag = ?,
+            updated_at = ?
+        WHERE id = 1
+        """,
+        (
+            tag_prefix_settings_json,
+            tag_prefix_settings_encryption_nonce,
+            tag_prefix_settings_encryption_tag,
             _serialize_datetime(datetime.now(timezone.utc)),
         ),
     )