From e4410f10717d62e0262dc8b3d660ff29379f7291 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Sat, 21 Dec 2024 18:42:44 -0800 Subject: [PATCH 1/8] litellm mode --- tonic_validate/services/openai_service.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tonic_validate/services/openai_service.py b/tonic_validate/services/openai_service.py index 4495cd3..241f3ca 100644 --- a/tonic_validate/services/openai_service.py +++ b/tonic_validate/services/openai_service.py @@ -44,6 +44,11 @@ def __init__( "AZURE_OPENAI_ENDPOINT must be set in the environment when using AzureOpenAI" ) self.client = AsyncAzureOpenAI(api_version="2023-12-01-preview") + elif "LITELLM_API_KEY" in os.environ: + self.client = AsyncOpenAI( + base_url="https://litellm.ml.scaleinternal.com/", + api_key=os.environ["LITELLM_API_KEY"], + ) elif "OPENAI_API_KEY" in os.environ: self.client = AsyncOpenAI() elif "OPENROUTR_API_KEY" in os.environ: From 5404e5bbf094da535bf81e515726a48d3187d050 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Sat, 21 Dec 2024 18:45:07 -0800 Subject: [PATCH 2/8] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6d3a8ec..ff98ab2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "tonic-validate" +name = "tonic_validate" version = "6.2.0" description = "RAG evaluation metrics." authors = ["Joe Ferrara ", "Ethan Philpott ", "Adam Kamor "] From e70e709e28ff98470a93c7b979a06dc0478e4556 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Sat, 21 Dec 2024 18:46:07 -0800 Subject: [PATCH 3/8] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ff98ab2..6d3a8ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "tonic_validate" +name = "tonic-validate" version = "6.2.0" description = "RAG evaluation metrics." authors = ["Joe Ferrara ", "Ethan Philpott ", "Adam Kamor "] From 6d754be53ac34ce12023b3fc8c1505f84c731366 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Sat, 21 Dec 2024 18:55:56 -0800 Subject: [PATCH 4/8] litellm mode --- tonic_validate/services/openai_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tonic_validate/services/openai_service.py b/tonic_validate/services/openai_service.py index 241f3ca..88dd948 100644 --- a/tonic_validate/services/openai_service.py +++ b/tonic_validate/services/openai_service.py @@ -58,7 +58,7 @@ def __init__( ) else: raise Exception( - "OPENAI_API_KEY or AZURE_OPENAI_API_KEY must be set in the environment" + "LITELLM_API_KEY or OPENAI_API_KEY or AZURE_OPENAI_API_KEY must be set in the environment" ) self.model = model self.encoder = encoder From 1d9e2f2f8708c0c0dd125bc61d3a1dfdd8b85253 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Wed, 29 Jan 2025 16:37:08 -0800 Subject: [PATCH 5/8] Update openai_service.py --- tonic_validate/services/openai_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tonic_validate/services/openai_service.py b/tonic_validate/services/openai_service.py index 88dd948..5647670 100644 --- a/tonic_validate/services/openai_service.py +++ b/tonic_validate/services/openai_service.py @@ -46,7 +46,7 @@ def __init__( self.client = AsyncAzureOpenAI(api_version="2023-12-01-preview") elif "LITELLM_API_KEY" in os.environ: self.client = AsyncOpenAI( - base_url="https://litellm.ml.scaleinternal.com/", + base_url=os.environ["LITELLM_BASE_URL"], api_key=os.environ["LITELLM_API_KEY"], ) elif "OPENAI_API_KEY" in os.environ: From 7b077ba6f5abe03d58f9d8de13ac266e52983393 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Fri, 31 Jan 2025 15:37:21 -0800 Subject: [PATCH 6/8] Update openai_service.py --- tonic_validate/services/openai_service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tonic_validate/services/openai_service.py b/tonic_validate/services/openai_service.py index 5647670..4c03d9a 100644 --- a/tonic_validate/services/openai_service.py +++ b/tonic_validate/services/openai_service.py @@ -44,10 +44,10 @@ def __init__( "AZURE_OPENAI_ENDPOINT must be set in the environment when using AzureOpenAI" ) self.client = AsyncAzureOpenAI(api_version="2023-12-01-preview") - elif "LITELLM_API_KEY" in os.environ: + elif "OPENAI_API_KEY" in os.environ and "OPENAI_API_BASE" in os.environ: self.client = AsyncOpenAI( - base_url=os.environ["LITELLM_BASE_URL"], - api_key=os.environ["LITELLM_API_KEY"], + api_base=os.environ["OPENAI_BASE_URL"], + api_key=os.environ["OPENAI_API_KEY"], ) elif "OPENAI_API_KEY" in os.environ: self.client = AsyncOpenAI() From 2927bd8fcb51e31f52bd601d4f52a9d937760aa8 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Fri, 31 Jan 2025 15:39:10 -0800 Subject: [PATCH 7/8] Update openai_service.py --- tonic_validate/services/openai_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tonic_validate/services/openai_service.py b/tonic_validate/services/openai_service.py index 4c03d9a..ab8a597 100644 --- a/tonic_validate/services/openai_service.py +++ b/tonic_validate/services/openai_service.py @@ -46,7 +46,7 @@ def __init__( self.client = AsyncAzureOpenAI(api_version="2023-12-01-preview") elif "OPENAI_API_KEY" in os.environ and "OPENAI_API_BASE" in os.environ: self.client = AsyncOpenAI( - api_base=os.environ["OPENAI_BASE_URL"], + api_base=os.environ["OPENAI_API_BASE"], api_key=os.environ["OPENAI_API_KEY"], ) elif "OPENAI_API_KEY" in os.environ: From befb95756edcd48ca28ae8078b865c3aa4fed267 Mon Sep 17 00:00:00 2001 From: Bijan Varjavand Date: Fri, 31 Jan 2025 15:39:44 -0800 Subject: [PATCH 8/8] Update openai_service.py --- tonic_validate/services/openai_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tonic_validate/services/openai_service.py b/tonic_validate/services/openai_service.py index ab8a597..d893de1 100644 --- a/tonic_validate/services/openai_service.py +++ b/tonic_validate/services/openai_service.py @@ -46,7 +46,7 @@ def __init__( self.client = AsyncAzureOpenAI(api_version="2023-12-01-preview") elif "OPENAI_API_KEY" in os.environ and "OPENAI_API_BASE" in os.environ: self.client = AsyncOpenAI( - api_base=os.environ["OPENAI_API_BASE"], + base_url=os.environ["OPENAI_API_BASE"], api_key=os.environ["OPENAI_API_KEY"], ) elif "OPENAI_API_KEY" in os.environ: