mlrun 1.7.0rc12__py3-none-any.whl → 1.7.0rc13__py3-none-any.whl

mlrun/common/schemas/alert.py

@@ -49,7 +49,7 @@ class Event(pydantic.BaseModel):
     kind: EventKind
     timestamp: Union[str, datetime] = None  # occurrence time
     entity: EventEntity
-    value: Optional[Union[float, str]] = None
+    value_dict: Optional[dict] = pydantic.Field(default_factory=dict)
 
     def is_valid(self):
         return self.entity.kind in _event_kind_entity_map[self.kind]

mlrun/config.py

@@ -552,6 +552,7 @@ default_config = {
             "nosql": "v3io:///projects/{project}/FeatureStore/{name}/nosql",
             # "authority" is optional and generalizes [userinfo "@"] host [":" port]
             "redisnosql": "redis://{authority}/projects/{project}/FeatureStore/{name}/nosql",
+            "dsnosql": "ds://{ds_profile_name}/projects/{project}/FeatureStore/{name}/nosql",
         },
         "default_targets": "parquet,nosql",
         "default_job_image": "mlrun/mlrun",

mlrun/datastore/datastore_profile.py

@@ -83,14 +83,28 @@ class DatastoreProfileBasic(DatastoreProfile):
 class DatastoreProfileKafkaTarget(DatastoreProfile):
     type: str = pydantic.Field("kafka_target")
     _private_attributes = "kwargs_private"
-    bootstrap_servers: str
-    brokers: str
+    bootstrap_servers: typing.Optional[str] = None
+    brokers: typing.Optional[str] = None
     topic: str
     kwargs_public: typing.Optional[dict]
     kwargs_private: typing.Optional[dict]
 
-    def __pydantic_post_init__(self):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        if not self.brokers and not self.bootstrap_servers:
+            raise mlrun.errors.MLRunInvalidArgumentError(
+                "DatastoreProfileKafkaTarget requires the 'brokers' field to be set"
+            )
+
         if self.bootstrap_servers:
+            if self.brokers:
+                raise mlrun.errors.MLRunInvalidArgumentError(
+                    "DatastoreProfileKafkaTarget cannot be created with both 'brokers' and 'bootstrap_servers'"
+                )
+            else:
+                self.brokers = self.bootstrap_servers
+                self.bootstrap_servers = None
             warnings.warn(
                 "'bootstrap_servers' parameter is deprecated in 1.7.0 and will be removed in 1.9.0, "
                 "use 'brokers' instead.",

mlrun/model_monitoring/helpers.py

@@ -253,3 +253,10 @@ def calculate_inputs_statistics(
             )
 
     return inputs_statistics
+
+
+def get_endpoint_record(project: str, endpoint_id: str):
+    model_endpoint_store = mlrun.model_monitoring.get_store_object(
+        project=project,
+    )
+    return model_endpoint_store.get_model_endpoint(endpoint_id=endpoint_id)

mlrun/model_monitoring/stream_processing.py

@@ -40,6 +40,7 @@ from mlrun.common.schemas.model_monitoring.constants import (
     ProjectSecretKeys,
     PrometheusEndpoints,
 )
+from mlrun.model_monitoring.helpers import get_endpoint_record
 from mlrun.utils import logger
 
 
@@ -1233,13 +1234,6 @@ def update_endpoint_record(
     )
 
 
-def get_endpoint_record(project: str, endpoint_id: str):
-    model_endpoint_store = mlrun.model_monitoring.get_store_object(
-        project=project,
-    )
-    return model_endpoint_store.get_model_endpoint(endpoint_id=endpoint_id)
-
-
 def update_monitoring_feature_set(
     endpoint_record: dict[str, typing.Any],
     feature_names: list[str],

mlrun/model_monitoring/writer.py

@@ -27,8 +27,13 @@ import mlrun.common.schemas.alert as alert_constants
 import mlrun.model_monitoring
 import mlrun.model_monitoring.db.stores
 import mlrun.utils.v3io_clients
-from mlrun.common.schemas.model_monitoring.constants import ResultStatusApp, WriterEvent
+from mlrun.common.schemas.model_monitoring.constants import (
+    EventFieldType,
+    ResultStatusApp,
+    WriterEvent,
+)
 from mlrun.common.schemas.notification import NotificationKind, NotificationSeverity
+from mlrun.model_monitoring.helpers import get_endpoint_record
 from mlrun.serving.utils import StepToDict
 from mlrun.utils import logger
 from mlrun.utils.notifications.notification_pusher import CustomNotificationPusher
@@ -112,6 +117,7 @@ class ModelMonitoringWriter(StepToDict):
             notification_types=[NotificationKind.slack]
         )
         self._create_tsdb_table()
+        self._endpoints_records = {}
 
     @staticmethod
     def get_v3io_container(project_name: str) -> str:
@@ -174,7 +180,7 @@ class ModelMonitoringWriter(StepToDict):
 
     @staticmethod
     def _generate_event_on_drift(
-        uid: str, drift_status: str, drift_value: float, project_name: str
+        uid: str, drift_status: str, event_value: dict, project_name: str
     ):
         if (
             drift_status == ResultStatusApp.detected
@@ -191,7 +197,7 @@ class ModelMonitoringWriter(StepToDict):
                 else alert_constants.EventKind.DRIFT_SUSPECTED
             )
             event_data = mlrun.common.schemas.Event(
-                kind=event_kind, entity=entity, value=drift_value
+                kind=event_kind, entity=entity, value_dict=event_value
             )
             mlrun.get_run_db().generate_event(event_kind, event_data)
 
@@ -227,10 +233,22 @@ class ModelMonitoringWriter(StepToDict):
         _Notifier(event=event, notification_pusher=self._custom_notifier).notify()
 
         if mlrun.mlconf.alerts.mode == mlrun.common.schemas.alert.AlertsModes.enabled:
+            endpoint_id = event[WriterEvent.ENDPOINT_ID]
+            endpoint_record = self._endpoints_records.setdefault(
+                endpoint_id,
+                get_endpoint_record(project=self.project, endpoint_id=endpoint_id),
+            )
+            event_value = {
+                "app_name": event[WriterEvent.APPLICATION_NAME],
+                "model": endpoint_record.get(EventFieldType.MODEL),
+                "model_endpoint_id": event[WriterEvent.ENDPOINT_ID],
+                "result_name": event[WriterEvent.RESULT_NAME],
+                "result_value": event[WriterEvent.RESULT_VALUE],
+            }
             self._generate_event_on_drift(
                 event[WriterEvent.ENDPOINT_ID],
                 event[WriterEvent.RESULT_STATUS],
-                event[WriterEvent.RESULT_VALUE],
+                event_value,
                 self.project,
             )
         logger.info("Completed event DB writes")

mlrun/utils/notifications/notification/slack.py

@@ -116,8 +116,12 @@ class SlackNotification(NotificationBase):
             self._get_slack_row(f"*Project:*\n{alert.project}"),
             self._get_slack_row(f"*UID:*\n{event_data.entity.id}"),
         ]
-        if event_data.value is not None:
-            line.append(self._get_slack_row(f"*Event data:*\n{event_data.value}"))
+        if event_data.value_dict:
+            data_lines = []
+            for key, value in event_data.value_dict.items():
+                data_lines.append(f"{key}: {value}")
+            data_text = "\n".join(data_lines)
+            line.append(self._get_slack_row(f"*Event data:*\n{data_text}"))
 
         if url := mlrun.utils.helpers.get_ui_url(alert.project, event_data.entity.id):
             line.append(self._get_slack_row(f"*Overview:*\n<{url}|*Job overview*>"))

mlrun/utils/notifications/notification/webhook.py

@@ -56,7 +56,7 @@ class WebhookNotification(NotificationBase):
         if alert:
             request_body["alert"] = alert.dict()
             if event_data:
-                request_body["value"] = event_data.value
+                request_body["value"] = event_data.value_dict
                 request_body["id"] = event_data.entity.id
 
         if custom_html:

mlrun/utils/version/version.json

@@ -1,4 +1,4 @@
 {
-  "git_commit": "d99c139a3045c51860077414b2076ea95b77a46c",
-  "version": "1.7.0-rc12"
+  "git_commit": "3bba8f5664d7a3ff4639a3437811fa5972883b2f",
+  "version": "1.7.0-rc13"
 }

