Software/platform
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Finish basic setup for configuration loading

Browse Source
This commit is contained in:
Dominic Ferrando
2026-07-04 19:05:38 -04:00
parent a888d24bfd
commit 338a40d947
11 changed files with 5724 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/database/seed.ts
+5 -5
View File
@@ -1,5 +1,5 @@
import {
DEFAULT_STANDARDS_CONFIG,
FALLBACK_STANDARDS_CONFIG,
StandardsDataSchema,
StandardsParamsSchema,
} from "@blade-and-brawn/calculator";
@@ -19,9 +19,9 @@ async function seedStandardsDataset(): Promise<string> {
return existing.id;
}
Value.Assert(StandardsDataSchema, DEFAULT_STANDARDS_CONFIG.data);
Value.Assert(StandardsDataSchema, FALLBACK_STANDARDS_CONFIG.data);
const result = await db.insertInto("standards_datasets")
.values({ name: DEFAULT_NAME, data: DEFAULT_STANDARDS_CONFIG.data })
.values({ name: DEFAULT_NAME, data: FALLBACK_STANDARDS_CONFIG.data })
.returning("id")
.executeTakeFirstOrThrow();
log.info({ id: result.id }, "seeded default standards dataset");
@@ -43,12 +43,12 @@ async function seedStandardsConfig(datasetId: string): Promise<void> {
.where("is_selected", "=", true)
.executeTakeFirst();
Value.Assert(StandardsParamsSchema, DEFAULT_STANDARDS_CONFIG.params);
Value.Assert(StandardsParamsSchema, FALLBACK_STANDARDS_CONFIG.params);
const result = await db.insertInto("standards_configs")
.values({
name: DEFAULT_NAME,
dataset_id: datasetId,
params: DEFAULT_STANDARDS_CONFIG.params,
params: FALLBACK_STANDARDS_CONFIG.params,
is_selected: !hasSelected,
})
.returning("id")
apps/api/src/scripts/analyze.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import {
type Levels,
DEFAULT_STANDARDS_CONFIG,
FALLBACK_STANDARDS_CONFIG,
} from "@blade-and-brawn/calculator";
import { Activity, clamp, Gender, range } from "@blade-and-brawn/domain";
import { levenbergMarquardt as LM } from "ml-levenberg-marquardt";
@@ -15,7 +15,7 @@ for (const activity of Object.values(Activity)) {
}
for (const gender of Object.values(Gender)) {
const standardsByGender = DEFAULT_STANDARDS_CONFIG.data[
const standardsByGender = FALLBACK_STANDARDS_CONFIG.data[
activity
].standards.filter((s) => s["metrics"].gender === gender);
const ages = [...new Set(standardsByGender.map((s) => s.metrics.age))];
apps/api/src/server.ts
+1 -1
View File
@@ -104,7 +104,7 @@ export const app = new Elysia()
(app) => app
// Non-authenticated
.post("/calculate", async ({ body }) => {
return { levels: s.Calculator.calculate(body.player, body.activityPerformances) };
return { levels: await s.Calculator.calculate(body.player, body.activityPerformances) };
}, {
body: t.Object({
player: PlayerSchema,
apps/api/src/services/calculator.ts
+15 -4
View File
@@ -1,14 +1,25 @@
import { LevelCalculator, Standards, DEFAULT_STANDARDS_CONFIG, type StandardsParams, StandardsParamsSchema, StandardsDataSchema, type StandardsConfig } from "@blade-and-brawn/calculator";
import { LevelCalculator, Standards, FALLBACK_STANDARDS_CONFIG, type StandardsParams, StandardsParamsSchema, StandardsDataSchema, type StandardsConfig } from "@blade-and-brawn/calculator";
import type { ActivityPerformance, Player } from "@blade-and-brawn/domain";
import { db } from "../database/db";
import { Value } from "@sinclair/typebox/value";
import { log } from "../util";
export class CalculatorService {
private Calculator = new LevelCalculator(new Standards(DEFAULT_STANDARDS_CONFIG));
private Calculator = new LevelCalculator(new Standards(FALLBACK_STANDARDS_CONFIG));
Standards: StandardsService = new StandardsService(this.Calculator);
private ready: Promise<void>;
calculate(player: Player, activityPerformances: ActivityPerformance[]) {
constructor() {
// Load the selected config on startup instead of waiting for the
// first `calculate()` call. If it fails (e.g. no config selected
// yet, DB unreachable at boot), fall back to DEFAULT_STANDARDS_CONFIG
// and keep serving — it'll retry on the next refresh.
this.ready = this.Standards.Config.refresh()
.catch((err) => log.error({ err }, "failed to load initial standards config, falling back to defaults"));
}
async calculate(player: Player, activityPerformances: ActivityPerformance[]) {
await this.ready;
this.Standards.Config.refresh({ onlyIfStale: true }).catch((err) => log.error({ err }, "failed to refresh standards config"));
return this.Calculator.calculate(player, activityPerformances);
}
@@ -92,7 +103,7 @@ class StandardsConfigService {
.set({ is_selected: true })
.where("id", "=", id)
.execute();
if (result[0]?.numUpdatedRows === 0n) throw new Error(`No config with id "${id}"`);
if (result[0]?.numUpdatedRows === 0n) throw new Error(`No standards config with id "${id}"`);
});
}
}
apps/portal/src/lib/components/StandardsTable.svelte
+5 -5
View File
@@ -2,7 +2,7 @@
import {
Standards,
type Standard,
type StandardsParams,
type StandardsConfig,
} from "@blade-and-brawn/calculator";
import {
Activity,
@@ -17,7 +17,7 @@
selected: {
activity: Activity;
metrics: Metrics;
params: StandardsParams;
standardsConfig: StandardsConfig;
};
}
@@ -52,7 +52,7 @@
<div>
<div class="flex items-center">
<p class="text-xs label">
{#if selected.params.activity[selected.activity].enableGeneration && allStandards
{#if selected.standardsConfig.params.activity[selected.activity].enableGeneration && allStandards
.byActivity(selected.activity)
.getMetadata().generators.length}
(Generated data: {allStandards
@@ -87,7 +87,7 @@
? parseFloat(kgToLb(standard.metrics.weight).toFixed(2))
: "None"}</th
>
{#each range(selected.params.global.maxLevel).map((i) => ++i) as lvl}
{#each range(selected.standardsConfig.params.global.maxLevel).map((i) => ++i) as lvl}
<td>{getLvlValue(activity, standard, lvl)}</td>
{/each}
</tr>
@@ -99,7 +99,7 @@
<thead>
<tr>
<th>Body weight</th>
{#each range(selected.params.global.maxLevel).map((i) => ++i) as lvl}
{#each range(selected.standardsConfig.params.global.maxLevel).map((i) => ++i) as lvl}
<td>{lvl}</td>
{/each}
</tr>
apps/portal/src/routes/(app)/calculator/+page.svelte
+93 -47
View File
@@ -1,8 +1,8 @@
<script lang="ts">
import {
DEFAULT_STANDARDS_CONFIG,
Standards,
type StandardsParams,
StandardsConfigSchema,
type StandardsConfig,
} from "@blade-and-brawn/calculator";
import {
Activity,
@@ -12,6 +12,9 @@
} from "@blade-and-brawn/domain";
import StandardsTable from "$lib/components/StandardsTable.svelte";
import PlayersTable from "$lib/components/PlayersTable.svelte";
import { api } from "$lib/api";
import { Value } from "@sinclair/typebox/value";
import { onMount } from "svelte";
let activeTab = $state("standards");
@@ -22,9 +25,7 @@
age: null as number | null,
weight: null as number | null, // lb
},
params: structuredClone(
DEFAULT_STANDARDS_CONFIG.params,
) as StandardsParams,
standardsConfig: null as StandardsConfig | null,
});
const selected = $derived({
@@ -34,32 +35,61 @@
age: input.metrics.age ?? 0,
weight: lbToKg(input.metrics.weight ?? 0),
} as Metrics,
params: input.params,
standardsConfig: input.standardsConfig,
});
const allStandards = $derived(
new Standards({
data: DEFAULT_STANDARDS_CONFIG.data,
params: selected.params,
}),
selected.standardsConfig
? new Standards($state.snapshot(selected.standardsConfig))
: null,
);
$effect(() => {
const savedParameters = localStorage.getItem("parameters");
if (!savedParameters) return;
let standardsConfigLoadError = $state<string | null>(null);
const parsed = JSON.parse(savedParameters);
if (parsed?.params) input = parsed;
onMount(async () => {
try {
const savedInputStringified = localStorage.getItem("input");
if (savedInputStringified) {
input = JSON.parse(savedInputStringified);
} else {
const res = await api.calculator.config.get();
if (res.error) throw res.error;
Value.Assert(StandardsConfigSchema, res.data);
input.standardsConfig = res.data;
}
} catch (err) {
console.error("failed to load standards config", err);
const value = (err as { value?: { error?: string } })?.value;
standardsConfigLoadError =
value?.error ??
(err instanceof Error ? err.message : "Unknown error");
}
});
$effect(() => {
localStorage.setItem("parameters", JSON.stringify(input));
localStorage.setItem("input", JSON.stringify(input));
});
</script>
<section class="w-full flex justify-between gap-2 pt-10 items-center">
{#if !(input.standardsConfig && allStandards)}
<div class="w-full flex justify-center pt-10">
{#if standardsConfigLoadError}
<div role="alert" class="alert alert-error max-w-lg">
<span>
Failed to load the standards configuration: {standardsConfigLoadError}
</span>
</div>
{:else}
<span class="loading loading-spinner loading-lg"></span>
{/if}
</div>
{:else}
{@const standardsConfig = input.standardsConfig}
<section class="w-full flex justify-between gap-2 pt-10 items-center">
<fieldset class="fieldset bg-base-200 p-6 max-w-lg">
<legend class="fieldset-legend text-lg font-semibold"> Data </legend>
<legend class="fieldset-legend text-lg font-semibold">
Data
</legend>
<div class="flex gap-4">
<fieldset class="fieldset bg-base-300 p-3 max-w-xl">
@@ -92,7 +122,9 @@
min="1"
max="100"
placeholder="5"
bind:value={input.params.global.maxLevel}
bind:value={
standardsConfig.params.global.maxLevel
}
/>
</label>
</div>
@@ -108,8 +140,9 @@
<input
type="checkbox"
bind:checked={
input.params.activity[selected.activity]
.enableGeneration
standardsConfig.params.activity[
selected.activity
].enableGeneration
}
class="toggle toggle-lg m-auto"
/>
@@ -124,10 +157,11 @@
step=".05"
placeholder=".1"
bind:value={
input.params.activity[selected.activity]
.weightModifier
standardsConfig.params.activity[
selected.activity
].weightModifier
}
disabled={!selected.params.activity[
disabled={!standardsConfig.params.activity[
selected.activity
].enableGeneration}
/>
@@ -157,10 +191,11 @@
max="1"
step=".05"
bind:value={
input.params.activity[selected.activity]
.difficultyModifier
standardsConfig.params.activity[
selected.activity
].difficultyModifier
}
disabled={!selected.params.activity[
disabled={!standardsConfig.params.activity[
selected.activity
].enableGeneration}
/>
@@ -174,10 +209,11 @@
max="1"
step=".05"
bind:value={
input.params.activity[selected.activity]
.ageModifier
standardsConfig.params.activity[
selected.activity
].ageModifier
}
disabled={!selected.params.activity[
disabled={!standardsConfig.params.activity[
selected.activity
].enableGeneration}
/>
@@ -191,16 +227,20 @@
max="100"
step="1"
bind:value={
input.params.activity[selected.activity].peakAge
standardsConfig.params.activity[
selected.activity
].peakAge
}
disabled={!selected.params.activity[
disabled={!standardsConfig.params.activity[
selected.activity
].enableGeneration}
/>
</label>
<fieldset class="fieldset bg-base-200 p-3 max-w-xl">
<legend class="fieldset-legend text-sm font-semibold">
<legend
class="fieldset-legend text-sm font-semibold"
>
Stretch
</legend>
<label>
@@ -212,10 +252,11 @@
max="10"
step="1"
bind:value={
input.params.activity[selected.activity]
.stretch.lower
standardsConfig.params.activity[
selected.activity
].stretch.lower
}
disabled={!selected.params.activity[
disabled={!standardsConfig.params.activity[
selected.activity
].enableGeneration}
/>
@@ -229,10 +270,11 @@
max="10"
step="1"
bind:value={
input.params.activity[selected.activity]
.stretch.upper
standardsConfig.params.activity[
selected.activity
].stretch.upper
}
disabled={!selected.params.activity[
disabled={!standardsConfig.params.activity[
selected.activity
].enableGeneration}
/>
@@ -288,11 +330,11 @@
</div>
</fieldset>
{/if}
</section>
</section>
<div class="divider"></div>
<div class="divider"></div>
<div role="tablist" class="tabs tabs-border">
<div role="tablist" class="tabs tabs-border">
<button
role="tab"
class="tab"
@@ -310,12 +352,16 @@
>
Players
</button>
</div>
</div>
{#if activeTab === "standards"}
<StandardsTable {selected} {allStandards} />
{/if}
{#if activeTab === "standards"}
<StandardsTable
selected={{ ...selected, standardsConfig }}
{allStandards}
/>
{/if}
{#if activeTab === "players"}
{#if activeTab === "players"}
<PlayersTable {allStandards} />
{/if}
{/if}
packages/calculator/src/data/standards/default-data.json → misc/backup/standards/data.json
View File
packages/calculator/src/data/standards/default-params.json → misc/backup/standards/params.json
View File
packages/calculator/src/data/standards/fallback-data.json
+5316
View File
File diff suppressed because it is too large Load Diff
packages/calculator/src/data/standards/fallback-params.json
+79
View File
@@ -0,0 +1,79 @@
{
"global": {
"maxLevel": 100
},
"activity": {
"BackSquat": {
"enableGeneration": true,
"weightModifier": 0,
"weightSkew": 0,
"ageModifier": 0,
"difficultyModifier": 0.3,
"peakAge": 0,
"stretch": {
"upper": 0,
"lower": 1
}
},
"BenchPress": {
"enableGeneration": true,
"weightModifier": 0,
"weightSkew": 0,
"ageModifier": 0,
"difficultyModifier": 0.05,
"peakAge": 0,
"stretch": {
"upper": 1,
"lower": 0
}
},
"Deadlift": {
"enableGeneration": true,
"weightModifier": 0,
"weightSkew": 0,
"ageModifier": 0,
"difficultyModifier": -0.05,
"peakAge": 0,
"stretch": {
"upper": 1,
"lower": 0
}
},
"Run": {
"enableGeneration": true,
"weightModifier": 0.1,
"weightSkew": 0,
"ageModifier": 0,
"difficultyModifier": 0.35,
"peakAge": 0,
"stretch": {
"upper": 1,
"lower": 1
}
},
"BroadJump": {
"enableGeneration": true,
"weightModifier": -0.1,
"weightSkew": 0,
"ageModifier": -0.25,
"difficultyModifier": -0.15,
"peakAge": 23,
"stretch": {
"upper": 3,
"lower": 1
}
},
"ConeDrill": {
"enableGeneration": true,
"weightModifier": -0.1,
"weightSkew": 0,
"ageModifier": -0.25,
"difficultyModifier": 0.15,
"peakAge": 23,
"stretch": {
"upper": 0,
"lower": 2
}
}
}
}
packages/calculator/src/index.ts
+3 -3
View File
@@ -10,8 +10,8 @@ import {
type Player,
} from "@blade-and-brawn/domain";
import { levenbergMarquardt as LM } from "ml-levenberg-marquardt";
import defaultStandardsParamsJson from "./data/standards/default-params.json" with { type: "json" };
import defaultStandardsDataJson from "./data/standards/default-data.json" with { type: "json" };
import defaultStandardsParamsJson from "./data/standards/fallback-params.json" with { type: "json" };
import defaultStandardsDataJson from "./data/standards/fallback-data.json" with { type: "json" };
import { getAvgWeight } from "./avg-weights";
import { StandardsDataSchema, StandardsParamsSchema, type LevelCalculatorOutput, type Levels, type NumberMetric, type Standard, type StandardsConfig, type StandardsData } from "./models";
import { Value } from "@sinclair/typebox/value";
@@ -36,7 +36,7 @@ const metricPriority = (m: NumberMetric) => {
Value.Assert(StandardsDataSchema, defaultStandardsDataJson);
Value.Assert(StandardsParamsSchema, defaultStandardsParamsJson);
export const DEFAULT_STANDARDS_CONFIG: StandardsConfig = {
export const FALLBACK_STANDARDS_CONFIG: StandardsConfig = {
data: defaultStandardsDataJson,
params: defaultStandardsParamsJson
};