wi1-bot 2.0.2__tar.gz → 2.0.4__tar.gz

wi1_bot-2.0.4/.dockerignore

@@ -0,0 +1,25 @@
+.DS_Store
+.direnv/
+.dockerignore
+.envrc
+.git/
+.github/
+.gitignore
+.mypy_cache/
+.pre-commit-config.yaml
+.ruff_cache/
+.venv/
+.vscode/
+Dockerfile
+compose.yaml
+flake.lock
+flake.nix
+
+config.yaml
+tests/files/
+log/
+
+build/
+dist/
+*.egg-info/
+_version.py

wi1_bot-2.0.4/.github/workflows/docker.yaml

@@ -0,0 +1,124 @@
+name: docker
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  packages: write
+  contents: read
+  attestations: write
+  id-token: write
+
+jobs:
+  docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [linux/amd64, linux/arm64]
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-latest
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+
+    runs-on: ${{ matrix.runner }}
+
+    steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: wthueb/wi1-bot
+
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: ${{ matrix.platform }}
+          tags: wthueb/wi1-bot
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,push-by-digest=true,name-canonical=true,push=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Export digest
+        run: |
+            mkdir -p ${{ runner.temp }}/digests
+            digest="${{ steps.build.outputs.digest }}"
+            touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: docker
+
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            wthueb/wi1-bot
+            ghcr.io/${{ github.repository_owner }}/wi1-bot
+
+      - name: Create Docker Hub manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create \
+            $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf 'wthueb/wi1-bot@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect wthueb/wi1-bot:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ghcr.io/${{ github.repository_owner }}/wi1-bot:${{ steps.meta.outputs.version }}

wi1_bot-2.0.4/Dockerfile

@@ -0,0 +1,36 @@
+FROM linuxserver/ffmpeg:latest AS base
+
+RUN apt-get update && apt-get install -yqq --no-install-recommends python3
+
+FROM base AS builder
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+ENV UV_PYTHON_DOWNLOADS=0 UV_COMPILE_BYTECODE=1 UV_LINK_MODE=copy
+
+WORKDIR /app
+
+COPY pyproject.toml uv.lock .
+
+RUN --mount=type=cache,target=/root/.cache/uv uv sync --locked --no-install-project --no-dev
+
+COPY . .
+
+RUN --mount=type=cache,target=/root/.cache/uv uv sync --locked --no-dev
+
+FROM base
+
+COPY --from=builder --chown=app:app /app /app
+ENV PATH="/app/.venv/bin:$PATH"
+
+LABEL org.opencontainers.image.source="https://github.com/wthueb/wi1-bot"
+LABEL org.opencontainers.image.maintainer="wilhueb@gmail.com"
+
+ENV WB_CONFIG_PATH=/config/config.yaml
+ENV WB_LOG_DIR=/logs
+
+RUN mkdir -p /config
+RUN mkdir -p /logs
+
+EXPOSE 9000
+
+ENTRYPOINT ["python", "-m", "wi1_bot.scripts.start"]

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wi1-bot
-Version: 2.0.2
+Version: 2.0.4
 Summary: Discord bot for Radarr/Sonarr integration
 Project-URL: Homepage, https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/compose.yaml

@@ -2,21 +2,22 @@ services:
   wi1-bot:
     container_name: wi1-bot
     image: wthueb/wi1-bot
-    runtime: nvidia
     deploy:
       resources:
         reservations:
           devices:
-            - capabilities:
-              - gpu
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
+    devices:
+      - /dev/dri:/dev/dri
     environment:
       - WB_CONFIG_PATH=/data/config.yaml
-      - WB_LOG_PATH=/data/logs
+      - WB_LOG_DIR=/data/logs
+      - MONGODB_CONNECTION_STRING=mongodb://mongodb:27017
     volumes:
       - .:/data
 
   mongodb:
     container_name: mongodb
     image: mongo:8.0
-    ports:
-      - 27017:27017

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/wi1_bot/discord/bot.py

@@ -1,7 +1,6 @@
 import asyncio
 import logging
 import traceback
-from typing import Any
 
 import discord
 from discord.ext import commands
