Compare commits

..

77 Commits

Author SHA1 Message Date
f5ef46d91a feat: implement error handling for task preview generation and add error message utility
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 14s
2026-03-28 16:21:03 -03:00
9b554644bc fix: change PullImage option to false in deploy workflow
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 16:15:13 -03:00
f71d11400a feat: add a playful line to the dashboard version display
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 14s
2026-03-28 16:13:31 -03:00
a708b5a6f5 fix: comment out Docker tag command in build workflow
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 6s
2026-03-28 16:07:40 -03:00
a4f805a122 fix: correct syntax for Docker tag command in build workflow
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 6s
2026-03-28 16:04:52 -03:00
e63db79119 fix: correct syntax for Docker build and tag commands in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 6s
2026-03-28 16:04:04 -03:00
165c141560 feat: remove Gitea registry login step from build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 6s
2026-03-28 16:01:00 -03:00
968fd07385 feat: simplify registry references in build and docker-compose files
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 15s
2026-03-28 15:59:47 -03:00
2c29a4bce7 feat: update image reference for condado-newsletter service in docker-compose
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 10s
2026-03-28 15:58:09 -03:00
58c3a54d4a feat: add generation source handling for task creation and updates
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 50s
2026-03-28 15:35:49 -03:00
ea54858165 feat: add required environment variable checks for stack deployment
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 15:01:07 -03:00
fda6fc77ee feat: implement orphan container cleanup for idempotent stack deployment
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 14:56:07 -03:00
ff93afd075 feat: add debug information and response headers to Portainer stack deployment
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 14:54:22 -03:00
af5def1e71 feat: enhance build and deploy workflows with debug information and environment variable handling
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 14:52:50 -03:00
0f9d35311f fix: remove image push steps from build workflow
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 14:49:07 -03:00
dc8f182c56 feat: add Gitea registry login and update Docker image build process
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 1m2s
2026-03-28 14:47:34 -03:00
b3f6d0ef17 fix: remove unnecessary env_file entries and correct OPENAI_API_KEY format
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 32s
2026-03-28 14:38:49 -03:00
6606c27323 fix: update OPENAI_API_KEY environment variable to include .env suffix
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
2026-03-28 14:38:02 -03:00
2c5c299aaa fix: standardize PostgreSQL user and password environment variables in Docker Compose
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
2026-03-28 14:36:25 -03:00
167cfdb742 fix: update PostgreSQL user and password environment variables for consistency
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 13s
2026-03-28 14:31:23 -03:00
b7274c4b6d fix: update healthcheck command for PostgreSQL service to use localhost
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 13s
2026-03-28 14:18:49 -03:00
5499a8a585 fix: update PostgreSQL healthcheck command and ensure default network is specified
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 15s
2026-03-28 14:10:37 -03:00
1c4a35eea8 fix: add 'default' network to condado-newsletter service in Docker Compose
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 8s
2026-03-28 14:04:02 -03:00
363bfcb135 fix: add external network configuration for condado-newsletter service in Docker Compose
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 17s
2026-03-28 14:01:30 -03:00
eaf588f7d5 fix: correct spelling of 'postgres' in Docker Compose and entrypoint scripts
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 15s
2026-03-28 13:54:14 -03:00
621bb1773c fix: update healthcheck command for PostgreSQL service in Docker Compose
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 31s
2026-03-28 13:46:34 -03:00
942da74778 fix: remove PostgreSQL initialization from entrypoint and update Docker configuration for external database
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 2m23s
2026-03-28 13:40:24 -03:00
52ea621145 fix: update Docker build command to use correct image name and remove unnecessary tagging steps
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 11s
2026-03-28 13:28:10 -03:00
f6d37bb1f2 fix: update Docker image source for condado-newsletter service
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 22s
2026-03-28 13:19:59 -03:00
2e2e75fe87 fix: update JwtService to handle default expiration and add tests for token generation
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 39s
2026-03-28 03:40:03 -03:00
8f508034d5 fix: update Docker configuration for image source and enhance logging in supervisord
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 14s
2026-03-28 03:32:08 -03:00
7108aff54d fix: add access and error log configuration for Nginx
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 39s
2026-03-28 03:26:50 -03:00
b0a4278699 fix: update stack deployment to use production Docker Compose file 2026-03-28 03:25:35 -03:00
73c51e514c fix: update Docker Compose configuration for service names and database connection
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 7s
2026-03-28 03:24:00 -03:00
596a17b252 fix: update supervisord configuration to log output to stdout
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 9s
2026-03-28 03:14:15 -03:00
5ff28fa3d4 fix: update homepage logo and href in Docker Compose configuration
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 12s
2026-03-28 03:09:35 -03:00
a672c9efed fix: correct stack name in Portainer deployment configuration
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 35s
2026-03-28 03:07:44 -03:00
bfe8965c06 fix: enhance Portainer API interaction with DNS fallback and improved error handling
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 11s
2026-03-28 03:06:37 -03:00
c72595d396 fix: improve Portainer deployment script with enhanced logging and error handling
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
2026-03-28 03:05:05 -03:00
51b596c7a5 fix: update Portainer API URL and correct image reference in Docker Compose
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 12s
2026-03-28 03:03:33 -03:00
e4e2ae3479 fix: sanitize Portainer API stack response output for improved logging
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 12s
2026-03-28 02:58:37 -03:00
808c0d0a22 fix: update Portainer API URL to use the correct lab address
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
2026-03-28 02:55:59 -03:00
e3938d2351 fix: add network info logging before Portainer deployment
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
2026-03-28 02:53:05 -03:00
8a04363b11 fix: enhance Portainer API deployment with detailed error handling and logging
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
2026-03-28 02:49:30 -03:00
1038f40721 fix: update Portainer API URL to include port number for deployment
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 7s
2026-03-28 02:30:01 -03:00
4fd90b2497 fix: streamline deployment process by removing Gitea registry login steps and enhancing Portainer API integration
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 16s
2026-03-28 02:21:36 -03:00
cb74fdef7b fix: remove Gitea container registry login and push steps from build workflow
All checks were successful
Build And Publish Production Image / Build And Publish Production Image (push) Successful in 7s
2026-03-28 01:34:08 -03:00
0ed6f3824a fix: update build workflow to combine tagging and pushing of registry images
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 17s
2026-03-28 01:27:09 -03:00
572dc49bc9 fix: update Docker image tag format in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 1m37s
2026-03-28 00:49:03 -03:00
29627a0062 fix: correct syntax for Docker image tags in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 16s
2026-03-28 00:42:16 -03:00
776941b323 fix: update Docker Hub login step to be optional and clean up registry login process
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 1m28s
2026-03-28 00:40:15 -03:00
5f8834d0d4 fix: update Docker registry configuration and login endpoint in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 1m18s
2026-03-28 00:31:33 -03:00
854fabd874 fix: update logging of Docker registry credentials to use base64 encoding
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 22s
2026-03-27 22:28:45 -03:00
000bc0cc36 fix: update Docker registry credentials logging to use environment variables
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 12s
2026-03-27 22:27:51 -03:00
4d27a256d2 fix: update logging of Docker registry credentials to use secrets
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 21s
2026-03-27 22:26:12 -03:00
08bfced7ce fix: add logging for Docker registry login credentials in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 7s
2026-03-27 22:25:18 -03:00
c266be0eba Remove CI workflow and instructions documentation files
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 23s
2026-03-27 22:18:02 -03:00
837214f41a fix: update Gitea registry login endpoint in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 7s
2026-03-27 17:07:30 -03:00
fa4bf360ff fix: update registry URL in build workflow
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 12s
2026-03-27 17:05:51 -03:00
2072dd299d fix: enhance Gitea registry login step to handle empty secrets
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 27s
2026-03-27 16:50:50 -03:00
af391efa89 fix: update Gitea registry login step to use correct secret names
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 22s
2026-03-27 16:46:54 -03:00
8893e85d53 fix: move Docker Hub login step into build job
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 1m48s
2026-03-27 16:44:14 -03:00
14ecd2fa18 fix: add Docker Hub login step to build workflow
Some checks failed
Build And Publish Production Image / Log In To Docker Hub (push) Successful in 2s
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 12s
2026-03-27 16:42:57 -03:00
0fa3d28c1b Merge pull request 'develop' (#8) from develop into main
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 24s
Reviewed-on: #8
2026-03-27 16:35:58 -03:00
924d3eab35 Merge branch 'main' into develop 2026-03-27 16:35:54 -03:00
c6a3971c15 Merge pull request 'fix: ensure newline at end of file in build workflow' (#7) from feature/testing into develop
Reviewed-on: #7
2026-03-27 16:35:38 -03:00
18dba7f7a2 Merge branch 'feature/testing' of http://gitea.lab/sancho41/condado-newsletter into feature/testing
Some checks failed
CI / Backend Tests (pull_request) Has been cancelled
CI / Frontend Tests (pull_request) Has been cancelled
2026-03-27 16:34:54 -03:00
62306ea6a6 fix: update build trigger to use push on main branch instead of pull request review 2026-03-27 16:34:40 -03:00
90f63bc6ed fix: ensure newline at end of file in build workflow
Some checks failed
CI / Backend Tests (pull_request) Has been cancelled
CI / Frontend Tests (pull_request) Has been cancelled
2026-03-27 16:27:32 -03:00
ac6efceede fix: ensure newline at end of file in build workflow
Some checks failed
CI / Frontend Tests (pull_request) Has been cancelled
CI / Backend Tests (pull_request) Has been cancelled
2026-03-27 16:26:29 -03:00
440a7eade1 Merge pull request 'develop' (#6) from develop into main
Reviewed-on: #6
2026-03-27 16:24:58 -03:00
1581ddcaea Merge branch 'main' into develop 2026-03-27 16:24:50 -03:00
37a9ef22df Merge pull request 'feature/testing' (#5) from feature/testing into main
Reviewed-on: #5
2026-03-27 16:23:53 -03:00
81d04b63d1 develop (#4)
Reviewed-on: #4
Co-authored-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
Co-committed-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
2026-03-27 16:23:13 -03:00
6306073921 feature/testing (#3)
Reviewed-on: #3
Co-authored-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
Co-committed-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
2026-03-27 16:22:43 -03:00
5723c74e39 fix: add missing colon in Active Entities label on DashboardPage (#1) (#2)
Reviewed-on: #1
Co-authored-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
Co-committed-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
Reviewed-on: #2
2026-03-27 16:19:26 -03:00
46f78467bb fix: add missing colon in Active Entities label on DashboardPage (#1)
Reviewed-on: #1
Co-authored-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
Co-committed-by: Gabriel Sancho <gabriel.sancho13@gmail.com>
2026-03-27 16:18:58 -03:00
30 changed files with 889 additions and 1177 deletions

View File

@@ -1,38 +1,62 @@
name: Build And Publish Production Image
on:
pull_request_review:
types: [submitted]
push:
branches:
- main
jobs:
build:
name: Build And Publish Production Image
if: github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'main'
runs-on: ubuntu-latest
env:
REGISTRY: gitea.lab
IMAGE_NAME: sancho41/condado-newsletter
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
steps:
- uses: actions/checkout@v4
with:
github-server-url: http://gitea.lab
ref: ${{ github.event.pull_request.head.sha }}
- name: Build debug context
run: |
set -eu
echo "Build debug"
echo "Repository: ${GITEA_REPOSITORY:-unknown}"
echo "Ref: ${GITEA_REF:-unknown}"
echo "Sha: ${GITEA_SHA:-unknown}"
echo "Runner OS: ${RUNNER_OS:-unknown}"
echo "Registry: ${REGISTRY}"
echo "Image: ${IMAGE_NAME}"
echo "Image latest tag: ${REGISTRY}/${IMAGE_NAME}:latest"
echo "Image sha tag: ${REGISTRY}/${IMAGE_NAME}:${GITEA_SHA:-unknown}"
echo "HTTP_PROXY=${HTTP_PROXY:-<empty>}"
echo "HTTPS_PROXY=${HTTPS_PROXY:-<empty>}"
echo "NO_PROXY=${NO_PROXY:-<empty>}"
if command -v ip >/dev/null 2>&1; then
echo "Runner network info:"
ip -4 addr show || true
ip route || true
else
hostname -I || true
fi
- name: Verify Docker CLI
run: docker version
- name: Log in to Docker Hub (optional)
if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}
run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login docker.io -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
- name: Build all-in-one image
run: docker build -t condado-newsletter:latest -f Dockerfile.allinone .
- name: Log in to Gitea container registry
run: echo "${{ secrets.GITEA_REGISTRY_PASSWORD }}" | docker login ${REGISTRY} -u "${{ secrets.GITEA_REGISTRY_USERNAME }}" --password-stdin
- name: Tag registry images
run: |
docker tag condado-newsletter:latest ${REGISTRY}/${IMAGE_NAME}:latest
docker tag condado-newsletter:latest ${REGISTRY}/${IMAGE_NAME}:${{ github.sha }}
docker build -t "${IMAGE_NAME}:latest" -f Dockerfile.allinone .
# docker tag "${IMAGE_NAME}:latest" "${IMAGE_NAME}:${{ gitea.sha }}"
- name: Push registry images
- name: Build result debug
run: |
docker push ${REGISTRY}/${IMAGE_NAME}:latest
docker push ${REGISTRY}/${IMAGE_NAME}:${{ github.sha }}
set -eu
echo "Listing produced image tags"
docker image ls "${IMAGE_NAME}" --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedSince}}' || true

330
.gitea/workflows/deploy.yml Normal file
View File

@@ -0,0 +1,330 @@
name: Deploy Production Stack
on:
workflow_run:
workflows: ["Build And Publish Production Image"]
types: [completed]
workflow_dispatch:
jobs:
deploy:
name: Deploy Stack Via Portainer
if: ${{ gitea.event_name == 'workflow_dispatch' || gitea.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest
env:
STACK_NAME: condado-newsletter-stack
PORTAINER_URL: ${{ secrets.PORTAINER_URL }}
PORTAINER_API_KEY: ${{ secrets.PORTAINER_API_KEY }}
PORTAINER_ENDPOINT_ID: ${{ secrets.PORTAINER_ENDPOINT_ID }}
ENV_VARS: ${{ secrets.ENV_VARS }}
steps:
- uses: actions/checkout@v4
with:
github-server-url: http://gitea.lab
- name: Validate ENV_VARS secret
run: |
set -eu
if [ -z "${ENV_VARS}" ]; then
echo "ENV_VARS secret is empty."
exit 1
fi
- name: Deploy stack via Portainer API
run: |
set -u
set +e
if ! command -v curl >/dev/null 2>&1; then
echo "curl is not available in this runner image"
exit 1
fi
if ! command -v jq >/dev/null 2>&1; then
echo "jq is not available in this runner image"
exit 1
fi
PORTAINER_BASE_URL=$(printf '%s' "${PORTAINER_URL:-http://portainer.lab/}" | sed -E 's/[[:space:]]+$//; s#/*$##')
echo "Portainer deploy debug"
echo "PORTAINER_URL=${PORTAINER_URL:-http://portainer.lab/}"
echo "PORTAINER_BASE_URL=${PORTAINER_BASE_URL}"
echo "STACK_NAME=${STACK_NAME}"
echo "PORTAINER_ENDPOINT_ID=${PORTAINER_ENDPOINT_ID}"
echo "HTTP_PROXY=${HTTP_PROXY:-<empty>}"
echo "HTTPS_PROXY=${HTTPS_PROXY:-<empty>}"
echo "NO_PROXY=${NO_PROXY:-<empty>}"
echo "Current runner network info:"
if command -v ip >/dev/null 2>&1; then
ip -4 addr show || true
ip route || true
else
hostname -I || true
fi
ENV_JSON=$(printf '%s\n' "${ENV_VARS}" | jq -R -s '
split("\n")
| map(gsub("\r$"; ""))
| map(select(length > 0))
| map(select(startswith("#") | not))
| map(select(test("^[A-Za-z_][A-Za-z0-9_]*=.*$")))
| map(capture("^(?<name>[A-Za-z_][A-Za-z0-9_]*)=(?<value>.*)$"))
| map({name: .name, value: .value})
')
echo "Loaded $(printf '%s' "${ENV_JSON}" | jq 'length') env entries from ENV_VARS"
echo "ENV names preview:"
printf '%s' "${ENV_JSON}" | jq -r '.[0:10][]?.name' || true
REQUIRED_ENV_KEYS=(
APP_PASSWORD
JWT_SECRET
SPRING_DATASOURCE_USERNAME
SPRING_DATASOURCE_PASSWORD
APP_RECIPIENTS
)
MISSING_KEYS=()
for REQUIRED_KEY in "${REQUIRED_ENV_KEYS[@]}"; do
if ! printf '%s' "${ENV_JSON}" | jq -e --arg required_key "${REQUIRED_KEY}" 'map(.name) | index($required_key) != null' >/dev/null; then
MISSING_KEYS+=("${REQUIRED_KEY}")
fi
done
if [ "${#MISSING_KEYS[@]}" -gt 0 ]; then
echo "ENV_VARS is missing required keys: ${MISSING_KEYS[*]}"
exit 1
fi
echo "Portainer base URL: ${PORTAINER_BASE_URL}"
echo "Target stack: ${STACK_NAME}"
echo "Endpoint id set: $([ -n "${PORTAINER_ENDPOINT_ID}" ] && echo yes || echo no)"
PORTAINER_HOST=$(printf '%s' "${PORTAINER_BASE_URL}" | sed -E 's#^[a-zA-Z]+://##; s#/.*$##; s/:.*$//')
PORTAINER_IP=""
ACTIVE_PORTAINER_BASE_URL="${PORTAINER_BASE_URL}"
if command -v getent >/dev/null 2>&1; then
PORTAINER_IP=$(getent hosts "${PORTAINER_HOST}" | awk 'NR==1{print $1}')
if [ -n "${PORTAINER_IP}" ]; then
PORTAINER_IP_BASE_URL="${PORTAINER_BASE_URL/${PORTAINER_HOST}/${PORTAINER_IP}}"
echo "Portainer DNS resolved ${PORTAINER_HOST} -> ${PORTAINER_IP}"
echo "IP fallback URL: ${PORTAINER_IP_BASE_URL}"
else
echo "DNS lookup returned no IP for ${PORTAINER_HOST}"
fi
else
echo "getent not available; skipping DNS pre-check"
fi
STACKS_BODY=$(mktemp)
STACKS_HEADERS=$(mktemp)
STACKS_ERR=$(mktemp)
STACKS_HTTP_CODE=$(curl -sS \
--noproxy "*" \
-D "${STACKS_HEADERS}" \
-o "${STACKS_BODY}" \
-w "%{http_code}" \
"${ACTIVE_PORTAINER_BASE_URL}/api/stacks" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
2>"${STACKS_ERR}")
STACKS_CURL_EXIT=$?
echo "GET /api/stacks curl exit: ${STACKS_CURL_EXIT}"
echo "GET /api/stacks http code: ${STACKS_HTTP_CODE}"
echo "GET /api/stacks headers:"
cat "${STACKS_HEADERS}" || true
if [ "${STACKS_CURL_EXIT}" -eq 6 ] && [ -n "${PORTAINER_IP:-}" ]; then
echo "Retrying stack list with IP fallback due to DNS failure"
STACKS_HTTP_CODE=$(curl -sS \
--noproxy "*" \
-D "${STACKS_HEADERS}" \
-o "${STACKS_BODY}" \
-w "%{http_code}" \
"${PORTAINER_IP_BASE_URL}/api/stacks" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
2>"${STACKS_ERR}")
STACKS_CURL_EXIT=$?
if [ "${STACKS_CURL_EXIT}" -eq 0 ]; then
ACTIVE_PORTAINER_BASE_URL="${PORTAINER_IP_BASE_URL}"
fi
echo "Retry GET /api/stacks curl exit: ${STACKS_CURL_EXIT}"
echo "Retry GET /api/stacks http code: ${STACKS_HTTP_CODE}"
fi
if [ "${STACKS_CURL_EXIT}" -ne 0 ]; then
echo "GET /api/stacks stderr:"
cat "${STACKS_ERR}" || true
exit "${STACKS_CURL_EXIT}"
fi
if [ "${STACKS_HTTP_CODE}" -lt 200 ] || [ "${STACKS_HTTP_CODE}" -ge 300 ]; then
echo "GET /api/stacks body:"
cat "${STACKS_BODY}" || true
exit 1
fi
STACK_ID=$(jq -r --arg stack_name "${STACK_NAME}" '.[] | select(.Name == $stack_name) | .Id' "${STACKS_BODY}" | head -n 1)
APPLY_BODY=$(mktemp)
APPLY_HEADERS=$(mktemp)
APPLY_ERR=$(mktemp)
# If the stack does not exist yet, remove orphan containers with names defined in compose.
# This enables an idempotent create-or-recreate flow when old standalone containers exist.
if [ -z "${STACK_ID}" ]; then
echo "Stack not found in Portainer; checking for orphan containers with conflicting names"
mapfile -t CONTAINER_NAMES < <(awk '/container_name:/{print $2}' docker-compose.prod.yml | tr -d '"' | sed '/^$/d')
for CONTAINER_NAME in "${CONTAINER_NAMES[@]}"; do
FILTERS=$(jq -cn --arg n "^/${CONTAINER_NAME}$" '{name: [$n]}')
FILTERS_URLENC=$(printf '%s' "${FILTERS}" | jq -sRr @uri)
LIST_URL="${ACTIVE_PORTAINER_BASE_URL}/api/endpoints/${PORTAINER_ENDPOINT_ID}/docker/containers/json?all=1&filters=${FILTERS_URLENC}"
LIST_BODY=$(mktemp)
LIST_ERR=$(mktemp)
LIST_HTTP_CODE=$(curl -sS \
--noproxy "*" \
-o "${LIST_BODY}" \
-w "%{http_code}" \
"${LIST_URL}" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
2>"${LIST_ERR}")
LIST_CURL_EXIT=$?
echo "Container pre-check [${CONTAINER_NAME}] curl=${LIST_CURL_EXIT} http=${LIST_HTTP_CODE}"
if [ "${LIST_CURL_EXIT}" -ne 0 ]; then
echo "Container pre-check stderr for ${CONTAINER_NAME}:"
cat "${LIST_ERR}" || true
continue
fi
if [ "${LIST_HTTP_CODE}" -lt 200 ] || [ "${LIST_HTTP_CODE}" -ge 300 ]; then
echo "Container pre-check non-success response for ${CONTAINER_NAME}:"
cat "${LIST_BODY}" || true
continue
fi
mapfile -t MATCHING_IDS < <(jq -r '.[].Id' "${LIST_BODY}")
if [ "${#MATCHING_IDS[@]}" -eq 0 ]; then
echo "No conflicting container found for ${CONTAINER_NAME}"
continue
fi
for CONTAINER_ID in "${MATCHING_IDS[@]}"; do
DELETE_URL="${ACTIVE_PORTAINER_BASE_URL}/api/endpoints/${PORTAINER_ENDPOINT_ID}/docker/containers/${CONTAINER_ID}?force=1"
DELETE_BODY=$(mktemp)
DELETE_ERR=$(mktemp)
DELETE_HTTP_CODE=$(curl -sS -X DELETE \
--noproxy "*" \
-o "${DELETE_BODY}" \
-w "%{http_code}" \
"${DELETE_URL}" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
2>"${DELETE_ERR}")
DELETE_CURL_EXIT=$?
echo "Removed conflicting container ${CONTAINER_NAME} (${CONTAINER_ID}) curl=${DELETE_CURL_EXIT} http=${DELETE_HTTP_CODE}"
if [ "${DELETE_CURL_EXIT}" -ne 0 ]; then
echo "Delete stderr:"
cat "${DELETE_ERR}" || true
fi
if [ "${DELETE_HTTP_CODE}" -lt 200 ] || [ "${DELETE_HTTP_CODE}" -ge 300 ]; then
echo "Delete response body:"
cat "${DELETE_BODY}" || true
fi
done
done
fi
if [ -n "${STACK_ID}" ]; then
echo "Updating existing stack id=${STACK_ID}"
REQUEST_URL="${ACTIVE_PORTAINER_BASE_URL}/api/stacks/${STACK_ID}?endpointId=${PORTAINER_ENDPOINT_ID}"
PAYLOAD=$(jq -n \
--rawfile stack_file docker-compose.prod.yml \
--argjson env_vars "${ENV_JSON}" \
'{StackFileContent: $stack_file, Env: $env_vars, Prune: false, PullImage: false}')
echo "Apply request URL: ${REQUEST_URL}"
echo "Apply payload summary:"
printf '%s' "${PAYLOAD}" | jq -r '{stackFileLength: (.StackFileContent | length), envCount: (.Env | length), prune: .Prune, pullImage: .PullImage}' || true
APPLY_HTTP_CODE=$(curl -sS -X PUT \
--noproxy "*" \
-D "${APPLY_HEADERS}" \
-o "${APPLY_BODY}" \
-w "%{http_code}" \
"${REQUEST_URL}" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
-H "Content-Type: application/json" \
-d "${PAYLOAD}" \
2>"${APPLY_ERR}")
APPLY_CURL_EXIT=$?
else
echo "Creating new stack ${STACK_NAME}"
REQUEST_URL="${ACTIVE_PORTAINER_BASE_URL}/api/stacks/create/standalone/string?endpointId=${PORTAINER_ENDPOINT_ID}"
PAYLOAD=$(jq -n \
--arg name "${STACK_NAME}" \
--rawfile stack_file docker-compose.prod.yml \
--argjson env_vars "${ENV_JSON}" \
'{Name: $name, StackFileContent: $stack_file, Env: $env_vars, FromAppTemplate: false}')
echo "Apply request URL: ${REQUEST_URL}"
echo "Apply payload summary:"
printf '%s' "${PAYLOAD}" | jq -r '{name: .Name, stackFileLength: (.StackFileContent | length), envCount: (.Env | length), fromAppTemplate: .FromAppTemplate}' || true
APPLY_HTTP_CODE=$(curl -sS -X POST \
--noproxy "*" \
-D "${APPLY_HEADERS}" \
-o "${APPLY_BODY}" \
-w "%{http_code}" \
"${REQUEST_URL}" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
-H "Content-Type: application/json" \
-d "${PAYLOAD}" \
2>"${APPLY_ERR}")
APPLY_CURL_EXIT=$?
fi
echo "Apply curl exit: ${APPLY_CURL_EXIT}"
echo "Apply http code: ${APPLY_HTTP_CODE}"
echo "Apply response headers:"
cat "${APPLY_HEADERS}" || true
if [ "${APPLY_CURL_EXIT}" -ne 0 ]; then
echo "Apply stderr:"
cat "${APPLY_ERR}" || true
exit "${APPLY_CURL_EXIT}"
fi
if [ "${APPLY_HTTP_CODE}" -lt 200 ] || [ "${APPLY_HTTP_CODE}" -ge 300 ]; then
echo "Apply response body:"
cat "${APPLY_BODY}" || true
echo "Apply response parsed as JSON (if possible):"
jq -r '.' "${APPLY_BODY}" 2>/dev/null || echo "<non-json or empty body>"
if [ ! -s "${APPLY_BODY}" ]; then
echo "Apply body is empty; retrying once with verbose curl for diagnostics"
curl -v -X "$( [ -n "${STACK_ID}" ] && echo PUT || echo POST )" \
--noproxy "*" \
-o /tmp/portainer-debug-body.txt \
"${REQUEST_URL}" \
-H "X-API-Key: ${PORTAINER_API_KEY}" \
-H "Content-Type: application/json" \
-d "${PAYLOAD}" \
2>/tmp/portainer-debug-stderr.txt || true
echo "Verbose retry stderr:"
cat /tmp/portainer-debug-stderr.txt || true
echo "Verbose retry body:"
cat /tmp/portainer-debug-body.txt || true
fi
exit 1
fi
echo "Portainer deploy completed successfully"

View File

@@ -1,57 +0,0 @@
name: CI
on:
pull_request:
branches: ["develop"]
jobs:
backend-test:
name: Backend Tests
runs-on: ubuntu-latest
defaults:
run:
working-directory: backend
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: "21"
distribution: temurin
cache: gradle
- name: Make Gradle wrapper executable
run: chmod +x gradlew
- name: Run tests
run: ./gradlew test --no-daemon
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
with:
name: backend-test-results
path: backend/build/reports/tests/
frontend-test:
name: Frontend Tests
runs-on: ubuntu-latest
defaults:
run:
working-directory: frontend
steps:
- uses: actions/checkout@v4
- name: Set up Node 20
uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
cache-dependency-path: frontend/package-lock.json
- name: Install dependencies
run: npm ci
- name: Run tests
run: npm run test

View File

@@ -29,14 +29,10 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y \
nginx \
postgresql \
supervisor \
openjdk-21-jre-headless \
&& rm -rf /var/lib/apt/lists/*
# PostgreSQL data directory
RUN mkdir -p /var/lib/postgresql/data && chown -R postgres:postgres /var/lib/postgresql
# Copy frontend static files
COPY --from=frontend-build /app/frontend/dist /usr/share/nginx/html

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,7 @@
package com.condado.newsletter.dto
import com.condado.newsletter.model.EntityTask
import com.condado.newsletter.model.TaskGenerationSource
import jakarta.validation.constraints.NotBlank
import jakarta.validation.constraints.NotNull
import java.time.LocalDateTime
@@ -11,7 +12,8 @@ data class EntityTaskCreateDto(
@field:NotBlank val name: String,
val prompt: String,
@field:NotBlank val scheduleCron: String,
@field:NotBlank val emailLookback: String
@field:NotBlank val emailLookback: String,
val generationSource: TaskGenerationSource = TaskGenerationSource.LLAMA
)
data class EntityTaskUpdateDto(
@@ -19,7 +21,8 @@ data class EntityTaskUpdateDto(
@field:NotBlank val name: String,
@field:NotBlank val prompt: String,
@field:NotBlank val scheduleCron: String,
@field:NotBlank val emailLookback: String
@field:NotBlank val emailLookback: String,
val generationSource: TaskGenerationSource? = null
)
data class EntityTaskResponseDto(
@@ -29,6 +32,7 @@ data class EntityTaskResponseDto(
val prompt: String,
val scheduleCron: String,
val emailLookback: String,
val generationSource: TaskGenerationSource,
val active: Boolean,
val createdAt: LocalDateTime?
) {
@@ -41,6 +45,7 @@ data class EntityTaskResponseDto(
prompt = task.prompt,
scheduleCron = task.scheduleCron,
emailLookback = task.emailLookback,
generationSource = task.generationSource,
active = task.active,
createdAt = task.createdAt
)

View File

@@ -3,6 +3,8 @@ package com.condado.newsletter.model
import jakarta.persistence.CascadeType
import jakarta.persistence.Column
import jakarta.persistence.Entity
import jakarta.persistence.EnumType
import jakarta.persistence.Enumerated
import jakarta.persistence.FetchType
import jakarta.persistence.GeneratedValue
import jakarta.persistence.GenerationType
@@ -37,6 +39,10 @@ class EntityTask(
@Column(name = "email_lookback", nullable = false)
val emailLookback: String,
@Enumerated(EnumType.STRING)
@Column(name = "generation_source", nullable = false)
val generationSource: TaskGenerationSource = TaskGenerationSource.LLAMA,
@Column(nullable = false)
val active: Boolean = true,

View File

@@ -0,0 +1,19 @@
package com.condado.newsletter.model
import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.annotation.JsonValue
enum class TaskGenerationSource(
@get:JsonValue val value: String
) {
OPENAI("openai"),
LLAMA("llama");
companion object {
@JvmStatic
@JsonCreator
fun from(value: String): TaskGenerationSource =
entries.firstOrNull { it.value.equals(value, ignoreCase = true) }
?: throw IllegalArgumentException("Invalid generationSource: $value")
}
}

View File

@@ -47,6 +47,7 @@ class EntityTaskService(
prompt = dto.prompt,
scheduleCron = dto.scheduleCron,
emailLookback = dto.emailLookback,
generationSource = dto.generationSource,
active = true
)
@@ -66,6 +67,7 @@ class EntityTaskService(
prompt = dto.prompt,
scheduleCron = dto.scheduleCron,
emailLookback = dto.emailLookback,
generationSource = dto.generationSource ?: existing.generationSource,
active = existing.active,
createdAt = existing.createdAt
).apply { id = existing.id }
@@ -83,6 +85,7 @@ class EntityTaskService(
prompt = existing.prompt,
scheduleCron = existing.scheduleCron,
emailLookback = existing.emailLookback,
generationSource = existing.generationSource,
active = false,
createdAt = existing.createdAt
).apply { id = existing.id }
@@ -100,6 +103,7 @@ class EntityTaskService(
prompt = existing.prompt,
scheduleCron = existing.scheduleCron,
emailLookback = existing.emailLookback,
generationSource = existing.generationSource,
active = true,
createdAt = existing.createdAt
).apply { id = existing.id }

View File

@@ -14,8 +14,10 @@ import java.util.Date
@Service
class JwtService(
@Value("\${app.jwt.secret}") val secret: String,
@Value("\${app.jwt.expiration-ms}") val expirationMs: Long
@Value("\${app.jwt.expiration-ms:86400000}") expirationMsRaw: String
) {
private val expirationMs: Long = expirationMsRaw.toLongOrNull() ?: 86400000L
private val signingKey by lazy {
Keys.hmacShaKeyFor(secret.toByteArray(Charsets.UTF_8))
}

View File

@@ -3,6 +3,7 @@ package com.condado.newsletter.service
import com.condado.newsletter.dto.GeneratedMessageHistoryResponseDto
import com.condado.newsletter.dto.TaskPreviewGenerateRequestDto
import com.condado.newsletter.model.GeneratedMessageHistory
import com.condado.newsletter.model.TaskGenerationSource
import com.condado.newsletter.repository.EntityTaskRepository
import com.condado.newsletter.repository.GeneratedMessageHistoryRepository
import org.springframework.stereotype.Service
@@ -16,7 +17,8 @@ import java.util.UUID
class TaskGeneratedMessageService(
private val generatedMessageHistoryRepository: GeneratedMessageHistoryRepository,
private val entityTaskRepository: EntityTaskRepository,
private val llamaPreviewService: LlamaPreviewService
private val llamaPreviewService: LlamaPreviewService,
private val aiService: AiService
) {
/** Lists persisted generated messages for a task. */
@@ -25,15 +27,19 @@ class TaskGeneratedMessageService(
.findAllByTask_IdOrderByCreatedAtDesc(taskId)
.map { GeneratedMessageHistoryResponseDto.from(it) }
/**
* Generates a new message using local Llama, persists it, and returns it.
*/
/** Generates a new message with the task-selected provider, persists it, and returns it. */
@Transactional
fun generateAndSave(taskId: UUID, request: TaskPreviewGenerateRequestDto): GeneratedMessageHistoryResponseDto {
val task = entityTaskRepository.findById(taskId)
.orElseThrow { IllegalArgumentException("Task not found: $taskId") }
val prompt = buildPrompt(request)
val generatedContent = llamaPreviewService.generate(prompt)
val generatedContent = when (task.generationSource) {
TaskGenerationSource.LLAMA -> llamaPreviewService.generate(prompt)
TaskGenerationSource.OPENAI -> {
val parsed = aiService.generate(prompt)
"SUBJECT: ${parsed.subject}\nBODY:\n${parsed.body}"
}
}
val nextLabel = "Message #${generatedMessageHistoryRepository.countByTask_Id(taskId) + 1}"
val saved = generatedMessageHistoryRepository.save(

View File

@@ -10,7 +10,7 @@ spring:
jpa:
hibernate:
ddl-auto: validate
ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:validate}
show-sql: false
properties:
hibernate:

View File

@@ -8,6 +8,7 @@ import com.condado.newsletter.scheduler.EntityScheduler
import com.condado.newsletter.service.JwtService
import com.ninjasquad.springmockk.MockkBean
import jakarta.servlet.http.Cookie
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
@@ -15,6 +16,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.http.MediaType
import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
@@ -56,7 +58,8 @@ class EntityTaskControllerTest {
"name": "Morning Blast",
"prompt": "",
"scheduleCron": "0 8 * * 1-5",
"emailLookback": "last_week"
"emailLookback": "last_week",
"generationSource": "openai"
}
""".trimIndent()
@@ -70,5 +73,96 @@ class EntityTaskControllerTest {
.andExpect(jsonPath("$.entityId").value(entity.id.toString()))
.andExpect(jsonPath("$.name").value("Morning Blast"))
.andExpect(jsonPath("$.prompt").value(""))
.andExpect(jsonPath("$.generationSource").value("openai"))
val persisted = entityTaskRepository.findAll().first()
assertThat(persisted.generationSource.value).isEqualTo("openai")
}
@Test
fun should_updateTaskAndPersistGenerationSource_when_validRequestProvided() {
val entity = virtualEntityRepository.save(
VirtualEntity(
name = "Entity B",
email = "entity-b@condado.com",
jobTitle = "Ops"
)
)
val createdPayload = """
{
"entityId": "${entity.id}",
"name": "Task One",
"prompt": "Initial prompt",
"scheduleCron": "0 8 * * 1-5",
"emailLookback": "last_week",
"generationSource": "openai"
}
""".trimIndent()
val createdResult = mockMvc.perform(
post("/api/v1/tasks")
.cookie(authCookie())
.contentType(MediaType.APPLICATION_JSON)
.content(createdPayload)
)
.andExpect(status().isCreated)
.andReturn()
val taskId = com.jayway.jsonpath.JsonPath.read<String>(createdResult.response.contentAsString, "$.id")
val updatePayload = """
{
"entityId": "${entity.id}",
"name": "Task One Updated",
"prompt": "Updated prompt",
"scheduleCron": "0 10 * * 1-5",
"emailLookback": "last_day",
"generationSource": "llama"
}
""".trimIndent()
mockMvc.perform(
put("/api/v1/tasks/$taskId")
.cookie(authCookie())
.contentType(MediaType.APPLICATION_JSON)
.content(updatePayload)
)
.andExpect(status().isOk)
.andExpect(jsonPath("$.name").value("Task One Updated"))
.andExpect(jsonPath("$.generationSource").value("llama"))
val persisted = entityTaskRepository.findById(java.util.UUID.fromString(taskId)).orElseThrow()
assertThat(persisted.generationSource.value).isEqualTo("llama")
}
@Test
fun should_returnBadRequest_when_generationSourceIsInvalid() {
val entity = virtualEntityRepository.save(
VirtualEntity(
name = "Entity C",
email = "entity-c@condado.com",
jobTitle = "Ops"
)
)
val payload = """
{
"entityId": "${entity.id}",
"name": "Morning Blast",
"prompt": "Prompt",
"scheduleCron": "0 8 * * 1-5",
"emailLookback": "last_week",
"generationSource": "invalid-provider"
}
""".trimIndent()
mockMvc.perform(
post("/api/v1/tasks")
.cookie(authCookie())
.contentType(MediaType.APPLICATION_JSON)
.content(payload)
)
.andExpect(status().isBadRequest)
}
}

View File

@@ -40,7 +40,7 @@ class AuthServiceTest {
fun should_returnValidClaims_when_jwtTokenParsed() {
val realJwtService = JwtService(
secret = "test-secret-key-for-testing-only-must-be-at-least-32-characters",
expirationMs = 86400000L
expirationMsRaw = "86400000"
)
val token = realJwtService.generateToken()
@@ -51,7 +51,7 @@ class AuthServiceTest {
fun should_returnFalse_when_expiredTokenValidated() {
val realJwtService = JwtService(
secret = "test-secret-key-for-testing-only-must-be-at-least-32-characters",
expirationMs = 1L
expirationMsRaw = "1"
)
val token = realJwtService.generateToken()

View File

@@ -0,0 +1,26 @@
package com.condado.newsletter.service
import io.jsonwebtoken.Jwts
import io.jsonwebtoken.security.Keys
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
class JwtServiceTest {
private val secret = "12345678901234567890123456789012"
@Test
fun should_generate_token_when_expiration_is_empty() {
val jwtService = JwtService(secret, "")
val token = jwtService.generateToken()
val claims = Jwts.parser()
.verifyWith(Keys.hmacShaKeyFor(secret.toByteArray(Charsets.UTF_8)))
.build()
.parseSignedClaims(token)
.payload
assertTrue(claims.expiration.after(claims.issuedAt))
}
}

View File

@@ -5,6 +5,8 @@ import com.condado.newsletter.dto.TaskPreviewGenerateRequestDto
import com.condado.newsletter.dto.TaskPreviewTaskDto
import com.condado.newsletter.model.EntityTask
import com.condado.newsletter.model.GeneratedMessageHistory
import com.condado.newsletter.model.ParsedAiResponse
import com.condado.newsletter.model.TaskGenerationSource
import com.condado.newsletter.model.VirtualEntity
import com.condado.newsletter.repository.EntityTaskRepository
import com.condado.newsletter.repository.GeneratedMessageHistoryRepository
@@ -21,15 +23,17 @@ class TaskGeneratedMessageServiceTest {
private val generatedMessageHistoryRepository: GeneratedMessageHistoryRepository = mockk()
private val entityTaskRepository: EntityTaskRepository = mockk()
private val llamaPreviewService: LlamaPreviewService = mockk()
private val aiService: AiService = mockk()
private val service = TaskGeneratedMessageService(
generatedMessageHistoryRepository = generatedMessageHistoryRepository,
entityTaskRepository = entityTaskRepository,
llamaPreviewService = llamaPreviewService
llamaPreviewService = llamaPreviewService,
aiService = aiService
)
@Test
fun should_generateAndPersistMessage_when_generateAndSaveCalled() {
fun should_useLlamaProvider_when_taskGenerationSourceIsLlama() {
val taskId = UUID.randomUUID()
val entity = VirtualEntity(name = "Entity", email = "e@x.com", jobTitle = "Ops").apply { id = UUID.randomUUID() }
val task = EntityTask(
@@ -37,7 +41,8 @@ class TaskGeneratedMessageServiceTest {
name = "Task",
prompt = "Prompt",
scheduleCron = "0 9 * * 1",
emailLookback = "last_week"
emailLookback = "last_week",
generationSource = TaskGenerationSource.LLAMA
).apply { id = taskId }
val captured = slot<GeneratedMessageHistory>()
@@ -59,9 +64,40 @@ class TaskGeneratedMessageServiceTest {
assertThat(captured.captured.task.id).isEqualTo(taskId)
verify(exactly = 1) { llamaPreviewService.generate(any()) }
verify(exactly = 0) { aiService.generate(any()) }
verify(exactly = 1) { generatedMessageHistoryRepository.save(any()) }
}
@Test
fun should_useOpenAiProvider_when_taskGenerationSourceIsOpenai() {
val taskId = UUID.randomUUID()
val entity = VirtualEntity(name = "Entity", email = "e@x.com", jobTitle = "Ops").apply { id = UUID.randomUUID() }
val task = EntityTask(
virtualEntity = entity,
name = "Task",
prompt = "Prompt",
scheduleCron = "0 9 * * 1",
emailLookback = "last_week",
generationSource = TaskGenerationSource.OPENAI
).apply { id = taskId }
val captured = slot<GeneratedMessageHistory>()
every { aiService.generate(any()) } returns ParsedAiResponse(subject = "Open Subject", body = "Open Body")
every { entityTaskRepository.findById(taskId) } returns java.util.Optional.of(task)
every { generatedMessageHistoryRepository.countByTask_Id(taskId) } returns 0
every { generatedMessageHistoryRepository.save(capture(captured)) } answers {
captured.captured.apply {
id = UUID.fromString("00000000-0000-0000-0000-000000000001")
}
}
val response = service.generateAndSave(taskId, sampleRequest())
assertThat(response.content).isEqualTo("SUBJECT: Open Subject\nBODY:\nOpen Body")
verify(exactly = 1) { aiService.generate(any()) }
verify(exactly = 0) { llamaPreviewService.generate(any()) }
}
private fun sampleRequest() = TaskPreviewGenerateRequestDto(
entity = TaskPreviewEntityDto(
id = UUID.randomUUID().toString(),

View File

@@ -1,15 +1,42 @@
services:
condado-newsletter:
image: gitea.lab/sancho41/condado-newsletter:latest
container_name: condado-newsletter
condado-newsletter-postgres:
image: postgres:16
container_name: condado-newsletter-postgres
restart: unless-stopped
environment:
POSTGRES_DB: ${APP_DB_NAME:-condado}
POSTGRES_USER: ${POSTGRES_USER:-condado}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-condado}
volumes:
- postgres-data:/var/lib/postgresql/data
networks:
- default
healthcheck:
test: ["CMD-SHELL", "pg_isready -h localhost -U $${POSTGRES_USER:-postgres}"]
interval: 10s
timeout: 5s
retries: 10
start_period: 10s
condado-newsletter:
image: sancho41/condado-newsletter:latest
container_name: condado-newsletter
restart: unless-stopped
depends_on:
condado-newsletter-postgres:
condition: service_healthy
networks:
- external
- default
environment:
SPRING_PROFILES_ACTIVE: prod
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
SPRING_JPA_HIBERNATE_DDL_AUTO: ${SPRING_JPA_HIBERNATE_DDL_AUTO:-update}
SPRING_DATASOURCE_URL: jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME:-condado}
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-condado}
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-condado}
APP_PASSWORD: ${APP_PASSWORD}
JWT_SECRET: ${JWT_SECRET}
JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS}
JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS:-86400000}
MAIL_HOST: ${MAIL_HOST}
MAIL_PORT: ${MAIL_PORT}
MAIL_USERNAME: ${MAIL_USERNAME}
@@ -25,22 +52,24 @@ services:
extra_hosts:
- "celtinha.desktop:host-gateway"
- "host.docker.internal:host-gateway"
volumes:
- postgres-data:/var/lib/postgresql/data
labels:
- "traefik.enable=true"
- "traefik.http.routers.condado.rule=Host(`condado-newsletter.lab`)"
- "traefik.http.services.condado.loadbalancer.server.port=80"
- "traefik.docker.network=traefik"
- "homepage.group=Hyperlink"
- "homepage.name=Condado Newsletter"
- "homepage.description=Automated newsletter generator using AI"
- "homepage.logo=https://raw.githubusercontent.com/celtinha/condado-newsletter/main/docs/logo.png"
- "homepage.url=http://condado-newsletter.lab"
- "homepage.logo=claude-ai.png"
- "homepage.href=http://condado-newsletter.lab"
volumes:
postgres-data:
networks:
default:
driver: bridge
external:
name: traefik
external: true

View File

@@ -4,14 +4,13 @@ services:
postgres:
image: postgres:16-alpine
restart: unless-stopped
container_name: condado-newsletter-postgres
environment:
POSTGRES_DB: condado
POSTGRES_USER: ${SPRING_DATASOURCE_USERNAME}
POSTGRES_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
volumes:
- postgres-data:/var/lib/postgresql/data
networks:
- condado-net
healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${SPRING_DATASOURCE_USERNAME} -d condado"]
interval: 10s
@@ -20,6 +19,7 @@ services:
# ── Backend (Spring Boot) ────────────────────────────────────────────────────
backend:
container_name: condado-newsletter-backend
build:
context: ./backend
dockerfile: Dockerfile
@@ -29,7 +29,7 @@ services:
condition: service_healthy
environment:
SPRING_PROFILES_ACTIVE: dev
SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/condado
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
APP_PASSWORD: ${APP_PASSWORD}
@@ -50,36 +50,42 @@ services:
extra_hosts:
- "celtinha.desktop:host-gateway"
- "host.docker.internal:host-gateway"
networks:
- condado-net
# ── Frontend + Nginx ─────────────────────────────────────────────────────────
nginx:
container_name: condado-newsletter-frontend
build:
context: ./frontend
dockerfile: Dockerfile
args:
VITE_API_BASE_URL: ${VITE_API_BASE_URL}
restart: unless-stopped
ports:
- "80:80"
depends_on:
- backend
networks:
- condado-net
- traefik
labels:
- "traefik.enable=true"
- "traefik.http.routers.condado.rule=Host(`condado-newsletter.lab`)"
- "traefik.http.services.condado.loadbalancer.server.port=80"
- "homepage.group=Hyperlink"
- "homepage.name=Condado Newsletter"
- "homepage.description=Automated newsletter generator using AI"
- "homepage.logo=claude-dark.png"
- "homepage.href=http://condado-newsletter.lab"
# ── Mailhog (DEV ONLY — SMTP trap) ───────────────────────────────────────────
mailhog:
container_name: condado-newsletter-mailhog
image: mailhog/mailhog:latest
restart: unless-stopped
ports:
- "8025:8025"
networks:
- condado-net
volumes:
postgres-data:
networks:
condado-net:
driver: bridge
traefik:
external: true
name: traefik

View File

@@ -5,28 +5,29 @@ APP_DB_NAME=${APP_DB_NAME:-condado}
APP_DB_USER=${SPRING_DATASOURCE_USERNAME:-condado}
APP_DB_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-condado}
# ── Initialise PostgreSQL data directory on first run ─────────────────────────
if [ ! -f /var/lib/postgresql/data/PG_VERSION ]; then
echo "Initialising PostgreSQL data directory..."
su -c "/usr/lib/postgresql/16/bin/initdb -D /var/lib/postgresql/data --encoding=UTF8 --locale=C" postgres
# Start postgres temporarily to create the app database and user
su -c "/usr/lib/postgresql/16/bin/pg_ctl -D /var/lib/postgresql/data -w start" postgres
su -c "psql -v ON_ERROR_STOP=1 -c \"CREATE USER ${APP_DB_USER} WITH PASSWORD '${APP_DB_PASSWORD}';\"" postgres
su -c "psql -v ON_ERROR_STOP=1 -c \"CREATE DATABASE ${APP_DB_NAME} OWNER ${APP_DB_USER};\"" postgres
su -c "/usr/lib/postgresql/16/bin/pg_ctl -D /var/lib/postgresql/data -w stop" postgres
echo "PostgreSQL initialised."
fi
# ── Ensure supervisor log directory exists ────────────────────────────────────
mkdir -p /var/log/supervisor
# ── Defaults for all-in-one local PostgreSQL ─────────────────────────────────
export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://localhost:5432/${APP_DB_NAME}}
# ── Defaults for external PostgreSQL service in production compose ───────────
export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME}}
export SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-${APP_DB_USER}}
export SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-${APP_DB_PASSWORD}}
export JWT_EXPIRATION_MS=${JWT_EXPIRATION_MS:-86400000}
# ── Log all Spring Boot environment variables for debugging ──────────────────
echo "========================================"
echo "Spring Boot Configuration:"
echo "========================================"
echo "SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}"
echo "SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}"
echo "SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}"
echo "JWT_EXPIRATION_MS=${JWT_EXPIRATION_MS}"
echo "JAVA_OPTS=${JAVA_OPTS:-not set}"
echo "OPENAI_API_KEY=${OPENAI_API_KEY:-not set}"
echo "========================================"
# ── Start all services via supervisord ───────────────────────────────────────
# Export unbuffered output for both Python and Java
export PYTHONUNBUFFERED=1
export JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8 -Djava.awt.headless=true"
exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

View File

@@ -1,27 +1,26 @@
[supervisord]
nodaemon=true
logfile=/var/log/supervisor/supervisord.log
silent=false
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/var/run/supervisord.pid
[program:postgres]
command=/usr/lib/postgresql/16/bin/postgres -D /var/lib/postgresql/data
user=postgres
autostart=true
autorestart=true
stdout_logfile=/var/log/supervisor/postgres.log
stderr_logfile=/var/log/supervisor/postgres.err.log
loglevel=info
[program:backend]
command=java -jar /app/app.jar
command=java -Dspring.output.ansi.enabled=always -Dlogging.level.root=DEBUG -jar /app/app.jar
autostart=true
autorestart=true
startsecs=15
stdout_logfile=/var/log/supervisor/backend.log
stderr_logfile=/var/log/supervisor/backend.err.log
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
[program:nginx]
command=/usr/sbin/nginx -g "daemon off;"
autostart=true
autorestart=true
stdout_logfile=/var/log/supervisor/nginx.log
stderr_logfile=/var/log/supervisor/nginx.err.log
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0

View File

@@ -39,6 +39,7 @@ const taskOne: EntityTaskResponse = {
prompt: 'Summarize jokes',
scheduleCron: '0 9 * * 1',
emailLookback: 'last_week',
generationSource: 'openai',
active: true,
createdAt: '2026-03-26T10:00:00Z',
}
@@ -50,6 +51,7 @@ const taskTwo: EntityTaskResponse = {
prompt: 'Escalate sandwich policy',
scheduleCron: '0 11 1 * *',
emailLookback: 'last_month',
generationSource: 'llama',
active: false,
createdAt: '2026-03-26T11:00:00Z',
}
@@ -72,6 +74,7 @@ const previewTask = {
prompt: 'Draft an absurdly official update about disappearing crackers.',
scheduleCron: '15 10 * * 2',
emailLookback: 'last_week' as const,
generationSource: 'openai' as const,
}
describe('tasksApi', () => {
@@ -143,6 +146,7 @@ describe('tasksApi', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'openai',
})
expect(createdTask).toEqual(
@@ -157,6 +161,7 @@ describe('tasksApi', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'openai',
})
})
@@ -168,6 +173,7 @@ describe('tasksApi', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
},
})
@@ -177,6 +183,7 @@ describe('tasksApi', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
})
expect(updatedTask).toEqual({
@@ -185,6 +192,7 @@ describe('tasksApi', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
})
expect(mockedApiClient.put).toHaveBeenCalledWith('/v1/tasks/task-1', {
entityId: 'entity-1',
@@ -192,6 +200,7 @@ describe('tasksApi', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
})
})
@@ -319,4 +328,18 @@ INSTRUCTIONS
'backend unavailable'
)
})
it('should_returnReadable401Message_when_generateTaskPreviewUnauthorized', async () => {
mockedApiClient.post.mockRejectedValue({
isAxiosError: true,
response: {
status: 401,
data: {},
},
})
await expect(generateTaskPreview('task-1', { entity, task: previewTask })).rejects.toThrow(
'Your session has expired. Please sign in again and retry.'
)
})
})

View File

@@ -50,6 +50,7 @@ describe('CreateTaskPage', () => {
expect(screen.getByLabelText(/task name/i)).toBeInTheDocument()
expect(screen.queryByLabelText(/task prompt/i)).not.toBeInTheDocument()
expect(screen.getByLabelText(/^Generation Source$/i)).toHaveValue('openai')
expect(screen.getByLabelText(/^Email Period$/i)).toBeInTheDocument()
expect(screen.getByLabelText(/^Minute$/i)).toBeInTheDocument()
expect(screen.getByLabelText(/^Hour$/i)).toBeInTheDocument()
@@ -68,6 +69,7 @@ describe('CreateTaskPage', () => {
prompt: '',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_week',
generationSource: 'openai',
active: false,
createdAt: '2026-03-26T10:00:00Z',
})
@@ -78,6 +80,7 @@ describe('CreateTaskPage', () => {
prompt: '',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_week',
generationSource: 'openai',
active: false,
createdAt: '2026-03-26T10:00:00Z',
})
@@ -118,6 +121,7 @@ describe('CreateTaskPage', () => {
prompt: '',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_week',
generationSource: 'openai',
})
)
expect(tasksApi.inactivateTask).toHaveBeenCalledWith('task-2')

View File

@@ -57,6 +57,7 @@ const mockTask = {
prompt: 'Summarize jokes',
scheduleCron: '0 9 * * 1',
emailLookback: 'last_week' as const,
generationSource: 'openai' as const,
active: true,
createdAt: '2026-03-26T10:00:00Z',
}
@@ -77,7 +78,7 @@ describe('EditTaskPage', () => {
vi.mocked(tasksApi.getTask).mockResolvedValue(mockTask)
vi.mocked(tasksApi.buildTaskPreviewPrompt).mockImplementation(
(entity, task) =>
`PROMPT FOR ${entity.name}: ${task.name} | ${task.prompt} | ${task.scheduleCron} | ${task.emailLookback}`
`PROMPT FOR ${entity.name}: ${task.name} | ${task.prompt} | ${task.scheduleCron} | ${task.emailLookback} | ${task.generationSource}`
)
vi.mocked(tasksApi.activateTask).mockResolvedValue({ ...mockTask, active: true })
vi.mocked(tasksApi.inactivateTask).mockResolvedValue({ ...mockTask, active: false })
@@ -97,6 +98,7 @@ describe('EditTaskPage', () => {
expect(screen.getByRole('heading', { name: /edit task/i })).toBeInTheDocument()
expect(screen.getByLabelText(/task name/i)).toHaveValue('Weekly Check-in')
expect(screen.getByLabelText(/task prompt/i)).toHaveValue('Summarize jokes')
expect(screen.getByLabelText(/^Generation Source$/i)).toHaveValue('openai')
expect(screen.getByLabelText(/^Email Period$/i)).toHaveValue('last_week')
expect(screen.getByLabelText(/^Minute$/i)).toHaveValue('0')
expect(screen.getByLabelText(/^Hour$/i)).toHaveValue('9')
@@ -124,6 +126,7 @@ describe('EditTaskPage', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
})
const { queryClient } = renderPage()
@@ -137,13 +140,16 @@ describe('EditTaskPage', () => {
fireEvent.change(screen.getByLabelText(/^Email Period$/i), {
target: { value: 'last_day' },
})
fireEvent.change(screen.getByLabelText(/^Generation Source$/i), {
target: { value: 'llama' },
})
fireEvent.click(screen.getByRole('button', { name: /Weekdays/i }))
fireEvent.change(screen.getByLabelText(/^Hour$/i), { target: { value: '8' } })
expect(screen.getByText(/Final Prompt/i)).toBeInTheDocument()
expect(
screen.getByText(
'PROMPT FOR Entity A: Daily Check-in | Ask about ceremonial coffee | 0 8 * * 1-5 | last_day'
'PROMPT FOR Entity A: Daily Check-in | Ask about ceremonial coffee | 0 8 * * 1-5 | last_day | llama'
)
).toBeInTheDocument()
@@ -159,6 +165,7 @@ describe('EditTaskPage', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
})
)
expect(vi.mocked(tasksApi.generateTaskPreview).mock.calls[0][0]).toEqual('task-1')
@@ -171,6 +178,7 @@ describe('EditTaskPage', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
}),
})
)
@@ -186,6 +194,7 @@ describe('EditTaskPage', () => {
prompt: 'Ask about ceremonial coffee',
scheduleCron: '0 8 * * 1-5',
emailLookback: 'last_day',
generationSource: 'llama',
})
expect(invalidateQueriesSpy).toHaveBeenCalledWith({ queryKey: ['entity-tasks', 'entity-1'] })
expect(invalidateQueriesSpy).toHaveBeenCalledWith({ queryKey: ['entity-task', 'task-1'] })
@@ -196,7 +205,7 @@ describe('EditTaskPage', () => {
it('should_showReadablePreviewError_when_generationFails', async () => {
vi.mocked(tasksApi.generateTaskPreview).mockRejectedValue(
new Error('Unable to generate a test message from the local model. Connection refused')
new Error('Your session has expired. Please sign in again and retry.')
)
renderPage()
@@ -206,7 +215,7 @@ describe('EditTaskPage', () => {
await waitFor(() => {
expect(
screen.getByText(/Unable to generate a test message from the local model. Connection refused/i)
screen.getByText(/Your session has expired. Please sign in again and retry./i)
).toBeInTheDocument()
})
})

View File

@@ -120,6 +120,7 @@ describe('EntityDetailPage', () => {
prompt: 'Summarize jokes',
scheduleCron: '0 9 * * 1',
emailLookback: 'last_week',
generationSource: 'openai',
active: true,
createdAt: '2026-03-26T10:00:00Z',
},
@@ -165,6 +166,7 @@ describe('EntityDetailPage', () => {
prompt: 'Archive the sandwich minutes',
scheduleCron: '0 9 * * 1',
emailLookback: 'last_week',
generationSource: 'llama',
active: false,
createdAt: '2026-03-26T10:00:00Z',
},

View File

@@ -0,0 +1,53 @@
import { isAxiosError } from 'axios'
function getMessageFromResponseData(data: unknown): string | null {
if (!data || typeof data !== 'object') {
return null
}
const payload = data as Record<string, unknown>
const candidate = payload.message ?? payload.error ?? payload.detail
if (typeof candidate === 'string' && candidate.trim().length > 0) {
return candidate.trim()
}
return null
}
export function getApiErrorMessage(error: unknown, fallback: string): string {
if (isAxiosError(error)) {
const status = error.response?.status
const responseMessage = getMessageFromResponseData(error.response?.data)
if (responseMessage) {
return responseMessage
}
if (status === 401) {
return 'Your session has expired. Please sign in again and retry.'
}
if (status === 403) {
return 'You do not have permission to perform this action.'
}
if (status === 404) {
return 'The requested resource was not found.'
}
if (status && status >= 500) {
return 'The server failed to process the request. Please try again in a moment.'
}
if (!error.response) {
return 'Unable to reach the server. Check your network connection and try again.'
}
}
if (error instanceof Error && error.message.trim().length > 0) {
return error.message
}
return fallback
}

View File

@@ -1,7 +1,9 @@
import type { VirtualEntityResponse } from './entitiesApi'
import apiClient from './apiClient'
import { getApiErrorMessage } from './errorMessage'
export type EmailLookback = 'last_day' | 'last_week' | 'last_month'
export type GenerationSource = 'openai' | 'llama'
export interface EntityTaskResponse {
id: string
@@ -10,6 +12,7 @@ export interface EntityTaskResponse {
prompt: string
scheduleCron: string
emailLookback: EmailLookback
generationSource: GenerationSource
active: boolean
createdAt: string
}
@@ -20,6 +23,7 @@ export interface EntityTaskCreateDto {
prompt: string
scheduleCron: string
emailLookback: EmailLookback
generationSource: GenerationSource
}
export type EntityTaskUpdateDto = EntityTaskCreateDto
@@ -85,11 +89,17 @@ export async function generateTaskPreview(
taskId: string,
payload: TaskPreviewRequest
): Promise<string> {
const response = await apiClient.post<GeneratedMessageHistoryItem>(
`/v1/tasks/${taskId}/generated-messages/generate`,
payload
)
return response.data.content
try {
const response = await apiClient.post<GeneratedMessageHistoryItem>(
`/v1/tasks/${taskId}/generated-messages/generate`,
payload
)
return response.data.content
} catch (error) {
throw new Error(
getApiErrorMessage(error, 'Unable to generate a test message right now. Please try again.')
)
}
}
/** Returns generated message history for one task. */

View File

@@ -6,12 +6,14 @@ import {
createTask,
inactivateTask,
type EmailLookback,
type GenerationSource,
} from '../api/tasksApi'
interface TaskFormState {
name: string
scheduleCron: string
emailLookback: EmailLookback
generationSource: GenerationSource
}
interface CronParts {
@@ -72,6 +74,7 @@ const DEFAULT_TASK_FORM: TaskFormState = {
name: '',
scheduleCron: buildCron(DEFAULT_CRON_PARTS),
emailLookback: 'last_week',
generationSource: 'openai',
}
export default function CreateTaskPage() {
@@ -151,6 +154,7 @@ export default function CreateTaskPage() {
prompt: '',
scheduleCron: taskForm.scheduleCron,
emailLookback: taskForm.emailLookback,
generationSource: taskForm.generationSource,
})
}}
>
@@ -167,6 +171,26 @@ export default function CreateTaskPage() {
/>
</div>
<div>
<label htmlFor="task-generation-source" className="text-sm font-medium text-slate-200">
Generation Source
</label>
<select
id="task-generation-source"
value={taskForm.generationSource}
onChange={(event) =>
setTaskForm((prev) => ({
...prev,
generationSource: event.target.value as GenerationSource,
}))
}
className="mt-1 w-full rounded-md border border-slate-700 bg-slate-900 px-3 py-2 text-sm text-slate-100"
>
<option value="openai">OpenAI</option>
<option value="llama">Llama</option>
</select>
</div>
<div>
<label htmlFor="task-lookback" className="text-sm font-medium text-slate-200">
Email Period

View File

@@ -23,6 +23,7 @@ export default function DashboardPage() {
<div>
<h1 className="text-3xl font-bold text-slate-100">Dashboard</h1>
<p className="mt-2 text-xs text-slate-400">Version {appVersion}</p>
<p className="mt-2 text-xs text-slate-400">Is this the real life?</p>
</div>
<div className="grid gap-4 md:grid-cols-2">

View File

@@ -1,6 +1,7 @@
import { useEffect, useMemo, useState } from 'react'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { Link, useNavigate, useParams } from 'react-router-dom'
import { getApiErrorMessage } from '../api/errorMessage'
import { getEntity } from '../api/entitiesApi'
import {
activateTask,
@@ -13,6 +14,7 @@ import {
inactivateTask,
updateTask,
type EmailLookback,
type GenerationSource,
} from '../api/tasksApi'
interface TaskFormState {
@@ -20,6 +22,7 @@ interface TaskFormState {
prompt: string
scheduleCron: string
emailLookback: EmailLookback
generationSource: GenerationSource
}
interface CronParts {
@@ -97,6 +100,7 @@ const DEFAULT_TASK_FORM: TaskFormState = {
prompt: '',
scheduleCron: buildCron(DEFAULT_CRON_PARTS),
emailLookback: 'last_week',
generationSource: 'openai',
}
async function invalidateTaskQueries(
@@ -119,6 +123,7 @@ export default function EditTaskPage() {
const [taskForm, setTaskForm] = useState<TaskFormState>(DEFAULT_TASK_FORM)
const [selectedMessageId, setSelectedMessageId] = useState('')
const [previewError, setPreviewError] = useState('')
const [actionError, setActionError] = useState('')
const { data: entity, isLoading: isLoadingEntity } = useQuery({
queryKey: ['entity', entityId],
@@ -164,6 +169,7 @@ export default function EditTaskPage() {
prompt: task.prompt,
scheduleCron: task.scheduleCron,
emailLookback: task.emailLookback,
generationSource: task.generationSource,
})
}, [task])
@@ -175,35 +181,60 @@ export default function EditTaskPage() {
prompt: data.prompt,
scheduleCron: data.scheduleCron,
emailLookback: data.emailLookback,
generationSource: data.generationSource,
}),
onMutate: () => {
setActionError('')
},
onSuccess: async () => {
await invalidateTaskQueries(queryClient, entityId, taskId)
navigate(`/entities/${entityId}`)
},
onError: (error) => {
setActionError(getApiErrorMessage(error, 'Unable to save the task right now. Please try again.'))
},
})
const inactivateTaskMutation = useMutation({
mutationFn: () => inactivateTask(taskId),
onMutate: () => {
setActionError('')
},
onSuccess: async () => {
await invalidateTaskQueries(queryClient, entityId, taskId)
navigate(`/entities/${entityId}`)
},
onError: (error) => {
setActionError(getApiErrorMessage(error, 'Unable to inactivate the task right now. Please try again.'))
},
})
const activateTaskMutation = useMutation({
mutationFn: () => activateTask(taskId),
onMutate: () => {
setActionError('')
},
onSuccess: async () => {
await invalidateTaskQueries(queryClient, entityId, taskId)
navigate(`/entities/${entityId}`)
},
onError: (error) => {
setActionError(getApiErrorMessage(error, 'Unable to activate the task right now. Please try again.'))
},
})
const deleteTaskMutation = useMutation({
mutationFn: () => deleteTask(taskId),
onMutate: () => {
setActionError('')
},
onSuccess: async () => {
await invalidateTaskQueries(queryClient, entityId, taskId)
navigate(`/entities/${entityId}`)
},
onError: (error) => {
setActionError(getApiErrorMessage(error, 'Unable to delete the task right now. Please try again.'))
},
})
const previewMutation = useMutation({
@@ -217,9 +248,10 @@ export default function EditTaskPage() {
},
onError: (error) => {
setPreviewError(
error instanceof Error
? error.message
: 'Unable to generate a test message from the local model.'
getApiErrorMessage(
error,
'Unable to generate a test message right now. Please try again.'
)
)
},
})
@@ -236,8 +268,16 @@ export default function EditTaskPage() {
prompt: taskForm.prompt,
scheduleCron: taskForm.scheduleCron,
emailLookback: taskForm.emailLookback,
generationSource: taskForm.generationSource,
}),
[entityId, taskForm.emailLookback, taskForm.name, taskForm.prompt, taskForm.scheduleCron]
[
entityId,
taskForm.emailLookback,
taskForm.generationSource,
taskForm.name,
taskForm.prompt,
taskForm.scheduleCron,
]
)
const finalPrompt = useMemo(() => {
@@ -255,6 +295,9 @@ export default function EditTaskPage() {
const deleteGeneratedMessageMutation = useMutation({
mutationFn: (messageId: string) => deleteTaskGeneratedMessage(taskId, messageId),
onMutate: () => {
setActionError('')
},
onSuccess: ( _data, messageId) => {
queryClient.setQueryData(
['task-generated-messages', taskId],
@@ -265,6 +308,14 @@ export default function EditTaskPage() {
) => currentMessages?.filter((message) => message.id !== messageId) ?? []
)
},
onError: (error) => {
setActionError(
getApiErrorMessage(
error,
'Unable to delete the generated message right now. Please try again.'
)
)
},
})
const applyCronParts = (nextCronParts: CronParts) => {
@@ -352,6 +403,26 @@ export default function EditTaskPage() {
/>
</div>
<div>
<label htmlFor="task-generation-source" className="text-sm font-medium text-slate-200">
Generation Source
</label>
<select
id="task-generation-source"
value={taskForm.generationSource}
onChange={(event) =>
setTaskForm((prev) => ({
...prev,
generationSource: event.target.value as GenerationSource,
}))
}
className="mt-1 w-full rounded-md border border-slate-700 bg-slate-900 px-3 py-2 text-sm text-slate-100"
>
<option value="openai">OpenAI</option>
<option value="llama">Llama</option>
</select>
</div>
<div>
<label htmlFor="task-lookback" className="text-sm font-medium text-slate-200">
Email Period
@@ -556,6 +627,12 @@ export default function EditTaskPage() {
</div>
{actionError && (
<p role="alert" className="text-sm text-red-300">
{actionError}
</p>
)}
<div className="flex justify-end gap-3 pb-8">
<button
type="button"

View File

@@ -15,6 +15,9 @@ http {
gzip_types text/plain text/css application/json application/javascript
text/xml application/xml application/xml+rss text/javascript;
access_log /dev/stdout;
error_log /dev/stderr;
server {
listen 80;
server_name _;