beekeeper-core 1.0.11__py3-none-any.whl → 1.0.12.post1__py3-none-any.whl

beekeeper/core/llms/decorators.py

@@ -6,6 +6,7 @@ from typing import Callable
 
 from beekeeper.core.llms.types import ChatMessage
 from beekeeper.core.monitors.types import PayloadRecord
+from beekeeper.core.prompts.utils import extract_template_vars
 
 logger = getLogger(__name__)
 
@@ -54,16 +55,29 @@ def llm_chat_monitor() -> Callable:
                             system_messages[0].content if system_messages else None
                         )
 
+                        # Extract template variables values from the prompt template if available
+                        template_var_values = (
+                            extract_template_vars(
+                                callback_manager_fns.prompt_template.template,
+                                (system_message or ""),
+                            )
+                            if callback_manager_fns.prompt_template
+                            else {}
+                        )
+
                         callback = callback_manager_fns(
                             payload=PayloadRecord(
-                                input_text=(system_message or "") + last_user_message,
+                                system_prompt=(system_message or ""),
+                                input_text=last_user_message,
+                                prompt_variables=list(template_var_values.keys()),
+                                prompt_variable_values=template_var_values,
                                 generated_text=llm_return_val.message.content,
-                                generated_token_count=llm_return_val.raw["usage"][
-                                    "completion_tokens"
-                                ],
                                 input_token_count=llm_return_val.raw["usage"][
                                     "prompt_tokens"
                                 ],
+                                generated_token_count=llm_return_val.raw["usage"][
+                                    "completion_tokens"
+                                ],
                                 response_time=response_time,
                             )
                         )

beekeeper/core/monitors/base.py

@@ -17,7 +17,7 @@ class PromptMonitor(BaseMonitor):
     """Abstract base class defining the interface for prompt observability."""
 
     def __init__(self, prompt_template: Optional[PromptTemplate] = None) -> None:
-        self.prompt_template = prompt_template
+        self.prompt_template = PromptTemplate.from_value(prompt_template)
 
     @classmethod
     def class_name(cls) -> str:

beekeeper/core/monitors/types.py

@@ -4,8 +4,11 @@ from pydantic import BaseModel
 class PayloadRecord(BaseModel):
     """Payload record."""
 
+    system_prompt: str | None = None
     input_text: str
+    prompt_variables: list[str] | None = None
+    prompt_variable_values: dict[str, str] | None = None
     generated_text: str
-    generated_token_count: int
     input_token_count: int
+    generated_token_count: int
     response_time: int

beekeeper/core/prompts/base.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from beekeeper.core.prompts.utils import SafeFormatter
 from pydantic import BaseModel
 
@@ -23,7 +24,12 @@ class PromptTemplate(BaseModel):
         super().__init__(template=template)
 
     @classmethod
-    def from_value(cls, value: str) -> "PromptTemplate":
+    def from_value(
+        cls, value: Optional[str | "PromptTemplate"]
+    ) -> Optional["PromptTemplate"]:
+        if value is None:
+            return None
+
         if isinstance(value, cls):
             return value
 