@@ -21,12 +20,14 @@ sonarr = Sonarr(config["sonarr"]["url"], config["sonarr"]["api_key"])
 
 
 @bot.check
-async def check_channel(ctx: commands.Context[Any]) -> bool:
+async def check_channel(ctx: commands.Context[commands.Bot]) -> bool:
     return ctx.channel.id == config["discord"]["channel_id"]
 
 
 @bot.event
-async def on_command_error(ctx: commands.Context[Any], error: commands.CommandError) -> None:
+async def on_command_error(
+    ctx: commands.Context[commands.Bot], error: commands.CommandError
+) -> None:
     match error:
         case commands.CommandNotFound() | commands.CheckFailure():
             pass
@@ -63,13 +64,13 @@ async def on_ready() -> None:
 
 
 @bot.before_invoke
-async def before_invoke(ctx: commands.Context[Any]) -> None:
+async def before_invoke(ctx: commands.Context[commands.Bot]) -> None:
     logger.info(f"got command from {ctx.message.author}: {ctx.message.content}")
 
 
 @bot.command(name="downloads", aliases=["queue", "q"], help="see the status of movie downloads")
 @commands.cooldown(1, 10)
-async def downloads_cmd(ctx: commands.Context[Any]) -> None:
+async def downloads_cmd(ctx: commands.Context[commands.Bot]) -> None:
     async with ctx.typing():
         queue = radarr.get_downloads() + sonarr.get_downloads()
 
@@ -84,7 +85,7 @@ async def downloads_cmd(ctx: commands.Context[Any]) -> None:
 
 @bot.command(name="quota", help="see your used space on the plex")
 @commands.cooldown(1, 60, commands.BucketType.user)
