Merge branch 'BerriAI:main' into gemini-embeddings

Author: marty-sullivan

docs/my-website/docs/proxy/guardrails/pii_masking_v2.md

@@ -13,6 +13,7 @@ import TabItem from '@theme/TabItem';
 | Supported Entity Types | All Presidio Entity Types |
 | Supported Actions | `MASK`, `BLOCK` |
 | Supported Modes | `pre_call`, `during_call`, `post_call`, `logging_only` |
+| Language Support | Configurable via `presidio_language` parameter (supports multiple languages including English, Spanish, German, etc.) |
 
 ## Deployment options
 
@@ -48,6 +49,18 @@ Now select the entity types you want to mask. See the [supported actions here](#
   style={{width: '50%', display: 'block', margin: '0'}}
 />
 
+#### 1.3 Set Default Language (Optional)
+
+You can also configure a default language for PII analysis using the `presidio_language` field in the UI. This sets the default language that will be used for all requests unless overridden by a per-request language setting. 
+
+**Supported language codes include:**
+- `en` - English (default)
+- `es` - Spanish  
+- `de` - German
+
+
+If not specified, English (`en`) will be used as the default language.
+
 </TabItem>
 
 
@@ -67,6 +80,7 @@ guardrails:
     litellm_params:
       guardrail: presidio  # supported values: "aporia", "bedrock", "lakera", "presidio"
       mode: "pre_call"
+      presidio_language: "en"  # optional: set default language for PII analysis
 ```
 
 Set the following env vars 
@@ -380,6 +394,86 @@ print(response)
 
 </Tabs>
 
+###  Set default `language` in config.yaml
+
+You can configure a default language for PII analysis in your YAML configuration using the `presidio_language` parameter. This language will be used for all requests unless overridden by a per-request language setting.
+
+```yaml title="Default Language Configuration" showLineNumbers
+model_list:
+  - model_name: gpt-3.5-turbo
+    litellm_params:
+      model: openai/gpt-3.5-turbo
+      api_key: os.environ/OPENAI_API_KEY
+
+guardrails:
+  - guardrail_name: "presidio-german"
+    litellm_params:
+      guardrail: presidio
+      mode: "pre_call"
+      presidio_language: "de"  # Default to German for PII analysis
+      pii_entities_config:
+        CREDIT_CARD: "MASK"
+        EMAIL_ADDRESS: "MASK"
+        PERSON: "MASK"
+        
+  - guardrail_name: "presidio-spanish"
+    litellm_params:
+      guardrail: presidio
+      mode: "pre_call"
+      presidio_language: "es"  # Default to Spanish for PII analysis
+      pii_entities_config:
+        CREDIT_CARD: "MASK"
+        PHONE_NUMBER: "MASK"
+```
+
+#### Supported Language Codes
+
+Presidio supports multiple languages for PII detection. Common language codes include:
+
+- `en` - English (default)
+- `es` - Spanish
+- `de` - German  
+
+For a complete list of supported languages, refer to the [Presidio documentation](https://microsoft.github.io/presidio/analyzer/languages/).
+
+#### Language Precedence
+
+The language setting follows this precedence order:
+
+1. **Per-request language** (via `guardrail_config.language`) - highest priority
+2. **YAML config language** (via `presidio_language`) - medium priority  
+3. **Default language** (`en`) - lowest priority
+
+**Example with mixed languages:**
+
+```yaml title="Mixed Language Configuration" showLineNumbers
+guardrails:
+  - guardrail_name: "presidio-multilingual"
+    litellm_params:
+      guardrail: presidio
+      mode: "pre_call"
+      presidio_language: "de"  # Default to German
+      pii_entities_config:
+        CREDIT_CARD: "MASK"
+        PERSON: "MASK"
+```
+
+```shell title="Override with per-request language" showLineNumbers
+curl http://localhost:4000/chat/completions \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer sk-1234" \
+  -d '{
+    "model": "gpt-3.5-turbo",
+    "messages": [
+      {"role": "user", "content": "Mi tarjeta de crédito es 4111-1111-1111-1111"}
+    ],
+    "guardrails": ["presidio-multilingual"],
+    "guardrail_config": {"language": "es"}
+  }'
+```
+
+In this example, the request will use Spanish (`es`) for PII detection even though the guardrail is configured with German (`de`) as the default language.
+
 ### Output parsing 
 
 

litellm/constants.py

@@ -588,6 +588,7 @@
 
 open_ai_embedding_models: List = ["text-embedding-ada-002"]
 cohere_embedding_models: List = [
+    "embed-v4.0",
     "embed-english-v3.0",
     "embed-english-light-v3.0",
     "embed-multilingual-v3.0",

litellm/proxy/guardrails/guardrail_hooks/presidio.py

@@ -69,6 +69,7 @@ def __init__(
         presidio_ad_hoc_recognizers: Optional[str] = None,
         logging_only: Optional[bool] = None,
         pii_entities_config: Optional[Dict[PiiEntityType, PiiAction]] = None,
+        presidio_language: Optional[str] = None,
         **kwargs,
     ):
         if logging_only is True:
@@ -83,6 +84,7 @@ def __init__(
         self.pii_entities_config: Dict[PiiEntityType, PiiAction] = (
             pii_entities_config or {}
         )
+        self.presidio_language = presidio_language or "en"
         if mock_testing is True:  # for testing purposes only
             return
 
@@ -161,7 +163,7 @@ def _get_presidio_analyze_request_payload(
         """
         analyze_payload: PresidioAnalyzeRequest = PresidioAnalyzeRequest(
             text=text,
-            language="en",
+            language=self.presidio_language,
         )
         ##################################################################
         ###### Check if user has configured any params for this guardrail

litellm/proxy/guardrails/guardrail_initializers.py

@@ -113,6 +113,7 @@ def initialize_presidio(litellm_params: LitellmParams, guardrail: Guardrail):
         pii_entities_config=litellm_params.pii_entities_config,
         presidio_analyzer_api_base=litellm_params.presidio_analyzer_api_base,
         presidio_anonymizer_api_base=litellm_params.presidio_anonymizer_api_base,
+        presidio_language=litellm_params.presidio_language,
     )
     litellm.logging_callback_manager.add_litellm_callback(_presidio_callback)
 
@@ -125,6 +126,7 @@ def initialize_presidio(litellm_params: LitellmParams, guardrail: Guardrail):
             default_on=litellm_params.default_on,
             presidio_analyzer_api_base=litellm_params.presidio_analyzer_api_base,
             presidio_anonymizer_api_base=litellm_params.presidio_anonymizer_api_base,
+            presidio_language=litellm_params.presidio_language,
         )
         litellm.logging_callback_manager.add_litellm_callback(_success_callback)
 

litellm/proxy/management_endpoints/scim/scim_v2.py

@@ -32,6 +32,7 @@
     ScimTransformations,
 )
 from litellm.proxy.management_endpoints.team_endpoints import new_team
+from litellm.proxy.utils import handle_exception_on_proxy
 from litellm.types.proxy.management_endpoints.scim_v2 import *
 
 scim_router = APIRouter(
@@ -81,13 +82,13 @@ async def get_users(
                 where_conditions["user_email"] = email
 
         # Get users from database
-        users: List[LiteLLM_UserTable] = (
-            await prisma_client.db.litellm_usertable.find_many(
-                where=where_conditions,
-                skip=(startIndex - 1),
-                take=count,
-                order={"created_at": "desc"},
-            )
+        users: List[
+            LiteLLM_UserTable
+        ] = await prisma_client.db.litellm_usertable.find_many(
+            where=where_conditions,
+            skip=(startIndex - 1),
+            take=count,
+            order={"created_at": "desc"},
         )
 
         # Get total count for pagination
@@ -111,9 +112,7 @@ async def get_users(
         )
 
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error retrieving users: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.get(
@@ -147,12 +146,8 @@ async def get_user(
         scim_user = await ScimTransformations.transform_litellm_user_to_scim_user(user)
         return scim_user
 
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error retrieving user: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.post(
@@ -213,13 +208,8 @@ async def create_user(
             user=created_user
         )
         return scim_user
-
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error creating user: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.put(
@@ -241,12 +231,8 @@ async def update_user(
         raise HTTPException(status_code=500, detail={"error": "No database connected"})
     try:
         return None
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error updating user: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.delete(
@@ -299,13 +285,8 @@ async def delete_user(
         await prisma_client.db.litellm_usertable.delete(where={"user_id": user_id})
 
         return Response(status_code=204)
-
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error deleting user: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.patch(
@@ -341,12 +322,8 @@ async def patch_user(
 
         return None
 
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error patching user: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 # Group Endpoints
@@ -431,9 +408,7 @@ async def get_groups(
         )
 
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error retrieving groups: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.get(
@@ -469,12 +444,8 @@ async def get_group(
         )
         return scim_group
 
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error retrieving group: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.post(
@@ -535,12 +506,8 @@ async def create_group(
             created_team
         )
         return scim_group
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error creating group: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.put(
@@ -655,12 +622,8 @@ async def update_group(
             },
         )
 
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error updating group: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.delete(
@@ -709,12 +672,8 @@ async def delete_group(
 
         return Response(status_code=204)
 
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error deleting group: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)
 
 
 @scim_router.patch(
@@ -749,9 +708,5 @@ async def patch_group(
                 detail={"error": f"Group not found with ID: {group_id}"},
             )
         return None
-    except HTTPException:
-        raise
     except Exception as e:
-        raise HTTPException(
-            status_code=500, detail={"error": f"Error patching group: {str(e)}"}
-        )
+        raise handle_exception_on_proxy(e)

litellm/types/guardrails.py

@@ -234,6 +234,10 @@ class PresidioPresidioConfigModelUserInterface(BaseModel):
         # extra param to let the ui know this is a boolean
         json_schema_extra={"ui_type": GuardrailParamUITypes.BOOL},
     )
+    presidio_language: Optional[str] = Field(
+        default="en",
+        description="Language code for Presidio PII analysis (e.g., 'en', 'de', 'es', 'fr')",
+    )
 
 
 class PresidioConfigModel(PresidioPresidioConfigModelUserInterface):