Merge pull request #3334 from CyanideByte/main

protected_namespaces warning fixed for model_name & model_info

litellm/proxy/_types.py

@@ -422,6 +422,9 @@ class LiteLLM_ModelTable(LiteLLMBase):
     created_by: str
     updated_by: str
 
+    class Config:
+        protected_namespaces = ()
+
 
 class NewUserRequest(GenerateKeyRequest):
     max_budget: Optional[float] = None
@@ -485,6 +488,9 @@ class TeamBase(LiteLLMBase):
 class NewTeamRequest(TeamBase):
     model_aliases: Optional[dict] = None
 
+    class Config:
+        protected_namespaces = ()
+
 
 class GlobalEndUsersSpend(LiteLLMBase):
     api_key: Optional[str] = None
@@ -534,6 +540,9 @@ class LiteLLM_TeamTable(TeamBase):
     budget_reset_at: Optional[datetime] = None
     model_id: Optional[int] = None
 
+    class Config:
+        protected_namespaces = ()
+
     @root_validator(pre=True)
     def set_model_info(cls, values):
         dict_fields = [
@@ -570,6 +579,9 @@ class LiteLLM_BudgetTable(LiteLLMBase):
     model_max_budget: Optional[dict] = None
     budget_duration: Optional[str] = None
 
+    class Config:
+        protected_namespaces = ()
+
 
 class NewOrganizationRequest(LiteLLM_BudgetTable):
     organization_id: Optional[str] = None

litellm/tests/test_config.py

@@ -26,6 +26,9 @@ class DBModel(BaseModel):
     model_info: dict
     litellm_params: dict
 
+    class Config:
+        protected_namespaces = ()
+
 
 @pytest.mark.asyncio
 async def test_delete_deployment():

litellm/tests/test_pydantic_namespaces.py

@@ -0,0 +1,10 @@
+import warnings
+import pytest
+
+def test_namespace_conflict_warning():
+    with warnings.catch_warnings(record=True) as recorded_warnings:
+        warnings.simplefilter("always")  # Capture all warnings
+        import litellm
+
+    # Check that no warning with the specific message was raised
+    assert not any("conflict with protected namespace" in str(w.message) for w in recorded_warnings), "Test failed: 'conflict with protected namespace' warning was encountered!"

litellm/types/router.py

@@ -202,12 +202,18 @@ class updateDeployment(BaseModel):
     litellm_params: Optional[updateLiteLLMParams] = None
     model_info: Optional[ModelInfo] = None
 
+    class Config:
+        protected_namespaces = ()
+
 
 class Deployment(BaseModel):
     model_name: str
     litellm_params: LiteLLM_Params
     model_info: ModelInfo
 
+    class Config:
+        protected_namespaces = ()
+
     def __init__(
         self,
         model_name: str,