More dicts.

Signed-off-by: Pavel Kirilin <s3riussan@gmail.com>

.github/workflows/tests.yml

@@ -6,7 +6,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -20,15 +20,7 @@ jobs:
   pytest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.12'
-      - name: Update docker-compose
-        uses: KengoTODA/actions-setup-docker-compose@v1
-        with:
-          version: "2.28.0"
       - name: run tests
         run: docker compose run --build --rm api pytest -vv
       - name: show logs

docker-compose.yml

@@ -25,8 +25,8 @@ services:
       ZANGRAMRU_DB_USER: zangramru
       ZANGRAMRU_DB_PASS: zangramru
       ZANGRAMRU_DB_BASE: zangramru
-    volumes:
+    # volumes:
-      - .:/app/src/
+    #   - .:/app/src/
 
   db:
     image: postgres:18.3-trixie
@@ -49,13 +49,14 @@ services:
   migrator:
     <<: *main_app
     restart: "no"
-    command: piccolo migrations forwards all
+    command:
+      - bash
+      - -c
+      - "ls && piccolo migrations forwards all"
     depends_on:
       db:
         condition: service_healthy
 
-
-
 volumes:
   zangramru-db-data:
     name: zangramru-db-data

zangramru/db/migrations/zangramru_db_2026_07_02t12_57_47_552419.py

@@ -0,0 +1,26 @@
+from piccolo.apps.migrations.auto.migration_manager import MigrationManager
+from piccolo.columns.column_types import Integer
+
+ID = "2026-07-02T12:57:47:552419"
+VERSION = "1.34.0"
+DESCRIPTION = ""
+
+
+async def forwards():
+    manager = MigrationManager(
+        migration_id=ID, app_name="zangramru_db", description=DESCRIPTION
+    )
+
+    manager.alter_column(
+        table_class_name="Puzzle",
+        tablename="puzzle",
+        column_name="number",
+        db_column_name="number",
+        params={"unique": True},
+        old_params={"unique": False},
+        column_class=Integer,
+        old_column_class=Integer,
+        schema=None,
+    )
+
+    return manager

zangramru/db/models/puzzle.py

@@ -12,4 +12,4 @@ class Puzzle(Table):
     solutions = JSON()
     extra = JSON()
     definitions = JSON()
-    number = Integer()
+    number = Integer(unique=True)

zangramru/services/puzzles.py

@@ -113,7 +113,7 @@ class PuzzleGenerator:
                 self.words[word] = row["def"]
                 self.trie.add(word)
 
-    def find_solutions(  # noqa: C901
+    def _find_solutions(  # noqa: C901
         self, board: list[list[str]]
     ) -> dict[str, list[tuple[int, int]]]:
         """
@@ -258,7 +258,7 @@ class PuzzleGenerator:
 
         return cover, extras
 
-    def get_valid_points(
+    def _get_valid_points(
         self,
         solutions: dict[str, list[tuple[int, int]]],
     ) -> set[tuple[int, int]]:
@@ -269,6 +269,32 @@ class PuzzleGenerator:
 
         return used_cells
 
+    def _verify_solution(
+        self, board: list[list[str]], target: int
+    ) -> tuple[set[tuple[int, int]], Puzzle | None]:
+        solutions = self._find_solutions(board)
+        cover, extra = self._find_minimal_cover(solutions, target)
+        valid_points = self._get_valid_points(cover)
+
+        # We found a valid solution | board combination
+        if len(valid_points) != 16 or len(cover) < target:
+            return valid_points, None
+
+        word_defs = {word: self.words[word] for word in cover | extra}
+
+        return valid_points, Puzzle(
+            board=board,
+            solutions=cover,
+            extra=extra,
+            word_defs=word_defs,
+        )
+
+    def check_board(self, compressed_board: str, target: int = 10) -> Puzzle | None:
+        """Check if given board is valid."""
+        board = [list(compressed_board[i * 4 : i * 4 + 4]) for i in range(4)]
+        _, puzzle = self._verify_solution(board, target)
+        return puzzle
+
     def generate(self, target: int, timeout: int = 10) -> Puzzle:
         """
         Generate a valid puzzle that has solutions.
@@ -289,27 +315,19 @@ class PuzzleGenerator:
                 )
             if single_board_attempt > 50:
                 valid_points = set()
+                single_board_attempt = 0
 
             for x in range(4):
                 for y in range(4):
                     if (x, y) not in valid_points:
                         board[x][y] = secrets.choice(WEIGHTED_ALPHABET)
 
-            solutions = self.find_solutions(board)
+            valid_points, puzzle = self._verify_solution(board, target)
-            cover, extra = self._find_minimal_cover(solutions, target)
+            if not puzzle:
-            valid_points = self.get_valid_points(cover)
-            word_defs = {word: self.words[word] for word in cover | extra}
-            # We found a valid solution | board combination
-            if len(valid_points) != 16 or len(cover) < target:
                 single_board_attempt += 1
                 continue
 
