Mirrowel commited on
Commit
c68b148
·
1 Parent(s): 5a4ba9e

fix(client): relocate model parameter conversion

Browse files

Moved the `_convert_model_params` calls from the `acompletion` and `aembedding` dispatcher methods into their respective internal execution functions (`_execute_with_retry` and `_streaming_acompletion_with_retry`).

This streamlines the top-level dispatchers and ensures parameter conversion occurs within the context of the retry and streaming logic, improving consistency.

Files changed (1) hide show
  1. src/rotator_library/client.py +3 -3
src/rotator_library/client.py CHANGED
@@ -196,7 +196,8 @@ class RotatingClient:
196
  keys_for_provider = self.api_keys[provider]
197
  tried_keys = set()
198
  last_exception = None
199
-
 
200
  while len(tried_keys) < len(keys_for_provider):
201
  current_key = None
202
  key_acquired = False
@@ -313,6 +314,7 @@ class RotatingClient:
313
  keys_for_provider = self.api_keys[provider]
314
  tried_keys = set()
315
  last_exception = None
 
316
  try:
317
  while len(tried_keys) < len(keys_for_provider):
318
  current_key = None
@@ -471,7 +473,6 @@ class RotatingClient:
471
 
472
  def acompletion(self, request: Optional[Any] = None, **kwargs) -> Union[Any, AsyncGenerator[str, None]]:
473
  """Dispatcher for completion requests."""
474
- kwargs = self._convert_model_params(**kwargs)
475
  if kwargs.get("stream"):
476
  return self._streaming_acompletion_with_retry(request, **kwargs)
477
  else:
@@ -479,7 +480,6 @@ class RotatingClient:
479
 
480
  def aembedding(self, request: Optional[Any] = None, **kwargs) -> Any:
481
  """Executes an embedding request with retry logic."""
482
- kwargs = self._convert_model_params(**kwargs)
483
  return self._execute_with_retry(litellm.aembedding, request, **kwargs)
484
 
485
  def token_count(self, **kwargs) -> int:
 
196
  keys_for_provider = self.api_keys[provider]
197
  tried_keys = set()
198
  last_exception = None
199
+ kwargs = self._convert_model_params(**kwargs)
200
+
201
  while len(tried_keys) < len(keys_for_provider):
202
  current_key = None
203
  key_acquired = False
 
314
  keys_for_provider = self.api_keys[provider]
315
  tried_keys = set()
316
  last_exception = None
317
+ kwargs = self._convert_model_params(**kwargs)
318
  try:
319
  while len(tried_keys) < len(keys_for_provider):
320
  current_key = None
 
473
 
474
  def acompletion(self, request: Optional[Any] = None, **kwargs) -> Union[Any, AsyncGenerator[str, None]]:
475
  """Dispatcher for completion requests."""
 
476
  if kwargs.get("stream"):
477
  return self._streaming_acompletion_with_retry(request, **kwargs)
478
  else:
 
480
 
481
  def aembedding(self, request: Optional[Any] = None, **kwargs) -> Any:
482
  """Executes an embedding request with retry logic."""
 
483
  return self._execute_with_retry(litellm.aembedding, request, **kwargs)
484
 
485
  def token_count(self, **kwargs) -> int: