🚀 CRADLE v3.0

.bumpversion.toml

@@ -1,7 +1,10 @@
 [tool.bumpversion]
-current_version = "2.10.2"
-parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
-serialize = ["{major}.{minor}.{patch}"]
+current_version = "2.10.2-beta.a070af1b"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(-beta\\.(?P<beta>[a-f0-9]+))?"
+serialize = [
+    "{major}.{minor}.{patch}-beta.{beta}",
+    "{major}.{minor}.{patch}"
+]
 search = "{current_version}"
 replace = "{new_version}"
 regex = false
@@ -11,19 +14,22 @@ tag = false
 sign_tags = false
 tag_name = "v{new_version}"
 tag_message = "Bump version: {current_version} → {new_version}"
-allow_dirty = false
-commit = true
-commit_args = "--no-verify"
+allow_dirty = true
+commit = false
 message = "Bump version: {current_version} → {new_version}"
-moveable_tags = []
-setup_hooks = []
-pre_commit_hooks = []
-post_commit_hooks = []
+
+[tool.bumpversion.parts.major]
+[tool.bumpversion.parts.minor]
+[tool.bumpversion.parts.patch]
+
+[tool.bumpversion.parts.beta]
+optional_value = "gamma"
+values = ["gamma"]
+independent = false
 
 [[tool.bumpversion.files]]
 filename = "docs/content/_index.md"
 
-
 [[tool.bumpversion.files]]
 filename = "backend/cradle/settings_common.py"
 
@@ -32,5 +38,9 @@ filename = "ui/package.json"
 search = "\"version\": \"{current_version}\""
 replace = "\"version\": \"{new_version}\""
 
+
 [[tool.bumpversion.files]]
-filename = "ui/src/renderer/src/components/Welcome/Welcome.jsx"
+filename = "backend/pyproject.toml"
+search = "version = \"{current_version}\""
+replace = "version = \"{new_version}\""
+

.githooks/post-commit

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Move to git root directory
+GIT_ROOT=$(git rev-parse --show-toplevel)
+cd "$GIT_ROOT" || exit 1
+
+if [ -f .git/BUMPVERSION_AMENDING ]; then
+    rm .git/BUMPVERSION_AMENDING
+    exit 0
+fi
+
+CURRENT=$(uv run --project backend bump-my-version show current_version 2> /dev/null)
+BASE_VERSION=$(echo "$CURRENT" | sed 's/-beta\..*//')
+GIT_HASH=$(git rev-parse --short HEAD^)
+NEW_VERSION="$BASE_VERSION-beta.$GIT_HASH"
+
+if [ "$CURRENT" != "$NEW_VERSION" ]; then
+  echo "Updating version to $NEW_VERSION"
+  touch .git/BUMPVERSION_AMENDING
+
+  uv run --project backend bump-my-version bump \
+      --new-version "$NEW_VERSION" \
+      --allow-dirty --no-commit --no-tag 2> /dev/null
+
+  git add -u
+  git commit --amend --no-edit --no-verify
+fi

.github/workflows/ci.yml

@@ -8,8 +8,8 @@ on:
   pull_request:
 
 jobs:
-  flake8:
-    name: Static Analysis - flake8
+  ruff:
+    name: Static Analysis - ruff
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -28,8 +28,8 @@ jobs:
           python-version: "3.11"
       - name: Install dependencies
         run: uv sync --extra dev
-      - name: Run flake8
-        run: uv run flake8 --verbose .
+      - name: Run ruff
+        run: uv run ruff check .
 
   tests:
     name: Run Django Tests
@@ -95,5 +95,5 @@ jobs:
           uv run python3 manage.py check
       - name: Run Tests with Coverage
         run: |
-          uv run coverage run manage.py test
+          uv run coverage run -m pytest
           uv run coverage report

.github/workflows/ui-checks.yml

@@ -0,0 +1,93 @@
+name: UI Checks
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  formatting:
+    name: Format Check - Prettier
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Run Prettier Check
+        run: bun run prettier . --check
+
+  lint:
+    name: Lint Check - ESLint
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Run ESLint
+        run: bun run lint
+
+  typecheck:
+    name: Type Check - TypeScript
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Run TypeScript Type Check
+        run: bun run typecheck

.vscode/launch.json

@@ -0,0 +1,50 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Django: runserver",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/backend/manage.py",
+      "args": [
+        "runserver",
+        "0.0.0.0:8000"
+      ],
+      "cwd": "${workspaceFolder}/backend",
+      "console": "integratedTerminal",
+      "django": true,
+      "justMyCode": true
+    },
+    {
+      "name": "Celery: worker",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "celery",
+      "args": [
+        "-A",
+        "cradle",
+        "worker",
+        "--beat",
+        "-Q",
+        "email,notes,graph,publish,import,access,enrich,digest,files",
+        "--loglevel",
+        "info",
+        "--concurrency",
+        "4"
+      ],
+      "cwd": "${workspaceFolder}/backend",
+      "console": "integratedTerminal",
+      "justMyCode": true
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Django + Celery",
+      "configurations": [
+        "Django: runserver",
+        "Celery: worker"
+      ],
+      "stopAll": true
+    }
+  ]
+}

README.md

@@ -91,15 +91,14 @@ The monorepo is organized into three main components:
 | Directory    | Description                                  | Documentation                   |
 |--------------|----------------------------------------------|---------------------------------|
 | `backend/`   | Django-based API and data processing layer   | [README](backend/README.md)     |
-| `ui/`        | Electron/React frontend application          | [README](ui/README.md)          |
+| `ui/`        | React frontend application                   | [README](ui/README.md)          |
 | `docker/`    | Relevant dockerfiles and configurations      | [README](docker/README.md)      |
 | `docs/`      | Documentation and project website            | [Webpage](https://cradle.sh)    |
 
 ### Built With
 
 [![Django][Django.com]][Django-url]
 [![React][React.js]][React-url]
-[![Electron][Electron.js]][Electron-url]
 [![Postgres][Postgres.com]][Postgres-url]
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
@@ -122,9 +121,9 @@ The monorepo is organized into three main components:
    ```
 2. Start the Docker containers
    ```sh
-   docker compose -f docker/docker-compose.demo.yml up -d
+   docker compose -f docker/docker-compose.demo.yml up -d --wait
    ```
-3. Access the application at `http://localhost:3000`
+3. Access the application at `http://localhost:8000`
 
 For advanced setup instructions, see the component-specific READMEs:
 - [Backend Setup](backend/README.md)
@@ -191,7 +190,5 @@ Project Link: [https://github.com/prodaft/cradle](https://github.com/prodaft/cra
 [Django-url]: https://www.djangoproject.com/
 [React.js]: https://img.shields.io/badge/React-20232A?style=for-the-badge&logo=react&logoColor=61DAFB
 [React-url]: https://reactjs.org/
-[Electron.js]: https://img.shields.io/badge/Electron-191970?style=for-the-badge&logo=electron&logoColor=white
-[Electron-url]: https://www.electronjs.org/
 [Postgres.com]: https://img.shields.io/badge/PostgreSQL-316192?style=for-the-badge&logo=postgresql&logoColor=white
 [Postgres-url]: https://www.postgresql.org/

backend/.gitignore

@@ -16,3 +16,4 @@ exceptions.log
 deploy/inventory.yml
 
 .vscode
+IntelOwl