Skip to content

Poster: Allow for reward per task #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeisses wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Poster: Allow for reward per task #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 38 additions & 15 deletions apps/task-poster/src/fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ export const fetcherForm = async (
dsId: number, values: FormValues, msg = "", f: Fetcher | undefined = undefined) => `
<div id="page">
<form hx-post="/d/${dsId}/${f?.index ? `f/${f.index}/edit` : "fetcher-create"}">
<div id="messages">
${msg ? `<p id="messages"><blockquote>${msg}</blockquote></p>` : ""}
</div>
<fieldset>
<legend>step info</legend>
<label for="name"><strong>Name</strong></label>
Expand Down Expand Up @@ -185,15 +188,21 @@ export const fetcherForm = async (
)}
</select>

<label for="price"><strong>Price per task</strong></label>
<div class="mt"></div>
<label for="price"><strong>Price per task</strong><br/>
<small>Default price per task. Can be overwritten in the task data with
the "dataffect/price" property. To avoid mistakes, task property price is capped
at 10x the default price. <strong>Important:</strong> both values are in
"lamports", so for 1 EFFECT enter 1000000.</small></label></label>
<input
placeholder="$EFFECT"
type="number"
id="price" ${addVal(values, "price")}
name="price"/>

<div class="mt"></div>
<label for="capabilities"><strong>Capabilities</strong><br/>
<small>Comme separated list of capabilities required for tasks (note: only 1 capability is used at the moment).</small></label>
<small>Comma separated list of capabilities required for tasks (note: only 1 capability is used at the moment).</small></label>
<input
placeholder="effectai/common-voice-validator:1.0.0, effectai/admin:1.0.0"
id="capabilities" ${addVal(values, "capabilities")}
Expand Down Expand Up @@ -445,26 +454,35 @@ export const getTasks = async (fetcher: Fetcher, csv: string) => {
break;
}

// we cap the maximum price of a task to 10* the default price, to
// avoid expensive mistakes.
const maxPrice = BigInt(fetcher.price) * BigInt(10);

const tasks = data.map(
(d, _idx) =>
({
(d, _idx) => {
const rawPrice = d["dataffect/reward"] ?
BigInt(d["dataffect/reward"] as string) : BigInt(fetcher.price);
const price = rawPrice > maxPrice ? maxPrice : rawPrice;

return {
id: ulid(),
title: fetcher.name,
reward: BigInt(fetcher.price * 1000000),
reward: price,
timeLimitSeconds: 600,
templateId: fetcher.template,
templateData: JSON.stringify(d),
capability: fetcher.capabilities[0],
}) as Task,
} as Task;
},
);

return tasks;
};

export const getPendingTasks = async (f: Fetcher) => {
export const getPendingTasks = async (f: Fetcher, queueName: string = "queue") => {

const tasks = await db.listAll<boolean>(
["fetcher", f.datasetId, f.index, "queue", {}], f.batchSize, false
["fetcher", f.datasetId, f.index, queueName, {}], f.batchSize, false
);

return tasks.map(t => t.key[4]);
Expand Down Expand Up @@ -642,15 +660,19 @@ export const importTasks = async (f: Fetcher) => {
await delay(400);

const task = await db.get<Task>(["task", taskId]);
if (!task) {
console.error(`Queued task not found in db ${taskId}, skipping.`);
continue;
}

try {
// TODO: actualize some of the data from the fetcher (like prize
// and templateId. these should probably not be stored to begin
// with, to avoid confusion.
// actualize some of the data from the fetcher (like the
// templateId). these should probably not be stored in the task
// to begin with, to avoid confusion.
const serializedTask = {
...task!.data,
// convert bigint to string for serialization
reward: BigInt(f.price * 1000000).toString(),
reward: task!.data.reward.toString(),
templateId: f.template,
};

Expand Down Expand Up @@ -782,7 +804,7 @@ const formValidations: ValidationMap = {
? "Must be a number"
: num <= 0
? "Price must be greater than 0"
: num > 100 && "Price too large";
: num > 100000000 && "Price too large";
},

template: (v: string) => (!v || v.length === 0) && "Template is required",
Expand Down Expand Up @@ -837,7 +859,7 @@ export const addFetcherRoutes = (app: Express): void => {
} else {
msg = '<h4 style="margin-top: 0;">Could not create dataset:</h4>' + msg;
console.log(`Invalid form submission ${msg}`);
res.send(await fetcherForm(id, req.body, msg));
res.send(await fetcherForm(id, req.body, msg, f));
}
});

Expand Down Expand Up @@ -1168,7 +1190,8 @@ ${Object.entries(peers)
id="templateFrame"
height="450px"
width="100%"
srcdoc="${escapeHTML(renderedTemplate)}"></iframe>`));
srcdoc="${escapeHTML(renderedTemplate)}"></iframe>
<pre>${JSON.stringify(task, (_, v) => typeof v === 'bigint' ? v.toString() : v)}</pre>`));
});

app.get("/d/:id/pipeline-preview", async (req, res) => {
Expand Down