Skip to content

Commit

Permalink
Merge pull request #650 from TransformerOptimus/dev
Browse files Browse the repository at this point in the history
Dev -> Main
  • Loading branch information
I’m authored Jul 5, 2023
2 parents 988038c + b699125 commit 221e6e9
Show file tree
Hide file tree
Showing 123 changed files with 3,443 additions and 565 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/1.BUG_REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ body:
[#general]: https://discord.com/channels/1107593006032355359/1107642413993959505
[#support]: https://discord.com/channels/1107593006032355359/1107645922797703198
[existing issues]: https://github.com/TransformerOptimus/SuperAGI/issues
- type: checkboxes
attributes:
label: ⚠️ Check for existing issues before proceeding. ⚠️
Expand Down
19 changes: 18 additions & 1 deletion config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ OPENAI_API_BASE: https://api.openai.com/v1

# "gpt-3.5-turbo-0301": 4032, "gpt-4-0314": 8092, "gpt-3.5-turbo": 4032, "gpt-4": 8092, "gpt-4-32k": 32768, "gpt-4-32k-0314": 32768, "llama":2048, "mpt-7b-storywriter":45000
MODEL_NAME: "gpt-3.5-turbo-0301"
RESOURCES_SUMMARY_MODEL_NAME: "gpt-3.5-turbo"
MAX_TOOL_TOKEN_LIMIT: 800
MAX_MODEL_TOKEN_LIMIT: 4032 # set to 2048 for llama

Expand Down Expand Up @@ -91,4 +92,20 @@ SLACK_BOT_TOKEN: YOUR_SLACK_BOT_TOKEN
# For running stable diffusion
STABILITY_API_KEY: YOUR_STABILITY_API_KEY
#Engine IDs that can be used: 'stable-diffusion-v1', 'stable-diffusion-v1-5','stable-diffusion-512-v2-0', 'stable-diffusion-768-v2-0','stable-diffusion-512-v2-1','stable-diffusion-768-v2-1','stable-diffusion-xl-beta-v2-2-2'
ENGINE_ID: "stable-diffusion-xl-beta-v2-2-2"
ENGINE_ID: "stable-diffusion-xl-beta-v2-2-2"

# To config a vector store for resources manager
# RESOURCE_VECTOR_STORE can be REDIS, PINECONE, CHROMA, QDRANT
RESOURCE_VECTOR_STORE: YOUR_RESOURCE_VECTOR_STORE
RESOURCE_VECTOR_STORE_INDEX_NAME: YOUR_RESOURCE_VECTOR_STORE_INDEX_NAME

# To use a custom redis
REDIS_VECTOR_STORE_URL: YOUR_REDIS_VECTOR_STORE_URL

# To use qdrant for vector store in resources manager
QDRANT_PORT: YOUR_QDRANT_PORT
QDRANT_HOST_NAME: YOUR_QDRANT_HOST_NAME

# To use chroma for vector store in resources manager
CHROMA_HOST_NAME: YOUR_CHROMA_HOST_NAME
CHROMA_PORT: YOUR_CHROMA_PORT
13 changes: 11 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@ services:
# - /app/node_modules/
# - /app/.next/
super__redis:
image: "docker.io/library/redis:latest"
image: "redis/redis-stack-server:latest"
networks:
- super_network
# uncomment to expose redis port to host
# ports:
# - "6379:6379"
volumes:
- redis_data:/data

super__postgres:
image: "docker.io/library/postgres:latest"
environment:
Expand All @@ -45,6 +51,9 @@ services:
- superagi_postgres_data:/var/lib/postgresql/data/
networks:
- super_network
# uncomment to expose postgres port to host
# ports:
# - "5432:5432"

proxy:
image: nginx:stable-alpine
Expand All @@ -58,9 +67,9 @@ services:
volumes:
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf


networks:
super_network:
driver: bridge
volumes:
superagi_postgres_data:
redis_data:
82 changes: 82 additions & 0 deletions gui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"date-fns": "^2.30.0",
"eslint": "8.40.0",
"eslint-config-next": "13.4.2",
"jszip": "^3.10.1",
"mitt": "^3.0.0",
"next": "13.4.2",
"react": "18.2.0",
Expand Down
5 changes: 3 additions & 2 deletions gui/pages/Content/Agents/ActivityFeed.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Image from "next/image";
import {loadingTextEffect, formatTimeDifference} from "@/utils/utils";
import {EventBus} from "@/utils/eventBus";

export default function ActivityFeed({selectedRunId, selectedView, setFetchedData }) {
export default function ActivityFeed({selectedRunId, selectedView, setFetchedData, runModal }) {
const [loadingText, setLoadingText] = useState("Thinking");
const [feeds, setFeeds] = useState([]);
const feedContainerRef = useRef(null);
Expand All @@ -18,7 +18,7 @@ export default function ActivityFeed({selectedRunId, selectedView, setFetchedDat

useEffect(() => {
const interval = window.setInterval(function(){
fetchFeeds();
fetchFeeds();
}, 10000);

return () => clearInterval(interval);
Expand Down Expand Up @@ -60,6 +60,7 @@ export default function ActivityFeed({selectedRunId, selectedView, setFetchedDat
setFeeds(data.feeds);
setRunStatus(data.status);
setFetchedData(data.permissions);
EventBus.emit('resetRunStatus', {executionId: selectedRunId, status: data.status});
})
.catch((error) => {
console.error('Error fetching execution feeds:', error);
Expand Down
Loading

0 comments on commit 221e6e9

Please sign in to comment.