From 4665b2a89891c0bd3800f088cca80c0fcbcf4409 Mon Sep 17 00:00:00 2001
From: Krrish Dholakia <krrishdholakia@gmail.com>
Date: Thu, 28 Sep 2023 17:58:39 -0700
Subject: [PATCH] updates to proxy

---
 litellm/__pycache__/utils.cpython-311.pyc | Bin 135578 -> 135771 bytes
 litellm/proxy/proxy_cli.py                |   5 ++--
 litellm/proxy/proxy_server.py             |  35 +++++++++++++++++-----
 litellm/utils.py                          |   8 ++++-
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/litellm/__pycache__/utils.cpython-311.pyc b/litellm/__pycache__/utils.cpython-311.pyc
index 53dec7ede15104982a96102363fc084037281c88..38371ff60d723ba9ab92177c36ecbf26dba536c8 100644
GIT binary patch
delta 2258
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
L1LJWhT1x#B1LS-O

delta 2104
zcmZ`)4Nz276n@`(?1GECAo8=I1&BH>lm_ZRmKa(Fm<Y;@gUo1)yCf6x^H>5A1;Q!N
zQA)w<pfYKtV>$hqa|N~h8!7w?!k@OmRLo3fWQj5@sqT4;;yBaW*>BG~_ndRT^WDSc
z#}B+3-}f@@HX03*c#5S!d-lpI(|!}|Wr$>sGOSR_QO<UFAc&c(5XgF-fv?`CY*SXr
zEc{mlJ>g-~+4MOmm-l+^QY7hP@pV6|lyZe#-GjhQ-=&(uAlak^QiKF4L$gYi45<Vb
zuN1XGgsYiME=MK|Y;ie~;w&DjT^8Pt1UNkltSfT!tv0nlycKzf=rHl9QIxigq6j(!
z|02!?$`K#xtMhT`rGU^&{^l-oc&9n?qB*9+9P`<;?dIv7=ILzhDx{8+bv{?TOf~u%
z{oT8Fi~L2gHKvi$rZKU~!35u#M(LPQp6SQKR%0H}%L^)yC!>Y^RD~BIv9WLBCcK%k
z8Z+<}n_G=Iy~$fJIl|Ue<1j|>q&3Kqaf<DG3(F9|N573|87EmvEykdY71kmcXV|)0
zjPgE59mGPwDfW3S8ua5up&}=1uSX!yT8lhI<h8HINPR0se#369#|6x0M>k+jP#d|r
z1$T?LdWP&m66Gw5sKaDmt@0`ICX=_FW!K?VOyjL}C?PU4He!6NR^hY=+T-D_5KUCx
zp{z=gwMVbUQL<L6oxFoow{66Hr1IX4SOifkxgH@S9@bK?Qsgz6Rdrz`tEtB<Wb)JX
z$U@XfTDd|XzLHujAYDx)^MA5)H{)e}Hfd5qnoQ)sY(^;(v^q37vj-VbNv+R^bu7Ba
zJNkt7sU&#7ZQmA5M<MUqf?hm5l&PpcP}IYCQEEtrK?RIk#k^MYoUKTLKPhN|TQYet
zmJM%0D0^}{0@w>p7^_*RXH&N0B3!h%9F4rJ2{DSV){Q2};2|H{fha$%=x}!vF5+{R
z-4p&`=dc1bC(p6OUb@txJVLCU#qLBZ-s3epk*(ky>-`W@<EbmbUu$USaJ6Zn{w$B2
zu+y+~S#jR$OKet$^^t=PW-E6g0f+eEUAX5frkZn{t7sv`I|vpLH%<H7^y(zIOz<Z`
zw*aSSezBvV*iq!JdXxNp1euiDKqGg9UNylFk#&$@yjXP_7dY|@k{ou`>d48@Q*Y72
zfGjaxGoHg8me7nzqSeA?*l?C#XvVQ&dP&?ts?3^>!z}(h`EkS{levx~r{ZhMK1OhY
zK%+mzm#DglXbiQjw3alk{j{pJB(|4SPuj#lV4)@=3A8)u0Id@IYY<aAS2S1o;KMJS
zKr(QEMV!RX@L<DQk*YI^8d-dCD_qb82s>x@f^Px%^Yk_(dV#U+9q7RqtoD1fidjnQ
z#8U`it2@P!__HIO;_fjMi(vLoCyK(t$POnsOzN4$kk|`Ixg~kl<#u%pd-ptE(M=Ko
zrTp4?tnmzqrr=CE1G-?{7jF#tCbP;eMCzsp`#k@&3$t{HX8qT215=o@8(~8Izq>I}
zI3urPtUk`2lYSkq>EeZbn;*H3Mjawp<}I{{pTHi38^%!-fte@tz^EXW&$|s1bSc6&
zhh_DOUOQQeOB9(eJPUb?3x4n$O=%khNip$>WGAu9eF#DtyVHjZLn^rltSsX<Q6Z7N
z)Q<^<baE3EvXXvOkD@9?qDk=|#C=v;DS|h6!0-4HBC+icG#HX7k)Vv{+(D!sv8?_+
z(vZw<+{d(V;;Irojf-WtT1BUyMPMVZoh1w)R76_`5Uig=t~6FTfG9%<*#ukp{sAoX
z&^d(d<RfIc5m?IhD)KDEahD=DD;3%x(R8RZ7Al>YN{6A6x|)XS5D`rQtzWl1BE;#D
zm7kxh?WWQ;j}7WyUe7Pjw-x8w<JCH`Dzue~rizhuDPsCu{t}<yCD(fS1i{B8J%nle
IsIQ><AN6=bWdHyG

diff --git a/litellm/proxy/proxy_cli.py b/litellm/proxy/proxy_cli.py
index 4d685ee1400..8961dbb1540 100644
--- a/litellm/proxy/proxy_cli.py
+++ b/litellm/proxy/proxy_cli.py
@@ -9,9 +9,10 @@ load_dotenv()
 @click.option('--debug', is_flag=True, help='To debug the input') 
 @click.option('--temperature', default=None, type=float, help='Set temperature for the model') 
 @click.option('--max_tokens', default=None, help='Set max tokens for the model') 
-def run_server(port, api_base, model, debug, temperature, max_tokens):
+@click.option('--telemetry', default=True, type=bool, help='Helps us know if people are using this feature. Turn this off by doing `--telemetry False`') 
+def run_server(port, api_base, model, debug, temperature, max_tokens, telemetry):
     from .proxy_server import app, initialize
-    initialize(model, api_base, debug, temperature, max_tokens)
+    initialize(model, api_base, debug, temperature, max_tokens, telemetry)
     try:
         import uvicorn
     except:
diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index 361cc46dd9d..f6446fbf77a 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -3,8 +3,20 @@ sys.path.insert(
     0, os.path.abspath("../..")
 )  # Adds the parent directory to the system path
 
+try:
+    import uvicorn
+    import fastapi
+except ImportError:
+    import subprocess
+    import sys
+
+    subprocess.check_call([sys.executable, "-m", "pip", "install", "uvicorn", "fastapi"])
+print()
+print("\033[1;31mGive Feedback / Get Help: https://github.com/BerriAI/litellm/issues/new\033[0m")
+print()
+print()
+
 import litellm
-print(litellm.__file__)
 from fastapi import FastAPI, Request
 from fastapi.responses import StreamingResponse
 import json
@@ -16,23 +28,31 @@ user_model = None
 user_debug = False
 user_max_tokens = None
 user_temperature = None
+user_telemetry = False
 
+#### HELPER FUNCTIONS ####
 def print_verbose(print_statement):
     global user_debug 
     print(f"user_debug: {user_debug}")
     if user_debug: 
          print(print_statement)
 
-def initialize(model, api_base, debug, temperature, max_tokens):
-    global user_model, user_api_base, user_debug, user_max_tokens, user_temperature
+def usage_telemetry(): # helps us know if people are using this feature. Set `litellm --telemetry False` to your cli call to turn this off
+    if user_telemetry: 
+        data = {
+            "feature": "local_proxy_server"
+        }
+        litellm.utils.litellm_telemetry(data=data)
+
+def initialize(model, api_base, debug, temperature, max_tokens, telemetry):
+    global user_model, user_api_base, user_debug, user_max_tokens, user_temperature, user_telemetry
     user_model = model
     user_api_base = api_base
     user_debug = debug
     user_max_tokens = max_tokens
     user_temperature = temperature
-
-    # if debug: 
-    #     litellm.set_verbose = True
+    user_telemetry = telemetry
+    usage_telemetry()
 
 # for streaming
 def data_generator(response):
@@ -41,7 +61,8 @@ def data_generator(response):
         print(f"chunk: {chunk}")
         print_verbose(f"returned chunk: {chunk}")
         yield f"data: {json.dumps(chunk)}\n\n"
-        
+
+#### API ENDPOINTS ####
 @app.get("/models") # if project requires model list 
 def model_list(): 
     return dict(
diff --git a/litellm/utils.py b/litellm/utils.py
index 6b716bb43ec..6ba4cbe3cf9 100644
--- a/litellm/utils.py
+++ b/litellm/utils.py
@@ -2776,10 +2776,16 @@ def litellm_telemetry(data):
         uuid_value = str(uuid.uuid4())
     try:
         # Prepare the data to send to litellm logging api
+        try: 
+            pkg_version = importlib.metadata.version("litellm")
+        except:
+            pkg_version = None
+        if "model" not in data:
+            data["model"] = None
         payload = {
             "uuid": uuid_value,
             "data": data,
-            "version:": importlib.metadata.version("litellm"),
+            "version:": pkg_version 
         }
         # Make the POST request to litellm logging api
         response = requests.post(