-            return Puzzle(
+            return puzzle
-                board=board,
-                solutions=cover,
-                extra=extra,
-                word_defs=word_defs,
-            )
 
 
 def setup_generator(app: FastAPI) -> None:

zangramru/static/index.html

@@ -403,7 +403,7 @@
         const cctx = confettiCanvas.getContext('2d');
 
         // ===================== Constants =====================
-        const CELL = 70, GAP = 20, GRID = 4, PITCH = CELL + GAP, SH = 5;
+        const CELL = 70, GAP = 30, GRID = 4, PITCH = CELL + GAP, SH = 5;
         const ENTRANCE_DUR = 360, ENTRANCE_STAGGER = 42, PULSE_DUR = 520;
         const PALETTE = [
             '#ff3d81','#ffd400','#00e0c6','#7c5cff','#54a0ff',
@@ -417,13 +417,13 @@
             light: {
                 tile: '#ffffff', border: '#14110c', shadow: '#14110c',
                 ink: '#14110c', inkOn: '#14110c',
-                line: '#e2dbc7', sel: '#14110c', found: '#12b886', bonus: '#ff7a00', selTile: '#ff3d81',
+                line: '#c7bb95', sel: '#14110c', found: '#12b886', bonus: '#ff7a00', selTile: '#ff3d81',
                 msgDefault: '#c98a00', muted: '#6f6650',
             },
             dark: {
                 tile: '#262633', border: '#f4efe3', shadow: '#000000',
                 ink: '#f4efe3', inkOn: '#14110c',
-                line: '#33333f', sel: '#f4efe3', found: '#24d38a', bonus: '#ffa733', selTile: '#ff479a',
+                line: '#52525f', sel: '#f4efe3', found: '#24d38a', bonus: '#ffa733', selTile: '#ff479a',
                 msgDefault: '#ffd400', muted: '#9a927f',
             },
         };
@@ -501,8 +501,10 @@
         // ===================== Persistence =====================
         function save() {
             if (puzzleNumber === null) return;
+            if (!allWordsFound()) {
                 elapsed += Date.now() - lastSaveTime;
                 lastSaveTime = Date.now();
+            }
             const state = { foundWords: Array.from(foundWords), elapsed, board, allSolutions, extraWords, wordDefs };
             localStorage.setItem('puzzle_' + puzzleNumber, JSON.stringify(state));
         }
