From 34fce009600f80bf2247f8f46a5f7fa07f3824c5 Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Thu, 15 Feb 2024 20:36:59 -0800 Subject: [PATCH] fix: dynamo_db.py handle permissions row --- litellm/proxy/db/dynamo_db.py | 7 ++++++- litellm/proxy/proxy_server.py | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/litellm/proxy/db/dynamo_db.py b/litellm/proxy/db/dynamo_db.py index a9461d9225..206fee7777 100644 --- a/litellm/proxy/db/dynamo_db.py +++ b/litellm/proxy/db/dynamo_db.py @@ -282,7 +282,12 @@ class DynamoDBWrapper(CustomDB): new_response = {} for k, v in response.items(): # handle json string if ( - (k == "aliases" or k == "config" or k == "metadata") + ( + k == "aliases" + or k == "config" + or k == "metadata" + or k == "permissions" + ) and v is not None and isinstance(v, str) ): diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 48271be0b7..afa97dc203 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -1013,7 +1013,10 @@ async def update_database( valid_token.spend = new_spend user_api_key_cache.set_cache(key=token, value=valid_token) except Exception as e: - verbose_proxy_logger.info(f"Update Key DB Call failed to execute") + traceback.print_exc() + verbose_proxy_logger.info( + f"Update Key DB Call failed to execute - {str(e)}" + ) ### UPDATE SPEND LOGS ### async def _insert_spend_log_to_db(): @@ -1656,9 +1659,7 @@ async def generate_key_helper_fn( saved_token["config"] = json.loads(saved_token["config"]) if isinstance(saved_token["metadata"], str): saved_token["metadata"] = json.loads(saved_token["metadata"]) - if saved_token["permissions"] is not None and isinstance( - saved_token["permissions"], str - ): + if isinstance(saved_token["permissions"], str): saved_token["permissions"] = json.loads(saved_token["permissions"]) if saved_token.get("expires", None) is not None and isinstance( saved_token["expires"], datetime