Make dumpus API easier to self-host

.env.example

@@ -9,3 +9,5 @@ CELERY_HOSTNAME=""
 
 DISWHO_JWT_SECRET=""
 DISWHO_BASE_URL=""
+
+DISCORD_SECRET=""

docker-compose.yml

@@ -0,0 +1,90 @@
+services:
+
+  broker:
+    container_name: dumpus-broker
+    image: rabbitmq:latest
+    ports:
+      - "5672:5672"
+
+    healthcheck:
+      test: [ "CMD", "rabbitmq-diagnostics", "--quiet", "ping" ]
+      timeout: 10s
+      retries: 5
+      start_period: 10s
+
+    environment:
+      RABBITMQ_DEFAULT_USER: dumpus
+      RABBITMQ_DEFAULT_PASS: dumpus
+
+    restart: unless-stopped
+
+  db:
+    container_name: dumpus-db
+    image: postgres:latest
+    ports:
+      - "6641:5432"
+
+    healthcheck:
+      test: [ "CMD-SHELL", "PGUSER=dumpus", "pg_isready" ]
+      interval: 1s
+      timeout: 10s
+      retries: 5
+
+    environment:
+      POSTGRES_USER: dumpus
+      POSTGRES_PASSWORD: dumpus
+      POSTGRES_DB: dumpus
+
+    restart: unless-stopped
+
+  worker:
+    container_name: dumpus-worker
+    build:
+      dockerfile: Dockerfile.worker
+
+    healthcheck:
+      test: [ "CMD-SHELL", "celery", "-A", "tasks", "inspect", "ping", "-d", "regular_process@$HOSTNAME" ]
+      interval: 2s
+      timeout: 10s
+      retries: 5
+
+    depends_on:
+      broker:
+        condition: service_healthy
+        restart: true
+      db:
+        condition: service_healthy
+        restart: true
+
+    environment:  
+      POSTGRES_URL: "postgresql+psycopg2://dumpus:dumpus@db:5432/dumpus"
+      RABBITMQ_URL: "amqp://dumpus:dumpus@broker:5672/"
+
+  api:
+    container_name: dumpus-api
+    build:
+      dockerfile: Dockerfile.api
+
+    ports:
+      - "5000:5000"
+    depends_on:
+      worker:
+        condition: service_healthy
+        restart: true
+
+    environment:
+      POSTGRES_URL: "postgresql+psycopg2://dumpus:dumpus@db:5432/dumpus"
+      RABBITMQ_URL: "amqp://dumpus:dumpus@broker:5672/"
+
+  # flower:
+  #   container_name: flower
+  #   build:
+  #     dockerfile: Dockerfile.flower
+
+  #   ports:
+  #     - "5566:5566"
+
+  #   depends_on:
+  #     worker:
+  #       condition: service_healthy
+  #       restart: true

src/util.py

@@ -99,13 +99,19 @@ def generate_diswho_jwt():
 
 def fetch_diswho_user(user_id):
     diswho_base_url = os.getenv('DISWHO_BASE_URL')
-    diswho_jwt = generate_diswho_jwt()
+    if diswho_base_url:
+        base_url = diswho_base_url + "/user"
+        diswho_jwt = generate_diswho_jwt()
+        auth = f"Bearer {diswho_jwt}"
+    else:
+        base_url = os.getenv('DISCORD_BASE_URL', 'https://discord.com/api/v8/users/')
+        auth = f"Bot {os.getenv('DISCORD_SECRET')}"
 
     headers = {
-        'authorization': f'Bearer {diswho_jwt}'
+        'authorization': auth
     }
 
-    r = requests.get(f'{diswho_base_url}/user/{user_id}', headers=headers)
+    r = requests.get(f'{base_url}/{user_id}', headers=headers)
     if r.status_code == 200:
         return r.json()
     else: