wi1-bot 1.4.12__tar.gz → 2.0.0__tar.gz

{wi1_bot-1.4.12 → wi1_bot-2.0.0}/.dockerignore

@@ -1,3 +1,4 @@
+env/
 config.yaml
 tests/files/
 log/

wi1_bot-2.0.0/.envrc

@@ -0,0 +1,3 @@
+if command -v nix-shell &>/dev/null; then
+  use flake
+fi

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

@@ -0,0 +1,59 @@
+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.0/.github/workflows/pypi-publish.yml

@@ -0,0 +1,33 @@
+name: Upload to PyPI
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: uv.lock
+
+      - name: Install python
+        run: uv python install 3.10
+
+      - name: build
+        run: uv build
+
+      - name: publish
+        run: uv publish

{wi1_bot-1.4.12 → wi1_bot-2.0.0}/.gitignore

@@ -2,7 +2,7 @@ config.yaml
 tests/files/
 log/
 
-build/
 dist/
-*.egg-info/
-_version.py
+flake.lock
+.direnv/
+.vscode/

wi1_bot-2.0.0/Dockerfile

@@ -0,0 +1,32 @@
+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"]

{wi1_bot-1.4.12 → wi1_bot-2.0.0}/PKG-INFO

@@ -1,49 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wi1-bot
-Version: 1.4.12
+Version: 2.0.0
 Summary: Discord bot for Radarr/Sonarr integration
-Author-email: William Huebner <wilhueb@gmail.com>
-License: MIT License
-        
-        Copyright (c) 2022 William Huebner
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
 Project-URL: Homepage, https://github.com/wthueb/wi1-bot
+Author-email: William Huebner <wilhueb@gmail.com>
+License-Expression: MIT
+License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: discord.py==2.3.2
-Requires-Dist: Flask==3.0.2
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.11
+Requires-Dist: discord-py==2.3.2
+Requires-Dist: flask==3.0.2
 Requires-Dist: mongoengine==0.29.1
 Requires-Dist: pyarr==5.2.0
-Requires-Dist: PyYAML==6.0.1
-Requires-Dist: requests==2.31.0
-Provides-Extra: dev
-Requires-Dist: mongo-types==0.15.1; extra == "dev"
-Requires-Dist: mypy==1.3.0; extra == "dev"
-Requires-Dist: pre-commit==3.6.2; extra == "dev"
-Requires-Dist: ruff==0.3.0; extra == "dev"
-Requires-Dist: types-PyYAML==6.0.12.12; extra == "dev"
+Requires-Dist: pyyaml==6.0.1
+Requires-Dist: requests>=2.32.4
+Description-Content-Type: text/markdown
 
 # wi1-bot
 
