format: fixed formatting and typing

gptme/eval/run.py

@@ -1,4 +1,3 @@
-import concurrent
 import concurrent.futures
 import inspect
 import io
@@ -11,7 +10,7 @@
 from collections import defaultdict
 from concurrent.futures import Future, ProcessPoolExecutor, as_completed
 from multiprocessing import Manager, Process
-from typing import TypedDict, Union
+from typing import TypedDict
 
 from tqdm import tqdm
 
@@ -44,7 +43,7 @@ class ProcessError(TypedDict):
     duration: float
 
 
-ProcessResult = Union[ProcessSuccess, ProcessError]
+ProcessResult = ProcessSuccess | ProcessError
 
 
 class SyncedDict(TypedDict):

gptme/llm_anthropic.py

@@ -16,6 +16,7 @@ def init(config):
     global anthropic
     api_key = config.get_env_required("ANTHROPIC_API_KEY")
     from anthropic import Anthropic  # fmt: skip
+
     anthropic = Anthropic(
         api_key=api_key,
         max_retries=5,

gptme/server/cli.py

@@ -36,4 +36,5 @@ def main(verbose: bool, model: str | None):  # pragma: no cover
 
     # noreorder
     from gptme.server.api import main as server_main  # fmt: skip
+
     server_main()

gptme/tools/_browser_playwright.py

@@ -3,9 +3,14 @@
 import urllib.parse
 from dataclasses import dataclass
 
-from playwright.sync_api import ElementHandle, Page, sync_playwright
-
-_p = None
+from playwright.sync_api import (
+    ElementHandle,
+    Page,
+    Playwright,
+    sync_playwright,
+)
+
+_p: Playwright | None = None
 logger = logging.getLogger(__name__)
 
 

gptme/tools/base.py

@@ -81,6 +81,7 @@ def execute(self, ask: bool) -> Generator[Message, None, None]:
     def is_runnable(self) -> bool:
         # noreorder
         from . import get_tool  # fmt: skip
+
         tool = get_tool(self.tool)
         return bool(tool.execute) if tool else False
 

gptme/tools/python.py

@@ -10,20 +10,29 @@
 import types
 from collections.abc import Callable, Generator
 from logging import getLogger
-from typing import Literal, TypeVar, get_origin
+from typing import (
+    TYPE_CHECKING,
+    Literal,
+    TypeVar,
+    get_origin,
+)
 
 from ..message import Message
 from ..util import ask_execute, print_preview
 from .base import ToolSpec, ToolUse
 
+if TYPE_CHECKING:
+    from IPython.terminal.embed import InteractiveShellEmbed  # fmt: skip
+
+
 logger = getLogger(__name__)
 
 # TODO: launch the IPython session in the current venv, if any, instead of the pipx-managed gptme-python venv (for example) in which gptme itself runs
 #       would let us use libraries installed with `pip install` in the current venv
 #       https://github.com/ErikBjare/gptme/issues/29
 
 # IPython instance
-_ipython = None
+_ipython: "InteractiveShellEmbed | None" = None
 
 
 registered_functions: dict[str, Callable] = {}
@@ -72,6 +81,7 @@ def get_functions_prompt() -> str:
 def _get_ipython():
     global _ipython
     from IPython.terminal.embed import InteractiveShellEmbed  # fmt: skip
+
     if _ipython is None:
         _ipython = InteractiveShellEmbed()
         _ipython.push(registered_functions)
@@ -98,6 +108,7 @@ def execute_python(code: str, ask: bool, args=None) -> Generator[Message, None,
 
     # Capture the standard output and error streams
     from IPython.utils.capture import capture_output  # fmt: skip
+
     with capture_output() as captured:
         # Execute the code
         result = _ipython.run_cell(code, silent=False, store_history=False)
@@ -118,7 +129,8 @@ def execute_python(code: str, ask: bool, args=None) -> Generator[Message, None,
         tb = result.error_in_exec.__traceback__
         while tb.tb_next:  # type: ignore
             tb = tb.tb_next  # type: ignore
-        output += f"Exception during execution on line {tb.tb_lineno}:\n  {result.error_in_exec.__class__.__name__}: {result.error_in_exec}"  # type: ignore
+        # type: ignore
+        output += f"Exception during execution on line {tb.tb_lineno}:\n  {result.error_in_exec.__class__.__name__}: {result.error_in_exec}"
     if result.result is not None:
         output += f"Result:\n```\n{result.result}\n```\n\n"
 

gptme/tools/shell.py

@@ -227,7 +227,7 @@ def restart(self):
         self._init()
 
 
-_shell = None
+_shell: ShellSession | None = None
 
 
 def get_shell() -> ShellSession:

gptme/tools/subagent.py

@@ -19,11 +19,12 @@
     # noreorder
     from ..logmanager import LogManager  # fmt: skip
 
+
 logger = logging.getLogger(__name__)
 
 Status = Literal["running", "success", "failure"]
 
-_subagents = []
+_subagents: list["Subagent"] = []
 
 
 @dataclass

gptme/util.py

@@ -176,6 +176,7 @@ def _is_sphinx_build() -> bool:
     try:
         # noreorder
         import sphinx  # fmt: skip
+
         is_sphinx = hasattr(sphinx, "application")
     except ImportError:
         is_sphinx = False

train/collect.py

@@ -116,7 +116,7 @@ def collect(model: str):
             (name, convs)
             for name, convs in zip(names, convs)
             if quality_check_convo(convs, name)
-        ]
+        ],
     )
     logger.info("Got %d conversations after filtering", len(convs))