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

Jump to bottom

Edit agent pr #1004

Merged
merged 13 commits into from
Aug 7, 2023
Merged

Edit agent pr #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0f35e69
edit agent frontend complete
namansleeps2 Jul 31, 2023
cc72077
edit agent frontend complete
namansleeps2 Aug 1, 2023
73eea52
Merge branch 'dev' of github.com:TransformerOptimus/SuperAGI into edi…
namansleeps2 Aug 1, 2023
1fa1e44
minor changes
namansleeps2 Aug 1, 2023
58867f5
minor changes and bug fixes
namansleeps2 Aug 3, 2023
7ea9945
merge with dev
namansleeps2 Aug 4, 2023
79717fc
edit agent persistence solved
namansleeps2 Aug 4, 2023
1f5582e
removing console loggers
namansleeps2 Aug 4, 2023
56ec32e
minor changes
namansleeps2 Aug 4, 2023
7034801
merging with dev
namansleeps2 Aug 7, 2023
dbe10d9
minor changes
namansleeps2 Aug 7, 2023
a106f33
removing save agent as template from pr
namansleeps2 Aug 7, 2023
24b976c
minor changes
namansleeps2 Aug 7, 2023
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
196 changes: 142 additions & 54 deletions gui/pages/Content/Agents/AgentCreate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {
getOrganisationConfig,
getLlmModels,
updateExecution,
uploadFile, getAgentWorkflows
uploadFile,
getAgentDetails, editAgent,
getAgentWorkflows
} from "@/pages/api/DashboardService";
import {
formatBytes,
Expand All @@ -34,7 +36,10 @@ export default function AgentCreate({
template,
internalId,
sendKnowledgeData,
env
env,
edit,
editAgentId,
agents
}) {
const [advancedOptions, setAdvancedOptions] = useState(false);
const [agentName, setAgentName] = useState("");
Expand Down Expand Up @@ -113,6 +118,8 @@ export default function AgentCreate({
const [createModal, setCreateModal] = useState(false);

const [scheduleData, setScheduleData] = useState(null);
const [editModal, setEditModal] = useState(false)


useEffect(() => {
getOrganisationConfig(organisationId, "model_api_key")
Expand Down Expand Up @@ -174,25 +181,18 @@ export default function AgentCreate({
.catch((error) => {
console.error('Error fetching agent workflows:', error);
});
if (edit) {
editingAgent();
}

if (template !== null) {
setLocalStorageValue("agent_name_" + String(internalId), template.name, setAgentName);
setLocalStorageValue("agent_description_" + String(internalId), template.description, setAgentDescription);
setLocalStorageValue("advanced_options_" + String(internalId), true, setAdvancedOptions);
fillDetails(template)
setLocalStorageValue("agent_template_id_" + String(internalId), template.id, setAgentTemplateId);

fetchAgentTemplateConfigLocal(template.id)
.then((response) => {
const data = response.data || [];
setLocalStorageArray("agent_goals_" + String(internalId), data.goal, setGoals);
setLocalStorageValue("agent_type_" + String(internalId), data.agent_type, setAgentType);
setLocalStorageArray("agent_constraints_" + String(internalId), data.constraints, setConstraints);
setLocalStorageValue("agent_iterations_" + String(internalId), data.max_iterations, setIterations);
setLocalStorageValue("agent_step_time_" + String(internalId), data.iteration_interval, setStepTime);
setLocalStorageValue("agent_permission_" + String(internalId), data.permission_type, setPermission);
setLocalStorageArray("agent_instructions_" + String(internalId), data.instruction, setInstructions);
setLocalStorageValue("agent_database_" + String(internalId), data.LTM_DB, setDatabase);
setLocalStorageValue("agent_model_" + String(internalId), data.model, setModel);
fillAdvancedDetails(data)
setLocalStorageArray("tool_names_" + String(internalId), data.tools, setToolNames);
setLocalStorageValue("is_agent_template_" + String(internalId), true, setShowButton);
setShowButton(true);
Expand Down Expand Up @@ -255,6 +255,44 @@ export default function AgentCreate({
setSearchValue('');
};

const editingAgent = () => {
const isLoaded = localStorage.getItem('is_editing_agent_' + String(internalId));
const agent = agents.find(agent => agent.id === editAgentId);
if (!isLoaded) {
fillDetails(agent)
}
getAgentDetails(editAgentId, -1)
.then((response) => {
const data = response.data || []
if (!isLoaded) {
fillAdvancedDetails(data)
setLocalStorageArray("tool_names_" + String(internalId), data.tools.map(tool => tool.name), setToolNames);
}
})
.catch((error) => {
console.error('Error fetching agent details:', error);
});
localStorage.setItem('is_editing_agent_' + String(internalId), true);
};

const fillDetails = (agent) => {
setLocalStorageValue("agent_name_" + String(internalId), agent.name, setAgentName);
setLocalStorageValue("agent_description_" + String(internalId), agent.description, setAgentDescription);
setLocalStorageValue("advanced_options_" + String(internalId), true, setAdvancedOptions);
}
const fillAdvancedDetails = (data) => {
setLocalStorageArray("agent_goals_" + String(internalId), data.goal, setGoals);
setLocalStorageValue("agent_type_" + String(internalId), data.agent_type, setAgentType);
setLocalStorageArray("agent_constraints_" + String(internalId), data.constraints, setConstraints);
setLocalStorageValue("agent_iterations_" + String(internalId), data.max_iterations, setIterations);
setLocalStorageValue("agent_step_time_" + String(internalId), data.iteration_interval, setStepTime);
setLocalStorageValue("agent_permission_" + String(internalId), data.permission_type, setPermission);
setLocalStorageArray("agent_instructions_" + String(internalId), data.instruction, setInstructions);
setLocalStorageValue("agent_database_" + String(internalId), data.LTM_DB, setDatabase);
setLocalStorageValue("agent_model_" + String(internalId), data.model, setModel);
}


const addToolkit = (toolkit) => {
const updatedToolIds = [...selectedTools];
const updatedToolNames = [...toolNames];
Expand Down Expand Up @@ -493,40 +531,73 @@ export default function AgentCreate({
"schedule": scheduleData,
}

createAgent(createModal ? scheduleAgentData : agentData, createModal)
.then((response) => {
const agentId = response.data.id;
const name = response.data.name;
const executionId = response.data.execution_id;
fetchAgents();

if (addResources && input.length > 0) {
const uploadPromises = input.map(fileData => {
return uploadResource(agentId, fileData)
.catch(error => {
console.error('Error uploading resource:', error);
return Promise.reject(error);
});
});

Promise.all(uploadPromises)
.then(() => {
runExecution(agentId, name, executionId, createModal);
if(edit){
agentData.agent_id = editAgentId;
const name = agentData.name
agentData.name = `New Run ${new Date()}`
editAgent(agentData)
.then((response) => {
if(response){
fetchAgents();
uploadResources(editAgentId, name)
}
})
}
else
{
createAgent(createModal ? scheduleAgentData : agentData, createModal)
.then((response) => {
const agentId = response.data.id;
const name = response.data.name;
const executionId = response.data.execution_id;
fetchAgents();
uploadResources(agentId, name, executionId)
})
.catch(error => {
console.error('Error uploading files:', error);
.catch((error) => {
console.error('Error creating agent:', error);
setCreateClickable(true);
});
} else {
runExecution(agentId, name, executionId, createModal);
}
})
.catch((error) => {
console.error('Error creating agent:', error);
setCreateClickable(true);
});
}
};

const uploadResources = (agentId, name, executionId) => {
if (addResources && input.length > 0) {
const uploadPromises = input.map(fileData => {
return uploadResource(agentId, fileData)
.catch(error => {
console.error('Error uploading resource:', error);
return Promise.reject(error);
});
});

Promise.all(uploadPromises)
.then(() => {
runDecision(agentId, name, executionId)
})
.catch(error => {
console.error('Error uploading files:', error);
setCreateClickable(true);
});
} else {
runDecision(agentId, name, executionId)
}
}

const runDecision = (agentId, name, executionId) => {
if(edit){
setEditModal(false)
sendAgentData({
id: editAgentId,
name: name,
contentType: "Agents",
});
removeTab(editAgentId, name, "Agents", internalId)
}
else {
runExecution(agentId, name, executionId, createModal);
}
}

const finaliseAgentCreation = (agentId, name, executionId) => {
toast.success('Agent created successfully', {autoClose: 1800});
let timeoutValue = executionId ? 0 : 1500;
Expand Down Expand Up @@ -794,20 +865,20 @@ export default function AgentCreate({
<div className="col-3"></div>
<div className="col-6" style={{padding: '25px 20px'}}>
<div>
<div className={styles.page_title}>Create new agent</div>
{!edit ? <div className={styles.page_title}>Create new agent</div> : <div className={styles.page_title}>Edit agent</div>}
</div>
<div style={{marginTop: '10px'}}>
<div>
<label className={styles.form_label}>Name</label>
<input className="input_medium" type="text" value={agentName} onChange={handleNameChange}/>
<input className="input_medium" type="text" value={agentName} disabled={edit} onChange={handleNameChange}/>
</div>
<div style={{marginTop: '15px'}}>
<label className={styles.form_label}>Description</label>
<textarea className="textarea_medium" rows={3} value={agentDescription} onChange={handleDescriptionChange}/>
<textarea className="textarea_medium" rows={3} value={agentDescription} disabled={edit} onChange={handleDescriptionChange}/>
</div>
<div style={{marginTop: '15px'}}>
<div><label className={styles.form_label}>Goals</label></div>
{goals.map((goal, index) => (<div key={index} style={{
{goals?.map((goal, index) => (<div key={index} style={{
marginBottom: '10px',
display: 'flex',
alignItems: 'center',
Expand Down Expand Up @@ -1120,7 +1191,7 @@ export default function AgentCreate({
</div>
<div style={{marginTop: '15px'}}>
<div><label className={styles.form_label}>Constraints</label></div>
{constraints.map((constraint, index) => (<div key={index} style={{
{constraints?.map((constraint, index) => (<div key={index} style={{
marginBottom: '10px',
display: 'flex',
alignItems: 'center',
Expand Down Expand Up @@ -1164,10 +1235,10 @@ export default function AgentCreate({
{/* </div>*/}
{/* </div>*/}
{/*</div>*/}
<div style={{marginTop: '15px'}}>
<label className={styles.form_label}>Time between steps (in milliseconds)</label>
<input className="input_medium" type="number" value={stepTime} onChange={handleStepChange}/>
</div>
{/*<div style={{marginTop: '15px'}}>*/}
{/* <label className={styles.form_label}>Time between steps (in milliseconds)</label>*/}
{/* <input className="input_medium" type="number" value={stepTime} onChange={handleStepChange}/>*/}
{/*</div>*/}
{/*<div style={{marginTop: '15px'}}>*/}
{/* <div style={{display:'flex'}}>*/}
{/* <input className="checkbox" type="checkbox" checked={longTermMemory} onChange={() => setLocalStorageValue("has_LTM_" + String(internalId), !longTermMemory, setLongTermMemory)} />*/}
Expand Down Expand Up @@ -1227,7 +1298,7 @@ export default function AgentCreate({
Update Template
</button>
)}
<div style={{display: 'flex', position: 'relative'}}>
{!edit ? <div style={{display: 'flex', position: 'relative'}}>
{createDropdown && (<div className="create_agent_dropdown_options" onClick={() => {
setCreateModal(true);
setCreateDropdown(false);
Expand All @@ -1244,13 +1315,30 @@ export default function AgentCreate({
alt="expand-icon"/>
</button>
</div>
</div>
</div>: <div className="primary_button" style={{backgroundColor: 'white', marginBottom: '4px', paddingLeft: '0', paddingRight: '5px'}}>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove inline css

<button className="primary_button" style={{paddingRight: '5px'}}
onClick={() => setEditModal(true)}>Update changes</button> </div>}
</div>

{createModal && (
<AgentSchedule env={env} internalId={internalId} closeCreateModal={closeCreateModal} type="create_agent"/>
)}

{editModal && (<div className="modal" onClick={() => setEditModal(!editModal)}>
<div className="modal-content w_35" onClick={preventDefault}>
<div className={styles.detail_name}>Update agent</div>
<div><label className={styles.form_label}>All the new runs of this agent will be updated with the latest changes. Are you sure you want to update changes?</label></div>
<div className="mt_20 justify_end display_flex">
<button className="secondary_button mr_10" onClick={() => setEditModal(false)}>
Cancel
</button>
<button className={`${styles.run_button} h_32p padding_0_15 `} onClick={handleAddAgent}>
Update changes
</button>
</div>
</div>
</div>)}

</div>
</div>
<div className="col-3"></div>
Expand Down
Loading