feat: admin ui - display information on agent when refName conflict

obot-platform · Nov 14, 2024 · 27d966e · 27d966e
1 parent 59c0450
commit 27d966e
Show file tree

Hide file tree

Showing 12 changed files with 189 additions and 53 deletions.
diff --git a/apiclient/types/assitant.go b/apiclient/types/assitant.go
@@ -5,6 +5,7 @@ type Assistant struct {
 	Name        string     `json:"name"`
 	Description string     `json:"description"`
 	Icons       AgentIcons `json:"icons"`
+	EntityId    string     `json:"entityId"`
 }
 
 type AssistantList List[Assistant]

diff --git a/pkg/api/handlers/assistants.go b/pkg/api/handlers/assistants.go
@@ -120,6 +120,7 @@ func convertAssistant(agent v1.Agent) types.Assistant {
 		Metadata:    MetadataFrom(&agent),
 		Name:        agent.Spec.Manifest.Name,
 		Description: agent.Spec.Manifest.Description,
+		EntityId:    agent.ObjectMeta.Name,
 		Icons:       icons,
 	}
 	assistant.ID = agent.Spec.Manifest.RefName

diff --git a/ui/admin/app/components/agent/Agent.tsx b/ui/admin/app/components/agent/Agent.tsx
@@ -7,11 +7,9 @@ import { cn } from "~/lib/utils";
 import { TypographyH4, TypographyP } from "~/components/Typography";
 import { useAgent } from "~/components/agent/AgentContext";
 import { AgentForm } from "~/components/agent/AgentForm";
+import { AgentPublishStatus } from "~/components/agent/AgentPublishStatus";
 import { PastThreads } from "~/components/agent/PastThreads";
-import { Publish } from "~/components/agent/Publish";
 import { ToolForm } from "~/components/agent/ToolForm";
-import { Unpublish } from "~/components/agent/Unpublish";
-import { CopyText } from "~/components/composed/CopyText";
 import { AgentKnowledgePanel } from "~/components/knowledge";
 import { Button } from "~/components/ui/button";
 import { Card } from "~/components/ui/card";
@@ -52,26 +50,11 @@ export function Agent({ className, onRefresh }: AgentProps) {
     return (
         <div className="h-full flex flex-col">
             <ScrollArea className={cn("h-full", className)}>
-                <div className="flex w-full justify-between px-8 pt-4 items-center gap-4">
-                    {agentUpdates.refName ? (
-                        <CopyText
-                            className="h-8 text-muted-foreground text-sm bg-background flex-row-reverse"
-                            holdStatusDelay={10000}
-                            text={`${window.location.protocol}//${window.location.host}/${agentUpdates.refName}`}
-                        />
-                    ) : (
-                        <div />
-                    )}
-
-                    {agentUpdates.refName ? (
-                        <Unpublish onChange={debouncedSetAgentInfo} />
-                    ) : (
-                        <Publish
-                            agent={agentUpdates}
-                            onChange={debouncedSetAgentInfo}
-                        />
-                    )}
-                </div>
+                <AgentPublishStatus
+                    agent={agentUpdates}
+                    onChange={partialSetAgent}
+                />
+
                 <Card className="p-4 m-4 lg:mx-6 xl:mx-8">
                     <AgentForm
                         agent={agentUpdates}
@@ -146,6 +129,7 @@ export function Agent({ className, onRefresh }: AgentProps) {
         </div>
     );
 }
+
 function convertTools(
     tools: { tool: string; variant: "fixed" | "default" | "available" }[]
 ) {

diff --git a/ui/admin/app/components/agent/AgentPublishStatus.tsx b/ui/admin/app/components/agent/AgentPublishStatus.tsx
@@ -0,0 +1,97 @@
+import { Link } from "@remix-run/react";
+import { useMemo } from "react";
+import { $path } from "remix-routes";
+import useSWR from "swr";
+
+import { AgentBase } from "~/lib/model/agents";
+import { AssistantApiService } from "~/lib/service/api/assistantApiService";
+
+import { TypographySmall } from "~/components/Typography";
+import { Publish } from "~/components/agent/Publish";
+import { Unpublish } from "~/components/agent/Unpublish";
+import { CopyText } from "~/components/composed/CopyText";
+
+type AgentPublishStatusProps = {
+    agent: AgentBase;
+    onChange: (agent: Partial<AgentBase>) => void;
+};
+
+export function AgentPublishStatus({
+    agent,
+    onChange,
+}: AgentPublishStatusProps) {
+    const getAssistants = useSWR(
+        () =>
+            agent.refName && !agent.refNameAssigned
+                ? AssistantApiService.getAssistants.key()
+                : null,
+        () => AssistantApiService.getAssistants()
+    );
+
+    const refAgent = useMemo(() => {
+        if (!getAssistants.data) return null;
+
+        return getAssistants.data.find(({ id }) => id === agent.refName);
+    }, [getAssistants.data, agent.refName]);
+
+    return (
+        <div className="flex w-full justify-between px-8 pt-4 items-center gap-4">
+            {renderAgentRef()}
+
+            {agent.refName ? (
+                <Unpublish onUnpublish={() => onChange({ refName: "" })} />
+            ) : (
+                <Publish
+                    refName={agent.refName}
+                    onPublish={(refName) => onChange({ refName })}
+                />
+            )}
+        </div>
+    );
+
+    function renderAgentRef() {
+        if (!agent.refName) return <div />;
+
+        if (refAgent) {
+            const route =
+                refAgent.type === "agent"
+                    ? $path("/agents/:agent", {
+                          agent: refAgent.entityId,
+                      })
+                    : $path("/workflows/:workflow", {
+                          workflow: refAgent.entityId,
+                      });
+
+            return (
+                <div className="flex flex-col gap-1 h-full">
+                    <div className="flex items-center gap-2">
+                        <div className="size-2 bg-warning rounded-full" />
+                        <TypographySmall>Unavailable</TypographySmall>
+                    </div>
+
+                    <TypographySmall className="pb-0 text-muted-foreground">
+                        <span className="min-w-fit">
+                            Ref name <b>{refAgent.id}</b> used by{" "}
+                        </span>
+                        <Link
+                            className="text-accent-foreground underline"
+                            to={route}
+                        >
+                            {refAgent.name}
+                        </Link>
+                    </TypographySmall>
+                </div>
+            );
+        }
+
+        if (!agent.refNameAssigned) return <div />;
+
+        return (
+            <CopyText
+                className="h-8 text-muted-foreground text-sm bg-background flex-row-reverse"
+                holdStatusDelay={10000}
+                text={`${window.location.protocol}//${window.location.host}/${agent.refName}`}
+            />
+        );
+    }
+}
diff --git a/ui/admin/app/components/agent/Publish.tsx b/ui/admin/app/components/agent/Publish.tsx
@@ -1,8 +1,6 @@
 import { Eye } from "lucide-react";
 import { useState } from "react";
 
-import { Agent } from "~/lib/model/agents";
-
 import {
     TypographyMuted,
     TypographyMutedAccent,
@@ -20,19 +18,18 @@ import { Input } from "~/components/ui/input";
 
 type PublishProps = {
     className?: string;
-    agent: Agent;
-    onChange: (agent: Agent) => void;
+    refName: string;
+    onPublish: (refName: string) => void;
 };
 
-export function Publish({ className, agent, onChange }: PublishProps) {
-    const [refName, setRefName] = useState(agent.refName);
+export function Publish({
+    className,
+    refName: _refName,
+    onPublish,
+}: PublishProps) {
+    const [refName, setRefName] = useState(_refName);
 
-    const handlePublish = () => {
-        onChange({
-            ...agent,
-            refName,
-        });
-    };
+    const handlePublish = () => onPublish(refName);
 
     return (
         <Dialog>

diff --git a/ui/admin/app/components/agent/ToolForm.tsx b/ui/admin/app/components/agent/ToolForm.tsx
@@ -166,7 +166,7 @@ export function ToolForm({
                             onDelete={() => removeTools([field.tool])}
                             actions={
                                 <Tooltip>
-                                    <TooltipTrigger>
+                                    <TooltipTrigger asChild>
                                         <Switch
                                             checked={
                                                 field.variant ===

diff --git a/ui/admin/app/components/agent/Unpublish.tsx b/ui/admin/app/components/agent/Unpublish.tsx
@@ -1,29 +1,19 @@
 import { EyeOff } from "lucide-react";
 
-import { Agent } from "~/lib/model/agents";
-
-import { useAgent } from "~/components/agent/AgentContext";
 import { ConfirmationDialog } from "~/components/composed/ConfirmationDialog";
 import { Button } from "~/components/ui/button";
 
-type PublishProps = {
+type UnpublishProps = {
     className?: string;
-    onChange: (agent: Agent) => void;
+    onUnpublish: () => void;
 };
 
-export function Unpublish({ onChange }: PublishProps) {
-    const { agent } = useAgent();
-
+export function Unpublish({ onUnpublish }: UnpublishProps) {
     return (
         <ConfirmationDialog
             title="Unpublish Agent"
             description="Are you sure you want to unpublish this agent? This action will disrupt every user currently using this reference."
-            onConfirm={() => {
-                onChange({
-                    ...agent,
-                    refName: "",
-                });
-            }}
+            onConfirm={() => onUnpublish()}
             confirmProps={{
                 variant: "destructive",
                 children: "Unpublish",

diff --git a/ui/admin/app/lib/model/agents.ts b/ui/admin/app/lib/model/agents.ts
@@ -8,6 +8,7 @@ export type AgentBase = {
     temperature?: number;
     cache?: boolean;
     refName: string;
+    refNameAssigned?: boolean;
     prompt: string;
     agents?: string[];
     workflows?: string[];
@@ -28,10 +29,15 @@ export type AgentOAuthStatus = {
 
 export type Agent = EntityMeta &
     AgentBase & {
-        slugAssigned: boolean;
-    } & {
         authStatus?: Record<string, AgentOAuthStatus>;
     };
 
 export type CreateAgent = AgentBase;
 export type UpdateAgent = AgentBase;
+
+export type AgentIcons = {
+    icon: string;
+    iconDark: string;
+    collapsed: string;
+    collapsedDark: string;
+};
diff --git a/ui/admin/app/lib/model/assistants.ts b/ui/admin/app/lib/model/assistants.ts
@@ -0,0 +1,10 @@
+import { AgentIcons } from "~/lib/model/agents";
+import { EntityMeta } from "~/lib/model/primitives";
+
+export type Assistant = EntityMeta & {
+    name: string;
+    entityId: string;
+    description: string;
+    icons: AgentIcons;
+    type: "agent" | "workflow";
+};
diff --git a/ui/admin/app/lib/routers/apiRoutes.ts b/ui/admin/app/lib/routers/apiRoutes.ts
@@ -30,6 +30,36 @@ const buildUrl = (path: string, params?: object) => {
 };
 
 export const ApiRoutes = {
+    assistants: {
+        base: () => buildUrl("/assistants"),
+        getAssistants: () => buildUrl("/assistants"),
+        getCredentials: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/credentials`),
+        deleteCredential: (assistantId: string, credentialId: string) =>
+            buildUrl(`/assistants/${assistantId}/credentials/${credentialId}`),
+        getEvents: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/events`),
+        invoke: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/invoke`),
+        getTools: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/tools`),
+        deleteTool: (assistantId: string, toolId: string) =>
+            buildUrl(`/assistants/${assistantId}/tools/${toolId}`),
+        getFiles: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/files`),
+        getFileById: (assistantId: string, fileId: string) =>
+            buildUrl(`/assistants/${assistantId}/files/${fileId}`),
+        uploadFile: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/files`),
+        deleteFile: (assistantId: string, fileId: string) =>
+            buildUrl(`/assistants/${assistantId}/files/${fileId}`),
+        getKnowledge: (assistantId: string) =>
+            buildUrl(`/assistants/${assistantId}/knowledge`),
+        addKnowledge: (assistantId: string, fileName: string) =>
+            buildUrl(`/assistants/${assistantId}/knowledge/${fileName}`),
+        deleteKnowledge: (assistantId: string, fileName: string) =>
+            buildUrl(`/assistants/${assistantId}/knowledge/${fileName}`),
+    },
     agents: {
         base: () => buildUrl("/agents"),
         getById: (agentId: string) => buildUrl(`/agents/${agentId}`),

diff --git a/ui/admin/app/lib/service/api/assistantApiService.ts b/ui/admin/app/lib/service/api/assistantApiService.ts
@@ -0,0 +1,16 @@
+import { Assistant } from "~/lib/model/assistants";
+import { ApiRoutes } from "~/lib/routers/apiRoutes";
+import { request } from "~/lib/service/api/primitives";
+
+async function getAssistants() {
+    const { data } = await request<{ items: Assistant[] }>({
+        url: ApiRoutes.assistants.getAssistants().url,
+    });
+
+    return data.items ?? [];
+}
+getAssistants.key = () => ({ url: ApiRoutes.assistants.getAssistants().path });
+
+export const AssistantApiService = {
+    getAssistants,
+};
diff --git a/ui/admin/app/routes/_auth.agents.$agent.tsx b/ui/admin/app/routes/_auth.agents.$agent.tsx
@@ -82,7 +82,11 @@ export default function ChatAgent() {
                         className="flex-auto"
                     >
                         <ResizablePanel className="">
-                            <Agent agent={agent} onRefresh={updateThreadId} />
+                            <Agent
+                                agent={agent}
+                                onRefresh={updateThreadId}
+                                key={agent.id}
+                            />
                         </ResizablePanel>
                         <ResizableHandle withHandle />
                         <ResizablePanel>