Merge remote-tracking branch 'upstream/main' into fix-pip-install-extra-proxy

This commit is contained in:
Dragos Campean 2024-03-23 21:37:48 +02:00
commit 9203eae056
2 changed files with 19 additions and 5 deletions

View file

@ -1,6 +1,7 @@
import sys, os, time import sys, os, time
import traceback, asyncio import traceback, asyncio
import pytest import pytest
import subprocess
sys.path.insert( sys.path.insert(
0, os.path.abspath("../..") 0, os.path.abspath("../..")
@ -16,3 +17,17 @@ def test_using_litellm():
pytest.fail( pytest.fail(
f"Error occurred: {e}. Installing litellm on python3.8 failed please retry" 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

View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "litellm" name = "litellm"
version = "1.33.7" version = "1.33.8"
description = "Library to easily interface with LLM API providers" description = "Library to easily interface with LLM API providers"
authors = ["BerriAI"] authors = ["BerriAI"]
license = "MIT" license = "MIT"
@ -31,7 +31,6 @@ pyyaml = {version = "^6.0.1", optional = true}
rq = {version = "*", optional = true} rq = {version = "*", optional = true}
orjson = {version = "^3.9.7", optional = true} orjson = {version = "^3.9.7", optional = true}
apscheduler = {version = "^3.10.4", optional = true} apscheduler = {version = "^3.10.4", optional = true}
streamlit = {version = "^1.29.0", optional = true}
fastapi-sso = { version = "^0.10.0", optional = true } fastapi-sso = { version = "^0.10.0", optional = true }
PyJWT = { version = "^2.8.0", optional = true } PyJWT = { version = "^2.8.0", optional = true }
python-multipart = { version = "^0.0.6", optional = true } python-multipart = { version = "^0.0.6", optional = true }
@ -41,6 +40,7 @@ azure-identity = {version = "^1.15.0", optional = true}
azure-keyvault-secrets = {version = "^4.8.0", optional = true} azure-keyvault-secrets = {version = "^4.8.0", optional = true}
google-cloud-kms = {version = "^2.21.3", optional = true} google-cloud-kms = {version = "^2.21.3", optional = true}
resend = {version = "^0.8.0", optional = true} resend = {version = "^0.8.0", optional = true}
cryptography = { version = "41.0.3", optional = true }
[tool.poetry.extras] [tool.poetry.extras]
proxy = [ proxy = [
@ -55,7 +55,7 @@ proxy = [
"fastapi-sso", "fastapi-sso",
"PyJWT", "PyJWT",
"python-multipart", "python-multipart",
"argon2-cffi", "cryptography"
] ]
extra_proxy = [ extra_proxy = [
@ -63,7 +63,6 @@ extra_proxy = [
"azure-identity", "azure-identity",
"azure-keyvault-secrets", "azure-keyvault-secrets",
"google-cloud-kms", "google-cloud-kms",
"streamlit",
"resend" "resend"
] ]
@ -82,7 +81,7 @@ requires = ["poetry-core", "wheel"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"
[tool.commitizen] [tool.commitizen]
version = "1.33.7" version = "1.33.8"
version_files = [ version_files = [
"pyproject.toml:^version" "pyproject.toml:^version"
] ]