@@ -560,7 +562,7 @@
         // ===================== Rendering =====================
         function drawConnections() {
             const p = PAL();
-            ctx.strokeStyle = p.line; ctx.lineWidth = GAP - 4; ctx.lineCap = 'round';
+            ctx.strokeStyle = p.line; ctx.lineWidth = 8; ctx.lineCap = 'round';
             ctx.beginPath();
             for (const key of getActiveConnections()) {
                 const [ka, kb] = key.split('-');
@@ -576,7 +578,7 @@
         function drawSelectionLine(color) {
             if (selected.length < 2) return;
             const t1 = CELL / (2 * PITCH), t2 = 1 - t1;
-            ctx.strokeStyle = color; ctx.lineWidth = GAP - 2; ctx.lineCap = 'round'; ctx.lineJoin = 'round';
+            ctx.strokeStyle = color; ctx.lineWidth = 10; ctx.lineCap = 'round'; ctx.lineJoin = 'round';
             ctx.beginPath();
             for (let i = 0; i < selected.length - 1; i++) {
                 const c1 = cellCenter(selected[i][0], selected[i][1]);
@@ -706,7 +708,7 @@
                         '<span class="word-text">' + word + '</span>' +
                         (isExtra ? '<span class="word-tag">бонус</span>' : '') +
                     '</div>' +
-                    (def ? '<span class="word-def">— ' + def + '</span>' : '');
+                    (def ? '<span class="word-def">' + def.replace(/\n/g, '<br>') + '</span>' : '');
                 grid.appendChild(item);
             }
             foundDiv.appendChild(grid);
@@ -951,7 +953,9 @@
         }
         function finishGame(withConfetti) {
             if (timerInterval) { clearInterval(timerInterval); timerInterval = null; }
-            gameTimeEl.textContent = formatTime(displayElapsed());
+            elapsed = displayElapsed();
+            if (puzzleNumber !== null) save();
+            gameTimeEl.textContent = formatTime(elapsed);
             gameCompleteEl.classList.add('show');
             if (withConfetti) celebrate();
         }
@@ -1005,14 +1009,20 @@
             startTimer();
         }
 
-        async function loadRandomPuzzle() {
+        async function loadRandomPuzzle(compressed) {
             gameCompleteEl.classList.remove('show');
             statLeft.textContent = '…';
             resetTimer();
             puzzleNumber = null;
             statNumber.textContent = '?';
+            let data;
+            if (compressed) {
+                const res = await fetch('/api/puzzles/random?board=' + encodeURIComponent(compressed));
+                data = await res.json();
+            } else {
                 const res = await fetch('/api/puzzles/random');
-            const data = await res.json();
+                data = await res.json();
+            }
             if (data.error) { statNumber.textContent = 'ERR'; return; }
             foundWords = new Set();
             board = data.board;
@@ -1047,9 +1057,16 @@
 
         // ===================== Copy result =====================
         function copyResult() {
-            const text = 'Занграммы #' + puzzleNumber +
+            let text;
-                '\n🎉 Мне потребовалось всего лишь ' + formatTime(displayElapsed()) +
+            if (puzzleNumber === null) {
+                const compressedBoard = board.flat().join('');
+                const url = window.location.origin + window.location.pathname + '#' + encodeURIComponent(compressedBoard);
+                text = 'Занграммы!\n🎉 Мне потребовалось всего лишь ' + formatTime(elapsed) + '\n\n' + url;
+            } else {
+                text = 'Занграммы #' + puzzleNumber +
+                    '\n🎉 Мне потребовалось всего лишь ' + formatTime(elapsed) +
                     '\n\n' + window.location.href;
+            }
             navigator.clipboard.writeText(text).then(
                 () => showMessage('Результат скопирован!', PAL().found),
                 () => showMessage('Не удалось скопировать', PAL().selTile),
@@ -1069,19 +1086,25 @@
         wordDisplay.addEventListener('click', submitSelection);
         $('copyResultBtn').addEventListener('click', copyResult);
         $('prevPuzzlesBtn').addEventListener('click', showNumberSelector);
-        $('randomPuzzleBtn').addEventListener('click', loadRandomPuzzle);
+        $('randomPuzzleBtn').addEventListener('click', () => loadRandomPuzzle());
         $('closeNumberBtn').addEventListener('click', () => numberSelectorEl.classList.remove('show'));
         themeBtn.addEventListener('click', () => applyTheme(theme === 'dark' ? 'light' : 'dark'));
         document.addEventListener('keydown', onKeyDown);
 
         window.addEventListener('resize', sizeConfetti);
-        window.addEventListener('beforeunload', save);
+
-        document.addEventListener('visibilitychange', () => { if (document.hidden) save(); });
+
 
         // ===================== Init =====================
         applyTheme(theme);
         sizeConfetti();
+        const hash = decodeURIComponent(window.location.hash.slice(1) || '');
+        if (hash && hash.length === 16) {
+            history.replaceState(null, '', window.location.pathname);
+            loadRandomPuzzle(hash);
+        } else {
             loadPuzzle();
+        }
     })();
     </script>
 </body>

zangramru/web/api/puzzles/views.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 from datetime import date, timedelta
 
@@ -15,9 +16,20 @@ router = APIRouter()
 
 
 @router.get("/random")
-def random_puzzle(generator: PuzzleGeneratorDep) -> PuzzleOutputDTO:
+def random_puzzle(
+    generator: PuzzleGeneratorDep,
+    board: str | None = None,
+) -> PuzzleOutputDTO:
     """Generate a random puzzle."""
-    puzzle = generator.generate(target=10)
+    if board:
+        puzzle = generator.check_board(board, target=10)
+        if puzzle is None:
+            raise HTTPException(
+                status_code=status.HTTP_421_MISDIRECTED_REQUEST,
+                detail="Given board has no solution",
+            )
+    else:
+        puzzle = generator.generate(10)
     return PuzzleOutputDTO.model_validate(puzzle, from_attributes=True)
 
 
@@ -30,7 +42,7 @@ async def daily_puzzle(
     # Because they start at one, so we need to subtract one.
     target_date = date.today()
     if number is not None:
-        target_date = settings.start_date + timedelta(days=number - 1)
+        target_date = settings.start_date + timedelta(days=number)
 
     if target_date > date.today():
         raise HTTPException(
@@ -45,13 +57,15 @@ async def daily_puzzle(
     if daily_puzzle is not None:
         board = [list(daily_puzzle.board[i * 4 : i * 4 + 4]) for i in range(4)]
         return DailyPuzzleDTO(
-            number=(date.today() - settings.start_date).days,
+            number=daily_puzzle.number,
             board=board,
             solutions=json.loads(daily_puzzle.solutions),
             extra=json.loads(daily_puzzle.extra),
             word_defs=json.loads(daily_puzzle.definitions),
         )
-    puzzle = generator.generate(target=10)
+
+    loop = asyncio.get_running_loop()
+    puzzle = await loop.run_in_executor(None, generator.generate, 10)
     compressedboard = "".join("".join(row) for row in puzzle.board)
     await Puzzle(
         {