Skip to content
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

add remove agent functionality #359

Merged
merged 6 commits into from
Feb 6, 2025
Merged

add remove agent functionality #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d0cace
Update agent duplication dialog button text
satococoa Feb 6, 2025
26d8333
Add delete agent (ui only)
satococoa Feb 6, 2025
270a06e
Implement full agent deletion with blob and database cleanup
satococoa Feb 6, 2025
e34a590
Add performance logging and error handling to agent duplication process
satococoa Feb 6, 2025
dbd0db2
Improve agent deletion flow with router refresh
satococoa Feb 6, 2025
bd2a242
delete agent with githubIntegrationSettings
satococoa Feb 6, 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
358 changes: 269 additions & 89 deletions app/(main)/agents/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
"use server";

import { agents, db } from "@/drizzle";
import { agents, db, githubIntegrationSettings } from "@/drizzle";
import {
ExternalServiceName,
VercelBlobOperation,
createLogger,
waitForTelemetryExport,
withCountMeasurement,
} from "@/lib/opentelemetry";
import { fetchCurrentUser } from "@/services/accounts";
import { fetchCurrentTeam } from "@/services/teams";
import { putGraph } from "@giselles-ai/actions";
Expand All @@ -13,7 +20,8 @@ import {
} from "@giselles-ai/lib/utils";
import type { AgentId, Graph, Node } from "@giselles-ai/types";
import { createId } from "@paralleldrive/cuid2";
import { copy, list } from "@vercel/blob";
import { copy, del, list } from "@vercel/blob";
import { eq } from "drizzle-orm";

interface AgentDuplicationSuccess {
result: "success";
Expand All @@ -25,6 +33,10 @@ interface AgentDuplicationError {
}
type AgentDuplicationResult = AgentDuplicationSuccess | AgentDuplicationError;

type DeleteAgentResult =
| { result: "success"; message: string }
| { result: "error"; message: string };

export async function copyAgent(
agentId: AgentId,
_formData: FormData,
Expand All @@ -39,101 +51,269 @@ export async function copyAgent(
if (agent === undefined || agent.graphUrl === null) {
return { result: "error", message: `${agentId} is not found.` };
}
const [user, team, graph] = await Promise.all([
fetchCurrentUser(),
fetchCurrentTeam(),
fetch(agent.graphUrl).then((res) => res.json() as unknown as Graph),
]);

try {
const startTime = Date.now();
const logger = createLogger("copyAgent");

const [user, team, graph] = await Promise.all([
fetchCurrentUser(),
fetchCurrentTeam(),
fetch(agent.graphUrl).then((res) => res.json() as unknown as Graph),
]);
if (agent.teamDbId !== team.dbId) {
return {
result: "error",
message: "You are not allowed to duplicate this agent",
};
}

const newNodes = await Promise.all(
graph.nodes.map(async (node) => {
if (node.content.type !== "files") {
return node;
}
const newData = await Promise.all(
node.content.data.map(async (fileData) => {
if (fileData.status !== "completed") {
return null;
}
const newFileId = createFileId();
const { blobList } = await withCountMeasurement(
logger,
async () => {
const result = await list({
prefix: buildFileFolderPath(fileData.id),
});
const size = result.blobs.reduce(
(sum, blob) => sum + blob.size,
0,
);
return {
blobList: result,
size,
};
},
ExternalServiceName.VercelBlob,
startTime,
VercelBlobOperation.List,
);

let newFileBlobUrl = "";
let newTextDataUrl = "";

await Promise.all(
blobList.blobs.map(async (blob) => {
const { url: copyUrl } = await withCountMeasurement(
logger,
async () => {
const copyResult = await copy(
blob.url,
pathJoin(
buildFileFolderPath(newFileId),
pathnameToFilename(blob.pathname),
),
{
addRandomSuffix: true,
access: "public",
},
);
return {
url: copyResult.url,
size: blob.size,
};
},
ExternalServiceName.VercelBlob,
startTime,
VercelBlobOperation.Copy,
);

if (blob.url === fileData.fileBlobUrl) {
newFileBlobUrl = copyUrl;
}
if (blob.url === fileData.textDataUrl) {
newTextDataUrl = copyUrl;
}
}),
);

return {
...fileData,
id: newFileId,
fileBlobUrl: newFileBlobUrl,
textDataUrl: newTextDataUrl,
};
}),
).then((data) => data.filter((d) => d !== null));
return {
...node,
content: {
...node.content,
data: newData,
},
} as Node;
}),
);

const newGraphId = createGraphId();
const { url } = await putGraph({
...graph,
id: newGraphId,
nodes: newNodes,
});

const newAgentId = `agnt_${createId()}` as AgentId;
const insertResult = await db
.insert(agents)
.values({
id: newAgentId,
name: `Copy of ${agent.name ?? agentId}`,
teamDbId: team.dbId,
creatorDbId: user.dbId,
graphUrl: url,
graphv2: {
agentId: newAgentId,
nodes: [],
xyFlow: {
nodes: [],
edges: [],
},
connectors: [],
artifacts: [],
webSearches: [],
mode: "edit",
flowIndexes: [],
},
})
.returning({ id: agents.id });

if (insertResult.length === 0) {
return {
result: "error",
message: "Failed to save the duplicated agent",
};
}

waitForTelemetryExport();
const newAgent = insertResult[0];
return { result: "success", agentId: newAgent.id };
} catch (error) {
console.error("Failed to copy agent:", error);
return {
result: "error",
message: `Failed to copy agent: ${error instanceof Error ? error.message : "Unknown error"}`,
};
}
}

export async function deleteAgent(
agentId: string,
formData: FormData,
): Promise<DeleteAgentResult> {
if (typeof agentId !== "string" || agentId.length === 0) {
return { result: "error", message: "Invalid agent id" };
}

const agent = await db.query.agents.findFirst({
where: (agents, { eq }) => eq(agents.id, agentId as AgentId),
});

if (agent === undefined || agent.graphUrl === null) {
return { result: "error", message: `Agent ${agentId} not found` };
}

const team = await fetchCurrentTeam();
if (agent.teamDbId !== team.dbId) {
Copy link
Member

Choose a reason for hiding this comment

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

👍

return {
result: "error",
message: "You are not allowed to duplicate this agent",
message: "You are not allowed to delete this agent",
};
}
const newNodes = await Promise.all(
graph.nodes.map(async (node) => {
if (node.content.type !== "files") {
return node;
}
const newData = await Promise.all(
node.content.data.map(async (fileData) => {
if (fileData.status !== "completed") {
return null;

try {
const startTime = Date.now();
const logger = createLogger("deleteAgent");

// Fetch graph data
const graph = await fetch(agent.graphUrl).then(
(res) => res.json() as unknown as Graph,
);

// Collect all blob URLs that need to be deleted
const blobUrlsToDelete = new Set<string>();
blobUrlsToDelete.add(agent.graphUrl);
let toDeleteBlobSize = 0;
toDeleteBlobSize += new TextEncoder().encode(JSON.stringify(graph)).length;

// Handle file nodes and their blobs
for (const node of graph.nodes) {
if (node.content.type === "files") {
for (const fileData of node.content.data) {
if (fileData.status === "completed") {
// Get all blobs in the file folder
const { blobList } = await withCountMeasurement(
logger,
async () => {
const result = await list({
prefix: buildFileFolderPath(fileData.id),
});
const size = result.blobs.reduce(
(sum, blob) => sum + blob.size,
0,
);
return {
blobList: result,
size,
};
},
ExternalServiceName.VercelBlob,
startTime,
VercelBlobOperation.List,
);
for (const blob of blobList.blobs) {
blobUrlsToDelete.add(blob.url);
toDeleteBlobSize += blob.size;
}
}
const newFileId = createFileId();
const blobList = await list({
prefix: buildFileFolderPath(fileData.id),
});
let newFileBlobUrl = "";
let newTextDataUrl = "";
await Promise.all(
blobList.blobs.map(async (blob) => {
const copyResult = await copy(
blob.url,
pathJoin(
buildFileFolderPath(newFileId),
pathnameToFilename(blob.pathname),
),
{
addRandomSuffix: true,
access: "public",
},
);
if (blob.url === fileData.fileBlobUrl) {
newFileBlobUrl = copyResult.url;
}
if (blob.url === fileData.textDataUrl) {
newTextDataUrl = copyResult.url;
}
}),
);
}
}
}

// Delete all collected blobs
if (blobUrlsToDelete.size > 0) {
await withCountMeasurement(
logger,
async () => {
const urls = Array.from(blobUrlsToDelete);
await del(urls);
return {
...fileData,
id: newFileId,
fileBlobUrl: newFileBlobUrl,
textDataUrl: newTextDataUrl,
size: toDeleteBlobSize,
};
}),
).then((data) => data.filter((d) => d !== null));
return {
...node,
content: {
...node.content,
data: newData,
},
} as Node;
}),
);
const newGraphId = createGraphId();
const { url } = await putGraph({ ...graph, id: newGraphId, nodes: newNodes });

const newAgentId = `agnt_${createId()}` as AgentId;
const insertResult = await db
.insert(agents)
.values({
id: newAgentId,
name: `Copy of ${agent.name ?? agentId}`,
teamDbId: team.dbId,
creatorDbId: user.dbId,
graphUrl: url,
graphv2: {
agentId: newAgentId,
nodes: [],
xyFlow: {
nodes: [],
edges: [],
},
connectors: [],
artifacts: [],
webSearches: [],
mode: "edit",
flowIndexes: [],
},
})
.returning({ id: agents.id });
if (insertResult.length === 0) {
return { result: "error", message: "Failed to save the duplicated agent" };
ExternalServiceName.VercelBlob,
startTime,
VercelBlobOperation.Del,
);
waitForTelemetryExport();
}

// Delete the agent from database
await db.transaction(async (tx) => {
await tx
.delete(githubIntegrationSettings)
.where(eq(githubIntegrationSettings.agentDbId, agent.dbId));
await tx.delete(agents).where(eq(agents.id, agentId as AgentId));
});

return {
result: "success",
message: "Agent deleted successfully",
};
} catch (error) {
console.error("Failed to delete agent:", error);
return {
result: "error",
message: `Failed to delete agent: ${error instanceof Error ? error.message : "Unknown error"}`,
};
}
const newAgent = insertResult[0];
return { result: "success", agentId: newAgent.id };
}
Loading