supernote 0.22.0__tar.gz → 0.23.0__tar.gz

{supernote-0.22.0 → supernote-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supernote
-Version: 0.22.0
+Version: 0.23.0
 Summary: All-in-one toolkit for Supernote devices: parse notebooks, self-host services, access services
 Author-email: jya <jya@wizmy.net>, Allen Porter <allen.porter@gmail.com>
 License-Expression: Apache-2.0

{supernote-0.22.0 → supernote-0.23.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools>=77.0"]
 
 [project]
 name = "supernote"
-version = "0.22.0"
+version = "0.23.0"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 description = "All-in-one toolkit for Supernote devices: parse notebooks, self-host services, access services"

supernote-0.23.0/supernote/alembic/versions/68964804740d_prevent_user_id_reuse.py

@@ -0,0 +1,74 @@
+"""Prevent reuse of deleted SQLite user IDs.
+
+Revision ID: 68964804740d
+Revises: d1e2f3a4b5c6
+Create Date: 2026-09-03 00:00:00.000000
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+from sqlalchemy import text
+
+revision: str = "68964804740d"
+down_revision: Union[str, None] = "d1e2f3a4b5c6"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    bind = op.get_bind()
+    if bind.dialect.name != "sqlite":
+        return
+
+    # Old deletions may have left owner rows behind. Preserve their highest user
+    # ID as part of the sequence floor so none can become visible after upgrade.
+    tables = (
+        "users",
+        "devices",
+        "login_records",
+        "f_user_file",
+        "f_capacity",
+        "f_recycle_file",
+        "f_summary",
+        "f_summary_tag",
+        "t_schedule_task",
+        "t_schedule_task_group",
+    )
+
+    def max_owner_id(table: str) -> int:
+        column = "id" if table == "users" else "user_id"
+        query = text(f'SELECT COALESCE(MAX({column}), 0) FROM "{table}"')
+        return int(bind.execute(query).scalar_one())
+
+    floor = max(max_owner_id(table) for table in tables)
+
+    with op.batch_alter_table(
+        "users", recreate="always", table_kwargs={"sqlite_autoincrement": True}
+    ):
+        pass
+
+    current = int(
+        bind.execute(
+            text(
+                "SELECT COALESCE(MAX(seq), 0) FROM sqlite_sequence WHERE name = 'users'"
+            )
+        ).scalar_one()
+    )
+    sequence = max(floor, current)
+    result = bind.execute(
+        text("UPDATE sqlite_sequence SET seq = :seq WHERE name = 'users'"),
+        {"seq": sequence},
+    )
+    if result.rowcount == 0:
+        bind.execute(
+            text("INSERT INTO sqlite_sequence(name, seq) VALUES ('users', :seq)"),
+            {"seq": sequence},
+        )
+
+
+def downgrade() -> None:
+    if op.get_bind().dialect.name != "sqlite":
+        return
+    with op.batch_alter_table("users", recreate="always"):
+        pass

supernote-0.23.0/supernote/server/db/migrations.py

@@ -0,0 +1,109 @@
+import importlib.resources
+import logging
+from pathlib import Path
+
+import alembic.command
+import alembic.config
+import sqlalchemy as sa
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+from sqlalchemy.exc import OperationalError, ProgrammingError
+
+logger = logging.getLogger(__name__)
+
+
+def _heal_orphaned_v20_revision(db_url: str) -> None:
+    """Detect and reconcile databases stamped with orphaned v0.20.0 revision c9a8b7c6d5e4.
+
+    In v0.20.0, migration c9a8b7c6d5e4 altered task_id and task_list_id to String,
+    but was superseded by d1e2f3a4b5c6 in subsequent releases. If detected, revert
+    the column types back to BigInteger and reset alembic_version to b8e9c0d1e2f3
+    so Alembic can cleanly upgrade forward to head.
+    """
+    sync_url = db_url.replace("+aiosqlite", "").replace("+asyncpg", "")
+    engine = sa.create_engine(sync_url)
+    try:
+        with engine.connect() as conn:
+            inspector = sa.inspect(conn)
+            if "alembic_version" not in inspector.get_table_names():
+                return
+
+            current_revision = conn.execute(
+                sa.text("SELECT version_num FROM alembic_version")
+            ).scalar()
+            if current_revision != "c9a8b7c6d5e4":
+                return
+
+            logger.warning(
+                "Detected orphaned v0.20.0 Alembic revision 'c9a8b7c6d5e4'. "
+                "Reconciling database schema back to 'b8e9c0d1e2f3'..."
+            )
+            migration_context = MigrationContext.configure(conn)
+            op = Operations(migration_context)
+
+            with op.batch_alter_table("t_schedule_task") as batch_op:
+                batch_op.alter_column(
+                    "task_list_id", type_=sa.BigInteger(), existing_type=sa.String()
+                )
+                batch_op.alter_column(
+                    "task_id", type_=sa.BigInteger(), existing_type=sa.String()
+                )
+
+            with op.batch_alter_table("t_schedule_task_group") as batch_op:
+                batch_op.alter_column(
+                    "task_list_id", type_=sa.BigInteger(), existing_type=sa.String()
+                )
+
+            conn.execute(
+                sa.text(
+                    "UPDATE alembic_version SET version_num = 'b8e9c0d1e2f3' WHERE version_num = 'c9a8b7c6d5e4'"
+                )
+            )
+            conn.commit()
+            logger.info(
+                "Successfully reconciled schema to 'b8e9c0d1e2f3'; proceeding with migration to head."
+            )
+    except (OperationalError, ProgrammingError) as exc:
+        logger.debug(
+            "Skipping v0.20.0 migration healing due to database check error: %s", exc
+        )
+    finally:
+        engine.dispose()
+
+
+def run_migrations(db_url: str, target_revision: str = "head") -> None:
+    """Run pending database migrations using Alembic.
+
+    Args:
+        db_url: The database connection URL to use for migrations.
+               This overrides the url in alembic.ini to ensure we target
+               the correct environment (prod, test, etc).
+        target_revision: Revision to migrate to (default: "head").
+    """
+    # Locate alembic.ini inside the supernote package
+    traversable = importlib.resources.files("supernote") / "alembic.ini"
+
+    with importlib.resources.as_file(traversable) as ini_path:
+        if not ini_path.exists():
+            raise FileNotFoundError(f"Could not find alembic.ini at {ini_path}")
+
+        alembic_cfg = alembic.config.Config(str(ini_path))
+
+    # IMPORTANT: Override the URL with the one from the running application.
+    alembic_cfg.set_main_option("sqlalchemy.url", db_url)
+    # Don't let alembic reset our carefully configured logging
+    alembic_cfg.set_main_option("skip_logging_config", "true")
+
+    # Ensure the database directory exists because sqlite won't create it
+    if db_url.startswith("sqlite"):
+        # Extract path from sqlite+aiosqlite:///path or sqlite:///path
+        path_str = db_url.split(":///")[-1]
+        if path_str != ":memory:":
+            db_path = Path(path_str)
+            db_path.parent.mkdir(parents=True, exist_ok=True)
+
+    _heal_orphaned_v20_revision(db_url)
+
+    logger.info("Running database migrations to %s...", target_revision)
+    alembic.command.upgrade(alembic_cfg, target_revision)
+    logger.info("Database migrations complete.")

{supernote-0.22.0 → supernote-0.23.0}/supernote/server/db/models/user.py

@@ -11,6 +11,8 @@ class UserDO(Base):
     """User database model."""
 
     __tablename__ = "users"
+    # User ids should not be recycled
+    __table_args__ = {"sqlite_autoincrement": True}
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
     email: Mapped[str] = mapped_column(String, unique=True, index=True)

{supernote-0.22.0 → supernote-0.23.0}/supernote/server/static/index.html

@@ -7,7 +7,7 @@
     <title>Supernote Cloud - Web Viewer</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/spark-md5/3.0.2/spark-md5.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-sha256/0.12.0/sha256.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-sha256/1.0.0/sha256.min.js"></script>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="/static/style.css">
     <link rel="icon" type="image/x-icon" href="/static/favicon.ico">

{supernote-0.22.0 → supernote-0.23.0}/supernote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supernote
-Version: 0.22.0
+Version: 0.23.0
 Summary: All-in-one toolkit for Supernote devices: parse notebooks, self-host services, access services
 Author-email: jya <jya@wizmy.net>, Allen Porter <allen.porter@gmail.com>
 License-Expression: Apache-2.0

{supernote-0.22.0 → supernote-0.23.0}/supernote.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ supernote/alembic/__init__.py
 supernote/alembic/env.py
 supernote/alembic/script.py.mako
 supernote/alembic/versions/0543a383957b_initial_schema.py
+supernote/alembic/versions/68964804740d_prevent_user_id_reuse.py
 supernote/alembic/versions/7a8291f043bc_add_links_and_sort_fields_to_schedule_task.py
 supernote/alembic/versions/b8e9c0d1e2f3_backfill_summary_md5_and_timestamps.py
 supernote/alembic/versions/d1e2f3a4b5c6_add_client_task_ids.py

supernote-0.22.0/supernote/server/db/migrations.py

@@ -1,44 +0,0 @@
-import importlib.resources
-import logging
-from pathlib import Path
-
-import alembic.command
-import alembic.config
-
-logger = logging.getLogger(__name__)
-
-
-def run_migrations(db_url: str, target_revision: str = "head") -> None:
-    """Run pending database migrations using Alembic.
-
-    Args:
-        db_url: The database connection URL to use for migrations.
-               This overrides the url in alembic.ini to ensure we target
-               the correct environment (prod, test, etc).
-        target_revision: Revision to migrate to (default: "head").
-    """
-    # Locate alembic.ini inside the supernote package
-    traversable = importlib.resources.files("supernote") / "alembic.ini"
-
-    with importlib.resources.as_file(traversable) as ini_path:
-        if not ini_path.exists():
-            raise FileNotFoundError(f"Could not find alembic.ini at {ini_path}")
-
-        alembic_cfg = alembic.config.Config(str(ini_path))
-
-    # IMPORTANT: Override the URL with the one from the running application.
-    alembic_cfg.set_main_option("sqlalchemy.url", db_url)
-    # Don't let alembic reset our carefully configured logging
-    alembic_cfg.set_main_option("skip_logging_config", "true")
-
-    # Ensure the database directory exists because sqlite won't create it
-    if db_url.startswith("sqlite"):
-        # Extract path from sqlite+aiosqlite:///path or sqlite:///path
-        path_str = db_url.split(":///")[-1]
-        if path_str != ":memory:":
-            db_path = Path(path_str)
-            db_path.parent.mkdir(parents=True, exist_ok=True)
-
-    logger.info("Running database migrations to %s...", target_revision)
-    alembic.command.upgrade(alembic_cfg, target_revision)
-    logger.info("Database migrations complete.")