{mlrun-1.7.0rc12.dist-info → mlrun-1.7.0rc13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlrun
-Version: 1.7.0rc12
+Version: 1.7.0rc13
 Summary: Tracking and config of machine learning runs
 Home-page: https://github.com/mlrun/mlrun
 Author: Yaron Haviv

{mlrun-1.7.0rc12.dist-info → mlrun-1.7.0rc13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mlrun/__init__.py,sha256=rxnxHjb5Rq_EnHv77irxah9zKL89AjZZpjQyx3W5izQ,7249
 mlrun/__main__.py,sha256=LKskOWulg04o0IFm33Pfmokuxo6P9wLSl3ZHkiS9eZc,49326
-mlrun/config.py,sha256=D0nTbeVyNlV2cT5VcL7l5W5V70O8kqYNMWo_S7hWC18,64041
+mlrun/config.py,sha256=i1yOBX-_h_zaHKnTUrx0heYeL7_-PeYF30Jyo6jfalw,64135
 mlrun/errors.py,sha256=HmOAdfpL0bCDisZMUoJPOumneq71ko49Ph-XBL-A4xA,7080
 mlrun/execution.py,sha256=F45o_rJI3Q8epQefTksvyjmgZr4ZxKmUxXbKW5UZOaY,40891
 mlrun/features.py,sha256=m17K_3l9Jktwb9dOwlHLTAPTlemsWrRF7dJhXUX0iJU,15429
@@ -28,7 +28,7 @@ mlrun/common/db/sql_session.py,sha256=Znc8KE2oLy4lg3_vRki1sVlNx59TgDSOTCXfU561hB
 mlrun/common/model_monitoring/__init__.py,sha256=x0EMEvxVjHsm858J1t6IEA9dtKTdFpJ9sKhss10ld8A,721
 mlrun/common/model_monitoring/helpers.py,sha256=1CpxIDQPumFnpUB1eqcvCpLlyPFVeW2sL6prM-N5A1A,4405
 mlrun/common/schemas/__init__.py,sha256=JGyxf4eM8ZuVVCASsKZS6lo_Y7VzAuCC8zXZACRAyks,5119
-mlrun/common/schemas/alert.py,sha256=zh80OYRcB3oPHoqowl2Qeu7VYmlUx3vT0Ar9GYnxM_g,3157
+mlrun/common/schemas/alert.py,sha256=F-ZQbfBdrSm-PYESjlQ_IjnzKs0OrilOhBdCWzNZOe8,3181
 mlrun/common/schemas/api_gateway.py,sha256=mw47rpTBAVIRV6TdMQ_A6rIgnEHOUweU7iT3VbINvBE,2519
 mlrun/common/schemas/artifact.py,sha256=d6srME_eWn2MpGuqvPQZtePRFkjDfNJgQ6JDd51qVrI,2796
 mlrun/common/schemas/auth.py,sha256=VNvMDdeQxYpnNxxuftI7O47bOaKzvYaiov2I6TnSFvM,6204
@@ -72,7 +72,7 @@ mlrun/datastore/alibaba_oss.py,sha256=OfQ9AbsJNBFF9DFgUdq38TvKw6qwnHmEcnH-nze6ZZ
 mlrun/datastore/azure_blob.py,sha256=NpkEoIie7mH171tOwlrwpEwzRYGoo9SF3FAAegEENhU,9019
 mlrun/datastore/base.py,sha256=wWE0lEjOWx_pGbxKQWQFhNvpdtR-WMCML-CiAHjhyzI,24403
 mlrun/datastore/datastore.py,sha256=GGo8XPnKVWWgY0b-18D93V1g8DJgeBNafa6knnHEabw,9111
-mlrun/datastore/datastore_profile.py,sha256=ttyqRWPGJui-0q_rihGk6H7g7aJFDpPCEdFcJZz7Z60,16549
+mlrun/datastore/datastore_profile.py,sha256=CTS22aaCy3IqzjJWTzSJnulxFYJ5LStqPOB4Py1py2U,17186
 mlrun/datastore/dbfs_store.py,sha256=5IkxnFQXkW0fdx-ca5jjQnUdTsTfNdJzMvV31ZpDNrM,6634
 mlrun/datastore/filestore.py,sha256=nS3Ie6jG41NDiW_as9tF8Nu5maaSVEKYKUr1IQtPhuA,3767
 mlrun/datastore/google_cloud_storage.py,sha256=Du5qYYUCSkLt9acQDeQ-PgEjttsE7D2eAoLebO43kiw,6110
@@ -207,12 +207,12 @@ mlrun/model_monitoring/controller.py,sha256=saz_EsiNARf4wkK6AePax82j3z10Fe5qbH-K
 mlrun/model_monitoring/controller_handler.py,sha256=J9Y9ppLsQaxyYRl21165Rr7QuI9EM-mk-5veAqs4Bi0,1336
 mlrun/model_monitoring/evidently_application.py,sha256=o9PsDsjyRfcbuC1X1gb2ww5nzWCsR_KheabtpxKZ5yY,4824
 mlrun/model_monitoring/features_drift_table.py,sha256=c6GpKtpOJbuT1u5uMWDL_S-6N4YPOmlktWMqPme3KFY,25308
-mlrun/model_monitoring/helpers.py,sha256=gEgj5rCU1q8NRtmpFBpzfpOaeDmdf1Aa0WPiHKtnjfo,9095
+mlrun/model_monitoring/helpers.py,sha256=oo_QZnx_M-b7QdVntwuFS4Y5p8pZRulCc44mwtqK8vM,9329
 mlrun/model_monitoring/model_endpoint.py,sha256=BBtxdY5ciormI_al4zshmIp0GN7hGhOCn-hLgpCXek0,3938
 mlrun/model_monitoring/prometheus.py,sha256=cUR4y73GutJB_pA_VCBDl9YtK4PcIJp2wj2rnLVmYi4,7578
-mlrun/model_monitoring/stream_processing.py,sha256=SbxH9NcwZymXiPSa51HRmyghxgSbPCzYgWarRa8iJx4,49264
+mlrun/model_monitoring/stream_processing.py,sha256=7p9ILBEI0opn1yf0AwHvucVRVjaJQItWq-Xr1uOG8Y4,49093
 mlrun/model_monitoring/tracking_policy.py,sha256=sQq956akAQpntkrJwIgFWcEq-JpyVcg0FxgNa4h3V70,5502
-mlrun/model_monitoring/writer.py,sha256=6l6no2xBwYAZxrs8ryaCdhFEf3aAicHWNuw6zrxYo-E,8555
+mlrun/model_monitoring/writer.py,sha256=zDdGC9BtMKz23IEYJA2rCX_bGi9vA5esjJ34lf2bMco,9294
 mlrun/model_monitoring/applications/__init__.py,sha256=6CsTXAxeLbbf8yfCADTaxmiavqwrLEdYFJ-qc5kgDAY,569
 mlrun/model_monitoring/applications/histogram_data_drift.py,sha256=RIBY2tqbbYuBgcpkMmR_IjtZjUr8ZSwfMlgszd9KuUc,11701
 mlrun/model_monitoring/db/__init__.py,sha256=sXYc6CF2I_HMJyUoY_4VueQf3OL-vhEAuWHxQvuoGRs,662
@@ -319,14 +319,14 @@ mlrun/utils/notifications/notification/base.py,sha256=sq6ICoboUeVwNPhMenaTFDEFnu
 mlrun/utils/notifications/notification/console.py,sha256=MAVk7v5PJ52vdGRv76YcEPixWgV0licBPWGpR01uR40,2643
 mlrun/utils/notifications/notification/git.py,sha256=ELZ-ZmbFDb39A0OUIhtvuSbqJoVfF_o_IOxMD5eBlv4,5351
 mlrun/utils/notifications/notification/ipython.py,sha256=ZtVL30B_Ha0VGoo4LxO-voT1U41IYwyytovv5X_LsI4,2066
-mlrun/utils/notifications/notification/slack.py,sha256=sLuSPOZmipVHnvzjljE3WBY1ejvmEiiRpvK4NCD61Z8,5112
-mlrun/utils/notifications/notification/webhook.py,sha256=zy9QfcyfKrWs9O-0oHfMv3rTkykdAJErJhkyvMapk4U,2743
+mlrun/utils/notifications/notification/slack.py,sha256=1-_lQ6GnSFMMOKMcVrvfd6LgbKJ22vhkBV92ZUzRsV8,5286
+mlrun/utils/notifications/notification/webhook.py,sha256=m6q7zhIUPjqzHwYXOQf_SjRXB7vQ5snE__gTHP9gRU8,2748
 mlrun/utils/version/__init__.py,sha256=7kkrB7hEZ3cLXoWj1kPoDwo4MaswsI2JVOBpbKgPAgc,614
-mlrun/utils/version/version.json,sha256=aWxUZS9PsSKh4bgra14brpJVJsvWpWqpM1AN9BuLwcE,89
+mlrun/utils/version/version.json,sha256=-jcRFJhvdBZzvie_QvhQm7zYeqjbPb1wo9f24sGuhSM,89
 mlrun/utils/version/version.py,sha256=eEW0tqIAkU9Xifxv8Z9_qsYnNhn3YH7NRAfM-pPLt1g,1878
-mlrun-1.7.0rc12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mlrun-1.7.0rc12.dist-info/METADATA,sha256=8WBtbHlAToh9ctqQ3hcotqMbaElPXndWA3PZYcvYyn0,18800
-mlrun-1.7.0rc12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mlrun-1.7.0rc12.dist-info/entry_points.txt,sha256=1Owd16eAclD5pfRCoJpYC2ZJSyGNTtUr0nCELMioMmU,46
-mlrun-1.7.0rc12.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
-mlrun-1.7.0rc12.dist-info/RECORD,,
+mlrun-1.7.0rc13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mlrun-1.7.0rc13.dist-info/METADATA,sha256=ngG2rsX5doAJG3DNh889Yih1WjSl4uXqTXqkmK06P74,18800
+mlrun-1.7.0rc13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mlrun-1.7.0rc13.dist-info/entry_points.txt,sha256=1Owd16eAclD5pfRCoJpYC2ZJSyGNTtUr0nCELMioMmU,46
+mlrun-1.7.0rc13.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
+mlrun-1.7.0rc13.dist-info/RECORD,,