Refactor agent creation and update logic to improve error handling and default values; enhance logging for better traceability

2025-11-30 17:13:15 +00:00 · 2025-10-01 13:56:31 +05:30
parent 82beafc086
commit ba49eea23d
5 changed files with 373 additions and 181 deletions
--- a/frontend/src/agents/NewAgent.tsx
+++ b/frontend/src/agents/NewAgent.tsx
@@ -46,11 +46,11 @@ export default function NewAgent({ mode }: { mode: 'new' | 'edit' | 'draft' }) {
    image: '',
    source: '',
    sources: [],
-    chunks: '',
-    retriever: '',
+    chunks: '2',
+    retriever: 'classic',
    prompt_id: 'default',
    tools: [],
-    agent_type: '',
+    agent_type: 'classic',
    status: '',
    json_schema: undefined,
  });
@@ -122,7 +122,8 @@ export default function NewAgent({ mode }: { mode: 'new' | 'edit' | 'draft' }) {
      agent.name && agent.description && agent.prompt_id && agent.agent_type;
    const isJsonSchemaValidOrEmpty =
      jsonSchemaText.trim() === '' || jsonSchemaValid;
-    return hasRequiredFields && isJsonSchemaValidOrEmpty;
+    const hasSource = selectedSourceIds.size > 0;
+    return hasRequiredFields && isJsonSchemaValidOrEmpty && hasSource;
  };

  const isJsonSchemaInvalid = () => {
@@ -353,6 +354,26 @@ export default function NewAgent({ mode }: { mode: 'new' | 'edit' | 'draft' }) {
    getPrompts();
  }, [token]);

