Merge pull request #174 from tisnik/sync-with-ols

Sync with OLS downstream
road-core · Dec 3, 2024 · e784f8b · e784f8b
2 parents c9c1b06 + 7e36327
commit e784f8b
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 29 deletions.
diff --git a/ols/src/llms/providers/azure_openai.py b/ols/src/llms/providers/azure_openai.py
@@ -64,10 +64,8 @@ def default_params(self) -> dict[str, Any]:
             "api_version": api_version,
             "deployment_name": deployment_name,
             "model": self.model,
-            "model_kwargs": {
-                "top_p": 0.95,
-                "frequency_penalty": 1.03,
-            },
+            "top_p": 0.95,
+            "frequency_penalty": 1.03,
             "organization": None,
             "cache": None,
             "streaming": True,

diff --git a/ols/src/llms/providers/openai.py b/ols/src/llms/providers/openai.py
@@ -36,10 +36,8 @@ def default_params(self) -> dict[str, Any]:
             "base_url": self.url,
             "openai_api_key": self.credentials,
             "model": self.model,
-            "model_kwargs": {
-                "top_p": 0.95,
-                "frequency_penalty": 1.03,
-            },
+            "top_p": 0.95,
+            "frequency_penalty": 1.03,
             "organization": None,
             "cache": None,
             "streaming": True,

diff --git a/ols/src/llms/providers/rhelai_vllm.py b/ols/src/llms/providers/rhelai_vllm.py
@@ -37,10 +37,8 @@ def default_params(self) -> dict[str, Any]:
             "base_url": self.url,
             "openai_api_key": self.credentials,
             "model": self.model,
-            "model_kwargs": {
-                "top_p": 0.95,
-                "frequency_penalty": 1.03,
-            },
+            "top_p": 0.95,
+            "frequency_penalty": 1.03,
             "organization": None,
             "cache": None,
             "streaming": True,

diff --git a/ols/src/llms/providers/rhoai_vllm.py b/ols/src/llms/providers/rhoai_vllm.py
@@ -37,10 +37,8 @@ def default_params(self) -> dict[str, Any]:
             "base_url": self.url,
             "openai_api_key": self.credentials,
             "model": self.model,
-            "model_kwargs": {
-                "top_p": 0.95,
-                "frequency_penalty": 1.03,
-            },
+            "top_p": 0.95,
+            "frequency_penalty": 1.03,
             "organization": None,
             "cache": None,
             "streaming": True,

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -123,6 +123,7 @@ dependencies = [
     "findpython==0.6.2",
     "filelock==3.16.1",
     "ffmpy==0.4.0",
+    "virtualenv==20.28.0",
 ]
 requires-python = "==3.11.*"
 readme = "README.md"

diff --git a/tests/benchmarks/test_redactor.py b/tests/benchmarks/test_redactor.py
@@ -10,7 +10,7 @@
 from ols.utils.redactor import Redactor, RegexFilter
 
 
-@pytest.fixture()
+@pytest.fixture
 def config():
     """Load configuration used for benchmarks."""
     config = AppConfig()

diff --git a/tests/unit/app/endpoints/test_feedback.py b/tests/unit/app/endpoints/test_feedback.py
@@ -11,7 +11,7 @@
 from ols.app.models.config import UserDataCollection
 
 
-@pytest.fixture()
+@pytest.fixture
 def feedback_location(tmpdir):
     """Fixture sets feedback location to tmpdir and return the path."""
     full_path = (tmpdir / "feedback").strpath

diff --git a/tests/unit/extra_certs/test_extra_certs.py b/tests/unit/extra_certs/test_extra_certs.py
@@ -17,7 +17,7 @@
 extra_cert_path = "tests/unit/extra_certs/sample_cert_2.crt"
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_certifi_store(tmpdir):
     """Create a fake certifi store."""
     cert_store_path = tmpdir / "cacerts.crt"

diff --git a/tests/unit/llms/providers/test_azure_openai.py b/tests/unit/llms/providers/test_azure_openai.py
@@ -430,7 +430,7 @@ def get_token(self, url):
         raise Exception("Error getting token")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mocked_token_cache():
     """Fake token cache."""
 

diff --git a/tests/unit/llms/providers/test_fake_provider.py b/tests/unit/llms/providers/test_fake_provider.py
@@ -1,7 +1,7 @@
 """Unit tests for BAM provider."""
 
 import pytest
-from langchain.llms.fake import FakeListLLM
+from langchain_community.llms import FakeListLLM
 
 from ols.app.models.config import ProviderConfig
 from ols.src.llms.providers.fake_provider import FakeProvider

diff --git a/tests/unit/llms/providers/test_rhelai_vllm.py b/tests/unit/llms/providers/test_rhelai_vllm.py
@@ -13,7 +13,7 @@
 cert_in_certificates_store_path = "tests/unit/extra_certs/sample_cert_1.crt"
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_certifi_store(tmpdir):
     """Create a fake certifi store."""
     cert_store_path = os.path.join(

diff --git a/tests/unit/llms/providers/test_rhoai_vllm.py b/tests/unit/llms/providers/test_rhoai_vllm.py
@@ -13,7 +13,7 @@
 cert_in_certificates_store_path = "tests/unit/extra_certs/sample_cert_1.crt"
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_certifi_store(tmpdir):
     """Create a fake certifi store."""
     cert_store_path = os.path.join(

diff --git a/tests/unit/query_helpers/test_attachment_appender.py b/tests/unit/query_helpers/test_attachment_appender.py
@@ -40,7 +40,7 @@ def yaml_without_name():
 """
 
 
-@pytest.fixture()
+@pytest.fixture
 def broken_yaml():
     """Broken YAML file for testing."""
     return """