fix: improved typechecking coverage and fixed issues

Author: ErikBjare

.pre-commit-config.yaml

@@ -16,6 +16,9 @@ repos:
   hooks:
   - id: mypy
     additional_dependencies: [
+      "gptme @ git+https://github.com/ErikBjare/gptme.git",
+      rich,
+      python-dotenv,
       tweepy,
       flask,
       discord.py,

mypy.ini

@@ -11,12 +11,6 @@ strict_optional = True
 [mypy.plugins.django.*]
 ignore_missing_imports = True
 
-[mypy-dotenv.*]
-ignore_missing_imports = True
-
-[mypy-rich.*]
-ignore_missing_imports = True
-
 [mypy-gptme.*]
 ignore_missing_imports = True
 

scripts/discord/discord_bot.py

@@ -15,6 +15,7 @@
 import os
 import re
 from copy import copy
+from pathlib import Path
 from typing import AsyncGenerator
 from typing import Callable
 from typing import Dict
@@ -64,12 +65,12 @@
 
 # Get workspace folder (location of `gptme.toml`):
 workspace_root = get_project_gptme_dir()
-logsdir = workspace_root / "logs_discord"
+logsdir = workspace_root / "logs_discord" if workspace_root else Path("logs_discord")
 
 # Load environment variables
 env_files = [".env", ".env.discord"]
 for env_file in env_files:
-    if (workspace_root / env_file).exists():
+    if workspace_root and (workspace_root / env_file).exists():
         load_dotenv(env_file, override=True)
         logger.info(f"Loaded environment from {env_file}")
 
@@ -696,7 +697,7 @@ async def tools(ctx: commands.Context) -> None:
     tool_info = "Available tools:\n\n"
     for tool in tools:
         tool_info += f"**{tool.name}**\n"
-        tool_info += f"- Description: {tool.description}\n"
+        tool_info += f"- Description: {tool.desc}\n"
         if tool.block_types:
             tool_info += f"- Usage: ```{', '.join(tool.block_types)}```\n"
         tool_info += "\n"
@@ -936,7 +937,7 @@ def main() -> None:
         tool_allowlist = frozenset(["read", "save", "append", "patch", "shell"])
 
         # Initialize gptme and tools
-        init(model=MODEL, interactive=False, tool_allowlist=tool_allowlist)
+        init(model=MODEL, interactive=False, tool_allowlist=list(tool_allowlist))
         tools = get_tools()
         if not tools:
             logger.error("No tools loaded in gptme")

scripts/twitter/llm.py

@@ -329,7 +329,7 @@ def create_review_prompt(draft: Dict, config: Dict) -> str:
 def get_system_prompt() -> Message:
     """Get system prompt for Twitter interactions."""
     workspace = get_project_git_dir()
-    context = get_workspace_prompt(workspace)
+    context = get_workspace_prompt(workspace) if workspace else ""
 
     def get_format_examples() -> Dict[str, Any]:
         """Generate format examples from dataclasses"""
@@ -431,6 +431,8 @@ def generate_response(tweet: Dict, eval_result: EvaluationResponse) -> Optional[
 
     # Get LLM response
     model = get_default_model()
+    if not model:
+        raise RuntimeError("default model not set")
     messages = [get_system_prompt(), Message("user", prompt)]
     response = reply(messages, model.full, stream=False)
 
@@ -444,6 +446,8 @@ def review_draft(draft: Dict) -> ReviewResponse:
 
     # Get LLM response
     model = get_default_model()
+    if not model:
+        raise RuntimeError("default model not set")
     messages = [get_system_prompt(), Message("user", prompt)]
     response = reply(messages, model.full, stream=False)
 

scripts/twitter/workflow.py

@@ -450,7 +450,7 @@ def list_drafts(status: str) -> List[Path]:
 )
 def cli(model: str):
     """Twitter Workflow Manager"""
-    init_gptme(model=model, interactive=False, tool_allowlist=frozenset())
+    init_gptme(model=model, interactive=False, tool_allowlist=[])
 
 
 @cli.command()

scripts/wordcount.py

@@ -103,11 +103,11 @@ def main() -> None:
     # Add rows
     for result in results:
         table.add_row(
-            result["source"],
+            str(result["source"]),
             str(result["lines"]),
             str(result["words"]),
             str(result["chars"]),
-            result["top_words"],
+            str(result["top_words"]),
         )
 
     # Add total row for multiple files

tools/tool_pushover.py

@@ -1,8 +1,9 @@
 import os
+
 import requests
-from gptme.tools import ToolSpec, Parameter, ToolUse
 from gptme.message import Message
-
+from gptme.tools import Parameter, ToolSpec, ToolUse
+from gptme.tools.base import ConfirmFunc
 
 PUSHOVER_USER_KEY = os.getenv("PUSHOVER_USER_KEY")
 PUSHOVER_API_TOKEN = os.getenv("PUSHOVER_API_TOKEN")
@@ -12,10 +13,15 @@ def has_pushover_conf():
     return PUSHOVER_USER_KEY and PUSHOVER_API_TOKEN
 
 
-def execute(content: str | None, args: list[str] | None, kwargs: dict[str, str] | None, confirm=None) -> Message:
-    if content is not None and args is not None:
+def execute(
+    code: str | None,
+    args: list[str] | None,
+    kwargs: dict[str, str] | None,
+    confirm: ConfirmFunc,
+) -> Message:
+    if code is not None and args is not None:
         title = args[0]
-        message = content
+        message = code
     elif kwargs is not None:
         title = kwargs.get("title", "No title")
         message = kwargs.get("message", "No message")