Merge pull request #1187 from MODSetter/dev

feat: various fixes and streamlined versioning

Author: MODSetter

.github/workflows/desktop-release.yml

@@ -52,6 +52,10 @@ jobs:
             VERSION=${TAG#beta-}
             VERSION=${VERSION#v}
           fi
+          if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
+            echo "::error::Version '$VERSION' is not valid semver (expected X.Y.Z). Fix your tag name."
+            exit 1
+          fi
           echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Setup pnpm

.github/workflows/docker-build.yml

@@ -40,11 +40,11 @@ jobs:
       - name: Read app version and calculate next Docker build version
         id: tag_version
         run: |
-          APP_VERSION=$(grep -E '^version = ' surfsense_backend/pyproject.toml | sed 's/version = "\(.*\)"/\1/')
-          echo "App version from pyproject.toml: $APP_VERSION"
+          APP_VERSION=$(tr -d '[:space:]' < VERSION)
+          echo "App version from VERSION file: $APP_VERSION"
 
           if [ -z "$APP_VERSION" ]; then
-            echo "Error: Could not read version from surfsense_backend/pyproject.toml"
+            echo "Error: Could not read version from VERSION file"
             exit 1
           fi
 

VERSION

@@ -0,0 +1 @@
+0.0.15

scripts/bump-version.ps1

@@ -0,0 +1,82 @@
+$ErrorActionPreference = "Stop"
+
+$RepoRoot = (Resolve-Path "$PSScriptRoot\..").Path
+$VersionFile = Join-Path $RepoRoot "VERSION"
+
+if (-not (Test-Path $VersionFile)) {
+    Write-Error "VERSION file not found at $VersionFile"
+    exit 1
+}
+
+$Version = (Get-Content $VersionFile -Raw).Trim()
+
+if ($Version -notmatch '^\d+\.\d+\.\d+(-[a-zA-Z0-9.]+)?$') {
+    Write-Error "'$Version' is not valid semver (expected X.Y.Z)"
+    exit 1
+}
+
+Write-Host "Bumping all packages to $Version"
+Write-Host "---------------------------------"
+
+function Bump-Json {
+    param([string]$File)
+    if (-not (Test-Path $File)) {
+        Write-Host "  SKIP  $File (not found)"
+        return
+    }
+    $content = Get-Content $File -Raw
+    $match = [regex]::Match($content, '"version"\s*:\s*"([^"]*)"')
+    if (-not $match.Success) {
+        Write-Host "  SKIP  $File (no version field found)"
+        return
+    }
+    $old = $match.Groups[1].Value
+    if ($old -eq $Version) {
+        Write-Host "  OK    $File ($old -- already up to date)"
+    } else {
+        $content = $content -replace [regex]::Escape("`"version`": `"$old`""), "`"version`": `"$Version`""
+        Set-Content $File -Value $content -NoNewline
+        Write-Host "  SET   $File ($old -> $Version)"
+    }
+}
+
+function Bump-Toml {
+    param([string]$File)
+    if (-not (Test-Path $File)) {
+        Write-Host "  SKIP  $File (not found)"
+        return
+    }
+    $content = Get-Content $File -Raw
+    $match = [regex]::Match($content, '(?m)^version\s*=\s*"([^"]*)"')
+    if (-not $match.Success) {
+        Write-Host "  SKIP  $File (no version field found)"
+        return
+    }
+    $old = $match.Groups[1].Value
+    if ($old -eq $Version) {
+        Write-Host "  OK    $File ($old -- already up to date)"
+    } else {
+        $content = $content -replace ('(?m)^version\s*=\s*"' + [regex]::Escape($old) + '"'), "version = `"$Version`""
+        Set-Content $File -Value $content -NoNewline
+        Write-Host "  SET   $File ($old -> $Version)"
+    }
+}
+
+Bump-Json (Join-Path $RepoRoot "surfsense_web\package.json")
+Bump-Json (Join-Path $RepoRoot "surfsense_browser_extension\package.json")
+Bump-Json (Join-Path $RepoRoot "surfsense_desktop\package.json")
+Bump-Toml (Join-Path $RepoRoot "surfsense_backend\pyproject.toml")
+
+Write-Host ""
+Write-Host "Syncing lock files..."
+if (Get-Command uv -ErrorAction SilentlyContinue) {
+    Push-Location (Join-Path $RepoRoot "surfsense_backend")
+    uv lock
+    Pop-Location
+    Write-Host "  OK    surfsense_backend/uv.lock"
+} else {
+    Write-Host "  SKIP  uv not found -- run 'uv lock' in surfsense_backend/ manually"
+}
+
+Write-Host "---------------------------------"
+Write-Host "Done. All packages set to $Version"

scripts/bump-version.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+VERSION_FILE="$REPO_ROOT/VERSION"
+
+if [ ! -f "$VERSION_FILE" ]; then
+  echo "ERROR: VERSION file not found at $VERSION_FILE" >&2
+  exit 1
+fi
+
+VERSION="$(tr -d '[:space:]' < "$VERSION_FILE")"
+
+if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
+  echo "ERROR: '$VERSION' is not valid semver (expected X.Y.Z)" >&2
+  exit 1
+fi
+
+echo "Bumping all packages to $VERSION"
+echo "---------------------------------"
+
+bump_json() {
+  local file="$1"
+  if [ ! -f "$file" ]; then
+    echo "  SKIP  $file (not found)"
+    return
+  fi
+  local old
+  old="$(sed -n 's/.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$file" | head -1)"
+  if [ "$old" = "$VERSION" ]; then
+    echo "  OK    $file ($old -- already up to date)"
+  else
+    sed -i "s/\"version\": \"$old\"/\"version\": \"$VERSION\"/" "$file"
+    echo "  SET   $file ($old -> $VERSION)"
+  fi
+}
+
+bump_toml() {
+  local file="$1"
+  if [ ! -f "$file" ]; then
+    echo "  SKIP  $file (not found)"
+    return
+  fi
+  local old
+  old="$(sed -n 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)".*/\1/p' "$file" | head -1)"
+  if [ "$old" = "$VERSION" ]; then
+    echo "  OK    $file ($old -- already up to date)"
+  else
+    sed -i "s/^version = \"$old\"/version = \"$VERSION\"/" "$file"
+    echo "  SET   $file ($old -> $VERSION)"
+  fi
+}
+
+bump_json "$REPO_ROOT/surfsense_web/package.json"
+bump_json "$REPO_ROOT/surfsense_browser_extension/package.json"
+bump_json "$REPO_ROOT/surfsense_desktop/package.json"
+bump_toml "$REPO_ROOT/surfsense_backend/pyproject.toml"
+
+echo ""
+echo "Syncing lock files..."
+if command -v uv &>/dev/null; then
+  (cd "$REPO_ROOT/surfsense_backend" && uv lock)
+  echo "  OK    surfsense_backend/uv.lock"
+else
+  echo "  SKIP  uv not found -- run 'uv lock' in surfsense_backend/ manually"
+fi
+
+echo "---------------------------------"
+echo "Done. All packages set to $VERSION"

surfsense_backend/app/db.py

@@ -25,7 +25,7 @@
 )
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
-from sqlalchemy.orm import DeclarativeBase, Mapped, declared_attr, relationship
+from sqlalchemy.orm import DeclarativeBase, Mapped, backref, declared_attr, relationship
 
 from app.config import config
 
@@ -1086,7 +1086,9 @@ class DocumentVersion(BaseModel, TimestampMixin):
     content_hash = Column(String, nullable=False)
     title = Column(String, nullable=True)
 
-    document = relationship("Document", backref="versions")
+    document = relationship(
+        "Document", backref=backref("versions", passive_deletes=True)
+    )
 
 
 class Chunk(BaseModel, TimestampMixin):

surfsense_backend/app/indexing_pipeline/connector_document.py

@@ -17,6 +17,7 @@ class ConnectorDocument(BaseModel):
     metadata: dict = {}
     connector_id: int | None = None
     created_by_id: str
+    folder_id: int | None = None
 
     @field_validator("title", "source_markdown", "unique_id", "created_by_id")
     @classmethod

surfsense_backend/app/indexing_pipeline/indexing_pipeline_service.py

@@ -268,6 +268,8 @@ async def prepare_for_indexing(
                         ):
                             existing.status = DocumentStatus.pending()
                             existing.updated_at = datetime.now(UTC)
+                            if connector_doc.folder_id is not None:
+                                existing.folder_id = connector_doc.folder_id
                             documents.append(existing)
                             log_document_requeued(ctx)
                         continue
@@ -294,6 +296,8 @@ async def prepare_for_indexing(
                     existing.document_metadata = connector_doc.metadata
                     existing.updated_at = datetime.now(UTC)
                     existing.status = DocumentStatus.pending()
+                    if connector_doc.folder_id is not None:
+                        existing.folder_id = connector_doc.folder_id
                     documents.append(existing)
                     log_document_updated(ctx)
                     continue
@@ -317,6 +321,7 @@ async def prepare_for_indexing(
                     created_by_id=connector_doc.created_by_id,
                     updated_at=datetime.now(UTC),
                     status=DocumentStatus.pending(),
+                    folder_id=connector_doc.folder_id,
                 )
                 self.session.add(document)
                 documents.append(document)