Merge pull request TransformerOptimus#128 from TransformerOptimus/dev

Merging dev
AICodeHunt · May 29, 2023 · b59ff0e · b59ff0e
2 parents 502bc16 + edabbab
commit b59ff0e
Show file tree

Hide file tree

Showing 149 changed files with 10,697 additions and 666 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,12 @@ config.yaml
 __pycache__
 superagi/models/__pycache__
 superagi/controllers/__pycache__
+**agent_dictvenv
+**/__gitpycache__/
+gui/node_modules
+gui/.next
+.DS_Store
+.DS_Store?
 venv
 gui/node_modules
 gui/.next

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,11 @@
+FROM python:3.9
+
+WORKDIR /app
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+COPY config.yaml .
+
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0","--port", "8001","--reload"]
diff --git a/DockerfileCelery b/DockerfileCelery
@@ -0,0 +1,11 @@
+FROM python:3.9
+
+WORKDIR /app
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+COPY config.yaml .
+
+CMD ["celery", "-A", "superagi.worker", "worker", "--loglevel=info"]
diff --git a/README.MD b/README.MD
@@ -1,7 +1,7 @@
 <p align=center>
 <a href="https://superagi.co"><img src=https://superagi.co/wp-content/uploads/2023/05/SuperAGI_icon.png></a>
 
-° [![Join our Discord Server](https://img.shields.io/badge/Discord-SuperAGI-blueviolet?logo=discord&logoColor=white)](https://discord.gg/dXbRe5BHJC) °  [![Follow us on Twitter](https://img.shields.io/twitter/follow/_superAGI?label=_superAGI&style=social)](https://twitter.com/_superAGI) ° [![Join the discussion on Reddit](https://img.shields.io/reddit/subreddit-subscribers/Super_AGI?label=%2Fr/Super_AGI&style=social)](https://www.reddit.com/r/Super_AGI) 
+° [![Join our Discord Server](https://img.shields.io/badge/Discord-SuperAGI-blueviolet?logo=discord&logoColor=white)](https://discord.gg/dXbRe5BHJC) °  [![Follow us on Twitter](https://img.shields.io/twitter/follow/_superAGI?label=_superAGI&style=social)](https://twitter.com/_superAGI) ° [![Join the discussion on Reddit](https://img.shields.io/reddit/subreddit-subscribers/Super_AGI?label=%2Fr/Super_AGI&style=social)](https://www.reddit.com/r/Super_AGI)
 </p>
 
 ### *Infrastructure for building useful Autonomous Agents*
@@ -10,10 +10,10 @@
 # 💡 Features
 
 ### 🚀 **Provision, Spawn & Deploy Autonomous AI Agents**
-Seamless provision and run agents 
+Seamless provision and run agents
 
 ### 🛠️ **Extend Agent Capabilities with Tools**
-Give capabilities to your agents by selecting tools from growing library or build your own custom tool 
+Give capabilities to your agents by selecting tools from growing library or build your own custom tool
 
 ### 🔄 **Run Concurrent Agents Seamlessly**
 Run agents concurrently
@@ -79,21 +79,21 @@ Read and store files generated by agents, facilitating data management and analy
 
 Before starting with the project, it is highly recommended to create a virtual environment in Python. This isolates the packages required for the project from other packages installed on your system, avoiding potential compatibility issues.
 
-  To create a virtual environment, follow the steps below for your respective operating system:
+To create a virtual environment, follow the steps below for your respective operating system:
 
-  - For Linux and Mac:
-    1. Open a terminal window.
-    2. Install the `virtualenv` package, if not already installed, by running: `pip install virtualenv` or `pip3 install virtualenv`.
-    3. Navigate to your project directory using `cd` command.
-    4. Create a virtual environment by running: `virtualenv venv` (you can replace "venv" with your desired virtual environment name).
-    5. Activate the virtual environment by running: `source venv/bin/activate`.
+- For Linux and Mac:
+  1. Open a terminal window.
+  2. Install the `virtualenv` package, if not already installed, by running: `pip install virtualenv` or `pip3 install virtualenv`.
+  3. Navigate to your project directory using `cd` command.
+  4. Create a virtual environment by running: `virtualenv venv` (you can replace "venv" with your desired virtual environment name).
+  5. Activate the virtual environment by running: `source venv/bin/activate`.
 
-  - For Windows:
-    1. Open a command prompt window.
-    2. Install the `virtualenv` package, if not already installed, by running: `pip install virtualenv`.
-    3. Navigate to your project directory using `cd` command.
-    4. Create a virtual environment by running: `virtualenv venv` (you can replace "venv" with your desired virtual environment name).
-    5. Activate the virtual environment by running: `venv\Scripts\activate`.
+- For Windows:
+  1. Open a command prompt window.
+  2. Install the `virtualenv` package, if not already installed, by running: `pip install virtualenv`.
+  3. Navigate to your project directory using `cd` command.
+  4. Create a virtual environment by running: `virtualenv venv` (you can replace "venv" with your desired virtual environment name).
+  5. Activate the virtual environment by running: `venv\Scripts\activate`.
 
 # 🛠 Configuration
 
@@ -115,9 +115,9 @@ Before starting with the project, it is highly recommended to create a virtual e
 Simply run the start script in your terminal. This will install any necessary Python packages and launch SuperAGI
 
 * On Linux/MacOS:
-`source run.sh`
+  `source run.sh`
 * On Windows:
-`.\run.bat`
+  `.\run.bat`
 > If this gives errors, make sure you have a compatible Python version installed (preferrably python 3.10).
 
 # ⚠️ Under Development!

diff --git a/alembic.ini b/alembic.ini
@@ -0,0 +1,110 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python-dateutil library that can be
+# installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = postgresql://localhost/super_agi_main1
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/alembic/README b/alembic/README
@@ -0,0 +1 @@
+Generic single-database configuration.
diff --git a/alembic/env.py b/alembic/env.py
@@ -0,0 +1,93 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+from superagi.config.config import get_config
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+from superagi.models.base_model import DBBaseModel
+target_metadata = DBBaseModel.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+database_url = get_config('POSTGRES_URL')
+db_username = get_config('DB_USERNAME')
+db_password = get_config('DB_PASSWORD')
+db_name = get_config('DB_NAME')
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+
+    if db_username is None:
+        db_url = f'postgresql://{database_url}/{db_name}'
+    else:
+        db_url = f'postgresql://{db_username}:{db_password}@{database_url}/{db_name}'
+
+    config.set_main_option("sqlalchemy.url", db_url)
+
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/alembic/script.py.mako b/alembic/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}