ruff format

2026-06-26 19:24:36 -05:00
parent 284e4f92fe
commit dbbfbd638f
6 changed files with 176 additions and 75 deletions
--- a/etc/moneybot.py
+++ b/etc/moneybot.py
@@ -13,26 +13,40 @@ intents.messages = True
 intents.message_content = True
 client = discord.Client(intents=intents)

+
@client.event
 async def on_ready():
    print(f"Logged in as {client.user.name} running {model}.", flush=True)

+
@client.event
 async def on_message(message):
    if message.author == client.user:
        return
-    if message.content.lower().startswith("hey money") or isinstance(message.channel, discord.DMChannel):
-        question = message.content[9:] if message.content.lower().startswith("hey money") else message.content
+    if message.content.lower().startswith("hey money") or isinstance(
+        message.channel, discord.DMChannel
+    ):
+        question = (
+            message.content[9:]
+            if message.content.lower().startswith("hey money")
+            else message.content
+        )
        try:
            response = openai.ChatCompletion.create(
                model=model,
                messages=[
-                        {"role": "system", "content": "Pretend you are eccentric conspiracy theorist Planetside 2 gamer named Dr. Moneypants."},
-                        {"role": "user", "content": f"{question} please keep it short with religious undertones"}
+                    {
+                        "role": "system",
+                        "content": "Pretend you are eccentric conspiracy theorist Planetside 2 gamer named Dr. Moneypants.",
+                    },
+                    {
+                        "role": "user",
+                        "content": f"{question} please keep it short with religious undertones",
+                    },
                ],
-                max_tokens=400
+                max_tokens=400,
            )
-            answer = response['choices'][0]['message']['content']
+            answer = response["choices"][0]["message"]["content"]
            answer = answer.replace("an AI language model", "a man of God")
            answer = answer.replace("language model AI", "man of God")
            await message.channel.send(answer)
@@ -40,6 +54,7 @@ async def on_message(message):
            e = str(e)
            await message.channel.send(f"`MoneyBot Error: {e}`")

+
 async def moneybot_connect():
    while True:
        try:
@@ -49,5 +64,6 @@ async def moneybot_connect():
            logger.error(f"Moneybot couldn't connect! {e}")
            await asyncio.sleep(60)

+
 if __name__ == "__main__":
    asyncio.run(moneybot_connect())
--- a/garfmain.py
+++ b/garfmain.py
@@ -42,18 +42,19 @@ weather = WeatherAPI()


 URL_PATTERNS = [
-    r'https?://(?:www\.)?youtube\.com/watch\?[^\s]*',
-    r'https?://youtu\.be/[^\s]*',
-    r'https?://(?:open\.)?spotify\.com/[^\s]*',
+    r"https?://(?:www\.)?youtube\.com/watch\?[^\s]*",
+    r"https?://youtu\.be/[^\s]*",
+    r"https?://(?:open\.)?spotify\.com/[^\s]*",
 ]

+
 def clean_url(url):
    try:
        parsed = urlparse(url)

-        if 'youtube.com' in parsed.hostname:
+        if "youtube.com" in parsed.hostname:
            params = parse_qs(parsed.query)
-            video_id = params.get('v', [None])[0]
+            video_id = params.get("v", [None])[0]
            if not video_id:
                return None
            # timestamp = params.get('t', [None])[0]
@@ -61,10 +62,10 @@ def clean_url(url):
            #     return f"https://www.youtube.com/watch?v={video_id}&t={timestamp}"
            return f"https://www.youtube.com/watch?v={video_id}"

-        if 'youtu.be' in parsed.hostname:
+        if "youtu.be" in parsed.hostname:
            return f"https://youtu.be{parsed.path}"

-        if 'spotify.com' in parsed.hostname:
+        if "spotify.com" in parsed.hostname:
            return f"https://open.spotify.com{parsed.path}"

    except Exception:
--- a/garfpy/aod.py
+++ b/garfpy/aod.py
@@ -134,4 +134,3 @@ async def aod_message(garfbot, message):

    #     if count >= 3 or (len(words) >= 2 and count / len(words) >= 0.75):
    #         await message.channel.send("Boy, you said it!")
-
--- a/garfpy/garfai.py
+++ b/garfpy/garfai.py
@@ -17,9 +17,27 @@ _MODEL_KEY   = "0eb50094-5c9b-431b-ba01-87e145edb849"
 _VAE_KEY = "dde3627c-8a45-4088-93d1-66c44acbb337"
 _ENCODER_KEY = "7ba22542-4687-4946-a52e-c92f925f4b75"

-_MODEL_REF   = {"key": _MODEL_KEY,   "hash": "blake3:c3ee838d71d99497db01fae6f304eafd9e734e935f3b783e968d50febb56be2c", "name": "FLUX.2 Klein 4B (GGUF Q4)",        "base": "flux2", "type": "main"}
-_VAE_REF     = {"key": _VAE_KEY,     "hash": "blake3:531855de70db993d0f6181f82cde27d15411d58b7ffa3b2fdce2b9434c0173c2", "name": "FLUX.2 VAE",                      "base": "flux2", "type": "vae"}
-_ENCODER_REF = {"key": _ENCODER_KEY, "hash": "blake3:af5840e6770dc99f678e69867949c8b9264835915eb82a990e940fa6e4fa6c81", "name": "FLUX.2 Klein Qwen3 4B Encoder", "base": "any",   "type": "qwen3_encoder"}
+_MODEL_REF = {
+    "key": _MODEL_KEY,
+    "hash": "blake3:c3ee838d71d99497db01fae6f304eafd9e734e935f3b783e968d50febb56be2c",
+    "name": "FLUX.2 Klein 4B (GGUF Q4)",
+    "base": "flux2",
+    "type": "main",
+}
+_VAE_REF = {
+    "key": _VAE_KEY,
+    "hash": "blake3:531855de70db993d0f6181f82cde27d15411d58b7ffa3b2fdce2b9434c0173c2",
+    "name": "FLUX.2 VAE",
+    "base": "flux2",
+    "type": "vae",
+}
+_ENCODER_REF = {
+    "key": _ENCODER_KEY,
+    "hash": "blake3:af5840e6770dc99f678e69867949c8b9264835915eb82a990e940fa6e4fa6c81",
+    "name": "FLUX.2 Klein Qwen3 4B Encoder",
+    "base": "any",
+    "type": "qwen3_encoder",
+}

 _POLL_INTERVAL = 2
 _POLL_ATTEMPTS = 60
@@ -40,34 +58,88 @@ def _build_graph(prompt: str) -> dict:
    out = _node_id("canvas_output")

    nodes = {
-        p:   {"id": p,   "is_intermediate": True,  "use_cache": True,  "value": prompt, "type": "string"},
-        ml:  {"id": ml,  "is_intermediate": True,  "use_cache": True,  "type": "flux2_klein_model_loader",
-              "model": _MODEL_REF, "vae_model": _VAE_REF, "qwen3_encoder_model": _ENCODER_REF},
-        te:  {"id": te,  "is_intermediate": True,  "use_cache": True,  "type": "flux2_klein_text_encoder"},
-        dn:  {"id": dn,  "is_intermediate": True,  "use_cache": True,  "type": "flux2_denoise", "seed": seed},
-        out: {"id": out, "is_intermediate": False, "use_cache": False, "type": "flux2_vae_decode"},
+        p: {
+            "id": p,
+            "is_intermediate": True,
+            "use_cache": True,
+            "value": prompt,
+            "type": "string",
+        },
+        ml: {
+            "id": ml,
+            "is_intermediate": True,
+            "use_cache": True,
+            "type": "flux2_klein_model_loader",
+            "model": _MODEL_REF,
+            "vae_model": _VAE_REF,
+            "qwen3_encoder_model": _ENCODER_REF,
+        },
+        te: {
+            "id": te,
+            "is_intermediate": True,
+            "use_cache": True,
+            "type": "flux2_klein_text_encoder",
+        },
+        dn: {
+            "id": dn,
+            "is_intermediate": True,
+            "use_cache": True,
+            "type": "flux2_denoise",
+            "seed": seed,
+        },
+        out: {
+            "id": out,
+            "is_intermediate": False,
+            "use_cache": False,
+            "type": "flux2_vae_decode",
+        },
    }

    edges = [
-        {"source": {"node_id": ml,  "field": "qwen3_encoder"},  "destination": {"node_id": te,  "field": "qwen3_encoder"}},
-        {"source": {"node_id": ml,  "field": "max_seq_len"},    "destination": {"node_id": te,  "field": "max_seq_len"}},
-        {"source": {"node_id": p,   "field": "value"},          "destination": {"node_id": te,  "field": "prompt"}},
-        {"source": {"node_id": ml,  "field": "transformer"},    "destination": {"node_id": dn,  "field": "transformer"}},
-        {"source": {"node_id": ml,  "field": "vae"},            "destination": {"node_id": dn,  "field": "vae"}},
-        {"source": {"node_id": te,  "field": "conditioning"},   "destination": {"node_id": dn,  "field": "positive_text_conditioning"}},
-        {"source": {"node_id": ml,  "field": "vae"},            "destination": {"node_id": out, "field": "vae"}},
-        {"source": {"node_id": dn,  "field": "latents"},        "destination": {"node_id": out, "field": "latents"}},
+        {
+            "source": {"node_id": ml, "field": "qwen3_encoder"},
+            "destination": {"node_id": te, "field": "qwen3_encoder"},
+        },
+        {
+            "source": {"node_id": ml, "field": "max_seq_len"},
+            "destination": {"node_id": te, "field": "max_seq_len"},
+        },
+        {
+            "source": {"node_id": p, "field": "value"},
+            "destination": {"node_id": te, "field": "prompt"},
+        },
+        {
+            "source": {"node_id": ml, "field": "transformer"},
+            "destination": {"node_id": dn, "field": "transformer"},
+        },
+        {
+            "source": {"node_id": ml, "field": "vae"},
+            "destination": {"node_id": dn, "field": "vae"},
+        },
+        {
+            "source": {"node_id": te, "field": "conditioning"},
+            "destination": {"node_id": dn, "field": "positive_text_conditioning"},
+        },
+        {
+            "source": {"node_id": ml, "field": "vae"},
+            "destination": {"node_id": out, "field": "vae"},
+        },
+        {
+            "source": {"node_id": dn, "field": "latents"},
+            "destination": {"node_id": out, "field": "latents"},
+        },
    ]

    return {"nodes": nodes, "edges": edges}


 async def _poll_batch(session: aiohttp.ClientSession, base: str, batch_id: str) -> bool:
-    """Poll batch status until completed, failed, or timed out. Returns True on success."""
    for _ in range(_POLL_ATTEMPTS):
        await asyncio.sleep(_POLL_INTERVAL)
        try:
-            async with session.get(f"{base}/api/v1/queue/default/b/{batch_id}/status") as resp:
+            async with session.get(
+                f"{base}/api/v1/queue/default/b/{batch_id}/status"
+            ) as resp:
                if not resp.ok:
                    continue
                s = await resp.json(content_type=None)
@@ -84,7 +156,9 @@ async def _poll_batch(session: aiohttp.ClientSession, base: str, batch_id: str)
    return False


-async def _get_image_name(session: aiohttp.ClientSession, base: str, batch_id: str) -> str | None:
+async def _get_image_name(
+    session: aiohttp.ClientSession, base: str, batch_id: str
+) -> str | None:
    try:
        async with session.get(f"{base}/api/v1/queue/default/i/{batch_id}") as resp:
            if resp.ok:
