Merged branch feature/crons-crons into develop

Author: mike-bestcat

docs/adrs/0008.webapi-backend-blend-via-config-global.md

@@ -41,7 +41,7 @@ scattering ad hoc rules across `env`, hosting flags, and implicit defaults.
 
 4. **Credentials and URLs**  
    Provider-specific secrets and connection strings remain in service-level
-   config (for example `src/webapi/Config.project` and related env). The
+   config (for example `src/webapi/srv/Config.project` and related env). The
    `WEBAPI_*` flags only choose **which** implementation to construct; they do
    not replace DSNs, API keys, or database URLs.
 

infra/self-hosted/compose.yaml

@@ -1,5 +1,32 @@
 name: jupiter
 
+x-webapi-cron-env: &webapi-cron-env
+  SQLITE_DB_URL: ${SQLITE_DB_URL:-sqlite+aiosqlite:////data/jupiter.sqlite}
+  POSTGRES_DB_URL: ${POSTGRES_DB_URL:-}
+  ALEMBIC_INI_PATH: ${ALEMBIC_INI_PATH:-../../core/migrations/alembic.sqlite.ini}
+  ALEMBIC_MIGRATIONS_PATH: ${ALEMBIC_MIGRATIONS_PATH:-../../core/migrations/sqlite}
+  UNIVERSE: ${UNIVERSE:?Check https://docs.get-thriving.com/how-tos/self-hosting}
+  ENV: ${ENV:-production}
+  INSTANCE: ${INSTANCE:?Check https://docs.get-thriving.com/how-tos/self-hosting}
+  AUTH_TOKEN_SECRET: ${AUTH_TOKEN_SECRET:?Check https://docs.get-thriving.com/how-tos/self-hosting}
+  WEBAPI_STORAGE_ENGINE: ${WEBAPI_STORAGE_ENGINE:-sqlite}
+  WEBAPI_TELEMETRY: ${WEBAPI_TELEMETRY:-local}
+  WEBAPI_SEARCH: ${WEBAPI_SEARCH:-sql}
+  WEBAPI_CRM: ${WEBAPI_CRM:-noop}
+  POSTGRES_VERSION: ${POSTGRES_VERSION:-18}
+  WEBAPI_CRON_EXECUTION_MODE: "run-forever"
+
+x-webapi-cron-service: &webapi-cron-service
+  restart: always
+  volumes:
+    - sqlite_data:/data
+  depends_on:
+    webapi-postgres:
+      condition: service_healthy
+      required: false
+    webapi:
+      condition: service_healthy
+
 services:
   webapi-postgres:
     profiles:
@@ -27,8 +54,8 @@ services:
     environment:
       - SQLITE_DB_URL=${SQLITE_DB_URL:-sqlite+aiosqlite:////data/jupiter.sqlite}
       - POSTGRES_DB_URL=${POSTGRES_DB_URL:-}
-      - ALEMBIC_INI_PATH=${ALEMBIC_INI_PATH:-../core/migrations/alembic.sqlite.ini}
-      - ALEMBIC_MIGRATIONS_PATH=${ALEMBIC_MIGRATIONS_PATH:-../core/migrations/sqlite}
+      - ALEMBIC_INI_PATH=${ALEMBIC_INI_PATH:-../../core/migrations/alembic.sqlite.ini}
+      - ALEMBIC_MIGRATIONS_PATH=${ALEMBIC_MIGRATIONS_PATH:-../../core/migrations/sqlite}
       - UNIVERSE=${UNIVERSE:?Check https://docs.get-thriving.com/how-tos/self-hosting}
       - ENV=${ENV:-production}
       - INSTANCE=${INSTANCE:?Check https://docs.get-thriving.com/how-tos/self-hosting}
@@ -54,6 +81,41 @@ services:
       interval: 30s
       timeout: 10s
       retries: 5
+  webapi-gc-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_GC_DO_ALL:-getthriving/webapi-gc-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
+  webapi-gen-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_GEN_DO_ALL:-getthriving/webapi-gen-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
+  webapi-schedule-external-sync-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_SCHEDULE_EXTERNAL_SYNC_DO_ALL:-getthriving/webapi-schedule-external-sync-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
+  webapi-search-index-backfill-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_SEARCH_INDEX_BACKFILL_DO_ALL:-getthriving/webapi-search-index-backfill-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
+  webapi-search-mutation-log-drain-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_SEARCH_MUTATION_LOG_DRAIN_DO_ALL:-getthriving/webapi-search-mutation-log-drain-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
+  webapi-search-mutation-log-processing-requeue-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_SEARCH_MUTATION_LOG_PROCESSING_REQUEUE_DO_ALL:-getthriving/webapi-search-mutation-log-processing-requeue-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
+  webapi-stats-do-all:
+    <<: *webapi-cron-service
+    image: ${DOCKER_IMAGE_WEBAPI_STATS_DO_ALL:-getthriving/webapi-stats-do-all:${VERSION:-latest}}
+    environment:
+      <<: *webapi-cron-env
   api:
     environment:
       - UNIVERSE=${UNIVERSE:?Check https://docs.get-thriving.com/how-tos/self-hosting}

itests/api/big_plans.test.py

@@ -452,9 +452,6 @@ def test_api_big_plan_create_inbox_task_visible_in_inbox(
         timeout=10,
     )
 
-    print(create_response.status_code)
-    print(create_response.content)
-
     assert create_response.status_code == 200
     created_ref_id = create_response.json()["new_inbox_task"]["ref_id"]
 

itests/package.mise.toml

@@ -87,7 +87,7 @@ hide = true
 run = """
 #!/usr/bin/env bash
 set -e -o pipefail
-cd src/webapi
+cd src/webapi/srv
 uv run pip-audit --disable-pip -r <(uv export --format requirements.txt --all-groups)
 """