beekeeper-monitors-watsonx 1.1.3__tar.gz → 1.1.4.post1__tar.gz

beekeeper_monitors_watsonx-1.1.4.post1/PKG-INFO

@@ -0,0 +1,24 @@
+Metadata-Version: 2.4
+Name: beekeeper-monitors-watsonx
+Version: 1.1.4.post1
+Summary: beekeeper monitors watsonx extension
+Author-email: Leonardo Furnielis <leonardofurnielis@outlook.com>
+License: Apache-2.0
+Requires-Python: <3.14,>=3.11
+Requires-Dist: beekeeper-core<2.0.0,>=1.0.12
+Requires-Dist: certifi<2026.0.0,>=2025.11.12
+Requires-Dist: ibm-aigov-facts-client<1.0.200,>=1.0.104
+Requires-Dist: ibm-watson-openscale<3.2.0,>=3.1.3
+Requires-Dist: ibm-watsonx-ai<2.0.0,>=1.4.11
+Requires-Dist: ipython==9.8.0
+Provides-Extra: dev
+Requires-Dist: ruff>=0.14.9; extra == 'dev'
+Description-Content-Type: text/markdown
+
+# Beekeeper monitors extension - watsonx
+
+## Installation 
+
+```bash
+pip install beekeeper-monitors-watsonx
+```

{beekeeper_monitors_watsonx-1.1.3 → beekeeper_monitors_watsonx-1.1.4.post1}/beekeeper/monitors/watsonx/base.py

@@ -9,7 +9,6 @@ import certifi
 from beekeeper.core.monitors import PromptMonitor
 from beekeeper.core.monitors.types import PayloadRecord
 from beekeeper.core.prompts import PromptTemplate
-from beekeeper.core.prompts.utils import extract_template_vars
 from beekeeper.monitors.watsonx.supporting_classes.credentials import (
     CloudPakforDataCredentials,
 )
@@ -855,15 +854,17 @@ class WatsonxExternalPromptMonitor(PromptMonitor):
         return {"status": "success"}
 
     def __call__(self, payload: PayloadRecord) -> None:
-        if self.prompt_template:
-            template_vars = extract_template_vars(
-                self.prompt_template.template, payload.input_text
-            )
-
-        if not template_vars:
-            self.store_payload_records([payload.model_dump()])
-        else:
-            self.store_payload_records([{**payload.model_dump(), **template_vars}])
+        self.store_payload_records(
+            [
+                {
+                    **payload.prompt_variable_values,
+                    **payload.model_dump(
+                        exclude_none=True,
+                        exclude={"system_prompt", "prompt_variable_values"},
+                    ),
+                }
+            ]
+        )
 
 
 class WatsonxPromptMonitor(PromptMonitor):
@@ -1611,12 +1612,14 @@ class WatsonxPromptMonitor(PromptMonitor):
         return {"status": "success"}
 
     def __call__(self, payload: PayloadRecord) -> None:
-        if self.prompt_template:
-            template_vars = extract_template_vars(
-                self.prompt_template.template, payload.input_text
-            )
-
-        if not template_vars:
-            self.store_payload_records([payload.model_dump()])
-        else:
-            self.store_payload_records([{**payload.model_dump(), **template_vars}])
+        self.store_payload_records(
+            [
+                {
+                    **payload.prompt_variable_values,
+                    **payload.model_dump(
+                        exclude_none=True,
+                        exclude={"system_prompt", "prompt_variable_values"},
+                    ),
+                }
+            ]
+        )

{beekeeper_monitors_watsonx-1.1.3 → beekeeper_monitors_watsonx-1.1.4.post1}/beekeeper/monitors/watsonx/custom_metric.py

@@ -453,6 +453,12 @@ class WatsonxCustomMetricsManager:
                 existing_instance_id,
             )
 
+        self._wos_client.custom_monitor.create_custom_dataset(
+            data_mart_id=data_mart_id,
+            subscription_id=subscription_id,
+            custom_monitor_id=monitor_definition_id,
+        )
+
         return monitor_instance_details
 
     @deprecated(

{beekeeper_monitors_watsonx-1.1.3 → beekeeper_monitors_watsonx-1.1.4.post1}/beekeeper/monitors/watsonx/supporting_classes/enums.py

@@ -4,7 +4,7 @@ _REGION_DATA = {
     "us-south": {
         "watsonxai": "https://us-south.ml.cloud.ibm.com",
         "openscale": "https://api.aiopenscale.cloud.ibm.com",
-        "factsheet": None,
+        "factsheet": "us-south",
     },
     "eu-de": {
         "watsonxai": "https://eu-de.ml.cloud.ibm.com",

{beekeeper_monitors_watsonx-1.1.3 → beekeeper_monitors_watsonx-1.1.4.post1}/pyproject.toml

@@ -4,19 +4,19 @@ build-backend = "hatchling.build"
 
 [project]
 name = "beekeeper-monitors-watsonx"
-version = "1.1.3"
+version = "1.1.4.post1"
 description = "beekeeper monitors watsonx extension"
 authors = [{ name = "Leonardo Furnielis", email = "leonardofurnielis@outlook.com" }]
 license = { text = "Apache-2.0" }
 readme = "README.md"
-requires-python = ">=3.10,<4.0"
+requires-python = ">=3.11,<3.14"
 dependencies = [
-    "certifi>=2025.4.26,<2026.0.0",
-    "ipython==8.37.0",
-    "ibm-aigov-facts-client>=1.0.96,<1.0.97",
-    "ibm-watson-openscale>=3.0.49,<3.1.0",
-    "ibm-watsonx-ai>=1.3.26,<2.0.0",
-    "beekeeper-core>=1.0.6,<2.0.0",
+    "certifi>=2025.11.12,<2026.0.0",
+    "ipython==9.8.0",
+    "ibm-aigov-facts-client>=1.0.104,<1.0.200",
+    "ibm-watson-openscale>=3.1.3,<3.2.0",
+    "ibm-watsonx-ai>=1.4.11,<2.0.0",
+    "beekeeper-core>=1.0.12,<2.0.0",
 ]
 
 [tool.hatch.build.targets.sdist]
@@ -27,5 +27,5 @@ include = ["beekeeper/"]
 
 [project.optional-dependencies]
 dev = [
-    "ruff>=0.11.13",
+    "ruff>=0.14.9",
 ]

beekeeper_monitors_watsonx-1.1.3/PKG-INFO

@@ -1,24 +0,0 @@
-Metadata-Version: 2.4
-Name: beekeeper-monitors-watsonx
-Version: 1.1.3
-Summary: beekeeper monitors watsonx extension
-Author-email: Leonardo Furnielis <leonardofurnielis@outlook.com>
-License: Apache-2.0
-Requires-Python: <4.0,>=3.10
-Requires-Dist: beekeeper-core<2.0.0,>=1.0.6
-Requires-Dist: certifi<2026.0.0,>=2025.4.26
-Requires-Dist: ibm-aigov-facts-client<1.0.97,>=1.0.96
-Requires-Dist: ibm-watson-openscale<3.1.0,>=3.0.49
-Requires-Dist: ibm-watsonx-ai<2.0.0,>=1.3.26
-Requires-Dist: ipython==8.37.0
-Provides-Extra: dev
-Requires-Dist: ruff>=0.11.13; extra == 'dev'
-Description-Content-Type: text/markdown
-
-# Beekeeper monitors extension - watsonx
-
-## Installation 
-
-```bash
-pip install beekeeper-monitors-watsonx
-```