comprobot 2.2.5__tar.gz → 2.2.6__tar.gz

{comprobot-2.2.5 → comprobot-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comprobot
-Version: 2.2.5
+Version: 2.2.6
 Summary: A self-hostable Discord bot built for maximum customization.
 Author: badluma
 License: MIT
@@ -18,8 +18,7 @@ Requires-Dist: requests
 Requires-Dist: tomlkit
 Requires-Dist: appdirs
 Requires-Dist: ollama
-Requires-Dist: google-genai
-Requires-Dist: groq
+Requires-Dist: httpx
 Requires-Dist: InquirerPy
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"

{comprobot-2.2.5 → comprobot-2.2.6}/comprobot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comprobot
-Version: 2.2.5
+Version: 2.2.6
 Summary: A self-hostable Discord bot built for maximum customization.
 Author: badluma
 License: MIT
@@ -18,8 +18,7 @@ Requires-Dist: requests
 Requires-Dist: tomlkit
 Requires-Dist: appdirs
 Requires-Dist: ollama
-Requires-Dist: google-genai
-Requires-Dist: groq
+Requires-Dist: httpx
 Requires-Dist: InquirerPy
 Provides-Extra: dev
 Requires-Dist: ruff; extra == "dev"

{comprobot-2.2.5 → comprobot-2.2.6}/comprobot.egg-info/requires.txt

@@ -4,8 +4,7 @@ requests
 tomlkit
 appdirs
 ollama
-google-genai
-groq
+httpx
 InquirerPy
 
 [dev]

{comprobot-2.2.5 → comprobot-2.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "comprobot"
-version = "2.2.5"
+version = "2.2.6"
 authors = [{name = "badluma"}]
 description = "A self-hostable Discord bot built for maximum customization."
 readme = "README.md"
@@ -22,8 +22,7 @@ dependencies = [
     "tomlkit",
     "appdirs",
     "ollama",
-    "google-genai",
-    "groq",
+    "httpx",
     "InquirerPy",
 ]
 

{comprobot-2.2.5 → comprobot-2.2.6}/src/config.py

@@ -24,7 +24,8 @@ def make_pretty(string):
         .replace("_", " ") \
         .replace("-", " ") \
         .title() \
-        .replace("Ai", "AI")
+        .replace("Ai", "AI") \
+        .replace("Api", "API")
 
 def pick_file():
     data_dir = appdirs.user_data_dir("Comprobot", appauthor=False)
@@ -101,7 +102,7 @@ def pick_key(content, is_secret=False):
             ).execute()
             content[key] = value
 
-        case str() | int():
+        case str():
             print()
             if is_secret:
                 value = secret.SecretPrompt(
@@ -120,6 +121,30 @@ def pick_key(content, is_secret=False):
                 ).execute()
             content[key] = value
 
+        case int():
+            print()
+            if is_secret:
+                value = secret.SecretPrompt(
+                    message=f"New value for '{make_pretty(key)}'?",
+                    style=style,
+                    amark="!",
+                    vi_mode=True,
+                ).execute()
+            else:
+                value = input.InputPrompt(
+                    message=f"What number do you want to assign to '{make_pretty(key)}'?",
+                    instruction=f"(Current: {content[key]})",
+                    style=style,
+                    amark="!",
+                    vi_mode=True,
+                ).execute()
+
+            if int(value) == None:
+                content[key] = 0
+                return
+            
+            content[key] = int(value)
+
         case list():
             print()
             value = input.InputPrompt(
@@ -129,7 +154,7 @@ def pick_key(content, is_secret=False):
                 amark="!",
                 vi_mode=True,
             ).execute().split(",")
-            content[key] = [item.strip() for item in value]
+            content[key] = [item.strip() for item in value if item.strip()]
 
 
 

{comprobot-2.2.5 → comprobot-2.2.6}/src/functions.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 import re
 import subprocess
@@ -5,10 +6,8 @@ from typing import Any, Dict, List, cast
 
 import appdirs
 import discord
-import groq
+import httpx
 import ollama
-from google import genai
-from google.genai.errors import ClientError
 
 from .bot import client
 from .data import ai, system_prompt_text
@@ -144,7 +143,6 @@ async def chat(message):
         )
         content = response.message.content or ""
     elif provider == "gemini":
-        gemini_client = genai.Client(api_key=os.getenv("GEMINI"))
         formatted_messages = []
         for m in messages:
             formatted_messages.append(
@@ -153,33 +151,55 @@ async def chat(message):
                     "parts": [{"text": m["content"]}],
                 }
             )
-
-        config = None
+        body: Dict[str, Any] = {"contents": formatted_messages}
         if system_prompt_text:
-            config = genai.types.GenerateContentConfig(
-                system_instruction=system_prompt_text
-            )
-
-        try:
-            response = gemini_client.models.generate_content(
-                model=ai["model"], contents=formatted_messages, config=config
-            )
-            content = response.text or ""
-        except ClientError as e:
-            if "NOT_FOUND" in str(e) or "404" in str(e):
-                available = gemini_client.models.list()
-                print(f"Available models: {[m.name for m in available]}")
-            raise
+            body["systemInstruction"] = {"parts": [{"text": system_prompt_text}]}
+
+        async with httpx.AsyncClient() as http:
+            resp = None
+            for attempt in range(4):
+                resp = await http.post(
+                    f"https://generativelanguage.googleapis.com/v1beta/models/{ai['model']}:generateContent",
+                    params={"key": os.getenv("GEMINI")},
+                    json=body,
+                    timeout=60,
+                )
+                if resp.status_code != 429:
+                    break
+                data = resp.json()
+                retry_delay = None
+                is_daily_quota = False
+                for detail in data.get("error", {}).get("details", []):
+                    if "retryDelay" in detail:
+                        retry_delay = detail["retryDelay"]
+                    if "violations" in detail:
+                        for v in detail["violations"]:
+                            if "PerDay" in v.get("quotaId", ""):
+                                is_daily_quota = True
+                if is_daily_quota or attempt == 3:
+                    resp.raise_for_status()
+                match = re.search(r"(\d+(?:\.\d+)?)", retry_delay or "")
+                wait = float(match.group(1)) if match else min(30 * (2 ** attempt), 120)
+                await asyncio.sleep(wait)
+            if resp is None:
+                raise RuntimeError("Gemini request never sent")
+            if resp.status_code == 404:
+                print(f"Model '{ai['model']}' not found. Check ai.toml for valid model name.")
+            resp.raise_for_status()
+            content = resp.json()["candidates"][0]["content"]["parts"][0]["text"]
     elif provider == "groq":
-        groq_client = groq.Groq(api_key=os.getenv("GROQ"))
         formatted_messages = [
             {"role": "system", "content": system_prompt_text}
         ] + messages
-        response = groq_client.chat.completions.create(
-            model=cast(str, ai["model"]),
-            messages=cast(Any, formatted_messages),
-        )
-        content = response.choices[0].message.content or ""
+        async with httpx.AsyncClient() as http:
+            resp = await http.post(
+                "https://api.groq.com/openai/v1/chat/completions",
+                headers={"Authorization": f"Bearer {os.getenv('GROQ')}"},
+                json={"model": ai["model"], "messages": formatted_messages},
+                timeout=60,
+            )
+        resp.raise_for_status()
+        content = resp.json()["choices"][0]["message"]["content"] or ""
     else:
         raise ValueError(f"Unknown provider: {ai['provider']}")