chore(backend,infra): resolve template update conflicts, import check knows the watcher and the api login

Co-authored-by: renovate <renovate@hhhhh.dev>

.copier/backend.yml

@@ -1,4 +1,4 @@
-_commit: v0.4.0
+_commit: v0.6.0
 _src_path: https://git.kotikot.com/templates/backend-python.git
 author_email: h@kotikot.com
 author_name: h

.copier/caddy.yml

@@ -1,4 +1,4 @@
-_commit: v0.1.2
+_commit: v0.1.4
 _src_path: https://git.kotikot.com/templates/caddy.git
 project_slug: beavergram
 routes:

.copier/frontend.yml

@@ -1,7 +1,8 @@
-_commit: v0.4.2
+_commit: v0.6.0
 _src_path: https://git.kotikot.com/templates/frontend-svelte.git
 install_deps: false
 layout: part
+linter: biome
 project_name: beavergram
 project_slug: beavergram
 serve: api

.copier/infra.yml

@@ -1,4 +1,4 @@
-_commit: v0.5.0
+_commit: v0.6.0
 _src_path: https://git.kotikot.com/templates/infra.git
 init_git: false
 layout: parts

.gitignore

@@ -8,4 +8,4 @@ docs
 storage
 
 # Local playground
-t/
+/t/

Makefile

@@ -1,6 +1,6 @@
 PARTS := $(patsubst %/Makefile,%,$(wildcard */Makefile))
 
-.PHONY: env recreate rebuild restart logs down deploy fmt check build pre-deploy post-deploy
+.PHONY: env recreate rebuild restart logs down fmt check build
 
 env:
 	@fresh=; test -f .env || { awk 'FNR == 1 && NR > 1 { print "" } 1' .env.example $(addsuffix /.env.example,$(PARTS)) > .env; fresh=1; }; \
@@ -30,9 +30,5 @@ logs:
 down:
 	docker compose down
 
-deploy: pre-deploy
+fmt check build:
-	docker compose up -d
-	$(MAKE) post-deploy
-
-fmt check build pre-deploy post-deploy:
 	@for part in $(PARTS); do $(MAKE) -C $$part $@ || exit 1; done

README.md

@@ -31,7 +31,8 @@ Read-only: `list_watched_bots`, `get_bot_stats`, `get_bot_updates`, `search_mess
 ```sh
 make env                                  # .env and docker-compose.override.yml from the examples
 make -C backend session                   # log the account in once; the session file stays in backend/sessions
-make deploy                               # build what changed, migrate, start the containers
+make -C backend migrate                   # the schema
+make recreate                             # build and start the services in COMPOSE_PROFILES
 ```
 
 `COMPOSE_PROFILES` in `.env` selects what runs on the machine, `docker-compose.override.yml` in each part holds the published ports and the `caddy` network aliases. The web client and the MCP endpoint are served by `api`; the bearer for both is `AUTH__TOKEN`.

backend/.env.example

@@ -4,6 +4,7 @@ TZ=UTC
 LOG__LEVEL=INFO
 LOG__LEVEL_EXTERNAL=WARNING
 LOG__SHOW_TIME=false
+LOG__SHOW_LOCALS=false
 LOG__CONSOLE_WIDTH=150
 
 DB__HOST=postgres

backend/CLAUDE.md

@@ -1,7 +1,8 @@
 ## Checking commands
 After writing code, always run from `backend/`:
 ```shell
-ruff format
+make fmt
-ruff check --fix
+make check
-ty check
 ```
+
+Mind startup imports: `make check` runs `scripts/check_imports.py`.

backend/Makefile

@@ -1,12 +1,6 @@
 COMPOSE := cd .. && docker compose
-IMAGE := beavergram/backend
-IMAGE_INPUTS := pyproject.toml uv.lock Dockerfile
-CODE := src scripts ../frontend
-SERVICES := api userbot watcher
-changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
-stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
 
-.PHONY: fmt check build pre-deploy post-deploy migrate revision session
+.PHONY: fmt check build migrate revision session
 
 fmt:
 	uv run ruff format
@@ -16,24 +10,11 @@ check:
 	uv run ruff format --check
 	uv run ruff check
 	uv run ty check
+	uv run python scripts/check_imports.py
 
 build:
 	$(COMPOSE) build api
 
-pre-deploy:
-	@if $(call changed,refs/deploy/backend,$(IMAGE_INPUTS)) || ! docker image inspect $(IMAGE) >/dev/null 2>&1; then \
-		$(MAKE) build && $(call stamp,refs/deploy/backend) && $(call stamp,refs/deploy/backend-code); \
-	fi
-	@$(COMPOSE) config --services | grep -qx postgres && $(COMPOSE) up -d postgres || true
-	$(MAKE) migrate
-
-post-deploy:
-	@if $(call changed,refs/deploy/backend-code,$(CODE)); then \
-		running=$$($(COMPOSE) ps --services --status running | grep -x $(addprefix -e ,$(SERVICES))); \
-		[ -z "$$running" ] || $(COMPOSE) restart $$running; \
-		$(call stamp,refs/deploy/backend-code); \
-	fi
-
 migrate:
 	$(COMPOSE) run --rm migrator $(or $(filter-out $@,$(MAKECMDGOALS)),upgrade head)
 

backend/migrations/env.py

@@ -20,10 +20,15 @@ def _async_url() -> str:
     return env.db.connection_url.replace("postgresql://", "postgresql+asyncpg://", 1)
 
 
+def include_name(name: str | None, type_: str, _parents: object) -> bool:
+    return not (type_ == "table" and name is not None and name.startswith("taskiq_"))
+
+
 def run_migrations_offline() -> None:
     context.configure(
         url=_async_url(),
         target_metadata=target_metadata,
+        include_name=include_name,
         literal_binds=True,
         dialect_opts={"paramstyle": "named"},
     )
@@ -32,7 +37,11 @@ def run_migrations_offline() -> None:
 
 
 def _do_run_migrations(connection) -> None:  # noqa: ANN001
-    context.configure(connection=connection, target_metadata=target_metadata)
+    context.configure(
+        connection=connection,
+        target_metadata=target_metadata,
+        include_name=include_name,
+    )
     with context.begin_transaction():
         context.run_migrations()
 

backend/pyproject.toml

@@ -39,6 +39,7 @@ unfixable = ["F401"]
 
 [tool.ruff.lint.per-file-ignores]
 "scripts/*" = ["INP"]
+"scripts/check_imports.py" = ["T201"]
 "t/*" = ["ALL"]
 "*.lock" = ["ALL"]
 "migrations/*" = ["INP", "D", "E501"]

backend/scripts/check_imports.py

@@ -0,0 +1,45 @@
+import os
+import subprocess
+import sys
+
+HEAVY = ["aiogram", "pyrogram", "fastapi", "google.genai"]
+SERVICES = {
+    "api": (["api.app"], {"fastapi", "pyrogram"}),
+    "userbot": (["userbot.runner", "userbot.handlers"], {"pyrogram"}),
+    "watcher": (["watcher.runner"], {"pyrogram"}),
+}
+PROBE = """
+import importlib, sys
+for module in sys.argv[1].split(","):
+    importlib.import_module(module)
+print(" ".join(name for name in sys.argv[2:] if name in sys.modules))
+"""
+ENV = {**os.environ, "AUTH__TOKEN": "check"}
+
+
+def loaded(modules: list[str]) -> tuple[set[str], str]:
+    result = subprocess.run(  # noqa: S603
+        [sys.executable, "-c", PROBE, ",".join(modules), *HEAVY],
+        capture_output=True,
+        text=True,
+        cwd="src",
+        env=ENV,
+        check=False,
+    )
+    error = (result.stderr.strip().splitlines() or ["exit code"])[-1]
+    return set(result.stdout.split()) & set(HEAVY), error if result.returncode else ""
+
+
+def main() -> int:
+    failed = False
+    for service, (modules, allowed) in SERVICES.items():
+        found, error = loaded(modules)
+        extra = sorted(found - allowed)
+        status = error or ("imports " + ", ".join(extra) if extra else "")
+        print(f"{service:10s} {'FAIL: ' + status if status else 'ok'}")
+        failed |= bool(status)
+    return int(failed)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

backend/src/api/login.py

@@ -9,7 +9,7 @@ from pyrogram.errors import AuthTokenExpired, SessionPasswordNeeded
 from pyrogram.qrlogin import QRLogin
 from pyrogram.types import User
 
-from userbot import PyroClient
+from userbot.modules.client import PyroClient
 from utils.env import env
 
 LOGIN_TTL_SECONDS = 900

backend/src/api/routers/accounts.py

@@ -9,7 +9,7 @@ from pyrogram.errors import FloodWait, RPCError
 from pyrogram.types import User
 
 from api.login import LoginError, login_manager
-from userbot import DEVICE_MODEL_LIMIT
+from userbot.modules.client import DEVICE_MODEL_LIMIT
 from utils.read import accounts
 from utils.read.models import AccountView
 

backend/src/userbot/__init__.py

@@ -1,3 +0,0 @@
-from userbot.modules.client import DEVICE_MODEL, DEVICE_MODEL_LIMIT, PyroClient
-
-__all__ = ["DEVICE_MODEL", "DEVICE_MODEL_LIMIT", "PyroClient"]

backend/src/userbot/handlers/deletes.py

@@ -1,8 +1,8 @@
 from pyrogram.types import Message
 
-from userbot import PyroClient
 from userbot.modules.capture import repository
 from userbot.modules.capture.repository import CHANNEL_ID_THRESHOLD
+from userbot.modules.client import PyroClient
 from utils.events import notify_bg_event
 
 

backend/src/userbot/handlers/edits.py

@@ -1,9 +1,9 @@
 from pyrogram.types import Message
 
-from userbot import PyroClient
 from userbot.modules.capture import repository
 from userbot.modules.capture.chat_meta import meta_from_chat
 from userbot.modules.capture.message import sender_id
+from userbot.modules.client import PyroClient
 from userbot.modules.media import capture_media, media_unique_id, self_destruct_ttl
 from userbot.modules.raw_json import raw_json
 from utils.events import notify_bg_event

backend/src/userbot/handlers/messages.py

@@ -1,8 +1,8 @@
 from pyrogram.types import Message
 
-from userbot import PyroClient
 from userbot.modules.capture import capture_message
 from userbot.modules.capture.chat_meta import meta_from_chat
+from userbot.modules.client import PyroClient
 from userbot.modules.stt import is_transcribable
 from userbot.modules.stt.gate import safe_transcribe
 from utils.events import notify_bg_event

backend/src/userbot/handlers/presence.py

@@ -2,7 +2,7 @@ from datetime import UTC, datetime
 
 from pyrogram.types import User
 
-from userbot import PyroClient
+from userbot.modules.client import PyroClient
 from userbot.modules.presence import repository
 from userbot.modules.raw_json import raw_json
 from utils.events import notify_bg_event

backend/src/userbot/handlers/raw/contacts.py

@@ -1,6 +1,6 @@
 from pyrogram import raw
 
-from userbot import PyroClient
+from userbot.modules.client import PyroClient
 
 HANDLES = (raw.types.UpdateContactsReset, raw.types.UpdateUser)
 

backend/src/userbot/handlers/raw/dialog_filters.py

@@ -1,6 +1,6 @@
 from pyrogram import raw
 
-from userbot import PyroClient
+from userbot.modules.client import PyroClient
 
 HANDLES = (
     raw.types.UpdateDialogFilter,

backend/src/userbot/handlers/raw/dispatcher.py

@@ -2,7 +2,6 @@ from collections.abc import Awaitable, Callable
 
 from pyrogram import raw
 
-from userbot import PyroClient
 from userbot.handlers.raw import (
     contacts,
     dialog_filters,
@@ -12,6 +11,7 @@ from userbot.handlers.raw import (
     read_receipts,
     transcribed,
 )
+from userbot.modules.client import PyroClient
 
 RawHandler = Callable[..., Awaitable[None]]
 

backend/src/userbot/handlers/raw/profiles.py

@@ -2,8 +2,8 @@ from dataclasses import replace
 
 from pyrogram import raw
 
-from userbot import PyroClient
 from userbot.modules.avatars import capture_avatar
+from userbot.modules.client import PyroClient
 from userbot.modules.profiles import active_username, snapshot_from_user
 from userbot.modules.profiles.parse import ProfileFields
 from userbot.modules.profiles.repository import get_peer, write_profile

backend/src/userbot/handlers/raw/reactions.py

@@ -1,8 +1,8 @@
 from pyrogram import raw, utils
 
-from userbot import PyroClient
 from userbot.modules.capture import repository
 from userbot.modules.capture.chat_meta import meta_from_peer
+from userbot.modules.client import PyroClient
 from utils.events import notify_bg_event
 
 HANDLES = (raw.types.UpdateMessageReactions,)

backend/src/userbot/handlers/raw/read_contents.py

@@ -2,8 +2,8 @@ from datetime import UTC, datetime
 
 from pyrogram import raw, utils
 
-from userbot import PyroClient
 from userbot.modules.capture.chat_meta import meta_from_chat_id
+from userbot.modules.client import PyroClient
 from userbot.modules.raw_json import raw_json
 from userbot.modules.read_receipts import repository as receipts
 from userbot.modules.stt import repository

backend/src/userbot/handlers/raw/read_receipts.py

@@ -2,7 +2,7 @@ from datetime import UTC, datetime
 
 from pyrogram import raw, utils
 
-from userbot import PyroClient
+from userbot.modules.client import PyroClient
 from userbot.modules.raw_json import raw_json
 from userbot.modules.read_receipts import repository
 from utils.events import notify_bg_event

backend/src/userbot/handlers/raw/transcribed.py

@@ -1,7 +1,7 @@
 from pyrogram import raw
 
-from userbot import PyroClient
 from userbot.modules.capture.chat_meta import meta_from_peer
+from userbot.modules.client import PyroClient
 from userbot.modules.stt import repository
 
 HANDLES = (raw.types.UpdateTranscribedAudio,)

backend/src/userbot/handlers/stories.py

@@ -1,6 +1,6 @@
 from pyrogram.types import Story
 
-from userbot import PyroClient
+from userbot.modules.client import PyroClient
 from userbot.modules.stories.service import save_story
 
 

backend/src/userbot/modules/capture/identity.py

@@ -41,9 +41,7 @@ class ChatMetaCache:
         chat_id: int,
         meta: tuple[str | None, str | None],
     ) -> bool:
-        from userbot.modules.groups.repository import (  # noqa: PLC0415
+        from userbot.modules.groups.repository import get_latest_chat_meta  # noqa: PLC0415
-            get_latest_chat_meta,
-        )
 
         if chat_id not in self._cache:
             self._cache[chat_id] = await get_latest_chat_meta(pool, account_id, chat_id)

backend/src/userbot/runner.py

@@ -10,8 +10,8 @@ import asyncpg
 import uvloop
 
 from dependencies.container import container
-from userbot import PyroClient
 from userbot.modules.capture import CaptureContext, build_capture_context
+from userbot.modules.client import PyroClient
 from userbot.modules.jobs import JobConsumer
 from utils.env import env
 from utils.jobs import enqueue

backend/src/utils/env.py

@@ -56,6 +56,7 @@ class LogSettings(BaseSettings):
     level: str = "INFO"
     level_external: str = "WARNING"
     show_time: bool = False
+    show_locals: bool = False
     console_width: int = 150
 
 

backend/src/utils/imports.py

@@ -0,0 +1,6 @@
+import asyncio
+from importlib import import_module
+
+
+async def preload(module: str) -> None:
+    await asyncio.to_thread(import_module, module)

backend/src/utils/logging.py

@@ -20,13 +20,13 @@ def setup_logging() -> None:
                 markup=True,
                 rich_tracebacks=True,
                 enable_link_path=False,
-                tracebacks_show_locals=True,
+                tracebacks_show_locals=env.log.show_locals,
                 omit_repeated_times=False,
                 show_time=env.log.show_time,
             )
         ],
     )
-    install(console=console, show_locals=True)
+    install(console=console, show_locals=env.log.show_locals)
 
 
 logger = logging.getLogger("beavergram")

backend/src/watcher/drain.py

@@ -13,10 +13,10 @@ from dataclasses import dataclass
 from pyrogram import raw, types
 from pyrogram.errors import RPCError
 
-from userbot import PyroClient
 from userbot.modules.capture import capture_message
 from userbot.modules.capture.chat_meta import meta_from_chat
 from userbot.modules.capture.context import CaptureContext
+from userbot.modules.client import PyroClient
 from utils.logging import logger
 
 EARLIEST_PTS = 1

backend/src/watcher/registry.py

@@ -11,9 +11,9 @@ from pyrogram.handlers import (
     MessageHandler,
 )
 
-from userbot import PyroClient
 from userbot.modules.capture import capture_message
 from userbot.modules.capture.chat_meta import meta_from_chat
+from userbot.modules.client import PyroClient
 from userbot.modules.jobs import JobConsumer
 from utils.events import notify_bg_event
 from utils.jobs import enqueue

caddy/.gitignore

@@ -1,2 +1,2 @@
 .env
-Caddyfile
+/Caddyfile

caddy/README.md

@@ -1,22 +1,3 @@
 # caddy
 
-`site.caddy` routes `{$BEAVERGRAM_DOMAIN}` to the project's services over the external `caddy` docker network. It works standalone and inside a shared Caddy that fronts several projects.
+`site.caddy` routes `{$BEAVERGRAM_DOMAIN}` to the project over the external `caddy` network. In a shared Caddy, mount this directory as `/etc/caddy/projects.d/beavergram:ro` and set `BEAVERGRAM_DOMAIN`. Keep it portable: domain only from the env, no `tls`, snippets prefixed with `beavergram_`.
-
-Standalone:
-
-```sh
-docker network create caddy
-cp Caddyfile.example Caddyfile
-cp .env.example .env
-docker compose up -d
-```
-
-Shared Caddy: mount this directory as `/etc/caddy/projects.d/beavergram:ro`, keep `import /etc/caddy/projects.d/*/site.caddy` in its Caddyfile and put `BEAVERGRAM_DOMAIN` in its environment.
-
-Rules that keep `site.caddy` portable:
-
-- the domain comes only from the environment variable
-- no `tls` block, certificates are configured by the host Caddy (`acme_dns cloudflare {env.CLOUDFLARE_API_TOKEN}` in the global block)
-- snippets are prefixed with the project slug because Caddy snippets are global
-- mount the directory, not the file: a single-file bind mount goes stale when git replaces the inode
-- keep `admin localhost:2019`, `admin off` makes `caddy reload` impossible

frontend/.dockerignore

@@ -1,5 +1,7 @@
 node_modules
 .svelte-kit
 build
-.env
+# .env goes into the build: $env/static/public (and static/private) are
+# inlined at build time from it. It stays in the builder stage, the runtime
+# image gets build/ only. Local overrides (.env.local and the like) stay out.
 .env.*

frontend/Makefile

@@ -1,8 +1,6 @@
 COMPOSE := cd .. && docker compose
-changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
-stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
 
-.PHONY: fmt check build pre-deploy post-deploy dev
+.PHONY: fmt check build dev
 
 fmt:
 	bun run fix
@@ -14,13 +12,5 @@ check:
 build:
 	$(COMPOSE) run --rm frontend-dev sh -c "bun install && bun run build"
 
-pre-deploy:
-	@if $(call changed,refs/deploy/frontend,.) || ! test -d build; then \
-		$(MAKE) build && $(call stamp,refs/deploy/frontend); \
-	fi
-
-post-deploy:
-	@:
-
 dev:
 	bun run dev

frontend/bun.lock

@@ -25,7 +25,7 @@
         "svelte-check": "^4.7.6",
         "tailwindcss": "^4.2.2",
         "typescript": "^5.9.3",
-        "ultracite": "7.12.2",
+        "ultracite": "7.12.4",
         "vite": "^8.0.7",
       },
     },
@@ -479,7 +479,7 @@
 
     "ufo": ["ufo@1.6.4", "", {}, "sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA=="],
 
-    "ultracite": ["ultracite@7.12.2", "", { "dependencies": { "@clack/prompts": "^1.8.1", "cli-truncate": "^6.1.1", "commander": "^15.0.0", "deepmerge": "^4.3.1", "empathic": "^2.1.0", "execa": "^10.0.1", "fast-glob": "^3.3.3", "find-workspaces": "^0.3.1", "jsonc-parser": "^3.3.1", "log-update": "^8.0.0", "magicast": "^0.5.5", "nypm": "^0.6.10", "resolve.exports": "^2.0.3", "semver": "^7.8.5", "string-width": "^8.3.0", "yaml": "^2.9.1", "zod": "^4.6.5" }, "peerDependencies": { "@biomejs/biome": "^2.5.0", "eslint": "^10.0.0", "oxfmt": ">=0.59.0", "oxlint": "^1.82.0", "prettier": "^3.0.0", "stylelint": "^17.0.0" }, "optionalPeers": ["@biomejs/biome", "eslint", "oxfmt", "oxlint", "prettier", "stylelint"], "bin": { "ultracite": "dist/index.js" } }, "sha512-0FQE7EuVFnX1FjtlIBklkfBTiZ5bJxknXSxcsjKos5Y73FlkasubWH7uVLS8jgOAI204B7xaIq+buE3vUybuwQ=="],
+    "ultracite": ["ultracite@7.12.4", "", { "dependencies": { "@clack/prompts": "^1.8.1", "cli-truncate": "^6.1.1", "commander": "^15.0.0", "deepmerge": "^4.3.1", "empathic": "^2.1.0", "execa": "^10.0.1", "fast-glob": "^3.3.3", "find-workspaces": "^0.3.1", "jsonc-parser": "^3.3.1", "log-update": "^8.0.0", "magicast": "^0.5.5", "npm-run-path": "^6.0.0", "nypm": "^0.6.10", "resolve.exports": "^2.0.3", "semver": "^7.8.5", "string-width": "^8.3.0", "which-command": "^0.1.0", "yaml": "^2.9.1", "zod": "^4.6.5" }, "peerDependencies": { "@biomejs/biome": "^2.5.0", "eslint": "^10.9.0", "oxfmt": ">=0.59.0", "oxlint": "^1.86.0", "prettier": "^3.0.0", "stylelint": "^17.0.0" }, "optionalPeers": ["@biomejs/biome", "eslint", "oxfmt", "oxlint", "prettier", "stylelint"], "bin": { "ultracite": "dist/index.js" } }, "sha512-6jVEwaZBaytFm6XRoI3WGS2ZydrkrNvHTD0qTf7983ti2FlEWL1YcxnPaMaYuS6PkXqMhIK2XGr0cbsL4x5pQA=="],
 
     "undici-types": ["undici-types@7.24.6", "", {}, "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg=="],
 

frontend/package.json

@@ -34,7 +34,7 @@
     "svelte-check": "^4.7.6",
     "tailwindcss": "^4.2.2",
     "typescript": "^5.9.3",
-    "ultracite": "7.12.2",
+    "ultracite": "7.12.4",
     "vite": "^8.0.7"
   }
 }