From 24204cec6b716ceacc980f874f96997aa7d7ceea Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Sat, 23 Mar 2024 10:31:31 -0700 Subject: [PATCH 1/5] build(pyproject.toml): fix dependency issue re: cryptography --- pyproject.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a3468a372..4056f1cda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,11 +31,10 @@ pyyaml = {version = "^6.0.1", optional = true} rq = {version = "*", optional = true} orjson = {version = "^3.9.7", optional = true} apscheduler = {version = "^3.10.4", optional = true} -streamlit = {version = "^1.29.0", optional = true} fastapi-sso = { version = "^0.10.0", optional = true } PyJWT = { version = "^2.8.0", optional = true } python-multipart = { version = "^0.0.6", optional = true } -argon2-cffi = { version = "^23.1.0", optional = true } +cryptography = { version = "41.0.3", optional = true } [tool.poetry.extras] proxy = [ @@ -50,7 +49,7 @@ proxy = [ "fastapi-sso", "PyJWT", "python-multipart", - "argon2-cffi", + "cryptography" ] extra_proxy = [ @@ -58,7 +57,6 @@ extra_proxy = [ "azure-identity", "azure-keyvault-secrets", "google-cloud-kms", - "streamlit", "resend" ] From 1b24beb7c709c310e5b606801deec2f90559d001 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Sat, 23 Mar 2024 10:31:38 -0700 Subject: [PATCH 2/5] =?UTF-8?q?bump:=20version=201.33.7=20=E2=86=92=201.33?= =?UTF-8?q?.7.dev1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4056f1cda..cc239f98d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "litellm" -version = "1.33.7" +version = "1.33.7.dev1" description = "Library to easily interface with LLM API providers" authors = ["BerriAI"] license = "MIT" @@ -75,7 +75,7 @@ requires = ["poetry-core", "wheel"] build-backend = "poetry.core.masonry.api" [tool.commitizen] -version = "1.33.7" +version = "1.33.7.dev1" version_files = [ "pyproject.toml:^version" ] From f0bee037adf595b189c0282ced91047699494bd1 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Sat, 23 Mar 2024 10:42:19 -0700 Subject: [PATCH 3/5] build(test_python_38.py): add testing for litellm cli import --- litellm/tests/test_python_38.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/litellm/tests/test_python_38.py b/litellm/tests/test_python_38.py index 077e65a3a..378b85b64 100644 --- a/litellm/tests/test_python_38.py +++ b/litellm/tests/test_python_38.py @@ -1,6 +1,7 @@ import sys, os, time import traceback, asyncio import pytest +import subprocess sys.path.insert( 0, os.path.abspath("../..") @@ -16,3 +17,17 @@ def test_using_litellm(): pytest.fail( f"Error occurred: {e}. Installing litellm on python3.8 failed please retry" ) + + +def test_litellm_proxy_server(): + # Install the litellm[proxy] package + subprocess.run(["pip", "install", "litellm[proxy]"]) + + # Import the proxy_server module + try: + import litellm.proxy.proxy_server + except ImportError: + pytest.fail("Failed to import litellm.proxy_server") + + # Assertion to satisfy the test, you can add other checks as needed + assert True From 8bd626197a5ff1eba53844e354ca6463c1d9bf73 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Sat, 23 Mar 2024 10:43:12 -0700 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"bump:=20version=201.33.7=20?= =?UTF-8?q?=E2=86=92=201.33.7.dev1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1b24beb7c709c310e5b606801deec2f90559d001. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cc239f98d..4056f1cda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "litellm" -version = "1.33.7.dev1" +version = "1.33.7" description = "Library to easily interface with LLM API providers" authors = ["BerriAI"] license = "MIT" @@ -75,7 +75,7 @@ requires = ["poetry-core", "wheel"] build-backend = "poetry.core.masonry.api" [tool.commitizen] -version = "1.33.7.dev1" +version = "1.33.7" version_files = [ "pyproject.toml:^version" ] From 05dfc9e6acee94af7216288cd3af25a446a39c14 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Sat, 23 Mar 2024 10:45:30 -0700 Subject: [PATCH 5/5] =?UTF-8?q?bump:=20version=201.33.7=20=E2=86=92=201.33?= =?UTF-8?q?.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4056f1cda..a58e8dd2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "litellm" -version = "1.33.7" +version = "1.33.8" description = "Library to easily interface with LLM API providers" authors = ["BerriAI"] license = "MIT" @@ -75,7 +75,7 @@ requires = ["poetry-core", "wheel"] build-backend = "poetry.core.masonry.api" [tool.commitizen] -version = "1.33.7" +version = "1.33.8" version_files = [ "pyproject.toml:^version" ]