@@ -62,16 +35,21 @@ A Discord bot to integrate [Radarr](https://radarr.video/) & [Sonarr](https://so
 3. `pip install -e .[dev]`
 4. `pre-commit install`
 
-Requires Python >=3.10.
+Requires Python >=3.11.
 
 ### TODO
 
+- use sqlite
+- dynamically copy streams
+  - i.e. if mov_text in input, -c:s srt
+  - https://github.com/HaveAGitGat/Tdarr_Plugins/blob/aef12f3c65905f5fc7d045b1a96ddc6a58dc55e7/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts#L77
+- https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
+- link discord user to overseerr user
 - https://github.com/kkroening/ffmpeg-python
   - `ffmpeg -codecs`, `ffmpeg -hwaccels`
 - ffmpeg filters for deinterlacing, scaling
   - https://docs.nvidia.com/video-technologies/video-codec-sdk/12.0/ffmpeg-with-nvidia-gpu/index.html#hwaccel-transcode-with-scaling
 - ffmpeg remove bad subtitle streams
-- use sqlite
 - have config.discord.users be a dict with 'quotas' and 'name' for *arr tags
 - Better pushover notifications
   - Failures for pretty much everything

{wi1_bot-1.4.12 → wi1_bot-2.0.0}/README.md

@@ -15,16 +15,21 @@ A Discord bot to integrate [Radarr](https://radarr.video/) & [Sonarr](https://so
 3. `pip install -e .[dev]`
 4. `pre-commit install`
 
-Requires Python >=3.10.
+Requires Python >=3.11.
 
 ### TODO
 
+- use sqlite
+- dynamically copy streams
+  - i.e. if mov_text in input, -c:s srt
+  - https://github.com/HaveAGitGat/Tdarr_Plugins/blob/aef12f3c65905f5fc7d045b1a96ddc6a58dc55e7/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts#L77
+- https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
+- link discord user to overseerr user
 - https://github.com/kkroening/ffmpeg-python
   - `ffmpeg -codecs`, `ffmpeg -hwaccels`
 - ffmpeg filters for deinterlacing, scaling
   - https://docs.nvidia.com/video-technologies/video-codec-sdk/12.0/ffmpeg-with-nvidia-gpu/index.html#hwaccel-transcode-with-scaling
 - ffmpeg remove bad subtitle streams
-- use sqlite
 - have config.discord.users be a dict with 'quotas' and 'name' for *arr tags
 - Better pushover notifications
   - Failures for pretty much everything

{wi1_bot-1.4.12 → wi1_bot-2.0.0}/compose.yaml

@@ -8,9 +8,15 @@ services:
         reservations:
           devices:
             - capabilities:
-                - gpu
+              - gpu
     environment:
       - WB_CONFIG_PATH=/data/config.yaml
       - WB_LOG_PATH=/data/logs
     volumes:
       - .:/data
+
+  mongodb:
+    container_name: mongodb
+    image: mongo:8.0
+    ports:
+      - 27017:27017

wi1_bot-2.0.0/flake.nix

@@ -0,0 +1,45 @@
+{
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+
+  outputs =
+    { self, nixpkgs }:
+    let
+      forAllSystems =
+        f:
+        nixpkgs.lib.genAttrs
+          [
+            "x86_64-linux"
+            "aarch64-linux"
+            "x86_64-darwin"
+            "aarch64-darwin"
+          ]
+          (
+            system:
+            f rec {
+              pkgs = nixpkgs.legacyPackages.${system};
+              python = pkgs.python311;
+            }
+          );
+    in
+    {
+      devShells = forAllSystems (
+        { pkgs, python }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              mongosh
+              uv
+            ];
+            env = {
+              UV_PYTHON_DOWNLOADS = "never";
+              UV_PYTHON = python.interpreter;
+            };
+            shellHook = ''
+              uv sync
+              source .venv/bin/activate
+            '';
+          };
+        }
+      );
+    };
+}

{wi1_bot-1.4.12 → wi1_bot-2.0.0}/pyproject.toml

@@ -1,23 +1,23 @@
 [project]
 name = "wi1-bot"
+dynamic = ["version"]
 description = "Discord bot for Radarr/Sonarr integration"
 authors = [{ name = "William Huebner", email = "wilhueb@gmail.com" }]
 readme = "README.md"
-license = { file = "LICENSE" }
+license = "MIT"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10"
+    "Programming Language :: Python :: 3.11"
 ]
-dynamic = ["version"]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
-    "discord.py==2.3.2",
-    "Flask==3.0.2",
+    "discord-py==2.3.2",
+    "flask==3.0.2",
     "mongoengine==0.29.1",
     "pyarr==5.2.0",
-    "PyYAML==6.0.1",
-    "requests==2.31.0"
+    "pyyaml==6.0.1",
+    "requests>=2.32.4",
 ]
 
 [project.urls]
@@ -29,25 +29,15 @@ transcode-item = "wi1_bot.scripts.transcode_item:main"
 add-tag = "wi1_bot.scripts.add_tag:main"
 rescan = "wi1_bot.scripts.rescan:main"
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
-    "mongo-types==0.15.1",
-    "mypy==1.3.0",
-    "pre-commit==3.6.2",
-    "ruff==0.3.0",
-    "types-PyYAML==6.0.12.12",
+    "mongo-types>=0.15.1",
+    "mypy>=1.16.0",
+    "pre-commit>=4.2.0",
+    "ruff>=0.11.13",
+    "types-pyyaml>=6.0.12.20250516",
 ]
 
-[build-system]
-requires = ["setuptools>=64", "setuptools-scm>=8"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools]
-packages = ["wi1_bot"]
-
-[tool.setuptools_scm]
-write_to = "wi1_bot/_version.py"
-
 [tool.ruff]
 line-length = 100
 
@@ -57,3 +47,13 @@ select = ["E", "F", "I"]
 [tool.mypy]
 packages = "wi1_bot"
 strict = true
+
+[build-system]
+requires = ["hatchling", "uv-dynamic-versioning"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "uv-dynamic-versioning"
+
+[tool.uv-dynamic-versioning]
+fallback-version = "0.0.0"