-async def quota_cmd(ctx: commands.Context[Any]) -> None:
+async def quota_cmd(ctx: commands.Context[commands.Bot]) -> None:
     async with ctx.typing():
         used = (
             radarr.get_quota_amount(ctx.message.author.id)
@@ -98,17 +99,14 @@ async def quota_cmd(ctx: commands.Context[Any]) -> None:
 
         pct = used / maximum * 100 if maximum != 0 else 100
 
-        msg = (
-            f"you have added {used:.2f}/{maximum:.2f} GB ({pct:.1f}%) of useless crap"
-            " to the plex"
-        )
+        msg = f"you have added {used:.2f}/{maximum:.2f} GB ({pct:.1f}%) of useless crap to the plex"
 
     await reply(ctx.message, msg)
 
 
 @bot.command(name="quotas", help="see everyone's used space on the plex")
 @commands.cooldown(1, 60)
-async def quotas_cmd(ctx: commands.Context[Any]) -> None:
+async def quotas_cmd(ctx: commands.Context[commands.Bot]) -> None:
     if "quotas" not in config["discord"]:
         await reply(ctx.message, "quotas are not implemented here")
         return
@@ -139,7 +137,7 @@ async def quotas_cmd(ctx: commands.Context[Any]) -> None:
 
 @bot.command(name="addtag", help="add a user tag")
 @commands.has_role("plex-admin")
-async def addtag_cmd(ctx: commands.Context[Any], name: str, user: discord.Member) -> None:
+async def addtag_cmd(ctx: commands.Context[commands.Bot], name: str, user: discord.Member) -> None:
     tag = f"{name}: {user.id}"
 
     radarr.create_tag(tag)

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/wi1_bot/discord/cogs/movie.py

@@ -1,6 +1,5 @@
 import asyncio
 import logging
-from typing import Any
 
 from discord.ext import commands
 
@@ -18,7 +17,7 @@ class MovieCog(commands.Cog):
         self.radarr = Radarr(config["radarr"]["url"], config["radarr"]["api_key"])
 
     @commands.command(name="addmovie", help="add a movie to the plex")
-    async def addmovie_cmd(self, ctx: commands.Context[Any], *, query: str = "") -> None:
+    async def addmovie_cmd(self, ctx: commands.Context[commands.Bot], *, query: str = "") -> None:
         if not query:
             await reply(ctx.message, "usage: !addmovie KEYWORDS...")
             return
@@ -71,7 +70,7 @@ class MovieCog(commands.Cog):
             await ctx.send(f"hey <@!{config['discord']['admin_id']}> get this guy a tag")
 
     @commands.command(name="delmovie", help="delete a movie from the plex")
-    async def delmovie_cmd(self, ctx: commands.Context[Any], *, query: str = "") -> None:
+    async def delmovie_cmd(self, ctx: commands.Context[commands.Bot], *, query: str = "") -> None:
         if not query:
             await reply(ctx.message, "usage: !delmovie KEYWORDS...")
             return

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/wi1_bot/discord/cogs/series.py

@@ -1,6 +1,5 @@
 import asyncio
 import logging
-from typing import Any
 
 from discord.ext import commands
 
@@ -19,7 +18,7 @@ class SeriesCog(commands.Cog):
 
     @commands.command(name="addshow", help="add a show to the plex")
     @commands.has_any_role("plex-admin", "plex-shows")
-    async def addshow_cmd(self, ctx: commands.Context[Any], *, query: str = "") -> None:
+    async def addshow_cmd(self, ctx: commands.Context[commands.Bot], *, query: str = "") -> None:
         if not query:
             await reply(ctx.message, "usage: !addshow KEYWORDS...")
             return
@@ -91,7 +90,9 @@ class SeriesCog(commands.Cog):
 
     @commands.command(name="delshow", help="delete a show from the plex")
     @commands.has_any_role("plex-admin", "plex-shows")
-    async def delshow_command(self, ctx: commands.Context[Any], *, query: str = "") -> None:
+    async def delshow_command(
+        self, ctx: commands.Context[commands.Bot], *, query: str = ""
+    ) -> None:
         if not query:
             await reply(ctx.message, "usage: !delshow KEYWORDS...")
             return

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/wi1_bot/transcoder/transcode_queue.py

@@ -1,3 +1,4 @@
+import os
 from typing import Any, cast
 
 from mongoengine import Document, connect
@@ -23,7 +24,7 @@ class TranscodeItem(Document):
 
 class TranscodeQueue:
     def __init__(self) -> None:
-        connect("wi1_bot", connect=False)
+        connect("wi1_bot", connect=True, host=os.environ.get("MONGODB_CONNECTION_STRING", None))
 
     def add(
         self,

{wi1_bot-2.0.2 → wi1_bot-2.0.4}/wi1_bot/webhook.py

@@ -103,6 +103,11 @@ def index() -> Any:
     return "", 200
 
 
+@app.route("/health", methods=["GET"])
+def health() -> Any:
+    return "OK", 200
+
+
 def start() -> None:
     logger.info("starting webhook listener")
 

wi1_bot-2.0.2/.dockerignore

@@ -1,9 +0,0 @@
-env/
-config.yaml
-tests/files/
-log/
-
-build/
-dist/
-*.egg-info/
-_version.py

wi1_bot-2.0.2/.github/workflows/docker.yaml

@@ -1,59 +0,0 @@
-name: docker
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            wthueb/wi1-bot
-            ghcr.io/wthueb/wi1-bot
-
-      - name: Build and push
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: wthueb/wi1-bot:latest
-          labels: ${{ steps.meta.outputs.labels }}

wi1_bot-2.0.2/Dockerfile

@@ -1,32 +0,0 @@
-FROM jrottenberg/ffmpeg:7.1-nvidia2404 AS base
-
-RUN apt-get update && apt-get install -yqq --no-install-recommends python3
-
-FROM base AS compiler
-
-RUN apt-get install -yqq --no-install-recommends python3-venv git
-
-RUN python3 -m venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-
-WORKDIR /app
-COPY . .
-RUN pip install .
-
-FROM base
-
-COPY --from=compiler /opt/venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-
-LABEL org.opencontainers.image.source="https://github.com/wthueb/wi1-bot"
-LABEL org.opencontainers.image.maintainer="wilhueb@gmail.com"
-
-ENV WB_CONFIG_PATH=/config/config.yaml
-ENV WB_LOG_DIR=/logs
-
-RUN mkdir -p /config
-RUN mkdir -p /logs
-
-EXPOSE 9000
-
-ENTRYPOINT ["python", "-m", "wi1_bot.scripts.start"]