use abc for provider

protocol is awesome for typing, but pycharm tooling doesn't fully
understand it && behavior difference between 3.9 and 3.11 makes it
cumbersome

Author: djcopley

src/shelloracle/providers/__init__.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+import abc
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Generic, Protocol, TypeVar
+from typing import TYPE_CHECKING, Generic, TypeVar
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
@@ -22,7 +23,7 @@ class ProviderError(Exception):
     """LLM providers raise this error to gracefully indicate something has gone wrong."""
 
 
-class Provider(Protocol):
+class Provider(abc.ABC):
     """
     LLM Provider Protocol
 
@@ -38,6 +39,7 @@ def __init__(self, config: Configuration) -> None:
         :param config: the configuration object
         :return: none
         """
+        self.config = config
 
     @abstractmethod
     def generate(self, prompt: str) -> AsyncIterator[str]:

src/shelloracle/providers/deepseek.py

@@ -9,17 +9,15 @@
 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, config: Configuration) -> None:
-        self.config = config
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)

src/shelloracle/providers/google.py

@@ -9,17 +9,15 @@
 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, config: Configuration) -> None:
-        self.config = config
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)

src/shelloracle/providers/localai.py

@@ -9,8 +9,6 @@
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
 
-    from shelloracle.config import Configuration
-
 
 class LocalAI(Provider):
     name = "LocalAI"
@@ -23,8 +21,8 @@ class LocalAI(Provider):
     def endpoint(self) -> str:
         return f"http://{self.host}:{self.port}"
 
-    def __init__(self, config: Configuration) -> None:
-        self.config = config
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
         # 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,8 +11,6 @@
 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
@@ -60,9 +58,6 @@ 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

@@ -9,17 +9,15 @@
 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, config: Configuration) -> None:
-        self.config = config
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)

src/shelloracle/providers/openai_compat.py

@@ -9,8 +9,6 @@
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
 
-    from shelloracle.config import Configuration
-
 
 class OpenAICompat(Provider):
     name = "OpenAICompat"
@@ -19,8 +17,8 @@ class OpenAICompat(Provider):
     api_key = Setting(default="")
     model = Setting(default="")
 
-    def __init__(self, config: Configuration) -> None:
-        self.config = config
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
         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

@@ -9,17 +9,15 @@
 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, config: Configuration) -> None:
-        self.config = config
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
         if not self.api_key:
             msg = "No API key provided"
             raise ProviderError(msg)