@@ -110,8 +184,9 @@ async def _get_image_name(session: aiohttp.ClientSession, base: str, batch_id: s
    return None


-async def _fetch_image_bytes(session: aiohttp.ClientSession, base: str, name: str) -> bytes | None:
-    """Try the full image endpoint, then fall back to thumbnail."""
+async def _fetch_image_bytes(
+    session: aiohttp.ClientSession, base: str, name: str
+) -> bytes | None:
    urls = [
        f"{base}/api/v1/images/i/{name}/full",
        f"{base}/api/v1/images/i/{name}/thumbnail",
@@ -121,7 +196,9 @@ async def _fetch_image_bytes(session: aiohttp.ClientSession, base: str, name: st
            async with session.get(url) as resp:
                ct = resp.headers.get("Content-Type", "")
                data = await resp.read()
-                logger.info(f"Image fetch {url}: status={resp.status} content-type={ct} size={len(data)}")
+                logger.info(
+                    f"Image fetch {url}: status={resp.status} content-type={ct} size={len(data)}"
+                )
                if "html" not in ct and len(data) >= _MIN_IMAGE_BYTES:
                    return data
        except Exception as e:
@@ -145,7 +222,9 @@ class GarfAI:
    async def garfpic(self, ctx, prompt):
        await self.image_request_queue.put({"ctx": ctx, "prompt": prompt})

-    async def generate_image(self, session: aiohttp.ClientSession, prompt: str) -> bytes | str:
+    async def generate_image(
+        self, session: aiohttp.ClientSession, prompt: str
+    ) -> bytes | str:
        base = INVOKEAI_BASE

        try:
@@ -182,7 +261,9 @@ class GarfAI:
        return "`GarfBot Error: Odie`"

    async def process_image_requests(self):
-        async with aiohttp.ClientSession(headers={"Accept": "application/json"}) as session:
+        async with aiohttp.ClientSession(
+            headers={"Accept": "application/json"}
+        ) as session:
            while True:
                request = await self.image_request_queue.get()
                ctx = request["ctx"]
@@ -231,7 +312,9 @@ class GarfAI:
    async def wikisum(self, query: str) -> str:
        try:
            summary = wikipedia.summary(query)
-            return await self.generate_chat(f"Please summarize in your own words: {summary}")
+            return await self.generate_chat(
+                f"Please summarize in your own words: {summary}"
+            )
        except wikipedia.exceptions.DisambiguationError as e:
            options = ", ".join(e.options[:3])
            return f"`GarfBot Error: Ambiguous query — did you mean: {options}?`"
--- a/jonbot/jonbot.py
+++ b/jonbot/jonbot.py
@@ -46,10 +46,12 @@ client = commands.Bot(
    intents=intents,
 )

+
@client.event
 async def on_ready():
    print(f"Logged in as {client.user.name} running {txtmodel}.", flush=True)

+
@client.command(name="chat")
 async def jonchat(ctx, *, prompt):
    if "is this true" in prompt.lower():
@@ -62,6 +64,7 @@ async def jonchat(ctx, *, prompt):
    )
    await ctx.reply(answer)

+
@client.event
 async def on_message(message):
    if message.author == client.user:
@@ -69,9 +72,7 @@ async def on_message(message):

    content = message.content.strip()
    lower = content.lower()
-    if lower.startswith("hey jon") or isinstance(
-        message.channel, discord.DMChannel
-    ):
+    if lower.startswith("hey jon") or isinstance(message.channel, discord.DMChannel):
        ctx = await client.get_context(message)
        await jonchat(ctx, prompt=content)

@@ -81,6 +82,7 @@ oai = AsyncOpenAI(
    base_url=config.BASE_URL,
 )

+
 async def generate_chat(question: str) -> str:
    try:
        response = await oai.chat.completions.create(
@@ -105,7 +107,6 @@ async def generate_chat(question: str) -> str:
        return "`JonBot Error: Liz`"


-
 async def jonbot_connect():
    while True:
        try:
@@ -115,5 +116,6 @@ async def jonbot_connect():
            logger.error(f"Jonbot couldn't connect! {e}")
            await asyncio.sleep(60)

+
 if __name__ == "__main__":
    asyncio.run(jonbot_connect())