Update app.py

app.py

@@ -17,17 +17,19 @@ event = Event()
 
 DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
 
+
 async def wait(job):
     while not job.done():
         await asyncio.sleep(0.2)
 
 
 def get_client(session: Optional[str] = None) -> grc.Client:
-    client = grc.Client("https://cryptoscoutv1-cs-crewai-researchreport.hf.space", hf_token=os.getenv("HF_TOKEN"))
+    client = grc.Client("https://freddyaboulton-echo-chatbot.hf.space", hf_token=os.getenv("HF_TOKEN"))
     if session:
         client.session_hash = session
     return client
 
+
 def truncate_response(response: str) -> str:
     ending = "...\nTruncating response to 2000 characters due to discord api limits."
     if len(response) > 2000:
@@ -35,14 +37,12 @@ def truncate_response(response: str) -> str:
     else:
         return response
 
+
 intents = discord.Intents.default()
 intents.message_content = True
 bot = commands.Bot(command_prefix="/", intents=intents)
 
 
-
-## BOT COMMANDS ##
-
 @bot.event
 async def on_ready():
     print(f"Logged in as {bot.user} (ID: {bot.user.id})")
@@ -51,16 +51,22 @@ async def on_ready():
     event.set()
     print("------")
 
-    # Generate OAuth URL when the bot is ready
-    permissions = Permissions(326417525824)
-    url = oauth_url(bot.user.id, permissions=permissions)
-    print(f"Add this bot to your server by clicking this link: {url}")
 
 thread_to_client = {}
 thread_to_user = {}
 
-## /echo command to return the llm repsonse ##
-@bot.hybrid_command(name="cryptoreport", description="Enter text a Cryptocurrency Symbol or name to build a report - NOTE: Report takes about 2 Minutes")
+
+# @bot.command()
+# @commands.is_owner()
+# async def sync(ctx) -> None:
+#     synced = await bot.tree.sync()
+#     await ctx.send(f"Synced commands: {', '.join([s.name for s in synced])}.")
+
+
+@bot.hybrid_command(
+    name="echo",
+    description="Enter some text to chat with the bot! Like this: /echo Hello, how are you?",
+)
 async def chat(ctx, prompt: str):
     if ctx.author.id == bot.user.id:
         return
@@ -76,7 +82,7 @@ async def chat(ctx, prompt: str):
         thread = await message.create_thread(name=prompt)
         loop = asyncio.get_running_loop()
         client = await loop.run_in_executor(None, get_client, None)
-        job = client.submit(prompt, api_name="/predict")
+        job = client.submit(prompt, api_name="/chat")
         await wait(job)
 
         try:
@@ -93,24 +99,43 @@ async def chat(ctx, prompt: str):
     except Exception as e:
         print(f"{e}")
 
-@bot.hybrid_command(name="cshelp", description="Get information on how to use this bot.")
-async def help_command(ctx):
-    help_message = """
-    **How to Use This Bot**
-    - Use `/echo your_message` to interact with the bot.
-    - Your message will be processed, and you will get a response.
-    - If you need any assistance, contact the server admins.
-    """
-    await ctx.send(help_message)
+
+async def continue_chat(message):
+    """Continues a given conversation based on chathistory"""
+    try:
+        client = thread_to_client[message.channel.id]
+        prompt = message.content
+        job = client.submit(prompt, api_name="/chat")
+        await wait(job)
+        try:
+            job.result()
+            response = job.outputs()[-1]
+            await message.reply(truncate_response(response))
+        except QueueError:
+            await message.reply(
+                "The gradio space powering this bot is really busy! Please try again later!"
+            )
+
+    except Exception as e:
+        print(f"Error: {e}")
+
 
 @bot.event
 async def on_message(message):
-    if message.author.bot:
-        return
+    """Continue the chat"""
+    try:
+        if not message.author.bot:
+            if message.channel.id in thread_to_user:
+                if thread_to_user[message.channel.id] == message.author.id:
+                    await continue_chat(message)
+            else:
+                await bot.process_commands(message)
+
+    except Exception as e:
+        print(f"Error: {e}")
 
-    if message.content.startswith(bot.command_prefix):
-        await bot.process_commands(message)
 
+# running in thread
 def run_bot():
     if not DISCORD_TOKEN:
         print("DISCORD_TOKEN NOT SET")
@@ -118,16 +143,20 @@ def run_bot():
     else:
         bot.run(DISCORD_TOKEN)
 
+
 threading.Thread(target=run_bot).start()
 
 event.wait()
-event.wait()
+
 if not DISCORD_TOKEN:
     welcome_message = """
+
     ## You have not specified a DISCORD_TOKEN, which means you have not created a bot account. Please follow these steps:
+
     ### 1. Go to https://discord.com/developers/applications and click 'New Application'
     
     ### 2. Give your bot a name 🤖
+
     ![](https://gradio-builds.s3.amazonaws.com/demo-files/discordbots/BotName.png)
     
     ## 3. In Settings > Bot, click the 'Reset Token' button to get a new token. Write it down and keep it safe 🔐
@@ -139,7 +168,9 @@ if not DISCORD_TOKEN:
     ## 5. Scroll down and enable 'Message Content Intent' under 'Priviledged Gateway Intents'
     
     ![](https://gradio-builds.s3.amazonaws.com/demo-files/discordbots/MessageContentIntent.png)
+
     ## 6. Save your changes!
+
     ## 7. The token from step 3 is the DISCORD_TOKEN. Rerun the deploy_discord command, e.g client.deploy_discord(discord_bot_token=DISCORD_TOKEN, ...), or add the token as a space secret manually.
 """
 else:
@@ -149,15 +180,20 @@ else:
     ## Add this bot to your server by clicking this link: 
     
     {url}
+
     ## How to use it?
+
     The bot can be triggered via `!echo` followed by your text prompt.
+
     ## Enabling slash commands
+
     If you are the owner of this bot, call the `!sync` command from your discord server.
     This will allow anyone in your server to call the bot via `/echo`.
     This is known as a slash command and is a nicer experience than calling the bot via `!echo`.
     
     After calling `!sync`, it may take a few minutes for `/echo` to be recognized as a valid command
     in your server.
+
     ⚠️ Note ⚠️: It is best to create a separate bot per command if you intend to use slash commands. Also make sure
     none of your bots have matching command names. 
     """
@@ -166,8 +202,9 @@ else:
 with gr.Blocks() as demo:
     gr.Markdown(
         f"""
-    # Discord bot of Crypto Scout - CrewAI - Crypto Research Report
+    # Discord bot of https://freddyaboulton-echo-chatbot.hf.space
     {welcome_message}
     """
     )
-demo.launch()
+
+demo.launch()