Separate built in providers and abstract hierarchy

Author: djcopley

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
 ]
 
 [tool.setuptools]
-packages = ["shelloracle", "shelloracle.config", "shelloracle.provider"]
+packages = ["shelloracle", "shelloracle.config", "shelloracle.providers"]
 
 [project.scripts]
 shor = "shelloracle.shelloracle:cli"

shelloracle/config/setting.py

@@ -5,7 +5,7 @@
 from . import config
 
 if TYPE_CHECKING:
-    from ..provider import Provider
+    from ..providers import Provider
 
 T = TypeVar("T")
 

shelloracle/provider/__init__.py renamed to shelloracle/provider.py

@@ -34,7 +34,7 @@ def get_provider(name: str) -> type[Provider]:
     :param name: the provider name
     :return: the requested provider
     """
-    from .ollama import Ollama
+    from .providers import Ollama
     providers = {
         "Ollama": Ollama
     }

shelloracle/providers/__init__.py

@@ -0,0 +1 @@
+from .ollama import Ollama

shelloracle/provider/ollama.py renamed to shelloracle/providers/ollama.py

@@ -5,7 +5,7 @@
 
 import httpx
 
-from . import Provider, ProviderError
+from ..provider import Provider, ProviderError
 from ..config import Setting
 
 
@@ -66,7 +66,7 @@ class Ollama(Provider):
     )
 
     @property
-    def endpoint(self):
+    def endpoint(self) -> str:
         # computed property because python descriptors need to be bound to an instance before access
         return f"http://{self.host}:{self.port}/api/generate"