From 076affbff28c7094c0a63cf0a2110a1b7b8ad622 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Tue, 26 Sep 2023 17:53:22 -0700 Subject: [PATCH] fix llama index validate environment error --- litellm/__pycache__/utils.cpython-311.pyc | Bin 134518 -> 134576 bytes litellm/tests/test_utils.py | 11 ++++++++++- litellm/utils.py | 5 ++++- pyproject.toml | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/litellm/__pycache__/utils.cpython-311.pyc b/litellm/__pycache__/utils.cpython-311.pyc index cf6dbf096bffda737290cb6ee4d8e407d30ec2e6..ec29fd6b8345d99d8f3de1bb854dc4aba8416041 100644 GIT binary patch delta 1579 zcmZvc4NO~A7>4hA?(H9?lv27<3KU!ZwrSWhO=Me?#BIn#r$bTZPn@~9xM@Wuk!cH^ zlc3Hlg|pa(Qgx@N#wZ9OL53eY1V8Z!0gVqnB9o6usUQn}(I>Rh?Yolc`6;U?YaDb{f{mW& z%B2^lEJW7O>8@;LN~gL^4nfxXC7&21RgFGT*6kw7hE>aDJss_FLQA)IyP&6gyX{6p zR4bC>xaJTuWg{K!b0S_Lby`1yl6Qid`&06E2(sxYK7$|}=igfc0+)OF774K}%u9@I z)Nby(7FWNs(>MXAEM+sPA11l+Y-{FkRID@ z&Ku7?%c7nF*{-IWqBwbBuJpJ>JCB*e4x=NsZfaEB5_Tb#TEbRy3tz(-)6=5*mt0R% zbUGfEjOj5wBdQxuyO5#!3%TDF(=!!aEw<>*Q!^~k!jcpey%x^h5#!u3j(Go8^K<_% zKjNL_9#7PhD`ze7^eY}@(T!({dHWakB;E!!uBQWMR%5Y$#QUfcSNcbbdOcWd81Xt( zg*S|LaAmPW@J=d<+9B%c^I)+h@E%vUvC(~f597aOH}u~s`^x?`yub?wgV&`xQt9FT z)x5Ar2AmrHM0%&yXd2ZGd=jOh5&vbxXI4GjTIsi+0A;CNXTa;??VG*v90@&C~6D%Kh|zv=&mLd zup6YVyI_(~yiS>r+Y30`LA5X=O%%ykIQ0QJn*46B6wEZBm( zB^+bnqo_{8w`^Sp&KvMR$bJfAm}XZ`;X{JWtiBu9fydaJJt#JyF4QxGS)N|oFrFg3 ze1=gB>hK*Kiy%>lF*bDx0WA?s?4`?aNm#?)o57R7{cK`ZIdCxxTtPZe9%{LYk9pbG zUqdOu3oQ6M9@1eSyD*2RC3LfUZ@{REw}|?Qr$)$O9Wt{v4j@ia0*`fVZ!D}N!sPQo!hFMr>D{r0|7V$Y_r7Bu0+mI_h7cQ zR?^epV`avzEz5_|>=AYRI zQo9`K;xp!$bU@HX5#-1YvFA`=flMRMEHX2}d6}@02`-Q+<(XVFqs`0QY-F?rGG3m^ zGc);ShD2_N46VNGO>ZZWvm9HT#0vG0z<5Dd4{6}zp*1kBfpI7j*(rjvmtlG+pZ9I< zyd-j;u!J(?qfZ>o#ee-H5!LXx!o3OZ&2`N?EV@=aT+I73yKF00GPvTSJ;N(8uS3QL z5Lw5smTKXBswDnydMydXG>=#puRSQJA?|Gli~&{$KqlqC{WPN!ChBZ>lV#uCWIk-|&mm z^sRVJ(1x)O=!MZG)IYw(b5cmB#A}-0tM7yKU@brVc!_tHRg&7I$sFytk~QheY^&&X zfBAPhMtfan7yA+FExzu^#0a~~i65*8vp@!BfJd0>M**;&m1d!ipn-L(xCTVo8v*PD zo@a$Y{3)Y@h4Rs7K@U4!fFcXdFz<3~$b-hVS3tGH&N?4NpNie=p+>x|AkO}27Tg!C zXbTDmCRn%yy#(juj;;6!zs0AvVl#e^H?$&w>#V2^UlIJpfeHo7S<4Hs z0Qqd&i}1+SJNO?~b2MJP2PN$IOXvbtv&MFu2P#;24^|OtSP&lxqL3Ya88Lz<+1+ut z30hd?UQ`3yS@%Bp6gqg4TqTJJ9upPn)y$o%}Qp{*sJHDDJWu}UqBdG z#XJ|qhRfK;mk?KRWb(eDapaYUz^#HRC0y<3-sjJaR2}S diff --git a/litellm/tests/test_utils.py b/litellm/tests/test_utils.py index aab86ac4e..abd99bc30 100644 --- a/litellm/tests/test_utils.py +++ b/litellm/tests/test_utils.py @@ -10,7 +10,7 @@ sys.path.insert( ) # Adds the parent directory to the system path import pytest import litellm -from litellm.utils import trim_messages, get_token_count, get_valid_models, check_valid_key +from litellm.utils import trim_messages, get_token_count, get_valid_models, check_valid_key, validate_environment # Assuming your trim_messages, shorten_message_to_fit_limit, and get_token_count functions are all in a module named 'message_utils' @@ -93,3 +93,12 @@ def test_good_key(): key = os.environ['OPENAI_API_KEY'] response = check_valid_key(model="gpt-3.5-turbo", api_key=key) assert(response == True) + +# test validate environment + +def test_validate_environment_empty_model(): + api_key = validate_environment() + if api_key is None: + raise Exception() + +# test_validate_environment_empty_model() \ No newline at end of file diff --git a/litellm/utils.py b/litellm/utils.py index 9b4aad5e7..f377954a4 100644 --- a/litellm/utils.py +++ b/litellm/utils.py @@ -1325,9 +1325,12 @@ def load_test_model( "exception": e, } -def validate_environment(model: str) -> dict: +def validate_environment(model: Optional[str]=None) -> dict: keys_in_environment = False missing_keys = [] + + if model is None: + return {"keys_in_environment": keys_in_environment, "missing_keys": missing_keys} ## EXTRACT LLM PROVIDER - if model name provided custom_llm_provider = None # check if llm provider part of model name diff --git a/pyproject.toml b/pyproject.toml index 46ff00573..aac731c19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "litellm" -version = "0.1.772" +version = "0.1.773" description = "Library to easily interface with LLM API providers" authors = ["BerriAI"] license = "MIT License"