+  // Auto-select default source if none selected
+  useEffect(() => {
+    if (sourceDocs && sourceDocs.length > 0 && selectedSourceIds.size === 0) {
+      const defaultSource = sourceDocs.find((s) => s.name === 'Default');
+      if (defaultSource) {
+        setSelectedSourceIds(
+          new Set([
+            defaultSource.id || defaultSource.retriever || defaultSource.name,
+          ]),
+        );
+      } else {
+        setSelectedSourceIds(
+          new Set([
+            sourceDocs[0].id || sourceDocs[0].retriever || sourceDocs[0].name,
+          ]),
+        );
+      }
+    }
+  }, [sourceDocs, selectedSourceIds.size]);
+
  useEffect(() => {
    if ((mode === 'edit' || mode === 'draft') && agentId) {
      const getAgent = async () => {
@@ -650,7 +671,34 @@ export default function NewAgent({ mode }: { mode: 'new' | 'edit' | 'draft' }) {
                  }
                  selectedIds={selectedSourceIds}
                  onSelectionChange={(newSelectedIds: Set<string | number>) => {
-                    setSelectedSourceIds(newSelectedIds);
+                    if (
+                      newSelectedIds.size === 0 &&
+                      sourceDocs &&
+                      sourceDocs.length > 0
+                    ) {
+                      const defaultSource = sourceDocs.find(
+                        (s) => s.name === 'Default',
+                      );
+                      if (defaultSource) {
+                        setSelectedSourceIds(
+                          new Set([
+                            defaultSource.id ||
+                              defaultSource.retriever ||
+                              defaultSource.name,
+                          ]),
+                        );
+                      } else {
+                        setSelectedSourceIds(
+                          new Set([
+                            sourceDocs[0].id ||
+                              sourceDocs[0].retriever ||
+                              sourceDocs[0].name,
+                          ]),
+                        );
+                      }
+                    } else {
+                      setSelectedSourceIds(newSelectedIds);
+                    }
                  }}
                  title="Select Sources"
                  searchPlaceholder="Search sources..."
--- a/frontend/src/components/Table.tsx
+++ b/frontend/src/components/Table.tsx
@@ -6,7 +6,6 @@ interface TableProps {
  minWidth?: string;
 }

-
 interface TableContainerProps {
  children: React.ReactNode;
  className?: string;
@@ -34,45 +33,44 @@ interface TableCellProps {
  align?: 'left' | 'right' | 'center';
 }

-const TableContainer = React.forwardRef<HTMLDivElement, TableContainerProps>(({
-  children,
-  className = '',
-  height = 'auto',
-  bordered = true
-}, ref) => {
-  return (
-    <div className={`relative rounded-[6px] ${className}`}>
-      <div
-        ref={ref}
-        className={`w-full overflow-x-auto rounded-[6px] bg-transparent ${bordered ? 'border border-[#D7D7D7] dark:border-[#6A6A6A]' : ''}`}
-        style={{
-          maxHeight: height === 'auto' ? undefined : height,
-          overflowY: height === 'auto' ? 'hidden' : 'auto'
-        }}
-      >
-        {children}
+const TableContainer = React.forwardRef<HTMLDivElement, TableContainerProps>(
+  ({ children, className = '', height = 'auto', bordered = true }, ref) => {
+    return (
+      <div className={`relative rounded-[6px] ${className}`}>
+        <div
+          ref={ref}
+          className={`w-full overflow-x-auto rounded-[6px] bg-transparent ${bordered ? 'border border-[#D7D7D7] dark:border-[#6A6A6A]' : ''}`}
+          style={{
+            maxHeight: height === 'auto' ? undefined : height,
+            overflowY: height === 'auto' ? 'hidden' : 'auto',
+          }}
+        >
+          {children}
+        </div>
      </div>
-    </div>
-  );
-});;
+    );
+  },
+);
+TableContainer.displayName = 'TableContainer';
+
 const Table: React.FC<TableProps> = ({
  children,
  className = '',
-  minWidth = 'min-w-[600px]'
+  minWidth = 'min-w-[600px]',
 }) => {
  return (
-    <table className={`w-full table-auto border-collapse bg-transparent ${minWidth} ${className}`}>
+    <table
+      className={`w-full table-auto border-collapse bg-transparent ${minWidth} ${className}`}
+    >
      {children}
    </table>
  );
 };
 const TableHead: React.FC<TableHeadProps> = ({ children, className = '' }) => {
  return (
-    <thead className={`
-      sticky top-0 z-10
-      bg-gray-100 dark:bg-[#27282D]
-      ${className}
-    `}>
+    <thead
+      className={`sticky top-0 z-10 bg-gray-100 dark:bg-[#27282D] ${className} `}
+    >
      {children}
    </thead>
  );
@@ -86,12 +84,20 @@ const TableBody: React.FC<TableHeadProps> = ({ children, className = '' }) => {
  );
 };

-const TableRow: React.FC<TableRowProps> = ({ children, className = '', onClick }) => {
-  const baseClasses = "border-b border-[#D7D7D7] hover:bg-[#ECEEEF] dark:border-[#6A6A6A] dark:hover:bg-[#27282D]";
-  const cursorClass = onClick ? "cursor-pointer" : "";
+const TableRow: React.FC<TableRowProps> = ({
+  children,
+  className = '',
+  onClick,
+}) => {
+  const baseClasses =
+    'border-b border-[#D7D7D7] hover:bg-[#ECEEEF] dark:border-[#6A6A6A] dark:hover:bg-[#27282D]';
+  const cursorClass = onClick ? 'cursor-pointer' : '';

  return (
-    <tr className={`${baseClasses} ${cursorClass} ${className}`} onClick={onClick}>
+    <tr
+      className={`${baseClasses} ${cursorClass} ${className}`}
+      onClick={onClick}
+    >
      {children}
    </tr>
  );
@@ -102,7 +108,7 @@ const TableHeader: React.FC<TableCellProps> = ({
  className = '',
  minWidth,
  width,
-  align = 'left'
+  align = 'left',
 }) => {
  const getAlignmentClass = () => {
    switch (align) {
@@ -133,7 +139,7 @@ const TableCell: React.FC<TableCellProps> = ({
  className = '',
  minWidth,
  width,
-  align = 'left'
+  align = 'left',
 }) => {
  const getAlignmentClass = () => {
    switch (align) {