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.

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

Dev -> Main #791

Merged
merged 53 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
8d4ec7a
Added is_deleted param in agent-model
Arkajit-Datta Jun 22, 2023
5e184eb
Agent deletion feature added to the agent controllers
Arkajit-Datta Jun 27, 2023
d778dc8
AgentWithConfig updated with is_deleted flag
Arkajit-Datta Jun 27, 2023
efac58e
is_deleted flag is cross-checked in the controllers before instantiating
Arkajit-Datta Jun 27, 2023
5ae32b1
agent delete endpoint is added
Arkajit-Datta Jun 27, 2023
82d6042
Testing Delete Feature BugFixes
Arkajit-Datta Jun 28, 2023
6bddeaf
Database migration, adding new Column of is_delete in agent table
Arkajit-Datta Jul 1, 2023
d4a1f8b
Removed dropping index commands from the migration file.
Arkajit-Datta Jul 1, 2023
d38fb43
Added is_deleted check in the queries, incorported the review changes
Arkajit-Datta Jul 3, 2023
f82da55
delete agent feature updated in GUI
Arkajit-Datta Jul 6, 2023
d9478c6
Merge branch 'dev' into feature/delete-agent
Arkajit-Datta Jul 6, 2023
3dfcf83
added imports in Agent
Arkajit-Datta Jul 6, 2023
98de087
Added the removeTab functionality to a deleted Agent, changed the dow…
Arkajit-Datta Jul 6, 2023
87769f9
new_agents_sorted initialization bug fized
Arkajit-Datta Jul 6, 2023
4ff7b4e
Merge branch 'dev' into feature/delete-agent
Arkajit-Datta Jul 6, 2023
751880e
Merge branch 'feature/delete-agent'
Arkajit-Datta Jul 6, 2023
7218eb8
Merge branch 'dev' into feature/delete-agent
Arkajit-Datta Jul 7, 2023
22851fb
bugfix in creation of New Run for an existing agent.
Arkajit-Datta Jul 7, 2023
485da52
Bug Fix: Ensure that all runs of an agent are terminated before delet…
Arkajit-Datta Jul 7, 2023
47b3aff
Merge branch 'feature/delete-agent'
Arkajit-Datta Jul 7, 2023
fa17477
Review Changes in agent controller
Arkajit-Datta Jul 11, 2023
686264e
Agent Config Review changes
Arkajit-Datta Jul 12, 2023
8d60b21
Merge branch 'dev'
Arkajit-Datta Jul 13, 2023
7061b10
New migration and frontend changes to adapt to internalId
Arkajit-Datta Jul 13, 2023
a1437b1
Merge branch 'dev'
Arkajit-Datta Jul 13, 2023
0806768
Adapting to the new internalId frontend changes
Arkajit-Datta Jul 13, 2023
f192721
Migration after the new dev release
Arkajit-Datta Jul 13, 2023
3223d7e
fixed: removeTab object parsing bug. The object was passed inside the…
Arkajit-Datta Jul 14, 2023
044e9f2
fixing the config exception issue
Jul 14, 2023
69fb8a7
Handling exception on agent run
Jul 14, 2023
820ed10
Twitter Readme and Email Readme Clean Up (#778)
Phoenix2809 Jul 17, 2023
f913608
Fixing apm (#774)
jedan2506 Jul 17, 2023
52d1708
Updated Dockerfile-Celery
luciferlinx101 Jul 17, 2023
42f87ae
Updated celery entry point
luciferlinx101 Jul 17, 2023
82d13a4
external tool docker file
luciferlinx101 Jul 17, 2023
775939e
reverted tools.json
luciferlinx101 Jul 17, 2023
9288128
Reverted Tool
luciferlinx101 Jul 17, 2023
c03d14b
reverted
luciferlinx101 Jul 17, 2023
9741d44
Merge pull request #558 from Arkajit-Datta/main
Jul 17, 2023
6b8c80d
Format frontend code (#782)
nborthy Jul 17, 2023
aa919a7
fixing twitter tool issues and minor refactorin
Jul 17, 2023
1f653fc
Merge pull request #784 from TransformerOptimus/twitter_tool_fix
Jul 17, 2023
4a6e579
Merge pull request #780 from TransformerOptimus/external-tool-fix
Jul 18, 2023
10d719c
fixing the error on handle tool reponse
Jul 18, 2023
699b2c1
adding error codes in openai and palm response
Jul 18, 2023
685cd00
fixing gpt 32k issue
Jul 18, 2023
44c6dda
fixing the none error for palm model
Jul 18, 2023
b8d9c1c
fixing the tool token limit issue
Jul 18, 2023
be2161a
fixing minor issues and errors from frontend
Jul 18, 2023
822e12f
Merge pull request #789 from TransformerOptimus/bug_fixes1
Jul 18, 2023
1ed1696
fixing unit tests
Jul 18, 2023
8ff1bcc
Bugs Resource Manager (#786)
jedan2506 Jul 18, 2023
ffa40c6
Merge branch 'main' into dev
Jul 18, 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
10 changes: 10 additions & 0 deletions DockerfileCelery
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,14 @@ WORKDIR /app
COPY . .
COPY config.yaml .

# Downloads the tools
RUN python superagi/tool_manager.py

# Set executable permissions for install_tool_dependencies.sh
RUN chmod +x install_tool_dependencies.sh

# Install dependencies
RUN ./install_tool_dependencies.sh


CMD ["celery", "-A", "superagi.worker", "worker", "--beat","--loglevel=info"]
2 changes: 1 addition & 1 deletion gui/pages/Content/APM/Apm.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

.apm_dashboard {
margin-top: 16px;
height: calc(100vh - 14vh);
height: calc(100vh - 16vh);
overflow-y: auto;
}
721 changes: 393 additions & 328 deletions gui/pages/Content/APM/ApmDashboard.js

Large diffs are not rendered by default.

123 changes: 61 additions & 62 deletions gui/pages/Content/APM/BarGraph.js
Original file line number Diff line number Diff line change
@@ -1,74 +1,73 @@
import React, { useEffect, useRef } from "react";
import React, {useEffect, useRef} from "react";
import * as echarts from 'echarts';
import {formatNumber} from "@/utils/utils";

export const BarGraph = ({ data, type, color }) => {
const chartRef = useRef(null);
const containerRef = useRef(null);
export const BarGraph = ({data, type, color}) => {
const chartRef = useRef(null);
const containerRef = useRef(null);

useEffect(() => {
const chartInstance = echarts.getInstanceByDom(chartRef.current);
const chart = chartInstance ? chartInstance : echarts.init(chartRef.current);
useEffect(() => {
const chartInstance = echarts.getInstanceByDom(chartRef.current);
const chart = chartInstance ? chartInstance : echarts.init(chartRef.current);

const option = {
color: color,
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
xAxis: {
type: 'category',
data: data.map(item => item.name),
axisLabel: {
interval: 0,
rotate: 45,
color: '#888'
}
},
yAxis: {
type: 'value',
axisLabel: {
formatter: function(value) {
if (value >= 1000) {
return `${value / 1000}k`;
} else {
return value;
}
}
},
splitLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.08)'
}
}
},
series: [{
data: data.map(item => type === 'tokens_per_call' ? (item.tokens_consumed/item.calls) : item[type]),
type: 'bar'
}],
responsive: true
};
const option = {
color: color,
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
xAxis: {
type: 'category',
data: data.map(item => item.name),
axisLabel: {
interval: 0,
rotate: 45,
color: '#888'
}
},
yAxis: {
type: 'value',
axisLabel: {
formatter: function (value) {
if (value >= 1000) {
return `${value / 1000}k`;
} else {
return value;
}
}
},
splitLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.08)'
}
}
},
series: [{
data: data.map(item => type === 'tokens_per_call' ? (item.tokens_consumed / item.calls) : item[type]),
type: 'bar'
}],
responsive: true
};

chart.setOption(option);
chart.setOption(option);

const resizeObserver = new ResizeObserver(entries => {
entries.forEach(entry => {
chart.resize();
});
});
const resizeObserver = new ResizeObserver(entries => {
entries.forEach(entry => {
chart.resize();
});
});

resizeObserver.observe(containerRef.current);
resizeObserver.observe(containerRef.current);

return () => resizeObserver.disconnect();
}, [data, type]);
return () => resizeObserver.disconnect();
}, [data, type]);

return (
<div ref={containerRef} style={{ width: '100%', height: '100%' }}>
<div ref={chartRef} style={{ width: '100%', height: '100%' }}></div>
</div>
);
return (
<div ref={containerRef} style={{width: '100%', height: '100%'}}>
<div ref={chartRef} style={{width: '100%', height: '100%'}}></div>
</div>
);
}

export default BarGraph;
Loading