From 093991ad70aeedcb363791eb1b2795b28e6b3602 Mon Sep 17 00:00:00 2001 From: nexy7574 Date: Thu, 18 Apr 2024 00:24:58 +0100 Subject: [PATCH] Black + isort --- src/cogs/auto_responder.py | 19 +++++++------------ src/cogs/ffmeta.py | 5 ++--- src/cogs/ollama.py | 17 ++++++++--------- src/cogs/quote_quota.py | 8 ++++---- src/cogs/screenshot.py | 3 +-- src/cogs/ytdl.py | 4 ++-- src/conf.py | 3 ++- src/main.py | 14 +++++++------- 8 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/cogs/auto_responder.py b/src/cogs/auto_responder.py index 3444a88..4493ccc 100644 --- a/src/cogs/auto_responder.py +++ b/src/cogs/auto_responder.py @@ -1,14 +1,13 @@ import asyncio +import logging import pathlib +import re import subprocess +import tempfile +from urllib.parse import urlparse import aiohttp import discord -import re -import tempfile -from urllib.parse import urlparse -import logging - import httpx from discord.ext import commands @@ -90,7 +89,7 @@ class AutoResponder(commands.Cog): if stream.get("profile", "Main ?") != "Main": self.log.warning( "Unsupported profile: %r - disabling hardware accelerated read.", - stream.get("profile", "Main ?") + stream.get("profile", "Main ?"), ) hwaccel = False break @@ -154,14 +153,10 @@ class AutoResponder(commands.Cog): "-profile:v", "main", "-y", - "-hide_banner" + "-hide_banner", ] if hwaccel: - args = [ - "-hwaccel", - "auto", - *args - ] + args = ["-hwaccel", "auto", *args] process = await asyncio.create_subprocess_exec( "ffmpeg", *args, diff --git a/src/cogs/ffmeta.py b/src/cogs/ffmeta.py index 76ea2c2..0d4a2c3 100644 --- a/src/cogs/ffmeta.py +++ b/src/cogs/ffmeta.py @@ -7,12 +7,11 @@ import tempfile import typing from pathlib import Path -import PIL.Image - import discord import httpx - +import PIL.Image from discord.ext import commands + from conf import VERSION diff --git a/src/cogs/ollama.py b/src/cogs/ollama.py index 2e3ec5c..48daf0c 100644 --- a/src/cogs/ollama.py +++ b/src/cogs/ollama.py @@ -1,25 +1,24 @@ import asyncio +import base64 import contextlib +import io import json import logging import os import textwrap import time import typing -import base64 -import io - -import httpx -import redis -from discord import Interaction - -from discord.ui import View, button from fnmatch import fnmatch import aiohttp -from yarl import URL import discord +import httpx +import redis +from discord import Interaction from discord.ext import commands +from discord.ui import View, button +from yarl import URL + from conf import CONFIG diff --git a/src/cogs/quote_quota.py b/src/cogs/quote_quota.py index f8a9dd3..60a8def 100644 --- a/src/cogs/quote_quota.py +++ b/src/cogs/quote_quota.py @@ -1,13 +1,13 @@ import asyncio +import io import logging import re +from datetime import datetime, timedelta +from typing import Annotated, Callable, Iterable import discord -import io import matplotlib.pyplot as plt -from datetime import timedelta, datetime from discord.ext import commands -from typing import Callable, Iterable, Annotated from conf import CONFIG @@ -188,7 +188,7 @@ class QuoteQuota(commands.Cog): "per_minute": 0.0, "per_hour": 0.0, "per_day": 0.0, - "hours": {} + "hours": {}, } for i in range(24): counts["hours"][str(i)] = 0 diff --git a/src/cogs/screenshot.py b/src/cogs/screenshot.py index d3434f6..7d4fccc 100644 --- a/src/cogs/screenshot.py +++ b/src/cogs/screenshot.py @@ -1,11 +1,11 @@ import asyncio +import copy import datetime import io import logging import os import tempfile import time -import copy import typing from urllib.parse import urlparse @@ -19,7 +19,6 @@ from selenium.webdriver.chrome.service import Service as ChromeService from conf import CONFIG - RESOLUTIONS = { "8k": "7680x4320", "4k": "3840x2160", diff --git a/src/cogs/ytdl.py b/src/cogs/ytdl.py index 03cb2ae..77fb8e0 100644 --- a/src/cogs/ytdl.py +++ b/src/cogs/ytdl.py @@ -2,15 +2,15 @@ import asyncio import functools import hashlib import logging +import subprocess import tempfile import textwrap -import subprocess import typing from pathlib import Path from urllib.parse import urlparse -import discord import aiosqlite +import discord import yt_dlp from discord.ext import commands diff --git a/src/conf.py b/src/conf.py index 0a81373..2a5e7fd 100644 --- a/src/conf.py +++ b/src/conf.py @@ -1,8 +1,9 @@ -import toml import logging import subprocess from pathlib import Path +import toml + log = logging.getLogger("jimmy.autoconf") if (Path.cwd() / ".git").exists(): diff --git a/src/main.py b/src/main.py index 80b41b1..bd57890 100644 --- a/src/main.py +++ b/src/main.py @@ -1,22 +1,22 @@ import asyncio import datetime import logging +import random import shutil import sys +import time import traceback import typing -from threading import Thread, Event -import time -import random -import httpx - -import uvicorn from logging import FileHandler +from threading import Event, Thread import discord +import httpx +import uvicorn from discord.ext import commands -from rich.logging import RichHandler from rich.console import Console +from rich.logging import RichHandler + from conf import CONFIG