datarobot-moderations 11.2.6__py3-none-any.whl → 11.2.8__py3-none-any.whl

datarobot_dome/async_http_client.py

@@ -232,9 +232,10 @@ class AsyncHTTPClient:
         try:
             response = await self.session.post(url, json=payload, headers=self.json_headers)
             if response.status != HTTPStatus.ACCEPTED:
+                response_text = await response.text()
                 raise Exception(
                     f"Error uploading custom metrics: Status Code: {response.status}"
-                    f"Message: {response.text}"
+                    f"Message: {response_text}"
                 )
             self._logger.info("Successfully uploaded custom metrics")
         except Exception as e:

datarobot_dome/drum_integration.py

@@ -18,6 +18,7 @@ import time
 import traceback
 import uuid
 from collections.abc import Iterable
+from inspect import signature
 from typing import Optional
 
 import numpy as np
@@ -483,7 +484,15 @@ def run_user_chat_function(completion_create_params, model, pipeline, drum_chat_
     start_time = time.time()
 
     try:
-        chat_completion = drum_chat_fn(completion_create_params, model, **kwargs)
+        # the standard chat hook takes only the first 2 parameters
+        # if so, passing in extra (such as headers=headers) will trigger a TypeError
+        # same logic is in DRUM PythonModelAdapter.chat()
+        chat_fn_params = signature(drum_chat_fn).parameters
+        if len(chat_fn_params) > 2:
+            chat_completion = drum_chat_fn(completion_create_params, model, **kwargs)
+        else:
+            _logger.debug("run_user_chat_function: chat hook takes 2 args; kwargs are discarded")
+            chat_completion = drum_chat_fn(completion_create_params, model)
     except Exception as e:
         _logger.error(f"Failed to execute user chat function: {e}")
         raise
@@ -798,6 +807,13 @@ def guard_chat_wrapper(
         if association_id:
             data[association_id_column_name] = [association_id]
 
+    # DRUM initializes the pipeline (which reads the deployment's list of custom metrics)
+    # at start time.
+    # If there are no extra_body fields (meaning no user-defined custom metrics to report),
+    # then the list does not need to be reread.
+    if chat_extra_body_params:
+        pipeline.lookup_custom_metric_ids()
+
     # report any metrics from extra_body. They are not tied to a prompt or response phase.
     _logger.debug("Report extra_body params as custom metrics")
     pipeline.report_custom_metrics_from_extra_body(association_id, chat_extra_body_params)

datarobot_dome/pipeline/llm_pipeline.py

@@ -385,6 +385,8 @@ class LLMPipeline(Pipeline):
     ) -> None:
         """
         Add any key-value pairs extracted from extra_body as custom metrics.
+        The custom metrics must be deployment-based, not model-specific.
+        (Bulk upload does not support heterogeneous model/non-model metrics.)
         :param association_id: Association ID of the chat request
         :param extra_params: a dict of {"name": value} for all extra_body parameters found
         """

datarobot_dome/pipeline/pipeline.py

@@ -203,12 +203,11 @@ class Pipeline:
         The complete set of guard metrics is also known at that time.
         However, the extra_body metrics needed are not known until guard_chat_wrapper
         parses extra_body.
-        For that reason, read and cache all the metric name/id pairs at pipeline create time.
+        For that reason, refresh the list when a chat request arrives.
         Side effect: updates self.custom_metric_names_to_ids
         """
-        if self.custom_metric_names_to_ids:
-            self._logger.debug("lookup_custom_metric_ids(): IDs were already read; skipping")
-            return
+        # set up DataRobot API client, only if not already set up
+        self.create_dr_client()
 
         # Manually paginate; the dmm list_custom_metrics does not implement pagination
         custom_metrics_list = []
@@ -222,7 +221,13 @@ class Pipeline:
             if response_list["next"] is None:
                 break
 
+        if not custom_metrics_list:
+            self._logger.warning(
+                "lookup_custom_metric_ids: result list is empty; no custom metrics to process"
+            )
+
         self.custom_metric_names_to_ids = {m["name"]: m["id"] for m in custom_metrics_list}
+        self._logger.debug(f"lookup_custom_metric_ids(): found {self.custom_metric_names_to_ids}")
 
     def create_custom_metrics(self):
         """

{datarobot_moderations-11.2.6.dist-info → datarobot_moderations-11.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datarobot-moderations
-Version: 11.2.6
+Version: 11.2.8
 Summary: DataRobot Monitoring and Moderation framework
 License: DataRobot Tool and Utility Agreement
 Author: DataRobot

{datarobot_moderations-11.2.6.dist-info → datarobot_moderations-11.2.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
 datarobot_dome/__init__.py,sha256=B5Rx8_CNCNsOpxBbRj27XOXCfRZmvmrAR-NzlzIKnDw,583
-datarobot_dome/async_http_client.py,sha256=cQFoSI2ovt0Kyk4XWQPXod5PAfA-ZPkjLYVWQZhDGDE,9809
+datarobot_dome/async_http_client.py,sha256=YVkzSSP7ItOEwEskjH0MAs1kJW0jXfbvJWkF_52K7CE,9863
 datarobot_dome/chat_helper.py,sha256=BzvtUyZSZxzOqq-5a2wQKhHhr2kMlcP1MFrHaDAeD_o,9671
 datarobot_dome/constants.py,sha256=jvgpHa3Wh_nZVZmfU-6ab8FHnKNW3KxOPYIIEb_oS6U,10662
-datarobot_dome/drum_integration.py,sha256=NWTYJWGPM_z8RQYXteEOWQkCVBXzJ5XRZEWJYeUdHf8,45656
+datarobot_dome/drum_integration.py,sha256=XcQRaUKQWCGCX9WwiViQQnUy4ZGMzS_FKpkVygg3W1M,46511
 datarobot_dome/guard.py,sha256=xJds9hcbUaS-KD5nC1mn0GiPdBrileFUu6BuTAjDNuY,34668
 datarobot_dome/guard_executor.py,sha256=ox5_jOHcqMaxaaagIYJJHhCwEI7Wg-rUEiu5rutsfVU,35363
 datarobot_dome/guard_helpers.py,sha256=jfu8JTWCcxu4WD1MKxeP1n53DeebY3SSuP-t5sWyV1U,17187
@@ -14,11 +14,11 @@ datarobot_dome/metrics/citation_metrics.py,sha256=l2mnV1gz7nQeJ_yfaS4dcP3DFWf0p5
 datarobot_dome/metrics/factory.py,sha256=7caa8paI9LuFXDgguXdC4on28V7IwwIsKJT2Z-Aps8A,2187
 datarobot_dome/metrics/metric_scorer.py,sha256=uJ_IJRw7ZFHueg8xjsaXbt0ypO7JiydZ0WapCp96yng,2540
 datarobot_dome/pipeline/__init__.py,sha256=B5Rx8_CNCNsOpxBbRj27XOXCfRZmvmrAR-NzlzIKnDw,583
-datarobot_dome/pipeline/llm_pipeline.py,sha256=PRJ7t5Bc8S2ZbD0yK8ztdTD1hPC7Yo8IvhFlWEkMkmU,20810
-datarobot_dome/pipeline/pipeline.py,sha256=m8m_QtoQNwJ5U-bbJGdtlmAbdI-UpobcMCuRz-U_H_Y,19052
+datarobot_dome/pipeline/llm_pipeline.py,sha256=bindyorJq9VSPZt2X8w0-3REaXui7wIA-8c-zNOIdZU,20961
+datarobot_dome/pipeline/pipeline.py,sha256=vCcP8dgu4TE-af6wUt7RqD4Xg7MzfwfK8njjC4XLnIA,19249
 datarobot_dome/pipeline/vdb_pipeline.py,sha256=zt5d_41oJjdT8qOtvpgz-l5uvImwKE9f6pQsAU_TdR4,9866
 datarobot_dome/runtime.py,sha256=FD8wXOweqoQVzbZMh-mucL66xT2kGxPsJUGAcJBgwxw,1468
 datarobot_dome/streaming.py,sha256=DkvKEH0yN0aPEWMTAjMFJB3Kx4iLGdjUMQU1pAplbeg,17751
-datarobot_moderations-11.2.6.dist-info/METADATA,sha256=U20ej2pA1_79GwOl4f7qShgB9Q4F_zb-phsOBTITOF0,4741
-datarobot_moderations-11.2.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-datarobot_moderations-11.2.6.dist-info/RECORD,,
+datarobot_moderations-11.2.8.dist-info/METADATA,sha256=WDKeoX2WMqkNUzqirtogVxJ4R5ItpPSA33Gp7I1q86c,4741
+datarobot_moderations-11.2.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+datarobot_moderations-11.2.8.dist-info/RECORD,,