fix python version incompatibilities

Author: djcopley

.github/workflows/tests.yml

@@ -31,4 +31,4 @@ jobs:
         with:
           python-version: ${{ matrix.py }}
       - name: Run test suite
-        run: hatch test
+        run: hatch test -py=${{ matrix.py }}

.gitignore

@@ -162,4 +162,5 @@ cython_debug/
 demo/
 
 # Experimental scripts
-experiments/
+experiments/
+/.jj/

pyproject.toml

@@ -28,14 +28,26 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
 dependencies = [
-    "httpx",
-    "openai",
-    "prompt-toolkit",
-    "yaspin",
-    "tomlkit",
-    "tomli >= 1.1.0; python_version < '3.11'",
-    "google-generativeai",
-    "click>=8.1.8",
+    "tomli ~= 2.1; python_version < '3.11'",
+    "click~=8.1",
+    "dspy~=2.6",
+    "httpx~=0.28",
+    "openai~=1.66",
+    "prompt-toolkit~=3.0",
+    "yaspin~=3.1",
+    "tomlkit~=0.13",
+    "google-generativeai~=0.8",
+]
+
+[dependency-groups]
+test = [
+    "pytest~=8.3",
+    "pytest-cov~=5.0",
+    "pytest-sugar~=1.0",
+    "pytest-xdist~=3.6",
+    "pytest-asyncio~=0.24",
+    "pytest-httpx~=0.30",
+    "tomli-w~=1.2.0",
 ]
 
 [project.scripts]

src/shelloracle/cli/__init__.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import logging
 import sys
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import click
 
@@ -10,6 +12,9 @@
 from shelloracle.config import Configuration
 from shelloracle.tty_log_handler import TtyLogHandler
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 logger = logging.getLogger(__name__)
 
 
@@ -34,7 +39,7 @@ def configure_logging(log_path: Path):
 @click.group(invoke_without_command=True)
 @click.version_option()
 @click.pass_context
-def cli(ctx):
+def cli(ctx: click.Context):
     """ShellOracle command line interface."""
     app = Application()
     configure_logging(app.log_path)

src/shelloracle/cli/application.py

@@ -1,6 +1,10 @@
+from __future__ import annotations
+
+import typing
 from pathlib import Path
 
-from shelloracle.config import Configuration
+if typing.TYPE_CHECKING:
+    from shelloracle.config import Configuration
 
 shelloracle_home = Path.home() / ".shelloracle"
 shelloracle_home.mkdir(exist_ok=True)

src/shelloracle/cli/config/edit.py

@@ -1,6 +1,11 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 import click
 
-from shelloracle.cli.application import Application
+if TYPE_CHECKING:
+    from shelloracle.cli.application import Application
 
 
 @click.command()

src/shelloracle/cli/config/init.py

@@ -1,6 +1,11 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 import click
 
-from shelloracle.cli import Application
+if TYPE_CHECKING:
+    from shelloracle.cli import Application
 
 
 @click.command()

src/shelloracle/providers/__init__.py

@@ -33,7 +33,11 @@ class Provider(Protocol):
     config: Configuration
 
     def __init__(self, config: Configuration) -> None:
-        self.config = config
+        """Initialize the provider with the given configuration.
+
+        :param config: the configuration object
+        :return: none
+        """
 
     @abstractmethod
     def generate(self, prompt: str) -> AsyncIterator[str]:

src/shelloracle/providers/deepseek.py

@@ -1,18 +1,25 @@
-from collections.abc import AsyncIterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from openai import APIError, AsyncOpenAI
 
 from shelloracle.providers import Provider, ProviderError, Setting, system_prompt
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from shelloracle.config import Configuration
+
 
 class Deepseek(Provider):
     name = "Deepseek"
 
     api_key = Setting(default="")
     model = Setting(default="deepseek-chat")
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)
@@ -22,7 +29,10 @@ async def generate(self, prompt: str) -> AsyncIterator[str]:
         try:
             stream = await self.client.chat.completions.create(
                 model=self.model,
-                messages=[{"role": "system", "content": system_prompt}, {"role": "user", "content": prompt}],
+                messages=[
+                    {"role": "system", "content": system_prompt},
+                    {"role": "user", "content": prompt},
+                ],
                 stream=True,
             )
             async for chunk in stream:

src/shelloracle/providers/google.py

@@ -1,18 +1,25 @@
-from collections.abc import AsyncIterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 import google.generativeai as genai
 
 from shelloracle.providers import Provider, ProviderError, Setting, system_prompt
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from shelloracle.config import Configuration
+
 
 class Google(Provider):
     name = "Google"
 
     api_key = Setting(default="")
     model = Setting(default="gemini-2.0-flash")  # Assuming a default model name
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)

src/shelloracle/providers/localai.py

@@ -1,9 +1,16 @@
-from collections.abc import AsyncIterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from openai import APIError, AsyncOpenAI
 
 from shelloracle.providers import Provider, ProviderError, Setting, system_prompt
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from shelloracle.config import Configuration
+
 
 class LocalAI(Provider):
     name = "LocalAI"
@@ -16,8 +23,8 @@ class LocalAI(Provider):
     def endpoint(self) -> str:
         return f"http://{self.host}:{self.port}"
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
         # Use a placeholder API key so the client will work
         self.client = AsyncOpenAI(api_key="sk-xxx", base_url=self.endpoint)
 

src/shelloracle/providers/ollama.py

@@ -11,6 +11,8 @@
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
 
+    from shelloracle.config import Configuration
+
 
 def dataclass_to_json(obj: Any) -> dict[str, Any]:
     """Convert dataclass to a json dict
@@ -58,6 +60,9 @@ class Ollama(Provider):
     port = Setting(default=11434)
     model = Setting(default="dolphin-mistral")
 
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
+
     @property
     def endpoint(self) -> str:
         # computed property because python descriptors need to be bound to an instance before access

src/shelloracle/providers/openai.py

@@ -1,18 +1,25 @@
-from collections.abc import AsyncIterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from openai import APIError, AsyncOpenAI
 
 from shelloracle.providers import Provider, ProviderError, Setting, system_prompt
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from shelloracle.config import Configuration
+
 
 class OpenAI(Provider):
     name = "OpenAI"
 
     api_key = Setting(default="")
     model = Setting(default="gpt-3.5-turbo")
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)

src/shelloracle/providers/openai_compat.py

@@ -1,9 +1,16 @@
-from collections.abc import AsyncIterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from openai import APIError, AsyncOpenAI
 
 from shelloracle.providers import Provider, ProviderError, Setting, system_prompt
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from shelloracle.config import Configuration
+
 
 class OpenAICompat(Provider):
     name = "OpenAICompat"
@@ -12,8 +19,8 @@ class OpenAICompat(Provider):
     api_key = Setting(default="")
     model = Setting(default="")
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
         if not self.api_key:
             msg = "No API key provided. Use a dummy placeholder if no key is required"
             raise ProviderError(msg)

src/shelloracle/providers/xai.py

@@ -1,18 +1,25 @@
-from collections.abc import AsyncIterator
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from openai import APIError, AsyncOpenAI
 
 from shelloracle.providers import Provider, ProviderError, Setting, system_prompt
 
+if TYPE_CHECKING:
+    from collections.abc import AsyncIterator
+
+    from shelloracle.config import Configuration
+
 
 class XAI(Provider):
     name = "XAI"
 
     api_key = Setting(default="")
     model = Setting(default="grok-beta")
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, config: Configuration) -> None:
+        self.config = config
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)

src/shelloracle/tty_log_handler.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 
 from prompt_toolkit import print_formatted_text
@@ -6,7 +8,7 @@
 
 
 class TtyLogHandler(logging.Handler):
-    def emit(self, record):
+    def emit(self, record: logging.LogRecord):
         if record.levelno >= logging.ERROR:
             color = "ansired"
         elif record.levelno == logging.WARNING: