Skip to content

Commit

Permalink
updated README. Bug fix for Windows Ollama preinstall step
Browse files Browse the repository at this point in the history
  • Loading branch information
LachsBagel committed Sep 14, 2024
1 parent 8513084 commit 707533a
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 55 deletions.
55 changes: 34 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@

## Morpheus Install for Local Web3 Agent Interaction

# TODO update images
![UI 1](images/moragents_chatpdf.png)
![UI 1](images/tweet_sizzler.png)

![UI 2](images/wallet_integration.png)

![UI 3](images/successful_swap.png)
![UI 3](images/mor_rewards.png)

![UI 4](images/agent_clarify.png)
![UI 4](images/price_fetcher.png)

![UI 5](images/moragents_chatpdf.jpg)

---
# TODO, give example queries

### Features
- Upload a PDF with paperclip icon, then ask question about PDF:
#### Upload a PDF with paperclip icon, then ask questions about the PDF 📄
- "Can you give me a summary?"
- "What's the main point of the document?"
- Swap ERC Compatible Tokens
- "Swap 0.01 ETH for "
# TODO, verify we can swap for MOR
- Fetch Price, Market Cap, and TVL of coins and tokens supported on CoinGecko
#### Swap ERC Compatible Tokens 🪙 -> 🪙
- "Swap 0.01 ETH for USDC"
#### Fetch Price, Market Cap, and TVL of coins and tokens supported on CoinGecko 📈
- "What's the price of ETH?"
- "What's the market cap of BTC?"
- Check MOR rewards
#### Check MOR rewards 🏆
- "How many MOR rewards do I have?"
- Write Sizzling Tweets 🌶️ No Content Moderation 😅
#### Write Sizzling Tweets 🌶️ No Content Moderation 😅
- "Write a based tweet about Crypto and AI"

**Works with your favorite wallet extensions in your existing browser**
Expand All @@ -39,28 +39,34 @@
#### Steps to Install
1. Download Installer
1. For Mac on Apple Silicon M1/2/3 etc. (arm64) [MORagents010-apple.pkg]()
> SHA256 MORagents010-apple.pkg
2. For Mac on Intel (x86_64) [MORagents010-intel.pkg]()
> SHA256 MORagents010-intel.pkg
1. For Mac on Apple Silicon M1/2/3 etc. (arm64)
1. Download and run MORagents installer [MORagents010-apple.pkg](https://drive.proton.me/urls/G9JZYZ508R#gmDk0i6UFLSG)
> SHA256 a4846c83ced5d35740f884a144cf518764edfc17b576b808cd77a8fe2da6ebf2 MORagents010-apple.pkg
2. For Mac on Intel (x86_64)
1. Download and install [Docker Desktop](https://desktop.docker.com/mac/main/amd64/Docker.dmg)
2. Download and run MORagents installer [MORagents010-intel.pkg](https://drive.proton.me/urls/HPFMSN40GM#Pa90tgOzYn9g)
> SHA256 46b0e927aaca27cf08d9a95b73d01bc07a92cb5a8b05cf69faaf71566712a781 MORagents010-intel.pkg
2. Wait several minutes for background files to download and then your browser should automatically open to http://localhost:3333
> Note: After installation is complete, the MORagents app icon will bounce for several minutes on your dock, and then stop. This is normal behavior as it's downloading a large 9GB file in the background. You can open "Activity Monitor" and in the Network tab see that it's downloading.
> Note: After installation is complete, the MORagents app icon will bounce for several minutes on your dock, and then stop. This is normal behavior as it's downloading a couple large 9GB files in the background. You can open "Activity Monitor" and in the Network tab see that it's downloading.
#### Future Usage
- Open the "MORagents" app from Mac search bar.
- For easier access: Right-click MORagents icon on dock -> Options -> Keep in Dock

#### Troubleshooting
If the app shows connections errors in connecting to agents. Please ensure Docker Desktop is running, then close and reopen **MORagents** from desktop.

- If the app shows connections errors in connecting to agents. Please ensure Docker Desktop is running, then close and reopen **MORagents** from desktop.
- If installation is unsuccessful, run the following in your Terminal and open the MORagents....pkg again
```shell
$ xcode-select --install
```
---

### Windows (x86_64)
>Assumes minimum 16GB RAM
#### Steps
1. Use Chrome to download [MORagentsSetupWindows010.zip]()
> SHA256 MORagentsSetupWindows010.zip
1. Download [MORagentsSetupWindows010.zip](https://drive.proton.me/urls/QXRZR77AJ0#U0ZRbd2rDbXT)
> SHA256 0ca1879d3f103938a49852d2d2f82a36bc0ebc44ed94400fcee3b883e2cbb2f6 MORagentsSetupWindows010.zip
2. Go to downloaded **MORagentsSetupWindows010(.zip)** file and double click to open
3. Double click **MORagentsSetup.exe**
1. You may need to click "More info" -> "Run anyway"
Expand All @@ -80,6 +86,13 @@ If the app shows connections errors in connecting to agents. Please ensure Docke
*Coming soon*


---
# Adding a New Agent

See [Agents README](submodules/moragents_dockers/README.md) section: "Steps to Add a New Agent".

This will allow you to add custom agents which will be automatically invoked based on relevant user queries.

---

### Build it Yourself
Expand Down
Binary file modified images/wallet_integration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 9 additions & 33 deletions submodules/moragents_dockers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Open in the browser: ```http://localhost:3333/```
Docker build will download the model. The first time that one of the agents are called, the model will be loaded into memory and this instance will be shared between all agents.

## Agents
Three agents are included:
Five agents are included:

### Data Agent

Expand Down Expand Up @@ -67,38 +67,14 @@ A typical flow looks like this:
## RAG Agent
This agent will answer questions about an uploaded PDF file.
## Tweet Sizzler Agent
This agent will let you generate tweets, edit with a WSYWIG.
Provided you enter API creds in the Settings you can also directly post to your X account.
# Delegator
The Delegator handles user queries by analyzing the prompt and delegating it to the appropriate agent.
## API Endpoints
1. **Chat Functionality**
- Endpoint: `POST /`
- Handles chat interactions, delegating to appropriate agents when necessary.
2. **Message History**
- Endpoint: `GET /messages`
- Retrieves chat message history.
3. **Clear Messages**
- Endpoint: `GET /clear_messages`
- Clears the chat message history.
4. **Swap Operations**
- Endpoints:
- `POST /tx_status`: Check transaction status
- `POST /allowance`: Get allowance
- `POST /approve`: Approve transaction
- `POST /swap`: Perform swap
5. **File Upload**
- Endpoint: `POST /upload`
- Handles file uploads for RAG (Retrieval-Augmented Generation) purposes.
## RAG Agent
This agent will answer questions about an uploaded PDF file.
## MOR Rewards Agent
Ask the agent to check your MOR rewards and it will retrieve claimable MOR stats from both capital and coder pools.
---
# Delegator
The Delegator handles user queries by analyzing the prompt and delegating it to the appropriate agent.
Expand Down Expand Up @@ -128,12 +104,12 @@ The Delegator handles user queries by analyzing the prompt and delegating it to
- Endpoint: `POST /upload`
- Handles file uploads for RAG (Retrieval-Augmented Generation) purposes.
# Adding a New Agent
## Overview
Each agent is configured in the `config.py` file, which specifies the agent's path, class, and other details.
Each agent is configured in the [agents/src/config.py](agents/src/config.py) file, which specifies the agent's path, class, and other details.
This allows the delegator to delegate to the correct task agent based on the user's query.
## Steps to Add a New Agent
Expand Down
3 changes: 2 additions & 1 deletion wizard_windows.iss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ Filename: "{tmp}\DockerDesktopInstaller.exe"; Parameters: "install"; StatusMsg:
Filename: "{tmp}\OllamaSetup.exe"; StatusMsg: "Installing Ollama..."; Flags: waituntilterminated
Filename: "{app}\LICENSE.md"; Description: "View License Agreement"; Flags: postinstall shellexec skipifsilent
Filename: "{app}\MORagents.exe"; Description: "Launch MORagents"; Flags: postinstall nowait skipifsilent unchecked
Filename: "cmd.exe"; Parameters: "/c ollama pull llama3.1 && ollama pull nomic-embed-text"; StatusMsg: "Pulling Ollama models..."; Flags: runhidden waituntilterminated
Filename: "cmd.exe"; Parameters: "/c ollama pull llama3.1"; StatusMsg: "Pulling llama3.1 model..."; Flags: runhidden waituntilterminated
Filename: "cmd.exe"; Parameters: "/c ollama pull nomic-embed-text"; StatusMsg: "Pulling nomic-embed-text model..."; Flags: runhidden waituntilterminated

[Code]
var
Expand Down

0 comments on commit 707533a

Please sign in to comment.