Skip to content

Commit

Permalink
Add basic async queue
Browse files Browse the repository at this point in the history
  • Loading branch information
nwrxi committed Apr 13, 2024
1 parent 3ef9064 commit ded9c29
Show file tree
Hide file tree
Showing 6 changed files with 250 additions and 0 deletions.
160 changes: 160 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
45 changes: 45 additions & 0 deletions bot.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import discord
import asyncio
from discord.ext import commands
from queue_handler import QueueHandler
from config import TOKEN
import logging

class MyClient(discord.Client):
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.handler = QueueHandler(2)

async def on_ready(self):
logging.info(f'Logged on as {self.user}!')
self.loop.create_task(self.handler.handle_queue())

async def on_message(self, message):
if message.author == self.user:
return # Avoid the bot responding to its own messages

if message.author.id in self.handler.users_in_queue:
await message.reply('You already have a message in the queue!', mention_author=True)
return # Prevent adding multiple messages from the same user

if self.handler.queue.full():
await message.reply('Queue is full!', mention_author=True)
else:
await self.handler.queue.put(message)
async with self.handler.lock:
self.handler.users_in_queue.add(message.author.id)
# Correct position reporting immediately after adding to queue
position = self.handler.queue.qsize() # This should reflect the new addition
await message.reply(f'Your position in the queue: {position}', mention_author=True)


# Configure global logging
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')

# Bot setup and running
intents = discord.Intents.default()
intents.messages = True
intents.message_content = True

client = MyClient(intents=intents)
client.run(TOKEN)
5 changes: 5 additions & 0 deletions config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import os
from dotenv import load_dotenv

load_dotenv()
TOKEN = os.getenv('DISCORD_TOKEN')
22 changes: 22 additions & 0 deletions queue_handler.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import asyncio
from utils import generate_random_string
import logging

class QueueHandler:
def __init__(self, queue_size):
self.queue = asyncio.Queue(queue_size)
self.users_in_queue = set()
self.lock = asyncio.Lock()

async def handle_queue(self):
while True:
msg = await self.queue.get()
try:
await asyncio.sleep(5) # Simulate external API call
await msg.reply(generate_random_string(), mention_author=True)
logging.info(f'Message from {msg.author}: {msg.content}')
except Exception as e:
logging.error(f"Failed to process message: {e}")
finally:
async with self.lock:
self.users_in_queue.discard(msg.author.id)
14 changes: 14 additions & 0 deletions random_string_generator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import random

class RandomStringGenerator:
@staticmethod
def generate_random_string():
dictionary = [
"apple", "banana", "orange", "grape", "pear",
"dog", "cat", "rabbit", "hamster", "bird",
"house", "car", "bicycle", "boat", "plane"
]
num_words = random.randint(5, 10)
random_words = random.choices(dictionary, k=num_words)
random_string = ' '.join(random_words)
return random_string
4 changes: 4 additions & 0 deletions utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from random_string_generator import RandomStringGenerator

def generate_random_string():
return RandomStringGenerator.generate_random_string()

0 comments on commit ded9c29

Please sign in to comment.