{beekeeper_core-1.0.11.dist-info → beekeeper_core-1.0.12.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beekeeper-core
-Version: 1.0.11
+Version: 1.0.12.post1
 Summary: Load any data in one line of code and connect with AI applications
 Project-URL: Repository, https://github.com/beekeeper-ai/beekeeper
 Author-email: Leonardo Furnielis <leonardofurnielis@outlook.com>

{beekeeper_core-1.0.11.dist-info → beekeeper_core-1.0.12.post1.dist-info}/RECORD

@@ -13,16 +13,16 @@ beekeeper/core/guardrails/base.py,sha256=T-Ywr80iTL0EFYarCymFEEI3QkMsrw27JVh_040
 beekeeper/core/guardrails/types.py,sha256=7sgw1S5BZY0OqO-n04pHXPU7sG-NEZJlQyIeb2Fsq9Q,359
 beekeeper/core/llms/__init__.py,sha256=PN-5Y_Km_l2vO8v9d7iJ6_5xPCZJBh8UzwqRvQZlmTo,250
 beekeeper/core/llms/base.py,sha256=fxjOJJR3pNJxtvkICr0Nq9A9wnqf3SMM4cm4sAhA9-o,1308
-beekeeper/core/llms/decorators.py,sha256=5vrYwShFgdtkrKOeEjWNVW1CfkOnIJOYpEkDJx1xVLA,3276
+beekeeper/core/llms/decorators.py,sha256=KzU5VrHrXpJBHWqDl0lUxeqrUHmaPiJovEeUTM_RNeU,4036
 beekeeper/core/llms/types.py,sha256=ttPCZ3VYtY6tx-E6VIOTicflYMJ3m0aw1znZeYAEVu8,1489
 beekeeper/core/monitors/__init__.py,sha256=TvoiIUJtWRO_4zqCICsFaGl_v4Tpvft1M542Bi13pOI,112
-beekeeper/core/monitors/base.py,sha256=3ooSfgVpWoRLe2TqizHMRK_bI5C-sla57aYJ47FmIXM,980
-beekeeper/core/monitors/types.py,sha256=s-4tB8OdeaCUIRvi6FLuib2u4Yl9evqQdCundNREXQY,217
+beekeeper/core/monitors/base.py,sha256=_MY0AXCqlLpptwBEOpIfw-lCfRog4rXe_WALPvkHFNk,1007
+beekeeper/core/monitors/types.py,sha256=kAA0g6YT_Menlc0HLPl87Rk9o4r2TybGfLlzuGlL40Y,357
 beekeeper/core/observers/__init__.py,sha256=Z5sDAajai4QLdGIrjq-vr5eJEBhriMMCw5u46j6xHvA,149
 beekeeper/core/observers/base.py,sha256=y1SE_0WQusKhVomFuZCkk42Jb7r93ZS6r_j8vs_Y_r4,1203
 beekeeper/core/observers/types.py,sha256=s-4tB8OdeaCUIRvi6FLuib2u4Yl9evqQdCundNREXQY,217
 beekeeper/core/prompts/__init__.py,sha256=kFp2N5giNEMA4hc3eZqstqaZu0c0BRAnP0NuF5aUaqI,85
-beekeeper/core/prompts/base.py,sha256=Edh77DuYm8lDhJvHazC5hgaiQEit-R4M-TWLX8-gIU0,1106
+beekeeper/core/prompts/base.py,sha256=EZ_x52kDsR-7cMmu1qPoHyu0446yFpdVcfAIIY88EI8,1238
 beekeeper/core/prompts/utils.py,sha256=Cqpefzzxd6DxPbOKVyUCsIs-ibBGKhYU6ppYqhPT9vM,1378
 beekeeper/core/readers/__init__.py,sha256=vPCmWmK92LYL-R0LFcPqjOKFHqxW0xUP5r6M9GNxoqY,157
 beekeeper/core/readers/base.py,sha256=46VRNkCmKP2RWJT1-kRTSHG9SjY1xbhKUy1a7-OrgPg,418
@@ -38,6 +38,6 @@ beekeeper/core/tools/base.py,sha256=A6TXn7g3DAZMREYAobfVlyOBuJn_8mIeCByc5412L9Y,
 beekeeper/core/utils/pairwise.py,sha256=cpi8GItPFSYP4sjB5zgTFHi6JfBVWsMnNu8koA9VYQU,536
 beekeeper/core/vector_stores/__init__.py,sha256=R5SRG3YpOZqRwIfBLB8KVV6FALWqhIzIhCjRGj-bwPc,93
 beekeeper/core/vector_stores/base.py,sha256=YFW1ioZbFEcJovAh0ZCpHnj0eiXtZvqy_pj2lxPS92k,1652
-beekeeper_core-1.0.11.dist-info/METADATA,sha256=ZJcrMqUeLOri7mgulUQc8DXpxsxZLaSIC5DByjHwj5w,1331
-beekeeper_core-1.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beekeeper_core-1.0.11.dist-info/RECORD,,
+beekeeper_core-1.0.12.post1.dist-info/METADATA,sha256=7AVnXsB891daoNzCr4jKefWltAIiYQNglQ4Mv8nBtW0,1337
+beekeeper_core-1.0.12.post1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beekeeper_core-1.0.12.post1.dist-info/RECORD,,