Merge pull request #35 from IshShogun/development

Handle insufficent context in llama, add network function

Author: betterbrand

src/backend/services/ollama.ts

@@ -152,7 +152,7 @@ export const askOllama = async (model: string, message: string) => {
       },
       {
         role: 'user',
-        content: `Answer the following question in a valid formatted JSON object without comments with both the response and action fields deduced from the user's question. Adhere strictly to JSON syntax without comments. Question: ${message}. Response:`,
+        content: `Answer the following query in a valid formatted JSON object without comments with both the response and action fields deduced from the user's question. Adhere strictly to JSON syntax without comments. Query: ${message}. Response: { "response":`,
       },
     ],
   });

src/backend/services/prompts.ts

@@ -1,5 +1,5 @@
 export const MOR_PROMPT = `###System:
-You are MORPHEUS, but you prefer to be called a SmartAgent. You are designed to assist users with MetaMask transactions and queries in a consistent JSON format. Your responses should always contain a "response" field for textual feedback 
+You are MORPHEUS, but you prefer to be called a SmartAgent. You are designed to assist users with MetaMask transactions and queries in a consistent JSON format. You handle bad queries gracefully as detailed in the "Bad Queries" section. Your responses should always contain a "response" field for textual feedback 
 and an "action" field for transaction details. There are multiple action types, as detailed in the "Action Types" section.
 
 ###Response Format:
@@ -10,7 +10,7 @@ All responses must follow this JSON structure:
     // Action details or an empty object
   }
 }
-Respond only in valid JSON without any comments. If the user is initiating an action, create a valid transaction JSON object from their question. If the user is not initiating an action, the "action" field should be an empty object. The object should be structured based on the type of action they wish to initiate. Keep the "response" field short, using 3 sentences maximum.
+Respond only in valid JSON without any comments. If the user is initiating an action, create a valid transaction JSON object from their query. If the user is not initiating an action, the "action" field should be an empty object. The object should be structured based on the type of action they wish to initiate. Keep the "response" field short, using 3 sentences maximum.
 
 ###Action Types:
 1. **Transfer**: For users wanting to transfer ETH. The user's input should provide the target address and ETH amount.
@@ -33,10 +33,10 @@ Respond only in valid JSON without any comments. If the user is initiating an ac
        }
      }
 
-###Error Handling:
-For actions requiring more information (e.g., missing ETH amount for transfers), respond with a request for the necessary details:
+###Bad Queries:
+For queries requiring more information (e.g., missing ETH amount for transfers, incomplete questions), respond with a polite request for the necessary details. Follow the following pattern:
 {
-  "response": "Please provide the amount in ETH and the target address for the transfer.",
+  "response": "Request for more information goes here",
   "action": {}
 }
 
@@ -53,22 +53,30 @@ For actions requiring more information (e.g., missing ETH amount for transfers),
 
 // Balance Inquiries
 - **Balance inquiry**:
-   - Questions: "What's my balance?", "Could you tell me my current balance, please?", "how much eth I got?", "Hey Morpheus, can you show me my balance now?", "I need to see my ETH balance, can you help?"
+   - Questions: "What's my balance?", "Could you tell me my current balance, please?", "how much eth I got?", "Hey Morpheus, can you show me my balance now?", "I need to see my ETH balance, can you help?", "balance?"
    - Response for all:
      {
        "response": "",
        "action": {"type": "Balance"}
      }
 
-// Insufficient Information for Transfer
-- **Insufficient info for transfer**:
-   - Question: "I want to transfer ETH."
+//Bad Queries
+- **Bad Query**:
+   - Questions: "transfer", "How much eth do i have", "send"
    - Response:
      {
        "response": "Please provide the ETH amount and the target address for the transfer.",
        "action": {}
      }
 
+- **Bad Query**:
+  - Questions: "please explain", "why does", "who is"
+  - Response:
+    {
+      "response": "Sorry! I dont think I understand, what would you like me to explain?",
+      "action": {}
+    }
+
 // Non-action Queries
 - **Non-action query (e.g., general question)**:
    - Question: "What is stETH?"

src/frontend/utils/chain.ts

@@ -0,0 +1,67 @@
+type ChainInfo = {
+  chainId: string;
+  chainName: string;
+  rpcUrls: string[];
+  iconUrls: string[];
+  nativeCurrency: {
+    name: string;
+    symbol: string;
+    decimals: number;
+  };
+  blockExplorerUrls: string[];
+};
+
+const params: ChainInfo[] = [
+  {
+    chainId: '0x64',
+    chainName: 'Gnosis',
+    rpcUrls: ['https://rpc.ankr.com/gnosis'],
+    iconUrls: [
+      'https://xdaichain.com/fake/example/url/xdai.svg',
+      'https://xdaichain.com/fake/example/url/xdai.png',
+    ],
+    nativeCurrency: {
+      name: 'xDAI',
+      symbol: 'xDAI',
+      decimals: 18,
+    },
+    blockExplorerUrls: ['https://blockscout.com/poa/xdai/'],
+  },
+  {
+    chainId: '0xaa36a7',
+    chainName: 'Sepolia',
+    rpcUrls: ['https://rpc.notadegen.com/eth/sepolia'],
+    iconUrls: [],
+    nativeCurrency: {
+      name: 'ETH',
+      symbol: 'ETH',
+      decimals: 18,
+    },
+    blockExplorerUrls: ['https://sepolia.etherscan.io/'],
+  },
+  {
+    chainId: '0xa4b1',
+    chainName: 'arbitrum',
+    rpcUrls: ['https://arb1.arbitrum.io/rpc'],
+    iconUrls: [],
+    nativeCurrency: {
+      name: 'ARB',
+      symbol: 'ARB',
+      decimals: 18,
+    },
+    blockExplorerUrls: ['https://arbiscan.io/'],
+  },
+];
+
+export function getChainInfoByChainId(chainId: string): ChainInfo | undefined {
+  return params.find((chain) => chain.chainId === chainId);
+}
+
+// const chainIdToSearch = "0x64";
+// const chainInfo = getChainInfoByChainId(chainIdToSearch);
+
+// if (chainInfo) {
+//   console.log("Found chain info:", chainInfo);
+// } else {
+//   console.log("Chain info not found for chainId:", chainIdToSearch);
+// }

src/frontend/views/chat.tsx

@@ -16,6 +16,7 @@ import {
 } from '../utils/transaction';
 import { parseResponse } from '../utils/utils';
 import { ActionParams } from '../utils/types';
+import { getChainInfoByChainId } from '../utils/chain';
 
 const ChatView = (): JSX.Element => {
   const [selectedModel, setSelectedModel] = useState('llama2');
@@ -184,7 +185,16 @@ const ChatView = (): JSX.Element => {
       });
       console.log(response);
     } catch (error) {
-      console.error('Failed to switch networks:', error);
+      //if switch chain fails then add the chain
+      try {
+        const chainInfo = getChainInfoByChainId(selectedChain);
+        const response = await provider.request({
+          method: 'wallet_addEthereumChain',
+          params: [chainInfo],
+        });
+      } catch (error) {
+        console.error('Failed to switch networks:', error);
+      }
     }
   };
 
@@ -193,8 +203,9 @@ const ChatView = (): JSX.Element => {
       <Chat.Dropdown onChange={handleNetworkChange} value="">
         <option value="">Select a network</option>
         <option value="0x1">Ethereum</option>
-        <option value="0x4268">Holesky</option>
+        <option value="0xaa36a7">Sepolia</option>
         <option value="0xa4b1">Arbitrum</option>
+        <option value="0x64">Gnosis</option>
       </Chat.Dropdown>
       <Chat.Main>
         {dialogueEntries.map((entry, index) => {