Fix for the GitHub workflow and its requirements

.github/workflows/python-package.yml

@@ -13,28 +13,32 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v4
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
-        pip install -e .
+        pip install -e .[dev]
+
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
     - name: Test with pytest
       run: |
         pytest

pyproject.toml

@@ -17,10 +17,12 @@ license = {text = "MIT"}
 [project.optional-dependencies]
 dev = [
     "pytest>=7.0.0",
+    "flake8>=6.0.0",
     "black>=22.0.0",
     "isort>=5.0.0",
     "mypy>=1.0.0",
     "mock>=5.0.0",
+    "requests",
     "openai",
     "ollama",
     "transformers",

tackleberry/engine/base.py

@@ -3,10 +3,16 @@ class TBEngine:
     def __init__(self):
         pass
 
-    def model(self, model: str):
+    def model(self,
+        model: str,
+        **kwargs,
+    ):
         from ..model import TBModel
-        return TBModel(self, model)
+        return TBModel(self, model, **kwargs)
 
-    def chat(self, model: str):
+    def chat(self,
+        model: str,
+        **kwargs,
+    ):
         from ..model import TBModelChat
-        return TBModelChat(self, model)
+        return TBModelChat(self, model, **kwargs)

tackleberry/main.py

@@ -43,6 +43,12 @@ def model(self,
             raise Exception(f"Can't find engine for engine class '{engine_class}'")
         return engine.model(model)
 
+    def chat(self,
+        model: str,
+        **kwargs,
+    ):
+        return self.model(model).chat(**kwargs)
+
     def engine(self,
         engine_class: str,
         **kwargs,

tackleberry/model/base.py

@@ -1,9 +1,11 @@
-from typing import Any, Dict, Optional
-
 from ..engine import TBEngine
 
 class TBModel:
 
     def __init__(self, engine: TBEngine, name: str):
         self.engine = engine
         self.name = name
+
+    def chat(self, **kwargs):
+        from .chat import TBModelChat
+        return TBModelChat(self.engine, self, **kwargs)

tackleberry/model/chat.py

@@ -9,8 +9,8 @@ class TBModelChat(TBModel):
     def __init__(self,
         engine: TBEngine,
         model_name_or_model: Union[str|TBModel],
-        system_prompt: str = None,
         context: TBContext = None,
+        system_prompt: str = None,
         **kwargs,
     ):
         self.engine = engine

tests/test_tackleberry.py

@@ -15,8 +15,10 @@ def test_000_unknown(self):
         """Test not existing Model and Engine"""
         with self.assertRaises(ModuleNotFoundError):
             engine = TB.engine('xxxxx')
-        with self.assertRaises(KeyError):            
+        with self.assertRaises(KeyError):
             model = TB.model('xxxxx')
+        with self.assertRaises(KeyError):
+            modelchat = TB.chat('xxxxx')
 
     def test_010_openai(self):
         """Test OpenAI"""
@@ -35,6 +37,9 @@ def test_010_openai(self):
             self.assertEqual(type(model).__name__, "TBModel")
             self.assertIsInstance(model.engine, TBEngine)
             self.assertEqual(type(model.engine).__name__, "TBEngineOpenai")
+            modelchat = TB.chat('gpt-4o')
+            self.assertIsInstance(modelchat, TBModel)
+            self.assertEqual(type(modelchat).__name__, "TBModelChat")
             models = engine.get_models()
             self.assertTrue(len(models) > 20)
         else:
@@ -57,6 +62,9 @@ def test_020_anthropic(self):
             self.assertEqual(type(model).__name__, "TBModel")
             self.assertIsInstance(model.engine, TBEngine)
             self.assertEqual(type(model.engine).__name__, "TBEngineAnthropic")
+            modelchat = TB.chat('claude-2.1')
+            self.assertIsInstance(modelchat, TBModel)
+            self.assertEqual(type(modelchat).__name__, "TBModelChat")
             models = engine.get_models()
             self.assertTrue(len(models) > 3)
         else:
@@ -79,6 +87,9 @@ def test_030_groq(self):
             self.assertEqual(type(model).__name__, "TBModel")
             self.assertIsInstance(model.engine, TBEngine)
             self.assertEqual(type(model.engine).__name__, "TBEngineGroq")
+            modelchat = TB.chat('llama3-8b-8192')
+            self.assertIsInstance(modelchat, TBModel)
+            self.assertEqual(type(modelchat).__name__, "TBModelChat")
             models = engine.get_models()
             self.assertTrue(len(models) > 10)
         else: