feat: wire Nitro API to Go, real staffing plan and train proxy
- Replace mock Nitro routes with server-side proxies to the Go API - /plan reads Go /api/staffing; local assumption edits are a labeled preview - /simulate reads base and scenario staffing from Go instead of local multipliers - Route train upload and scenario POST through Nitro with server-only credentials - Keep NUXT_PUBLIC_USE_MOCK=1 as an explicit dev fallback only - Match Go's global-peak flat schedule and add a captured Go parity fixture - Run the web runtime as numeric UID/GID 10001:10001 - Add make check, Gitea CI workflow and a proxy smoke script
This commit is contained in:
1 parent
e8d141ca43
commit
b33e6ff001
33 files changed
+1147
-317
No files matched your search
@@ -1,3 +1,8 @@
|
||||
import type { ContextResponse } from '../../shared/types'
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
import { mockContext } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler(() => mockContext)
|
||||
export default defineEventHandler(async () => {
|
||||
if (isMockMode()) return mockContext
|
||||
return apiRequest<ContextResponse>('/api/context')
|
||||
})
|
||||
+23
-25
@@ -1,34 +1,32 @@
|
||||
import { applyScenario } from '../../shared/staffing'
|
||||
import { HORIZONS, SCENARIOS } from '../../shared/types'
|
||||
import type { Horizon, Scenario } from '../../shared/types'
|
||||
import type { ForecastResponse, Horizon, Scenario } from '../../shared/types'
|
||||
import { apiRequest, enumParam, isMockMode, sensorParam } from '../utils/api'
|
||||
import { getMockForecast } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler((event) => {
|
||||
export default defineEventHandler(async (event) => {
|
||||
const query = getQuery(event)
|
||||
const sensor = String(query.sensor ?? 'hn-stadtgalerie-01')
|
||||
const horizon = String(query.horizon ?? '7d') as Horizon
|
||||
const scenario = String(query.scenario ?? 'base') as Scenario
|
||||
const forecast = getMockForecast(sensor)
|
||||
const sensor = sensorParam(query.sensor)
|
||||
const horizon = enumParam<Horizon>(query.horizon, HORIZONS, 'horizon', '7d')
|
||||
const scenario = enumParam<Scenario>(query.scenario, SCENARIOS, 'scenario', 'base')
|
||||
|
||||
if (!forecast) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown sensor: ${sensor}` })
|
||||
}
|
||||
if (!HORIZONS.includes(horizon)) {
|
||||
throw createError({ statusCode: 400, statusMessage: `Invalid horizon: ${horizon}` })
|
||||
}
|
||||
if (!SCENARIOS.includes(scenario)) {
|
||||
throw createError({ statusCode: 400, statusMessage: `Invalid scenario: ${scenario}` })
|
||||
if (isMockMode()) {
|
||||
const forecast = getMockForecast(sensor)
|
||||
if (!forecast) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown sensor: ${sensor}` })
|
||||
}
|
||||
const points = applyScenario(forecast.points, scenario)
|
||||
const limit = horizon === '15m' ? 1 : horizon === '1h' ? 4 : horizon === '48h' ? 48 : points.length
|
||||
return {
|
||||
...forecast,
|
||||
horizon,
|
||||
scenario,
|
||||
points: points.slice(0, limit),
|
||||
cached: false,
|
||||
}
|
||||
}
|
||||
|
||||
const points = applyScenario(forecast.points, scenario)
|
||||
const limit = horizon === '15m' ? 1 : horizon === '1h' ? 4 : horizon === '48h' ? 48 : points.length
|
||||
|
||||
return {
|
||||
...forecast,
|
||||
horizon,
|
||||
scenario,
|
||||
points: points.slice(0, limit),
|
||||
// The mock is computed locally; it is not a cached fallback from the Go API.
|
||||
cached: false,
|
||||
}
|
||||
return apiRequest<ForecastResponse>('/api/forecast', {
|
||||
query: { sensor, horizon, scenario },
|
||||
})
|
||||
})
|
||||
@@ -1 +1,6 @@
|
||||
export default defineEventHandler(() => ({ ok: true }))
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
|
||||
export default defineEventHandler(async () => {
|
||||
if (isMockMode()) return { ok: true }
|
||||
return apiRequest<{ ok: boolean }>('/api/healthz')
|
||||
})
|
||||
@@ -1,3 +1,8 @@
|
||||
import type { MetaResponse } from '../../shared/types'
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
import { mockMeta } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler(() => mockMeta)
|
||||
export default defineEventHandler(async () => {
|
||||
if (isMockMode()) return mockMeta
|
||||
return apiRequest<MetaResponse>('/api/meta')
|
||||
})
|
||||
@@ -1 +1,6 @@
|
||||
export default defineEventHandler(() => ({ ok: true, data: true, model: true }))
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
|
||||
export default defineEventHandler(async () => {
|
||||
if (isMockMode()) return { ok: true, data: true, model: true }
|
||||
return apiRequest<{ ok: boolean; data: boolean; model: boolean }>('/api/readyz')
|
||||
})
|
||||
@@ -1,3 +1,8 @@
|
||||
import type { ScenarioState } from '../../shared/types'
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
import { mockScenario } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler(() => mockScenario)
|
||||
export default defineEventHandler(async () => {
|
||||
if (isMockMode()) return mockScenario
|
||||
return apiRequest<ScenarioState>('/api/scenario')
|
||||
})
|
||||
@@ -1,5 +1,6 @@
|
||||
import { SCENARIOS } from '../../shared/types'
|
||||
import type { Scenario, ScenarioDefinition } from '../../shared/types'
|
||||
import type { Scenario, ScenarioDefinition, ScenarioState } from '../../shared/types'
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
import { mockScenario } from '../utils/mock-data'
|
||||
|
||||
let version = mockScenario.version
|
||||
@@ -13,10 +14,21 @@ export default defineEventHandler(async (event) => {
|
||||
statusMessage: 'Invalid scenario. Expected base | sunny-saturday-market | rainy-saturday | weekday-event.',
|
||||
})
|
||||
}
|
||||
version += 1
|
||||
return {
|
||||
version,
|
||||
scenario: body,
|
||||
at: new Date().toISOString(),
|
||||
|
||||
if (isMockMode()) {
|
||||
version += 1
|
||||
return {
|
||||
version,
|
||||
scenario: body,
|
||||
at: new Date().toISOString(),
|
||||
}
|
||||
}
|
||||
|
||||
// Control credentials are attached in the server process, never in the
|
||||
// browser. Go returns 503 until CONTROL_USER/CONTROL_PASS are configured.
|
||||
return apiRequest<ScenarioState>('/api/scenario', {
|
||||
method: 'POST',
|
||||
body,
|
||||
control: true,
|
||||
})
|
||||
})
|
||||
@@ -1,3 +1,5 @@
|
||||
import { mockScenarios } from '../utils/mock-data'
|
||||
import { SCENARIO_PRESETS } from '../../shared/scenarios'
|
||||
|
||||
export default defineEventHandler(() => mockScenarios)
|
||||
// Scenario labels are UI metadata, not a Go endpoint. The forecast values and
|
||||
// the scenario enum come from the API.
|
||||
export default defineEventHandler(() => SCENARIO_PRESETS)
|
||||
@@ -1,3 +1,8 @@
|
||||
import type { Sensor } from '../../shared/types'
|
||||
import { apiRequest, isMockMode } from '../utils/api'
|
||||
import { mockSensors } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler(() => mockSensors)
|
||||
export default defineEventHandler(async () => {
|
||||
if (isMockMode()) return mockSensors
|
||||
return apiRequest<Sensor[]>('/api/sensors')
|
||||
})
|
||||
@@ -1,12 +1,29 @@
|
||||
import type { SeriesResponse } from '../../shared/types'
|
||||
import { apiRequest, enumParam, isMockMode, sensorParam } from '../utils/api'
|
||||
import { getMockSeries } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler((event) => {
|
||||
const STEPS = ['15m', '1h'] as const
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const query = getQuery(event)
|
||||
const sensor = String(query.sensor ?? 'hn-stadtgalerie-01')
|
||||
const series = getMockSeries(sensor)
|
||||
if (!series) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown sensor: ${sensor}` })
|
||||
const sensor = sensorParam(query.sensor)
|
||||
|
||||
if (isMockMode()) {
|
||||
const series = getMockSeries(sensor)
|
||||
if (!series) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown sensor: ${sensor}` })
|
||||
}
|
||||
const step = query.step === '15m' ? '15m' : '1h'
|
||||
return { ...series, step }
|
||||
}
|
||||
const step = query.step === '15m' ? '15m' : '1h'
|
||||
return { ...series, step }
|
||||
|
||||
const step = query.step ? enumParam(query.step, STEPS, 'step') : undefined
|
||||
return apiRequest<SeriesResponse>('/api/series', {
|
||||
query: {
|
||||
sensor,
|
||||
step,
|
||||
from: query.from,
|
||||
to: query.to,
|
||||
},
|
||||
})
|
||||
})
|
||||
+27
-26
@@ -1,37 +1,38 @@
|
||||
import { applyScenario, buildStaffing, planWeekStart } from '../../shared/staffing'
|
||||
import { planDrivers } from '../../shared/insights'
|
||||
import { SCENARIOS, STANDARDS } from '../../shared/types'
|
||||
import type { Scenario, Standard } from '../../shared/types'
|
||||
import type { Scenario, StaffingResponse, Standard } from '../../shared/types'
|
||||
import { apiRequest, enumParam, isMockMode, sensorParam } from '../utils/api'
|
||||
import { getMockForecast, mockContext, mockDemo } from '../utils/mock-data'
|
||||
|
||||
export default defineEventHandler((event) => {
|
||||
export default defineEventHandler(async (event) => {
|
||||
const query = getQuery(event)
|
||||
const sensor = String(query.sensor ?? 'hn-stadtgalerie-01')
|
||||
const scenario = String(query.scenario ?? 'base') as Scenario
|
||||
const standard = String(query.standard ?? 'standard') as Standard
|
||||
const forecast = getMockForecast(sensor)
|
||||
const sensor = sensorParam(query.sensor)
|
||||
const scenario = enumParam<Scenario>(query.scenario, SCENARIOS, 'scenario', 'base')
|
||||
const standard = enumParam<Standard>(query.standard, STANDARDS, 'standard', 'standard')
|
||||
|
||||
if (!forecast) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown sensor: ${sensor}` })
|
||||
}
|
||||
if (!SCENARIOS.includes(scenario)) {
|
||||
throw createError({ statusCode: 400, statusMessage: `Invalid scenario: ${scenario}` })
|
||||
}
|
||||
if (!STANDARDS.includes(standard)) {
|
||||
throw createError({ statusCode: 400, statusMessage: `Invalid standard: ${standard}` })
|
||||
if (isMockMode()) {
|
||||
const forecast = getMockForecast(sensor)
|
||||
if (!forecast) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown sensor: ${sensor}` })
|
||||
}
|
||||
const weekStart = planWeekStart(mockDemo.now)
|
||||
const build = buildStaffing({
|
||||
sensor,
|
||||
scenario,
|
||||
standard,
|
||||
points: applyScenario(forecast.points, scenario),
|
||||
weekStart,
|
||||
data_version: forecast.data_version,
|
||||
model_version: forecast.model_version,
|
||||
context_version: forecast.context_version,
|
||||
})
|
||||
build.response.why = planDrivers(build.response, mockContext, weekStart, scenario)
|
||||
return build.response
|
||||
}
|
||||
|
||||
const weekStart = planWeekStart(mockDemo.now)
|
||||
const build = buildStaffing({
|
||||
sensor,
|
||||
scenario,
|
||||
standard,
|
||||
points: applyScenario(forecast.points, scenario),
|
||||
weekStart,
|
||||
data_version: forecast.data_version,
|
||||
model_version: forecast.model_version,
|
||||
context_version: forecast.context_version,
|
||||
// The Go API owns the plan. The browser never computes staffing in this path.
|
||||
return apiRequest<StaffingResponse>('/api/staffing', {
|
||||
query: { sensor, scenario, standard },
|
||||
})
|
||||
build.response.why = planDrivers(build.response, mockContext, weekStart, scenario)
|
||||
return build.response
|
||||
})
|
||||
+46
-24
@@ -1,34 +1,56 @@
|
||||
import { apiForward, isMockMode } from '../utils/api'
|
||||
import { createMockTrainJob } from '../utils/train-jobs'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
let model: 'small' | 'forecast' = 'small'
|
||||
let filename: string | null = null
|
||||
if (isMockMode()) {
|
||||
let model: 'small' | 'forecast' = 'small'
|
||||
let filename: string | null = null
|
||||
|
||||
const contentType = getRequestHeader(event, 'content-type') ?? ''
|
||||
if (contentType.includes('multipart/form-data')) {
|
||||
const parts = await readMultipartFormData(event)
|
||||
for (const part of parts ?? []) {
|
||||
if (part.name === 'model' && part.data) {
|
||||
const value = part.data.toString()
|
||||
if (value === 'small' || value === 'forecast') model = value
|
||||
}
|
||||
if (part.name === 'file' && part.filename) {
|
||||
filename = part.filename
|
||||
const contentType = getRequestHeader(event, 'content-type') ?? ''
|
||||
if (contentType.includes('multipart/form-data')) {
|
||||
const parts = await readMultipartFormData(event)
|
||||
for (const part of parts ?? []) {
|
||||
if (part.name === 'model' && part.data) {
|
||||
const value = part.data.toString()
|
||||
if (value === 'small' || value === 'forecast') model = value
|
||||
}
|
||||
if (part.name === 'file' && part.filename) {
|
||||
filename = part.filename
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const body = await readBody<{ model?: 'small' | 'forecast'; path?: string }>(event).catch(() => null)
|
||||
if (body?.model === 'small' || body?.model === 'forecast') model = body.model
|
||||
if (body?.path) filename = body.path
|
||||
}
|
||||
|
||||
const job = createMockTrainJob(model, filename)
|
||||
setResponseStatus(event, 202)
|
||||
return {
|
||||
job_id: job.job_id,
|
||||
status: job.status,
|
||||
model: job.model,
|
||||
submitted_at: job.started_at,
|
||||
mock: true,
|
||||
}
|
||||
} else {
|
||||
const body = await readBody<{ model?: 'small' | 'forecast'; path?: string }>(event).catch(() => null)
|
||||
if (body?.model === 'small' || body?.model === 'forecast') model = body.model
|
||||
if (body?.path) filename = body.path
|
||||
}
|
||||
|
||||
const job = createMockTrainJob(model, filename)
|
||||
setResponseStatus(event, 202)
|
||||
return {
|
||||
job_id: job.job_id,
|
||||
status: job.status,
|
||||
model: job.model,
|
||||
submitted_at: job.started_at,
|
||||
mock: true,
|
||||
// Stream the multipart CSV to Go unchanged. The control credentials are
|
||||
// attached by the Nitro process and never reach the browser bundle.
|
||||
const contentType = getRequestHeader(event, 'content-type') ?? ''
|
||||
if (!contentType) {
|
||||
throw createError({
|
||||
statusCode: 400,
|
||||
statusMessage: 'Content-Type must be application/json or multipart/form-data',
|
||||
})
|
||||
}
|
||||
|
||||
const body = await readRawBody(event)
|
||||
return apiForward(event, '/api/train', {
|
||||
method: 'POST',
|
||||
body,
|
||||
headers: { 'content-type': contentType },
|
||||
control: true,
|
||||
timeoutMs: 60_000,
|
||||
})
|
||||
})
|
||||
@@ -1,10 +1,19 @@
|
||||
import { apiRequest, isMockMode } from '../../utils/api'
|
||||
import { getMockTrainJob } from '../../utils/train-jobs'
|
||||
|
||||
export default defineEventHandler((event) => {
|
||||
export default defineEventHandler(async (event) => {
|
||||
const jobId = getRouterParam(event, 'jobId')
|
||||
const job = jobId ? getMockTrainJob(jobId) : undefined
|
||||
if (!job) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown training job: ${jobId}` })
|
||||
if (!jobId) {
|
||||
throw createError({ statusCode: 400, statusMessage: 'jobId is required' })
|
||||
}
|
||||
return job
|
||||
|
||||
if (isMockMode()) {
|
||||
const job = getMockTrainJob(jobId)
|
||||
if (!job) {
|
||||
throw createError({ statusCode: 404, statusMessage: `Unknown training job: ${jobId}` })
|
||||
}
|
||||
return job
|
||||
}
|
||||
|
||||
return apiRequest(`/api/train/${encodeURIComponent(jobId)}`, { control: true })
|
||||
})
|
||||
Reference in new issue
Block a user