solved merge conflict

AndrewHakmi · May 22, 2023 · 8c2ec60 · 8c2ec60
2 parents aa35e2d + e15831e
commit 8c2ec60
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/README.MD b/README.MD
@@ -63,10 +63,10 @@ Read and store files generated by agents, facilitating data management and analy
 
 # 🛠 Configuration
 
-1. Find the file named .env.template in the main SuperAGI folder. This file may be hidden by default in some operating systems due to the dot prefix. To reveal hidden files, follow the instructions for your specific operating system: [Windows](https://support.microsoft.com/en-us/windows/view-hidden-files-and-folders-in-windows-97fbc472-c603-9d90-91d0-1166d1d9f4b5), [macOS](https://www.pcmag.com/how-to/how-to-access-your-macs-hidden-files).
+1. Find the file named config_template.yaml in the main SuperAGI folder. This file may be hidden by default in some operating systems due to the dot prefix. To reveal hidden files, follow the instructions for your specific operating system: [Windows](https://support.microsoft.com/en-us/windows/view-hidden-files-and-folders-in-windows-97fbc472-c603-9d90-91d0-1166d1d9f4b5), [macOS](https://www.pcmag.com/how-to/how-to-access-your-macs-hidden-files).
 2. Create a copy of config_template.yaml and call it config.yaml; if you're already in a command prompt/terminal window: cp config_template.yaml  config.yaml.
 3. Open the config.yaml file in a text editor.
-4. Find the line that says OPENAI_API_KEY=.
+4. Find the line that says OPENAI_API_KEY:
 5. After the :, enter your unique OpenAI API Key, Google key and Custom search engine ID without any quotes or spaces.
 6. Enter any other API keys or tokens for services you would like to use.
 7. Save and close the config.yaml file

diff --git a/requirements.txt b/requirements.txt
@@ -23,6 +23,7 @@ filelock==3.12.0
 frozenlist==1.3.3
 google-search-results==2.4.2
 google-serp-api==1.0.3
+greenlet==2.0.2
 h11==0.14.0
 httptools==0.5.0
 idna==3.4
@@ -84,3 +85,4 @@ watchfiles==0.19.0
 websockets==10.4
 yarl==1.9.2
 zipp==3.15.0
+tiktoken==0.4.0
diff --git a/run.sh b/run.sh
@@ -1,25 +1,3 @@
-# if [ ! -f "config.yaml" ]; then
-#     echo "ERROR: config.yaml file not found. Please create the config.yaml file using the command 'cp config_template.yaml config.yaml' and edit it."
-#     exit 1
-# fi
-
-# # Install requirements
-# echo "Installing requirements..."
-# pip install -r requirements.txt
-
-# # Run test.py using python
-# echo "Running test.py with python..."
-# python test.py
-
-# # If the above command fails, run test.py using python3
-# if [ $? -ne 0 ]; then
-#     echo "Running test.py with python3..."
-#     python3 test.py
-# fi
-
-#!/bin/bash
-
-# Check if config.yaml file exists
 #!/bin/bash
 
 # Check if config.yaml file exists

diff --git a/test.py b/test.py
@@ -33,4 +33,10 @@ def create_campaign(campaign_name: str):
 # send_tool = SendTweetTool()
 # send_tool.execute("Innovation isn't a one-time event; it's a culture. It's about daring to question the status quo, nurturing a curiosity that stretches horizons, and constantly seeking new ways to add value #Innovation #ChangeTheWorld")
 superagi = SuperAgi.from_llm_and_tools("Super AGI", "Super AGI", memory, tools, OpenAi(model="gpt-4"))
-superagi.execute(["Write best marketing strategies for ecommerce brand in a file"])
+
+user_input=[]
+user_input=str(input("Enter your Goal:\n"))
+
+superagi.execute([user_input])
+
+# superagi.execute(["Write best marketing strategies for ecommerce brand in a file"])