x
This commit is contained in:
@@ -2,7 +2,7 @@ services:
|
||||
webui:
|
||||
image: minimax
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "4000:3000"
|
||||
volumes:
|
||||
- ./data:/app/data
|
||||
env_file:
|
||||
|
||||
@@ -80,7 +80,6 @@ pub struct RhaiAgent<R: Rng + 'static> {
|
||||
|
||||
engine: Engine,
|
||||
script: AST,
|
||||
scope: Scope<'static>,
|
||||
print_callback: Arc<dyn Fn(&str) + 'static>,
|
||||
}
|
||||
|
||||
@@ -118,7 +117,6 @@ impl<R: Rng + 'static> RhaiAgent<R> {
|
||||
|
||||
// Do not use FULL, rand_* functions are not pure
|
||||
engine.set_optimization_level(OptimizationLevel::Simple);
|
||||
|
||||
engine.disable_symbol("eval");
|
||||
engine.set_max_expr_depths(100, 100);
|
||||
engine.set_max_strings_interned(1024);
|
||||
@@ -201,13 +199,11 @@ impl<R: Rng + 'static> RhaiAgent<R> {
|
||||
};
|
||||
|
||||
let script = engine.compile(script)?;
|
||||
let scope = Scope::new(); // Not used
|
||||
|
||||
Ok(Self {
|
||||
rng,
|
||||
engine,
|
||||
script,
|
||||
scope,
|
||||
print_callback,
|
||||
})
|
||||
}
|
||||
@@ -227,7 +223,7 @@ impl<R: Rng + 'static> Agent for RhaiAgent<R> {
|
||||
fn step_min(&mut self, board: &Board) -> Result<PlayerAction, Self::ErrorType> {
|
||||
let res = self.engine.call_fn_with_options::<PlayerAction>(
|
||||
CallFnOptions::new().eval_ast(false),
|
||||
&mut self.scope,
|
||||
&mut Scope::new(),
|
||||
&self.script,
|
||||
"step_min",
|
||||
(board.clone(),),
|
||||
@@ -242,7 +238,7 @@ impl<R: Rng + 'static> Agent for RhaiAgent<R> {
|
||||
fn step_max(&mut self, board: &Board) -> Result<PlayerAction, Self::ErrorType> {
|
||||
let res = self.engine.call_fn_with_options::<PlayerAction>(
|
||||
CallFnOptions::new().eval_ast(false),
|
||||
&mut self.scope,
|
||||
&mut Scope::new(),
|
||||
&self.script,
|
||||
"step_max",
|
||||
(board.clone(),),
|
||||
|
||||
@@ -28,7 +28,6 @@ export async function GET(request: NextRequest) {
|
||||
const filename = `${name}.rhai`;
|
||||
const filepath = join(saveDir, filename);
|
||||
|
||||
// Check if file exists
|
||||
if (!existsSync(filepath)) {
|
||||
return NextResponse.json(
|
||||
{ error: `Script "${name}" not found` },
|
||||
@@ -36,7 +35,6 @@ export async function GET(request: NextRequest) {
|
||||
);
|
||||
}
|
||||
|
||||
// Read and return file content
|
||||
const content = await readFile(filepath, "utf8");
|
||||
|
||||
return NextResponse.json({
|
||||
|
||||
@@ -1,31 +1,41 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { readdir } from "fs/promises";
|
||||
import { join } from "path";
|
||||
import { existsSync } from "fs";
|
||||
import { SAVE_CONFIG } from "@/lib/saveConfig";
|
||||
|
||||
export async function GET() {
|
||||
const headers = {
|
||||
"Cache-Control": "no-store, no-cache, must-revalidate, proxy-revalidate",
|
||||
Pragma: "no-cache",
|
||||
Expires: "0",
|
||||
};
|
||||
|
||||
export async function GET(_request: NextRequest) {
|
||||
try {
|
||||
const saveDir = SAVE_CONFIG.SAVE_DIRECTORY;
|
||||
|
||||
console.log(saveDir);
|
||||
|
||||
// If save directory doesn't exist, return empty array
|
||||
if (!existsSync(saveDir)) {
|
||||
return NextResponse.json({ scripts: [] });
|
||||
return NextResponse.json({ scripts: [] }, { headers });
|
||||
}
|
||||
|
||||
// Read directory and filter for .rhai files
|
||||
const files = await readdir(saveDir);
|
||||
|
||||
console.log(files);
|
||||
|
||||
const scripts = files
|
||||
.filter((file) => file.endsWith(".rhai"))
|
||||
.map((file) => file.replace(".rhai", ""))
|
||||
.sort(); // Sort alphabetically
|
||||
|
||||
return NextResponse.json({ scripts });
|
||||
return NextResponse.json({ scripts }, { headers });
|
||||
} catch (error) {
|
||||
console.error("List scripts error:", error);
|
||||
return NextResponse.json(
|
||||
{ error: "Failed to list scripts" },
|
||||
{ status: 500 }
|
||||
{ status: 500, headers }
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,28 +42,6 @@ fn step_max(board) {
|
||||
const AGENTS = {
|
||||
// special-cased below
|
||||
Self: undefined,
|
||||
|
||||
Random: `fn random_action(board) {
|
||||
let symb = rand_symb();
|
||||
let pos = rand_int(0, 10);
|
||||
let action = Action(symb, pos);
|
||||
|
||||
while !board.can_play(action) {
|
||||
let symb = rand_symb();
|
||||
let pos = rand_int(0, 10);
|
||||
action = Action(symb, pos);
|
||||
}
|
||||
|
||||
return action;
|
||||
}
|
||||
|
||||
fn step_min(board) {
|
||||
return random_action(board);
|
||||
}
|
||||
|
||||
fn step_max(board) {
|
||||
return random_action(board);
|
||||
}`,
|
||||
};
|
||||
|
||||
export default function Playground() {
|
||||
@@ -126,10 +104,7 @@ export default function Playground() {
|
||||
// Combine hardcoded agents with saved scripts, ensuring Self and Random are first
|
||||
const combinedAgents = [
|
||||
"Self",
|
||||
"Random",
|
||||
...Object.keys(AGENTS).filter(
|
||||
(key) => key !== "Self" && key !== "Random"
|
||||
),
|
||||
...Object.keys(AGENTS).filter((key) => key !== "Self"),
|
||||
...scripts,
|
||||
];
|
||||
|
||||
|
||||
@@ -24,14 +24,18 @@ self.onmessage = async (event) => {
|
||||
|
||||
if (type === "data") {
|
||||
if (currentGame !== null) {
|
||||
currentGame.take_input(event_data.data);
|
||||
try {
|
||||
currentGame.take_input(event_data.data);
|
||||
|
||||
if (currentGame.is_error()) {
|
||||
currentGame = null;
|
||||
self.postMessage({ type: "complete" });
|
||||
} else if (currentGame.is_done()) {
|
||||
currentGame = null;
|
||||
self.postMessage({ type: "complete" });
|
||||
if (currentGame.is_error()) {
|
||||
currentGame = null;
|
||||
self.postMessage({ type: "complete" });
|
||||
} else if (currentGame.is_done()) {
|
||||
currentGame = null;
|
||||
self.postMessage({ type: "complete" });
|
||||
}
|
||||
} catch (error) {
|
||||
self.postMessage({ type: "error", error: String(error) });
|
||||
}
|
||||
}
|
||||
} else if (type === "init") {
|
||||
|
||||
Reference in New Issue
Block a user