beekeeper-core 1.0.11__tar.gz → 1.0.12.post1__tar.gz

{beekeeper_core-1.0.11 → beekeeper_core-1.0.12.post1}/PKG-INFO

@@ -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 → beekeeper_core-1.0.12.post1}/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-1.0.11 → beekeeper_core-1.0.12.post1}/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-1.0.11/beekeeper/core/observers → beekeeper_core-1.0.12.post1/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-1.0.11 → beekeeper_core-1.0.12.post1}/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 → beekeeper_core-1.0.12.post1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "beekeeper-core"
-version = "1.0.11"
+version = "1.0.12.post1"
 description = "Load any data in one line of code and connect with AI applications"
 authors = [{ name = "Leonardo Furnielis", email = "leonardofurnielis@outlook.com" }]
 license = { text = "Apache-2.0" }