testing

Dockerfile

@@ -6,27 +6,29 @@ RUN useradd -m -u 1000 user
 # Switch to the "user" user
 USER user
 
-# Set home to the user's home directory
+# Set home to the user's home directory and update PATH
 ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
-
-# Set the working directory to the user's home directory
-WORKDIR $HOME/app
+    PATH=/home/user/.local/bin:$PATH
 
+# Set the working directory to /app
 WORKDIR /app
 
-COPY --chown=user ./requirements.txt requirements.txt
+# Copy requirements.txt and install dependencies
+COPY --chown=user: ./requirements.txt ./requirements.txt
 RUN pip install --no-cache-dir --upgrade -r requirements.txt
 
-COPY --chown=user . $HOME/app
+# Copy the rest of the application code
+COPY --chown=user: . .
+
+# Expose necessary ports
+EXPOSE 7860 80
 
-EXPOSE 7860
-EXPOSE 80
+# Set environment variables
 ENV PYTHONUNBUFFERED=1 \
-	GRADIO_ALLOW_FLAGGING=never \
-	GRADIO_NUM_PORTS=1 \
-	GRADIO_SERVER_NAME=0.0.0.0 \
-	SYSTEM=spaces
+    GRADIO_ALLOW_FLAGGING=never \
+    GRADIO_NUM_PORTS=1 \
+    GRADIO_SERVER_NAME=0.0.0.0 \
+    SYSTEM=spaces
 
-COPY --chown=user . /app
+# Specify the command to run the application
 CMD ["python", "app.py"]

app.py

@@ -1,5 +1,3 @@
-# discord_bot.py
-
 import asyncio
 import logging
 import os
@@ -7,11 +5,12 @@ import re
 import sys
 
 import discord
-import requests  # Ensure 'requests' is installed
+import requests
+from aiohttp import web  # Added missing import
 from discord import Embed
 from discord.ext import commands
 from gradio_client import Client
-from gradio_client.exceptions import AppError  # Updated import
+from gradio_client.exceptions import AppError
 
 # **Fetch Discord Bot Token from Environment Variable**
 DISCORD_BOT_TOKEN = os.environ.get('DISCORD_BOT_TOKEN')
@@ -48,14 +47,12 @@ PROMPT_REGEX = re.compile(r'prompt\s*=\s*"(.*?)"')
 # Initialize the Gradio client with hf_token
 GRADIO_CLIENT = Client("Nevaehni/FLUX.1-schnell", hf_token=HF_TOKEN)
 
-
 @bot.event
 async def on_ready():
     """Event handler triggered when the bot is ready."""
     logger.info(f'Logged in as {bot.user} (ID: {bot.user.id})')
     logger.info('------')
 
-
 def parse_prompt(command: str) -> str:
     """
     Parse the prompt from the command string.
@@ -71,7 +68,6 @@ def parse_prompt(command: str) -> str:
         return match.group(1).strip()
     return ''
 
-
 def create_example_embed() -> Embed:
     """
     Create an embed message with an example !generate command.
@@ -86,7 +82,6 @@ def create_example_embed() -> Embed:
     )
     return embed
 
-
 @bot.command(name='generate')
 async def generate(ctx: commands.Context, *, args: str = None):
     """
@@ -221,7 +216,6 @@ async def generate(ctx: commands.Context, *, args: str = None):
         # Delete the processing message
         await processing_message.delete()
 
-
 @bot.event
 async def on_command_error(ctx: commands.Context, error):
     """
@@ -239,11 +233,9 @@ async def on_command_error(ctx: commands.Context, error):
         await ctx.send(f"❌ **Error:** {str(error)}")
         logger.error(f"Unhandled command error: {str(error)}")
 
-
 async def handle_root(request):
     return web.Response(text="DarkMuse GOES VROOOOM", status=200)
 
-
 async def start_web_server():
     app = web.Application()
     app.router.add_get('/', handle_root)
@@ -251,12 +243,20 @@ async def start_web_server():
     await runner.setup()
     site = web.TCPSite(runner, '0.0.0.0', 7860)
     await site.start()
+    logger.info("Web server started on port 7860")
 
+async def start_bot():
+    await bot.start(DISCORD_BOT_TOKEN)
+
+async def main():
+    await asyncio.gather(
+        start_bot(),
+        start_web_server()
+    )
 
-# Run the bot
+# Run the bot and web server concurrently
 if __name__ == '__main__':
     try:
-        bot.run(DISCORD_BOT_TOKEN)
-        bot.loop.create_task(start_web_server())
+        asyncio.run(main())
     except Exception as e:
         logger.exception(f"Failed to run the bot: {e}")