From 96f9fd4fce92e5dadff98ac3a5563d2b53245fa5 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 13 Mar 2024 13:37:50 -0600 Subject: [PATCH] new things --- Dockerfile-web | 6 ++++++ {bot/bin => bin}/storage.py | 0 bot/bot.py | 2 +- bot/cogs/counting.py | 2 +- bot/cogs/settings.py | 2 +- compose.yaml | 15 ++++++++++++++- flask/app.py | 19 +++++++++++++++++++ flask/requirements.txt | 2 ++ 8 files changed, 44 insertions(+), 4 deletions(-) rename {bot/bin => bin}/storage.py (100%) create mode 100644 flask/app.py create mode 100644 flask/requirements.txt diff --git a/Dockerfile-web b/Dockerfile-web index e69de29..1e2b023 100644 --- a/Dockerfile-web +++ b/Dockerfile-web @@ -0,0 +1,6 @@ +FROM python:3.12-slim +RUN mkdir -p /app +COPY flask/. /app +WORKDIR /app +RUN pip install -r requirements.txt +ENTRYPOINT ["granian", "--interface wsgi", "app:app", "--port 8000"] \ No newline at end of file diff --git a/bot/bin/storage.py b/bin/storage.py similarity index 100% rename from bot/bin/storage.py rename to bin/storage.py diff --git a/bot/bot.py b/bot/bot.py index 0f7eae1..f1c7222 100644 --- a/bot/bot.py +++ b/bot/bot.py @@ -3,7 +3,7 @@ import discord from discord.ext import bridge import logging from pymongo import MongoClient -from bin.storage import storage +from ..bin.storage import storage logging.basicConfig(filename="turdbot.log",level=logging.INFO) diff --git a/bot/cogs/counting.py b/bot/cogs/counting.py index 4698218..e4bbde4 100644 --- a/bot/cogs/counting.py +++ b/bot/cogs/counting.py @@ -1,5 +1,5 @@ from discord.ext import bridge, commands -from bin.storage import storage +from ..bin.storage import storage class Counting(commands.Cog): def __init__(self, bot): diff --git a/bot/cogs/settings.py b/bot/cogs/settings.py index a47de2c..99c9486 100644 --- a/bot/cogs/settings.py +++ b/bot/cogs/settings.py @@ -1,5 +1,5 @@ from discord.ext import bridge, commands -from bin.storage import storage +from ..bin.storage import storage class Settings(commands.Cog): def __init__(self, bot): diff --git a/compose.yaml b/compose.yaml index 9b46b21..d7425d0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: turdbot: - image: "ionburger/turdbot:latest" + image: ionburger/turdbot restart: always container_name: turdbot depends_on: @@ -11,6 +11,19 @@ services: - DB_USERNAME=${DB_USERNAME} - DB_PASSWORD=${DB_PASSWORD} + flask: + image: ionburger/turdweb + restart: always + container_name: turdweb + depends_on: + - mongodb + environment: + - DB_HOST=mongodb + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} + ports: + - "5005:5005" + mongodb: image: mongo restart: always diff --git a/flask/app.py b/flask/app.py new file mode 100644 index 0000000..1de582d --- /dev/null +++ b/flask/app.py @@ -0,0 +1,19 @@ +from flask import Flask +from pymongo import MongoClient +from ..bin.storage import storage +from os import environ as env +import logging + +logging.basicConfig(level=logging.INFO) + +app = Flask(__name__) + +uri = f"mongodb://{env['DB_USERNAME']}:{env['DB_PASSWORD']}@{env['DB_HOST']}/?authSource=admin" +app.db = MongoClient(uri)["turdbot"] + + +@app.route("/") +def hello(): + db = storage(1004178748205187083,app.db).db + count = db('counting', 'count') + return f"Hello World! {count}" \ No newline at end of file diff --git a/flask/requirements.txt b/flask/requirements.txt new file mode 100644 index 0000000..9dfdbc9 --- /dev/null +++ b/flask/requirements.txt @@ -0,0 +1,2 @@ +grainian +flask \ No newline at end of file