opik-optimizer 0.7.2__py3-none-any.whl → 0.7.3__py3-none-any.whl

opik_optimizer/_throttle.py

@@ -1,43 +1,43 @@
-import threading
+import functools
+import pyrate_limiter
 import time
-import queue
-from functools import wraps
+import opik.config
+
+from typing import Callable, Any
+
 
 class RateLimiter:
     """
-    Rate limiter that enforces a maximum number of calls across all threads.
+    Rate limiter that enforces a maximum number of calls across all threads using pyrate_limiter.
     """
-    def __init__(self, max_calls_per_second):
+    def __init__(self, max_calls_per_second: int):
         self.max_calls_per_second = max_calls_per_second
-        self.interval = 1.0 / max_calls_per_second  # Time between allowed calls
-        self.last_call_time = 0
-        self.lock = threading.Lock()
+        rate = pyrate_limiter.Rate(max_calls_per_second, pyrate_limiter.Duration.SECOND)
+
+        self.limiter = pyrate_limiter.Limiter(rate, raise_when_fail=False)
+        self.bucket_key = "global_rate_limit"
         
-    def acquire(self):
-        """
-        Wait until a call is allowed according to the global rate limit.
-        Returns immediately if the call is allowed, otherwise blocks until it's time.
-        """
-        with self.lock:
-            current_time = time.time()
-            time_since_last = current_time - self.last_call_time
-            
-            # If we haven't waited long enough since the last call
-            if time_since_last < self.interval:
-                # Calculate how much longer we need to wait
-                sleep_time = self.interval - time_since_last
-                time.sleep(sleep_time)
-                
-            # Update the last call time (after potential sleep)
-            self.last_call_time = time.time()
-
-def rate_limited(limiter):
+    def acquire(self) -> None:
+        while not self.limiter.try_acquire(self.bucket_key):
+            time.sleep(0.01)
+
+def rate_limited(limiter: RateLimiter) -> Callable[[Callable], Callable]:
     """Decorator to rate limit a function using the provided limiter"""
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
+
+    def decorator(func: Callable) -> Callable:
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs) -> Any:
             limiter.acquire()
             return func(*args, **kwargs)
         return wrapper
     return decorator
 
+
+def get_rate_limiter_for_current_opik_installation() -> RateLimiter:
+    opik_config = opik.config.OpikConfig()
+    max_calls_per_second = (
+        10
+        if opik_config.is_cloud_installation
+        else 50
+    )
+    return RateLimiter(max_calls_per_second=max_calls_per_second)

opik_optimizer/base_optimizer.py

@@ -12,7 +12,7 @@ from .cache_config import initialize_cache
 from opik.evaluation.models.litellm import opik_monitor as opik_litellm_monitor
 from .optimization_config.configs import TaskConfig, MetricConfig
 
-limiter = RateLimiter(max_calls_per_second=15)
+limiter = RateLimiter(max_calls_per_second=8)
 
 # Don't use unsupported params:
 litellm.drop_params = True
@@ -141,85 +141,6 @@ class BaseOptimizer:
         """
         self._history.append(round_data)
 
-    @rate_limited(limiter)
-    def _call_model(
-        self,
-        prompt: str,
-        system_prompt: Optional[str] = None,
-        is_reasoning: bool = False,
-    ) -> str:
-        """Call the model to get suggestions based on the meta-prompt."""
-        model = self.reasoning_model if is_reasoning else self.model
-        messages = []
-
-        if system_prompt:
-            messages.append({"role": "system", "content": system_prompt})
-            logger.debug(f"Using custom system prompt: {system_prompt[:100]}...")
-        else:
-            messages.append(
-                {"role": "system", "content": "You are a helpful assistant."}
-            )
-
-        messages.append({"role": "user", "content": prompt})
-        logger.debug(f"Calling model {model} with prompt: {prompt[:100]}...")
-
-        api_params = self.model_kwargs.copy()
-        api_params.update(
-            {
-                "model": model,
-                "messages": messages,
-                # Ensure required params like 'temperature', 'max_tokens' are present
-                # Defaults added here for safety, though usually set in __init__ kwargs
-                "temperature": api_params.get("temperature", 0.3),
-                "max_tokens": api_params.get("max_tokens", 1000),
-            }
-        )
-
-        # Attempt to add Opik monitoring if available
-        try:
-            # Assuming opik_litellm_monitor is imported and configured elsewhere
-            api_params = opik_litellm_monitor.try_add_opik_monitoring_to_params(
-                api_params
-            )
-            logger.debug("Opik monitoring hooks added to LiteLLM params.")
-        except Exception as e:
-            logger.warning(f"Could not add Opik monitoring to LiteLLM params: {e}")
-
-        logger.debug(
-            f"Final API params (excluding messages): { {k:v for k,v in api_params.items() if k != 'messages'} }"
-        )
-
-        # Increment Counter
-        self.llm_call_counter += 1
-        logger.debug(f"LLM Call Count: {self.llm_call_counter}")
-
-        try:
-            response = litellm.completion(**api_params)
-            model_output = response.choices[0].message.content.strip()
-            logger.debug(f"Model response from {model_to_use}: {model_output[:100]}...")
-            return model_output
-        except litellm.exceptions.RateLimitError as e:
-            logger.error(f"LiteLLM Rate Limit Error for model {model_to_use}: {e}")
-            # Consider adding retry logic here with tenacity
-            raise
-        except litellm.exceptions.APIConnectionError as e:
-            logger.error(f"LiteLLM API Connection Error for model {model_to_use}: {e}")
-            # Consider adding retry logic here
-            raise
-        except litellm.exceptions.ContextWindowExceededError as e:
-            logger.error(
-                f"LiteLLM Context Window Exceeded Error for model {model_to_use}. Prompt length: {len(prompt)}. Details: {e}"
-            )
-            raise
-        except litellm.exceptions.APIError as e:  # Catch broader API errors
-            logger.error(f"LiteLLM API Error for model {model_to_use}: {e}")
-            raise
-        except Exception as e:
-            # Catch any other unexpected errors
-            logger.error(
-                f"Unexpected error during model call to {model_to_use}: {type(e).__name__} - {e}"
-            )
-            raise
 
     def update_optimization(self, optimization, status: str) -> None:
         """

opik_optimizer/few_shot_bayesian_optimizer/few_shot_bayesian_optimizer.py

@@ -1,8 +1,8 @@
 import random
-from typing import Any, Dict, List, Tuple, Union, Optional, Callable, Literal
-import openai
+from typing import Any, Dict, List, Tuple, Union, Optional, Literal
 import opik
 import optuna
+import optuna.samplers
 import logging
 import json
 
@@ -14,18 +14,18 @@ from opik_optimizer import base_optimizer
 
 from . import prompt_parameter
 from . import prompt_templates
-from .._throttle import RateLimiter, rate_limited
+from .. import _throttle
 from .. import optimization_result, task_evaluator
 
 import litellm
 
 from opik.evaluation.models.litellm import opik_monitor as opik_litellm_monitor
 
-limiter = RateLimiter(max_calls_per_second=15)
+_limiter = _throttle.get_rate_limiter_for_current_opik_installation()
 
 logger = logging.getLogger(__name__)
 
-@rate_limited(limiter)
+@_throttle.rate_limited(_limiter)
 def _call_model(model, messages, seed, model_kwargs):
     model_kwargs = opik_litellm_monitor.try_add_opik_monitoring_to_params(model_kwargs)
 
@@ -59,7 +59,6 @@ class FewShotBayesianOptimizer(base_optimizer.BaseOptimizer):
         self.n_threads = n_threads
         self.n_initial_prompts = n_initial_prompts
         self.n_iterations = n_iterations
-
         self._opik_client = opik.Opik()
         logger.debug(f"Initialized FewShotBayesianOptimizer with model: {model}")
 
@@ -240,7 +239,8 @@ class FewShotBayesianOptimizer(base_optimizer.BaseOptimizer):
         except Exception as e:
             logger.warning(f"Could not configure Optuna logging within optimizer: {e}")
 
-        study = optuna.create_study(direction="maximize")
+        sampler = optuna.samplers.TPESampler(seed=self.seed)
+        study = optuna.create_study(direction="maximize", sampler=sampler)
         study.optimize(optimization_objective, n_trials=n_trials)
         logger.info("Optuna study finished.")
 

opik_optimizer/meta_prompt_optimizer.py

@@ -16,6 +16,7 @@ from opik_optimizer import task_evaluator
 from opik.api_objects import opik_client
 from opik.evaluation.models.litellm import opik_monitor as opik_litellm_monitor
 from opik.environment import get_tqdm_for_current_environment
+from . import _throttle
 
 tqdm = get_tqdm_for_current_environment()
 
@@ -26,6 +27,7 @@ litellm.cache = Cache(type="disk", disk_cache_dir=disk_cache_dir)
 # Set up logging
 logger = logging.getLogger(__name__)  # Gets logger configured by setup_logging
 
+_rate_limiter = _throttle.get_rate_limiter_for_current_opik_installation()
 
 class MetaPromptOptimizer(BaseOptimizer):
     """Optimizer that uses meta-prompting to improve prompts based on examples and performance."""
@@ -176,6 +178,7 @@ class MetaPromptOptimizer(BaseOptimizer):
             optimization_id=optimization_id,
         )
 
