Skip to content

feat(macos): replace uv in mcp_config.json with the uv and python inc… #126

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

Closed
johnfunmula wants to merge 1 commit into from
Closed

feat(macos): replace uv in mcp_config.json with the uv and python inc… #126

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
36 changes: 29 additions & 7 deletions electron/main/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,32 @@ async function initApp() {

// create command alias file if not exists
const commandAliasPath = path.join(baseConfigDir, "command_alias.json")
await createFileIfNotExists(commandAliasPath, JSON.stringify(process.platform === "win32" && app.isPackaged ? {
"npx": path.join(process.resourcesPath, "node", "npx.cmd"),
"npm": path.join(process.resourcesPath, "node", "npm.cmd"),
} : {}, null, 2))
await createFileIfNotExists(commandAliasPath, JSON.stringify(getAlias(), null, 2), true)
}

async function createFileIfNotExists(_path: string, content: string) {
if (!(await fse.pathExists(_path))) {
function getAlias() {
if (!app.isPackaged) {
return {}
}

switch (process.platform) {
case "win32":
return {
"npx": path.join(process.resourcesPath, "node", "npx.cmd"),
"npm": path.join(process.resourcesPath, "node", "npm.cmd"),
}
case "darwin":
return {
"uv": path.join(process.resourcesPath, "uv", "uv"),
"uvx": path.join(process.resourcesPath, "uv", "uvx"),
}
default:
return {}
}
}

async function createFileIfNotExists(_path: string, content: string, rewrite = false) {
if (!(await fse.pathExists(_path)) || rewrite) {
console.log("creating file", _path)
await fse.ensureDir(path.dirname(_path))
await fse.writeFile(_path, content)
Expand Down Expand Up @@ -181,12 +199,16 @@ async function startHostService() {
? ["-I", path.join(pyBinPath, "dive_httpd")]
: ["run", "dive_httpd"]

const httpdEnv = {
const httpdEnv: any = {
...process.env,
DIVE_CONFIG_DIR: baseConfigDir,
RESOURCE_DIR: hostCacheDir,
}

if (process.platform === "darwin" && app.isPackaged) {
httpdEnv.UV_PYTHON = path.join(process.resourcesPath, "python", "bin", "python3")
}

console.log("httpd executing path: ", httpdExec)

const busPath = path.join(hostCacheDir, "bus")
Expand Down