bardd commited on
Commit
1526e1b
·
verified ·
1 Parent(s): 2b504d6

Update src/rotator_library/client.py

Browse files
Files changed (1) hide show
  1. src/rotator_library/client.py +1 -22
src/rotator_library/client.py CHANGED
@@ -650,21 +650,6 @@ class RotatingClient:
650
  return True
651
  return False
652
 
653
- def _verify_model_allowed(self, provider: str, model_id: str) -> None:
654
- """
655
- Verifies if a model is allowed according to whitelist and ignore rules.
656
- Raises ValueError if the model is restricted.
657
- """
658
- is_whitelisted = self._is_model_whitelisted(provider, model_id)
659
- is_blacklisted = self._is_model_ignored(provider, model_id)
660
-
661
- # A model is allowed if it's whitelisted OR not blacklisted.
662
- # Conversely, it's restricted ONLY if it's NOT whitelisted AND it IS blacklisted.
663
- if not is_whitelisted and is_blacklisted:
664
- lib_logger.warning(
665
- f"Blocking request for restricted model: {model_id} (provider: {provider})"
666
- )
667
- raise ValueError(f"Model '{model_id}' is restricted and cannot be used.")
668
 
669
  def _sanitize_litellm_log(self, log_data: dict) -> dict:
670
  """
@@ -1255,9 +1240,6 @@ class RotatingClient:
1255
  model = resolved_model
1256
  kwargs["model"] = model # Ensure kwargs has the resolved model for litellm
1257
 
1258
- # [STRICT ENFORCEMENT] Verify model is allowed before proceeding
1259
- self._verify_model_allowed(provider, model)
1260
-
1261
  # [NEW] Filter by model tier requirement and build priority map
1262
  credential_priorities = None
1263
  if provider_plugin and hasattr(provider_plugin, "get_model_tier_requirement"):
@@ -2020,9 +2002,6 @@ class RotatingClient:
2020
  model = resolved_model
2021
  kwargs["model"] = model # Ensure kwargs has the resolved model for litellm
2022
 
2023
- # [STRICT ENFORCEMENT] Verify model is allowed before proceeding
2024
- self._verify_model_allowed(provider, model)
2025
-
2026
  # [NEW] Filter by model tier requirement and build priority map
2027
  credential_priorities = None
2028
  if provider_plugin and hasattr(provider_plugin, "get_model_tier_requirement"):
@@ -3600,4 +3579,4 @@ class RotatingClient:
3600
 
3601
  total_tokens = message_tokens + tool_tokens
3602
 
3603
- return {"input_tokens": total_tokens}
 
650
  return True
651
  return False
652
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
653
 
654
  def _sanitize_litellm_log(self, log_data: dict) -> dict:
655
  """
 
1240
  model = resolved_model
1241
  kwargs["model"] = model # Ensure kwargs has the resolved model for litellm
1242
 
 
 
 
1243
  # [NEW] Filter by model tier requirement and build priority map
1244
  credential_priorities = None
1245
  if provider_plugin and hasattr(provider_plugin, "get_model_tier_requirement"):
 
2002
  model = resolved_model
2003
  kwargs["model"] = model # Ensure kwargs has the resolved model for litellm
2004
 
 
 
 
2005
  # [NEW] Filter by model tier requirement and build priority map
2006
  credential_priorities = None
2007
  if provider_plugin and hasattr(provider_plugin, "get_model_tier_requirement"):
 
3579
 
3580
  total_tokens = message_tokens + tool_tokens
3581
 
3582
+ return {"input_tokens": total_tokens}