+    @_throttle.rate_limited(_rate_limiter)
     def _call_model(
         self,
         prompt: str,

opik_optimizer/mipro_optimizer/_lm.py

@@ -22,11 +22,11 @@ from dspy.dsp.utils.settings import settings
 from dspy.utils.callback import BaseCallback, with_callbacks
 from dspy.clients.base_lm import BaseLM
 
-from .._throttle import RateLimiter, rate_limited
+from .._throttle import RateLimiter, rate_limited, get_rate_limiter_for_current_opik_installation
 
 logger = logging.getLogger(__name__)
 # Limit how fast an LLM can be called:
-limiter = RateLimiter(max_calls_per_second=15)
+limiter = get_rate_limiter_for_current_opik_installation()
 
 class LM(BaseLM):
     """

{opik_optimizer-0.7.2.dist-info → opik_optimizer-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opik_optimizer
-Version: 0.7.2
+Version: 0.7.3
 Summary: Agent optimization with Opik
 Home-page: https://github.com/comet-ml/opik
 Author: Comet ML
@@ -21,6 +21,7 @@ Requires-Dist: optuna
 Requires-Dist: pydantic
 Requires-Dist: pandas
 Requires-Dist: hf_xet
+Requires-Dist: pyrate-limiter
 Provides-Extra: dev
 Requires-Dist: adalflow; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -72,7 +73,7 @@ from your LLMs. You can use a variety of algorithms, including:
 
 3. Install the package:
    ```bash
-   pip install git+https://github.com/comet-ml/opik#subdirectory=sdks/opik_optimizer
+   pip install opik-optimizer
    ```
 
 You'll need:
@@ -94,11 +95,10 @@ You can see how to use those below:
 
 ```python
 from opik.evaluation.metrics import LevenshteinRatio
-from opik_optimizer.few_shot_bayesian_optimizer import FewShotBayesianOptimizer
+from opik_optimizer import FewShotBayesianOptimizer
 from opik_optimizer.demo import get_or_create_dataset
 
 from opik_optimizer import (
-    OptimizationConfig,
     MetricConfig,
     TaskConfig,
     from_dataset_field,
@@ -111,40 +111,41 @@ hot_pot_dataset = get_or_create_dataset("hotpot-300")
 prompt_instruction = """
 Answer the question.
 """
-
-initial_prompt_no_examples = [
-    {"role": "system", "content": prompt_instruction},
-    {"role": "user", "content": "{{question}}"},
-]
+project_name = "optimize-few-shot-bayesian-hotpot"
 
 optimizer = FewShotBayesianOptimizer(
     model="gpt-4o-mini",
-    project_name="optimize-few-shot-bayesian-hotpot",
+    project_name=project_name,
     min_examples=3,
     max_examples=8,
     n_threads=16,
     seed=42,
 )
 
-optimization_config = OptimizationConfig(
+metric_config = MetricConfig(
+    metric=LevenshteinRatio(project_name=project_name),
+    inputs={
+        "output": from_llm_response_text(),
+        "reference": from_dataset_field(name="answer"),
+    },
+)
+
+task_config = TaskConfig(
+    instruction_prompt=prompt_instruction,
+    input_dataset_fields=["question"],
+    output_dataset_field="answer",
+    use_chat_prompt=True,
+)
+
+result = optimizer.optimize_prompt(
     dataset=hot_pot_dataset,
-    objective=MetricConfig(
-        metric=LevenshteinRatio(),
-        inputs={
-            "output": from_llm_response_text(),
-            "reference": from_dataset_field(name="answer"),
-        },
-    ),
-    task=TaskConfig(
-        instruction_prompt=prompt_instruction,
-        input_dataset_fields=["question"],
-        output_dataset_field="answer",
-        use_chat_prompt=True,
-    ),
+    metric_config=metric_config,
+    task_config=task_config,
+    n_trials=10,
+    n_samples=150,
 )
 
-result = optimizer.optimize_prompt(optimization_config, n_trials=10)
-print(result)
+result.display()
 ```
 
 More examples can be found in the `scripts` folder.
@@ -152,7 +153,7 @@ More examples can be found in the `scripts` folder.
 ## Installation
 
 ```bash
-pip install git+https://github.com/comet-ml/opik#subdirectory=sdks/opik_optimizer
+pip install opik-optimizer
 ```
 
 ## Development
@@ -167,6 +168,6 @@ pip install -e .
 
 ## Requirements
 
-- Python 3.10+
+- Python 3.10+ < 3.13
 - Opik API key
 - OpenAI API key (or other LLM provider)

{opik_optimizer-0.7.2.dist-info → opik_optimizer-0.7.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 opik_optimizer/__init__.py,sha256=x5QSFom-TtmmUNzqyYIJY2AujMJXbyhXs2oz44-4Af0,1121
-opik_optimizer/_throttle.py,sha256=7vcHoISqXbysymwdb1LPAFJB28tOmih9zzZQWajpH0k,1494
-opik_optimizer/base_optimizer.py,sha256=EEFx9ekIV5IjLaf18e6zFzxBO44uxkeHelGmC70GPpo,8260
+opik_optimizer/_throttle.py,sha256=ztub8qlwz4u0GVA2TIoLig0D1Cs0hJ7_o_SnT_C7Nmk,1360
+opik_optimizer/base_optimizer.py,sha256=f4gNX9j3Z3TGst8F0gm1nMHHpHKAlChmeCVAcTdTIR4,4883
 opik_optimizer/cache_config.py,sha256=EzF4RAzxhSG8vtMJANdiUpNHQ9HzL2CrCXp0iik0f4A,580
 opik_optimizer/logging_config.py,sha256=ELevhxtflYinTo-jVvyQYZbXG7FgAe_b5dPa9y5uLWw,2774
-opik_optimizer/meta_prompt_optimizer.py,sha256=tRxA4YD2AWvKl7fJNg6Oxxay8iyqvdJ8zXy59-qKyUM,46802
+opik_optimizer/meta_prompt_optimizer.py,sha256=AoFskD01Mu9VbH-Ys4CUoqZk3Gn3iFrOzF2yh-Hw7GM,46944
 opik_optimizer/optimization_result.py,sha256=9zdDV2MXeLYk7U8OqgMmSU-DdPV6qgYQWS2rtkO6Dzw,8693
 opik_optimizer/task_evaluator.py,sha256=MafDMaLeW0_yGPrumLvYF0HzQUKrnpAlM_0N_TPG8tw,3695
 opik_optimizer/utils.py,sha256=HivUsNzbt7BcuZeEvikdER1DaTPUFLJrpaVQ8raZYD8,3637
@@ -11,20 +11,20 @@ opik_optimizer/demo/__init__.py,sha256=KSpFYhzN7fTmLEsIaciRHwxcJDeAiX5NDmYLdPsfp
 opik_optimizer/demo/cache.py,sha256=5WqK8rSiijzU6s4VHIjLuL1LR5i1yHtY-x5FZTduSus,3669
 opik_optimizer/demo/datasets.py,sha256=hD6JZAQotEDQb4nK7dbnurquILqQsrFRF7nUwon_iXE,22930
 opik_optimizer/few_shot_bayesian_optimizer/__init__.py,sha256=VuH7FOROyGcjMPryejtZC-5Y0QHlVTFLTGUDgNqRAFw,113
-opik_optimizer/few_shot_bayesian_optimizer/few_shot_bayesian_optimizer.py,sha256=NL7cDnD7Mg7_fGK1iDOXJ9PrV-M6lCFmZttioMRKbeQ,15150
+opik_optimizer/few_shot_bayesian_optimizer/few_shot_bayesian_optimizer.py,sha256=HIoIVDW9v0p2Y9B736DncXjJPPYoDfphgeSqiB4MIVM,15235
 opik_optimizer/few_shot_bayesian_optimizer/prompt_parameter.py,sha256=EDsSIFAUOfiZKWLrOAaBDB7Exk7cmIs4ccI95kVa7JY,3118
 opik_optimizer/few_shot_bayesian_optimizer/prompt_templates.py,sha256=HmvD-UeT3aKiiet5cUtULXe6iFPEOo6hxyDE0pH2LnQ,2424
 opik_optimizer/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opik_optimizer/mipro_optimizer/__init__.py,sha256=CF9TVXjOxTobDO1kAS8CD4eyLVzEozxjfgoKwIO6ZpU,44
-opik_optimizer/mipro_optimizer/_lm.py,sha256=UwSEcTLVIt_a-coQbLACNnm-RTMJIzLEyPS4qLfUosg,16316
+opik_optimizer/mipro_optimizer/_lm.py,sha256=bcTy2Y5HjSaFQOATIpUaA86eIp3vKHaMuDI2_RvN2ww,16376
 opik_optimizer/mipro_optimizer/_mipro_optimizer_v2.py,sha256=r8FKaqvtZq_R7FwGnXqp1foCLk7M7r6M-CMvWbJtP5c,39512
 opik_optimizer/mipro_optimizer/mipro_optimizer.py,sha256=5QS7OKqOMKe4CD_8W2FMD_qJNmulkvxmOT_YtJ3BllM,14755
 opik_optimizer/mipro_optimizer/utils.py,sha256=4et1JA1QInX3h6Is-_RqzliFwJqkm6tlA0X5CryG60I,3142
 opik_optimizer/optimization_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opik_optimizer/optimization_config/configs.py,sha256=MYL9H2UAqeyGBlBGWbOZ-6Snto4ZMuXnypgvVuUSW1Y,1132
 opik_optimizer/optimization_config/mappers.py,sha256=RXgTMxPzTQ1AHGke6Zca6rTcfCI7IkCKhQYciaEGSAo,1698
-opik_optimizer-0.7.2.dist-info/licenses/LICENSE,sha256=dTRSwwCHdWeSjzodvnivYqcwi8x3Qfr21yv65QUWWBE,1062
-opik_optimizer-0.7.2.dist-info/METADATA,sha256=KBdfx16FiT5icWE96bkgeFuhrM3NyMX2bF9Ooeo36Ag,4047
-opik_optimizer-0.7.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-opik_optimizer-0.7.2.dist-info/top_level.txt,sha256=ondOlpq6_yFckqpxoAHSfzZS2N-JfgmA-QQhOJfz7m0,15
-opik_optimizer-0.7.2.dist-info/RECORD,,
+opik_optimizer-0.7.3.dist-info/licenses/LICENSE,sha256=dTRSwwCHdWeSjzodvnivYqcwi8x3Qfr21yv65QUWWBE,1062
+opik_optimizer-0.7.3.dist-info/METADATA,sha256=ng9ZwnuLM631y5mrK-DSi70r763Db51thVyE1QNuQlI,3826
+opik_optimizer-0.7.3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+opik_optimizer-0.7.3.dist-info/top_level.txt,sha256=ondOlpq6_yFckqpxoAHSfzZS2N-JfgmA-QQhOJfz7m0,15
+opik_optimizer-0.7.3.dist-info/RECORD,,