fixed merge conflicts for swap

chatxbt-assistant.py

@@ -1,6 +1,7 @@
-import os
+import os, json
 from typing import Optional, Dict
 from dotenv import load_dotenv
+
 load_dotenv()
 
 import chainlit as cl
@@ -9,13 +10,16 @@ from phi.llm.openai import OpenAIChat
 from phi.tools.duckduckgo import DuckDuckGo
 from phi.tools.yfinance import YFinanceTools
 from src.databases.postgres import sqlalchemy_engine
+from src.knowledge_bases.combined import knowledge_base
 from src.tools.crypto_swap_toolkit import CryptoSwapTools
 from src.tools.crypto_data_toolkit import CryptoDataTools
-from src.tools.crypto_evm_wallet_toolkit import CryptoEVMWalletTools
-from src.tools.user_confirmation_pin_toolkit import UserConfirmationPinToolkit
+from portkey_ai import PORTKEY_GATEWAY_URL, createHeaders
+from src.config.portkey_config import generate_portkey_config
 from src.tools.user_profile_toolkit import UserProfileToolkit
 from phi.storage.assistant.postgres import PgAssistantStorage
-from src.knowledge_bases.combined import knowledge_base
+from src.tools.crypto_evm_wallet_toolkit import CryptoEVMWalletTools
+from src.tools.user_confirmation_pin_toolkit import UserConfirmationPinToolkit
+
 
 storage = PgAssistantStorage(
     # stores runs in the ai.assistant_runs table
@@ -23,50 +27,6 @@ storage = PgAssistantStorage(
     db_engine=sqlalchemy_engine
 )
 
-@cl.on_chat_start
-async def start():
-    is_dev_mode = True if os.getenv("DEV_MODE") else False
-
-    # Initialize the assistant
-    cxbt_assistant = Assistant(
-        llm=OpenAIChat(model="gpt-4o"),
-        tools=[
-            UserProfileToolkit(),
-            DuckDuckGo(),
-            CryptoDataTools(),
-            CryptoSwapTools(),
-            CryptoEVMWalletTools(),
-            UserConfirmationPinToolkit(),
-            YFinanceTools(stock_price=True)
-        ],
-        show_tool_calls=is_dev_mode,
-        markdown=True,
-        knowledge_base=knowledge_base,
-        storage=storage,
-        search_knowledge=True,
-        read_chat_history=True,
-        add_references_to_prompt=True,
-        add_chat_history_to_prompt=True
-    )
-    cxbt_assistant.knowledge_base.load(recreate=False)
-
-    # Set the assistant in the user session
-    cl.user_session.set("agent", cxbt_assistant)
-
-@cl.on_message
-async def main(message: cl.Message):
-
-    # Retrieve the assistant from the user session
-    agent = cl.user_session.get("agent")
-
-    # Process the user message using the assistant
-    response = ""
-    for delta in agent.run(message.content, stream=True):
-        response += delta
-    
-    # Send the response back to the user
-    await cl.Message(content=response).send()
-
 @cl.oauth_callback
 def oauth_callback(
   provider_id: str,
@@ -125,6 +85,62 @@ async def set_starters():
             )
         ]
 
+@cl.on_chat_start
+async def start():
+    is_dev_mode = True if os.getenv("DEV_MODE") else False
+
+    portkey_local_gateway = True if os.getenv("PORTKEY_LOCAL_GATEWAY_URL") else False
+    portkey_config = generate_portkey_config(local=portkey_local_gateway)
+
+    # Initialize the assistant
+    cxbt_assistant = Assistant(
+        llm=OpenAIChat(
+            api_key=os.getenv("PORTKEY_API_KEY"),
+            base_url=os.getenv("PORTKEY_LOCAL_GATEWAY_URL") or PORTKEY_GATEWAY_URL,
+            default_headers=createHeaders(
+                api_key=os.getenv("PORTKEY_API_KEY") or None,
+                config=portkey_config
+            ),
+        ),
+        tools=[
+            DuckDuckGo(),
+            CryptoDataTools(),
+            CryptoSwapTools(),
+            UserProfileToolkit(),
+            CryptoEVMWalletTools(),
+            UserConfirmationPinToolkit(),
+            YFinanceTools(stock_price=True)
+        ],
+        show_tool_calls=is_dev_mode,
+        markdown=True,
+        knowledge_base=knowledge_base,
+        storage=storage,
+        search_knowledge=True,
+        read_chat_history=True,
+        add_references_to_prompt=True,
+        add_chat_history_to_prompt=True,
+        prevent_hallucinations=True,
+        prevent_prompt_injection=True
+    )
+    cxbt_assistant.knowledge_base.load(recreate=False)
+
+    # Set the assistant in the user session
+    cl.user_session.set("agent", cxbt_assistant)
+
+@cl.on_message
+async def main(message: cl.Message):
+
+    # Retrieve the assistant from the user session
+    agent = cl.user_session.get("agent")
+
+    # Process the user message using the assistant
+    response = ""
+    for delta in agent.run(message.content, stream=True):
+        response += delta
+    
+    # Send the response back to the user
+    await cl.Message(content=response).send()
+
 # Run the Chainlit application
 if __name__ == "__main__":
     cl.run()

requirements.txt

@@ -8,12 +8,14 @@ anthropic==0.28.0
 anyio==3.7.1
 appdirs==1.4.4
 appnope==0.1.4
+APScheduler==3.10.4
 asgiref==3.8.1
 asttokens==2.4.1
 async-timeout==4.0.3
 asyncer==0.0.2
 attrs==23.2.0
 backcall==0.2.0
+backoff==2.2.1
 baize==0.20.8
 beautifulsoup4==4.12.3
 bidict==0.23.1
@@ -21,22 +23,26 @@ bitarray==2.9.2
 bleach==6.1.0
 boto3==1.34.106
 botocore==1.34.106
+cached-property==1.5.2
 certifi==2024.6.2
+cffi==1.16.0
 chainlit==1.1.300
 charset-normalizer==3.3.2
-psycopg2-binary==2.9.9
 chevron==0.14.0
 ckzg==1.0.2
 click==8.1.7
 coingecko==0.13
+cryptography==42.0.8
 cytoolz==0.12.3
 dataclasses-json==0.5.14
 decorator==5.1.1
 defusedxml==0.7.1
 Deprecated==1.2.14
 distro==1.9.0
+dnspython==2.6.1
 docopt==0.6.2
 duckduckgo_search==6.1.6
+email_validator==2.2.0
 eth-account==0.11.2
 eth-hash==0.7.0
 eth-keyfile==0.8.1
@@ -47,7 +53,9 @@ eth-utils==4.1.1
 eth_abi==5.1.0
 exceptiongroup==1.2.1
 executing==2.0.1
-fastapi==0.110.3
+fastapi==0.111.1
+fastapi-cli==0.0.4
+fastapi-sso==0.10.0
 fastjsonschema==2.19.1
 filelock==3.15.1
 filetype==1.2.0
@@ -62,10 +70,12 @@ google_search_results==2.4.2
 googleapis-common-protos==1.63.1
 greenlet==3.0.3
 grpcio==1.64.1
+gunicorn==22.0.0
 h11==0.14.0
 hexbytes==0.3.1
 html5lib==1.1
 httpcore==1.0.5
+httptools==0.6.1
 httpx==0.27.0
 huggingface-hub==0.23.3
 idna==3.7
@@ -92,6 +102,7 @@ langchainhub==0.1.20
 langgraph==0.0.68
 langsmith==0.1.77
 Lazify==0.4.0
+litellm==1.41.21
 literalai==0.0.604
 logfire==0.42.0
 lru-dict==1.2.0
@@ -104,6 +115,7 @@ mdurl==0.1.2
 mistune==3.0.2
 multidict==6.0.5
 multitasking==0.0.11
+mypy==1.10.1
 mypy-extensions==1.0.0
 nbclient==0.10.0
 nbconvert==7.16.4
@@ -111,6 +123,7 @@ nbformat==5.10.4
 nest-asyncio==1.6.0
 numexpr==2.10.0
 numpy==1.26.4
+oauthlib==3.2.2
 openai==1.34.0
 opentelemetry-api==1.25.0
 opentelemetry-exporter-otlp==1.25.0
@@ -142,6 +155,7 @@ pickleshare==0.7.5
 pipdeptree==2.22.0
 pipreqs==0.5.0
 platformdirs==4.2.2
+portkey-ai==1.7.0
 prompt_toolkit==3.0.47
 protobuf==4.25.3
 psutil==5.9.8
@@ -149,6 +163,7 @@ psycopg==3.1.19
 psycopg2==2.9.9
 ptyprocess==0.7.0
 pure-eval==0.2.2
+pycparser==2.22
 pycryptodome==3.20.0
 pydantic==2.7.4
 pydantic-settings==2.3.3
@@ -175,6 +190,7 @@ rich==13.7.1
 rlp==4.0.1
 rpc.py==0.6.0
 rpds-py==0.18.1
+rq==1.16.2
 s3fs==2024.6.0
 s3transfer==0.10.1
 shellingham==1.5.4
@@ -202,11 +218,13 @@ types-requests==2.32.0.20240602
 typing-inspect==0.9.0
 typing_extensions==4.12.2
 tzdata==2024.1
+tzlocal==5.2
 ulid==1.1
 upstash-redis==1.1.0
 uptrace==1.24.0
 urllib3==2.2.1
-uvicorn==0.25.0
+uvicorn==0.22.0
+uvloop==0.19.0
 watchfiles==0.20.0
 wcwidth==0.2.13
 web3==6.19.0

src/config/portkey_config.py

@@ -0,0 +1,108 @@
+import json
+import os
+
+def generate_portkey_config(local: bool = True):
+    if local:
+        config = {
+            "strategy": {
+                "mode": "fallback"
+            },
+            "cache": {
+                "mode": "semantic",
+                "max_age": 10000
+            },
+            "retry": {
+                "attempts": 3,
+                "on_status_codes": [429]
+            },
+            "targets": [
+                # {
+                #     "provider": "mistral-ai",
+                #     "api_key": os.getenv("MISTRAL_API_KEY"),
+                #     "override_params": {
+                #         "model": "codestral-latest",
+                #         "max_tokens": 1024,
+                #         "temperature": 0
+                #     }
+                # },
+                {
+                    "provider": "anthropic",
+                    "api_key": os.getenv("ANTHROPIC_API_KEY"),
+                    "override_params": {
+                        "model": "claude-3-5-sonnet-20240620",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                },
+                {
+                    "provider": "openai",
+                    "api_key": os.getenv("OPENAI_API_KEY"),
+                    "override_params": {
+                        "model": "gpt-4o",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                },
+                {
+                    "provider": "anthropic",
+                    "api_key": os.getenv("ANTHROPIC_API_KEY"),
+                    "override_params": {
+                        "model": "claude-3-opus-20240229",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                }
+            ]
+        }
+    else:
+        config = {
+            "strategy": {
+                "mode": "fallback"
+            },
+            "cache": {
+                "mode": "semantic",
+                "max_age": 10000
+            },
+            "retry": {
+                "attempts": 3,
+                "on_status_codes": [429]
+            },
+            "targets": [
+                
+                {
+                    "virtual_key": os.getenv("PORTKEY_OPENAI_VIRTUAL_KEY"),
+                    "override_params": {
+                        "model": "gpt-4o",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                },
+                {
+                    "provider": "anthropic",
+                    "api_key": os.getenv("POETRY_ANTHROPIC_API_KEY"),
+                    "override_params": {
+                        "model": "claude-3-5-sonnet-20240620",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                },
+                {
+                    "virtual_key": os.getenv("PORTKEY_ANTHROPIC_API_KEY"),
+                    "override_params": {
+                        "model": "claude-3-opus-20240229",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                },
+                {
+                    "virtual_key": os.getenv("PORTKEY_MISTRAL_API_KEY"),
+                    "override_params": {
+                        "model": "codestral-latest",
+                        "max_tokens": 1024,
+                        "temperature": 0
+                    }
+                }
+            ]
+        }
+    
+    return json.dumps(config)