Skip to content

pull gateway config from GitHub #51

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
merged 6 commits into from
Aug 10, 2024
Merged

pull gateway config from GitHub #51

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f6e506
pull gateway config from GitHub
g-linville Aug 10, 2024
661b45c
remove comment
g-linville Aug 10, 2024
47ef895
PR feedback
g-linville Aug 10, 2024
3fb13af
fix interval
g-linville Aug 10, 2024
6776c64
update comment
g-linville Aug 10, 2024
aa4bd5c
PR feedback
g-linville Aug 10, 2024
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
78 changes: 58 additions & 20 deletions server/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ export const startAppServer = ({dev, hostname, port, dir}) => {
});
}

setInterval(() => {
updateGPTScriptConfig(gptscript)
.then(() => {
console.log('GPTScript config updated');
})
.catch(err => {
console.error('Error updating GPTScript config:', err);
});
}, 30 * 60 * 1000); // Pull the config from GitHub every 30 minutes

Promise.resolve(gptscriptInitPromise).then(() => {
app.prepare().then(() => {
const httpServer = createServer(handler);
Expand Down Expand Up @@ -104,9 +114,9 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
prompt: true,
confirm: true,
};

if (tool) opts.subTool = tool;

let state = {};
let statePath = '';
if (threadID) statePath = path.join(THREADS_DIR, threadID, STATE_FILE);
Expand Down Expand Up @@ -178,7 +188,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
await runningScript.close();
runningScript = null;
}

// find the root tool and then add the new tool
for (let block of script) {
if (block.type === "tool") {
Expand All @@ -188,7 +198,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
}
}

/*
/*
note(tylerslaton)

this is a hacky way to add a tool to the chat state. When GPTScript does a run, it will
Expand All @@ -203,7 +213,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
socket.emit("addingTool");

const currentState = JSON.parse(state.chatState);

opts.chatState = undefined; // clear the chat state so we can get the new tool mappings
const newStateRun = await gptscript.evaluate(script, opts)
await newStateRun.text();
Expand All @@ -213,7 +223,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp

opts.chatState = JSON.stringify(currentState);
state.tools = [...new Set([...state.tools || [], tool])];

if (threadID) {
fs.writeFile(statePath, JSON.stringify(state), (err) => {
if (err) {
Expand All @@ -230,7 +240,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
await runningScript.close();
runningScript = null;
}

// find the root tool and then remove the tool
for (let block of script) {
if (block.type === "tool") {
Expand All @@ -241,7 +251,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
}
}

/*
/*
note(tylerslaton)

this is a hacky way to remove a tool from the chat state. When GPTScript does a run, it will
Expand All @@ -256,7 +266,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp
socket.emit("removingTool");

const currentState = JSON.parse(state.chatState);

opts.chatState = undefined; // clear the chat state so we can get the new tool mappings
const newStateRun = await gptscript.evaluate(script, opts)
await newStateRun.text();
Expand All @@ -266,7 +276,7 @@ const mount = async (location, tool, args, scriptWorkspace, socket, threadID, gp

opts.chatState = JSON.stringify(currentState);
state.tools = state.tools.filter(t => t !== tool);

if (threadID) {
fs.writeFile(statePath, JSON.stringify(state), (err) => {
if (err) {
Expand Down Expand Up @@ -356,7 +366,7 @@ const initGPTScriptConfig = async (gptscript) => {

const configPath = gptscriptConfigPath();

fs.readFile(configPath, 'utf8', (err, data) => {
fs.readFile(configPath, 'utf8', async (err, data) => {
Copy link
Member

@njhale njhale Aug 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want initGPTScriptConfig to block server startup until the file is created. Won't switching this to async mean that initGPTScriptConfig can return before the file is created?

Copy link
Member Author

@g-linville g-linville Aug 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Idk but I'll remove it and handle everything with .then.

if (err) {
console.error('Error reading config file:', err);
return;
Expand All @@ -370,15 +380,8 @@ const initGPTScriptConfig = async (gptscript) => {
}

// Default values to add if they don't exist
const defaultConfig = {
gatewayURL: 'https://gateway-api.gptscript.ai',
integrations: {
microsoft365: 'microsoft365',
slack: 'slack',
notion: 'notion',
GitLab: 'gitlab'
}
};
const defaultConfigResult = await fetch("https://raw.githubusercontent.com/gptscript-ai/gateway-config/main/config.json");
const defaultConfig = await defaultConfigResult.json()

// Update the config object with default values if they don't exist
config = {
Expand All @@ -401,6 +404,41 @@ const initGPTScriptConfig = async (gptscript) => {
});
}

async function updateGPTScriptConfig(gptscript) {
const configPath = gptscriptConfigPath();

fs.readFile(configPath, 'utf8', async (err, data) => {
if (err) {
console.error('Error reading config file:', err);
return;
}

let config;
try {
config = JSON.parse(data);
} catch (parseErr) {
throw new Error(`Error parsing config file: ${parseErr}`);
}

const defaultConfigResult = await fetch("https://raw.githubusercontent.com/gptscript-ai/gateway-config/main/config.json");
const defaultConfig = await defaultConfigResult.json()

// Override the config with the integrations for the gateway if the URLs match
if (config.gatewayURL === defaultConfig.gatewayURL) {
config.integrations = defaultConfig.integrations
}

// Write the updated config back to the file
fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf8', (writeErr) => {
if (writeErr) {
console.error('Error writing config file:', writeErr);
return;
}
console.log('Config file updated successfully');
});
});
}

function gptscriptConfigPath() {
const homeDir = os.homedir();
let configDir;
Expand Down