Skip to content

Typos + promisify exec calls #2243

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

Merged
cte merged 3 commits into from
Apr 3, 2025
Merged

Typos + promisify exec calls #2243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5a0dac
Fix typos
cte Apr 2, 2025
706975e
Fix exec calls
cte Apr 2, 2025
323164a
Fix flake
cte Apr 3, 2025
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
4 changes: 2 additions & 2 deletions evals/apps/web/src/app/runs/new/settings-diff.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function SettingsDiff({
const isDefault = JSON.stringify(defaultValue) === JSON.stringify(customValue)

return isDefault ? null : (
<SetttingDiff
<SettingDiff
key={key}
name={key}
defaultValue={JSON.stringify(defaultValue, null, 2)}
Expand All @@ -46,7 +46,7 @@ type SettingDiffProps = HTMLAttributes<HTMLDivElement> & {
customValue?: string
}

export function SetttingDiff({ name, defaultValue, customValue, ...props }: SettingDiffProps) {
export function SettingDiff({ name, defaultValue, customValue, ...props }: SettingDiffProps) {
return (
<Fragment {...props}>
<div className="overflow-hidden font-mono">{name}</div>
Expand Down
49 changes: 29 additions & 20 deletions evals/apps/web/src/lib/server/processes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,33 @@
import psTree from "ps-tree"
import { exec } from "child_process"

export const getProcessList = async (pid: number) => {
const promise = new Promise<string>((resolve, reject) => {
exec(`ps -p ${pid} -o pid=`, (err, stdout, stderr) => {
if (err) {
reject(stderr)
const asyncExec = (command: string): Promise<{ stdout: string; stderr: string }> =>
new Promise((resolve, reject) => {
exec(command, (error, stdout, stderr) => {
if (error) {
reject(error)
} else {
resolve({ stdout, stderr })
}

resolve(stdout)
})
})

export const getProcessList = async (pid: number) => {
try {
await promise
} catch (_) {
return null
}
await asyncExec(`ps -p ${pid} -o pid=`)

return new Promise<number[]>((resolve, reject) => {
psTree(pid, (err, children) => {
if (err) {
reject(err)
}
return new Promise<number[]>((resolve, reject) => {
psTree(pid, (err, children) => {
if (err) {
reject(err)
}

resolve(children.map((p) => parseInt(p.PID)))
resolve(children.map((p) => parseInt(p.PID)))
})
})
})
} catch (_) {
return null
}
}

export const killProcessTree = async (pid: number) => {
Expand All @@ -39,8 +40,16 @@ export const killProcessTree = async (pid: number) => {
}

if (descendants.length > 0) {
await exec(`kill -9 ${descendants.join(" ")}`)
try {
await asyncExec(`kill -9 ${descendants.join(" ")}`)
} catch (error) {
console.error("Error killing descendant processes:", error)
}
}

await exec(`kill -9 ${pid}`)
try {
await asyncExec(`kill -9 ${pid}`)
} catch (error) {
console.error("Error killing main process:", error)
}
}
2 changes: 1 addition & 1 deletion evals/packages/db/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Update `src/schema.ts` as needed, and then run:
pnpm db:generate
```

Inspect the generated sql in the migration filed added to `drizzle/`.
Inspect the sql in the migration file added to `drizzle/`.

If it looks okay, then run:

Expand Down