5 Commits
Author SHA1 Message Date
jpmschweitzerandClaude Opus 4.5 58ac4054a9 chore: Bump version to 1.0.2
Build and Push / build (release) Successful in 11s
🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-14 12:17:24 +01:00
jpmschweitzerandClaude Opus 4.5 feb7c9e561 fix: Remove setup_database.sql from Dockerfile
Database schema is managed externally - the SQL file was only copied
but never used by the application.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-14 12:16:27 +01:00
jpmschweitzerandClaude Opus 4.5 6f8e6f1c1f feat: Add version tracking via pyproject.toml
Build and Push / build (release) Failing after 10s
- Add pyproject.toml as single source of truth for version and metadata
- Update config.py to read version from pyproject.toml using tomllib
- FastAPI app now loads title and version dynamically from config
- Health endpoint now includes version in response
- Dockerfile updated to include pyproject.toml

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-14 10:58:28 +01:00
jpmschweitzer 030da66a78 CI/CD network issue 2025-12-14 10:51:24 +01:00
jpmschweitzer 48e82e3a2e cleanup 2025-12-11 19:49:27 +01:00
7 changed files with 90 additions and 128 deletions
+3 -3
View File
@@ -13,7 +13,7 @@ jobs:
- name: Login to Gitea Registry
uses: docker/login-action@v3
with:
registry: git.schweitz.net
registry: git.schweitz.internal
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }}
@@ -23,5 +23,5 @@ jobs:
context: .
push: true
tags: |
git.schweitz.net/jpmschweitzer/scheduler:latest
git.schweitz.net/jpmschweitzer/scheduler:${{ github.ref_name }}
git.schweitz.internal/jpmschweitzer/scheduler:latest
git.schweitz.internal/jpmschweitzer/scheduler:${{ github.ref_name }}
+15
View File
@@ -4,6 +4,21 @@ All notable changes to The Scheduler will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [1.0.2] - 2025-12-14
### Fixed
- Removed unused `setup_database.sql` from Dockerfile (database schema managed externally)
## [1.0.1] - 2025-12-14
### Changed
- **Version tracking now uses pyproject.toml** as single source of truth
- Added `pyproject.toml` with project metadata and dependencies
- `config.py` reads version from pyproject.toml using `tomllib`
- FastAPI app title and version dynamically loaded from config
- Health endpoint now includes version in response
- Dockerfile updated to include pyproject.toml
## [1.0.0] - 2025-12-07
### Added
+1 -1
View File
@@ -13,7 +13,7 @@ RUN pip install --no-cache-dir -r requirements.txt
# Copy application
COPY src/ ./src/
COPY setup_database.sql .
COPY pyproject.toml .
# Configure git
RUN git config --global user.name "The Librarian" && \
+45
View File
@@ -0,0 +1,45 @@
[project]
name = "the-scheduler"
version = "1.0.2"
description = "System-wide maintenance orchestration - backups, doc mirroring, cleanup, task automation"
readme = "README.md"
requires-python = ">=3.12"
dependencies = [
# FastAPI ecosystem
"fastapi~=0.124.0",
"uvicorn[standard]~=0.38.0",
"pydantic~=2.12.5",
"pydantic-settings~=2.7.0",
# Task scheduling
"apscheduler~=3.11.1",
"sqlalchemy~=2.0.36",
# Database
"psycopg2-binary~=2.9.11",
"redis~=5.2.0",
# HTTP client
"httpx~=0.28.1",
# Web scraping (for doc mirroring)
"scrapy~=2.12.0",
"beautifulsoup4~=4.12.3",
"lxml~=5.1.0",
# Git operations
"gitpython~=3.1.43",
# Security/Auth
"python-jose[cryptography]~=3.3.0",
]
[project.optional-dependencies]
test = [
"pytest~=8.3.4",
"pytest-asyncio~=0.25.2",
"pytest-cov~=6.0.0",
"freezegun~=1.5.1",
]
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"
[tool.setuptools.packages.find]
where = ["."]
include = ["src*"]
-120
View File
@@ -1,120 +0,0 @@
-- The Scheduler Database Setup
-- Run this from postgres-shared container
-- Create database and user
CREATE DATABASE scheduler;
CREATE USER scheduler_user WITH PASSWORD 'a/Ph0NhC4pTDDjSpL6q/DtBI+z0nf43ijVHjTo1KrXc=';
GRANT ALL PRIVILEGES ON DATABASE scheduler TO scheduler_user;
-- Connect to the new database
\c scheduler
-- Grant schema permissions
GRANT ALL ON SCHEMA public TO scheduler_user;
-- Create scheduled_tasks table
CREATE TABLE scheduled_tasks (
id SERIAL PRIMARY KEY,
task_name VARCHAR(100) NOT NULL UNIQUE,
service VARCHAR(50) NOT NULL, -- Which service owns this task
executor VARCHAR(100) NOT NULL, -- Executor module to run
priority INTEGER NOT NULL DEFAULT 30, -- Lower = higher priority (1-100)
-- Scheduling (supports wildcards: -1 = any)
minute INTEGER DEFAULT -1, -- 0-59 or -1 (any)
hour INTEGER DEFAULT -1, -- 0-23 or -1 (any)
day_of_month INTEGER DEFAULT -1, -- 1-31 or -1 (any)
month INTEGER DEFAULT -1, -- 1-12 or -1 (any)
day_of_week INTEGER DEFAULT -1, -- 0-6 (0=Monday) or -1 (any)
enabled BOOLEAN DEFAULT true,
description TEXT,
config JSONB, -- Arguments for executor
-- Execution tracking
last_run TIMESTAMP,
last_status VARCHAR(20), -- success, failed, timeout
last_duration_seconds INTEGER,
retry_count INTEGER DEFAULT 0,
max_retries INTEGER DEFAULT 3,
timeout_seconds INTEGER DEFAULT 3600, -- 1 hour default
-- Metadata
created_at TIMESTAMP DEFAULT NOW(),
updated_at TIMESTAMP DEFAULT NOW(),
created_by VARCHAR(50),
-- Constraints
CHECK (priority >= 1 AND priority <= 100),
CHECK (minute >= -1 AND minute <= 59),
CHECK (hour >= -1 AND hour <= 23),
CHECK (day_of_month >= -1 AND day_of_month <= 31),
CHECK (month >= -1 AND month <= 12),
CHECK (day_of_week >= -1 AND day_of_week <= 6)
);
-- Create task_executions table
CREATE TABLE task_executions (
id SERIAL PRIMARY KEY,
task_id INTEGER NOT NULL REFERENCES scheduled_tasks(id),
task_name VARCHAR(100) NOT NULL,
service VARCHAR(50) NOT NULL,
executor VARCHAR(100) NOT NULL,
priority INTEGER NOT NULL,
status VARCHAR(20) NOT NULL, -- pending, running, success, failed, timeout
triggered_by VARCHAR(50), -- scheduler, manual, retry
triggered_at TIMESTAMP DEFAULT NOW(),
started_at TIMESTAMP,
completed_at TIMESTAMP,
duration_seconds INTEGER,
output TEXT,
error TEXT,
retry_count INTEGER DEFAULT 0,
metadata JSONB
);
-- Create doc_sources table
CREATE TABLE doc_sources (
id SERIAL PRIMARY KEY,
project_name VARCHAR(100) NOT NULL UNIQUE,
current_version VARCHAR(50),
last_mirrored TIMESTAMP,
last_checked TIMESTAMP,
gitea_repo VARCHAR(200),
config JSONB
);
-- Indexes for scheduled_tasks
CREATE INDEX idx_tasks_enabled ON scheduled_tasks(enabled) WHERE enabled = true;
CREATE INDEX idx_tasks_priority ON scheduled_tasks(priority);
CREATE INDEX idx_tasks_service ON scheduled_tasks(service);
CREATE INDEX idx_tasks_schedule ON scheduled_tasks(minute, hour, day_of_month, month, day_of_week) WHERE enabled = true;
-- Indexes for task_executions
CREATE INDEX idx_executions_task_id ON task_executions(task_id);
CREATE INDEX idx_executions_task_name ON task_executions(task_name);
CREATE INDEX idx_executions_status ON task_executions(status);
CREATE INDEX idx_executions_triggered_at ON task_executions(triggered_at DESC);
CREATE INDEX idx_executions_service ON task_executions(service);
CREATE INDEX idx_executions_running ON task_executions(task_id) WHERE status = 'running';
-- Grant permissions
GRANT ALL ON ALL TABLES IN SCHEMA public TO scheduler_user;
GRANT ALL ON ALL SEQUENCES IN SCHEMA public TO scheduler_user;
-- Insert example test task
INSERT INTO scheduled_tasks
(task_name, service, executor, priority, minute, hour, description, config, created_by)
VALUES
('test_example_task', 'scheduler', 'example_executor', 50, -1, -1,
'Example task that runs every minute for testing',
'{"message": "Scheduler is working!", "delay_seconds": 2}'::jsonb,
'setup_script');
-- Verify tables created
\dt
-- Show the test task
SELECT task_name, service, priority, enabled, description FROM scheduled_tasks;
+22 -2
View File
@@ -2,17 +2,37 @@
Configuration management for The Scheduler.
Uses Pydantic BaseSettings for type-safe environment variable loading.
"""
import tomllib
from functools import lru_cache
from pathlib import Path
from pydantic_settings import BaseSettings
from pydantic import Field
def _get_version_from_pyproject() -> tuple[str, str, str]:
"""Read version info from pyproject.toml."""
pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
if pyproject_path.exists():
with open(pyproject_path, "rb") as f:
data = tomllib.load(f)
project = data.get("project", {})
return (
project.get("name", "the-scheduler"),
project.get("version", "0.0.0"),
project.get("description", ""),
)
return ("the-scheduler", "0.0.0", "")
_PROJECT_NAME, _PROJECT_VERSION, _PROJECT_DESCRIPTION = _get_version_from_pyproject()
class Settings(BaseSettings):
"""Application settings loaded from environment variables."""
# Application
app_name: str = Field(default="The Scheduler", alias="APP_NAME")
app_version: str = Field(default="1.0.0", alias="APP_VERSION")
app_name: str = Field(default=_PROJECT_NAME, alias="APP_NAME")
app_version: str = Field(default=_PROJECT_VERSION, alias="APP_VERSION")
debug: bool = Field(default=False, alias="DEBUG")
host: str = Field(default="0.0.0.0", alias="HOST")
port: int = Field(default=8090, alias="PORT")
+4 -2
View File
@@ -102,9 +102,10 @@ async def lifespan(app: FastAPI):
# FastAPI app
settings = get_settings()
app = FastAPI(
title="The Scheduler",
version="1.0.0",
title=settings.app_name,
version=settings.app_version,
description="System-wide maintenance orchestration - backups, doc mirroring, cleanup, task automation",
lifespan=lifespan
)
@@ -134,6 +135,7 @@ async def health(
"""Health check endpoint."""
return {
"status": "healthy",
"version": settings.app_version,
"scheduler_running": sched.running,
"jobs_count": len(sched.get_jobs()),
"database": settings.postgres_db