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

More models organization

Browse Source
This commit is contained in:
Dominic Ferrando
2026-07-04 15:57:20 -04:00
parent a7b8dd0bea
commit 28c5b3df18
9 changed files with 148 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/database/migrations/2026-06-03.ts
+1 -1
View File
@@ -38,7 +38,7 @@ export async function up(db: Kysely<any>): Promise<void> {
await db.schema.createTable("standards_configs")
.$call(addDefaultColumns)
.addColumn("name", "text", (cb) => cb.notNull().defaultTo(""))
.addColumn("parameters", "jsonb", (cb) => cb.notNull())
.addColumn("params", "jsonb", (cb) => cb.notNull())
.addColumn("is_selected", "boolean", (cb) => cb.notNull().defaultTo(false))
.addColumn("dataset_id", "bigint", (cb) => cb.notNull())
.addForeignKeyConstraint(
apps/api/src/scripts/analyze.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import {
type Levels,
DEFAULT_STANDARDS_DATASET,
DEFAULT_STANDARDS_DATA,
} 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_DATASET[
const standardsByGender = DEFAULT_STANDARDS_DATA[
activity
].standards.filter((s) => s["metrics"].gender === gender);
const ages = [...new Set(standardsByGender.map((s) => s.metrics.age))];
apps/api/src/server.ts
+6 -6
View File
@@ -18,7 +18,7 @@ import { CommerceService } from "./services/commerce";
import cluster from "node:cluster";
import { randomUUIDv7 } from "bun";
import { CalculatorService } from "./services/calculator";
import { StandardsParametersSchema } from "@blade-and-brawn/calculator";
import { StandardsParamsSchema } from "@blade-and-brawn/calculator";
// SERVICES
// -----------
@@ -117,16 +117,16 @@ export const app = new Elysia()
if (!token || !token.sessionId) throw status(401, "Unauthorized");
return { sessionId: token.sessionId.toString() };
})
.put("/config/:id", async ({ params: { id }, body: { datasetId, parameters } }) => {
.put("/config/:id", async ({ params: { id }, body: { datasetId, params: parameters } }) => {
await s.Calculator.Standards.Config.update(id, datasetId, parameters);
}, {
params: t.Object({ id: t.String() }),
body: t.Object({ datasetId: t.String(), parameters: StandardsParametersSchema })
body: t.Object({ datasetId: t.String(), params: StandardsParamsSchema })
})
.post("/config", async ({ body: { datasetId, parameters } }) => {
await s.Calculator.Standards.Config.create(datasetId, parameters);
.post("/config", async ({ body: { datasetId, params } }) => {
await s.Calculator.Standards.Config.create(datasetId, params);
}, {
body: t.Object({ datasetId: t.String(), parameters: StandardsParametersSchema })
body: t.Object({ datasetId: t.String(), params: StandardsParamsSchema })
})
.post("/config/:id/switch", async ({ params: { id } }) => {
await s.Calculator.Standards.Config.switch(id);
apps/api/src/services/calculator.ts
+13 -13
View File
@@ -1,11 +1,11 @@
import { LevelCalculator, Standards, DEFAULT_STANDARDS_DATASET, type StandardsParameters, StandardsParametersSchema, StandardsDatasetSchema } from "@blade-and-brawn/calculator";
import { LevelCalculator, Standards, DEFAULT_STANDARDS_DATA, type StandardsParams, StandardsParamsSchema, StandardsDataSchema } 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_DATASET));
private Calculator = new LevelCalculator(new Standards(DEFAULT_STANDARDS_DATA));
Standards: StandardsService = new StandardsService(this.Calculator);
calculate(player: Player, activityPerformances: ActivityPerformance[]) {
@@ -30,23 +30,23 @@ class StandardsConfigService {
constructor(private Calculator: LevelCalculator) { }
async create(datasetId: string, parameters: StandardsParameters) {
async create(datasetId: string, params: StandardsParams) {
await db.insertInto("standards_configs")
.values({ parameters, dataset_id: datasetId })
.values({ params, dataset_id: datasetId })
.execute();
}
/** Retrieves the currently selected configuration */
async get(opt: { skipCache?: boolean } = {}): Promise<StandardsParameters> {
async get(opt: { skipCache?: boolean } = {}): Promise<StandardsParams> {
if (!opt.skipCache) return this.Calculator.Standards.params;
await this.refresh();
return this.Calculator.Standards.params;
}
async update(id: string, datasetId: string, parameters: StandardsParameters) {
async update(id: string, datasetId: string, params: StandardsParams) {
const result = await db.updateTable("standards_configs")
.set({ parameters, dataset_id: datasetId })
.set({ params, dataset_id: datasetId })
.where("id", "=", id)
.execute();
if (result[0]?.numUpdatedRows === 0n) throw new Error(`No config with id "${id}"`);
@@ -62,19 +62,19 @@ class StandardsConfigService {
.innerJoin("standards_datasets", "standards_datasets.id", "standards_configs.dataset_id")
.select([
"standards_configs.dataset_id as datasetId",
"standards_configs.parameters as parameters",
"standards_datasets.data as dataset",
"standards_configs.params as params",
"standards_datasets.data as data",
])
.where("standards_configs.is_selected", "=", true)
.limit(1)
.executeTakeFirstOrThrow({ errorConstructor: () => new Error("No standards config selected") });
Value.Assert(StandardsParametersSchema, config.parameters);
Value.Assert(StandardsDatasetSchema, config.dataset);
Value.Assert(StandardsParamsSchema, config.params);
Value.Assert(StandardsDataSchema, config.data);
const parametersStringified = JSON.stringify(config.parameters);
const parametersStringified = JSON.stringify(config.params);
if (parametersStringified === this.cachedParametersStringified && config.datasetId === this.cachedDatasetId) return;
this.Calculator.Standards = new Standards(config.dataset, config.parameters);
this.Calculator.Standards = new Standards(config.data, config.params);
this.cachedParametersStringified = parametersStringified;
this.cachedDatasetId = config.datasetId;
}
apps/portal/src/lib/components/StandardsTable.svelte
+2 -2
View File
@@ -2,7 +2,7 @@
import {
Standards,
type Standard,
type StandardsParameters,
type StandardsParams,
} from "@blade-and-brawn/calculator";
import {
Activity,
@@ -17,7 +17,7 @@
selected: {
activity: Activity;
metrics: Metrics;
params: StandardsParameters;
params: StandardsParams;
};
}
apps/portal/src/routes/(app)/calculator/+page.svelte
+17 -13
View File
@@ -1,8 +1,8 @@
<script lang="ts">
import {
DEFAULT_STANDARDS_DATASET,
DEFAULT_STANDARDS_DATA,
Standards,
type StandardsParameters,
type StandardsParams,
} from "@blade-and-brawn/calculator";
import {
Activity,
@@ -15,7 +15,7 @@
let activeTab = $state("standards");
const defaultStandards = new Standards(DEFAULT_STANDARDS_DATASET);
const defaultStandards = new Standards(DEFAULT_STANDARDS_DATA);
let input = $state({
activity: Activity.BenchPress,
@@ -24,7 +24,7 @@
age: null as number | null,
weight: null as number | null, // lb
},
params: structuredClone(defaultStandards.params) as StandardsParameters,
params: structuredClone(defaultStandards.params) as StandardsParams,
});
const selected = $derived({
@@ -38,7 +38,7 @@
});
const allStandards = $derived(
new Standards(DEFAULT_STANDARDS_DATASET, selected.params),
new Standards(DEFAULT_STANDARDS_DATA, selected.params),
);
$effect(() => {
@@ -124,8 +124,9 @@
input.params.activity[selected.activity]
.weightModifier
}
disabled={!selected.params.activity[selected.activity]
.enableGeneration}
disabled={!selected.params.activity[
selected.activity
].enableGeneration}
/>
</label>
<!-- <label> -->
@@ -156,8 +157,9 @@
input.params.activity[selected.activity]
.difficultyModifier
}
disabled={!selected.params.activity[selected.activity]
.enableGeneration}
disabled={!selected.params.activity[
selected.activity
].enableGeneration}
/>
</label>
<label>
@@ -172,8 +174,9 @@
input.params.activity[selected.activity]
.ageModifier
}
disabled={!selected.params.activity[selected.activity]
.enableGeneration}
disabled={!selected.params.activity[
selected.activity
].enableGeneration}
/>
</label>
<label>
@@ -187,8 +190,9 @@
bind:value={
input.params.activity[selected.activity].peakAge
}
disabled={!selected.params.activity[selected.activity]
.enableGeneration}
disabled={!selected.params.activity[
selected.activity
].enableGeneration}
/>
</label>