beekeeper-core 1.0.10__py3-none-any.whl → 1.0.12__py3-none-any.whl

beekeeper/core/llms/base.py

@@ -1,15 +1,16 @@
 from abc import ABC, abstractmethod
-from typing import Any, List, Optional
+from typing import Any, Optional
 
 from beekeeper.core.llms.types import ChatMessage, ChatResponse, GenerateResponse
 from beekeeper.core.monitors import BaseMonitor
 from pydantic import BaseModel
 
 
-class BaseLLM(ABC, BaseModel):
+class BaseLLM(BaseModel, ABC):
     """Abstract base class defining the interface for LLMs."""
 
     model_config = {"arbitrary_types_allowed": True}
+    model: str
     callback_manager: Optional[BaseMonitor] = None
 
     @classmethod
@@ -34,6 +35,6 @@ class BaseLLM(ABC, BaseModel):
 
     @abstractmethod
     def chat_completion(
-        self, messages: List[ChatMessage], **kwargs: Any
+        self, messages: list[ChatMessage | dict], **kwargs: Any
     ) -> ChatResponse:
         """Generates a chat completion for LLM."""

beekeeper/core/llms/decorators.py

@@ -6,17 +6,12 @@ from typing import Callable
 
 from beekeeper.core.llms.types import ChatMessage
 from beekeeper.core.monitors.types import PayloadRecord
-from deprecated import deprecated
+from beekeeper.core.prompts.utils import extract_template_vars
 
 logger = getLogger(__name__)
 
 
-@deprecated(
-    reason="'llm_chat_observer()' is deprecated and will be removed in a future version. Use 'llm_chat_monitor()'.",
-    version="1.0.8",
-    action="always",
-)
-def llm_chat_observer() -> Callable:
+def llm_chat_monitor() -> Callable:
     """
     Decorator to wrap a method with llm handler logic.
     Looks for observability instances in `self.callback_manager`.
@@ -60,89 +55,29 @@ def llm_chat_observer() -> Callable:
                             system_messages[0].content if system_messages else None
                         )
 
-                        callback = callback_manager_fns(
-                            payload=PayloadRecord(
-                                input_text=(system_message or "") + last_user_message,
-                                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"
-                                ],
-                                response_time=response_time,
+                        # 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 asyncio.iscoroutine(callback):
-                            asyncio.run(callback)
-
-                    except Exception as e:
-                        logger.error(f"Observability callback error: {e}")
-
-                threading.Thread(target=async_callback_thread).start()
-
-            return llm_return_val
-
-        return async_wrapper
-
-    return decorator
-
-
-def llm_chat_monitor() -> Callable:
-    """
-    Decorator to wrap a method with llm handler logic.
-    Looks for observability instances in `self.callback_manager`.
-    """
-
-    def decorator(f: Callable) -> Callable:
-        def async_wrapper(self, *args, **kwargs):
-            callback_manager_fns = getattr(self, "callback_manager", None)
-
-            start_time = time.time()
-            llm_return_val = f(self, *args, **kwargs)
-            response_time = int((time.time() - start_time) * 1000)
-
-            if callback_manager_fns:
-
-                def async_callback_thread():
-                    try:
-                        # Extract input messages
-                        if len(args) > 0 and isinstance(args[0], ChatMessage):
-                            input_chat_messages = args[0]
-                        elif "messages" in kwargs:
-                            input_chat_messages = kwargs["messages"]
-                        else:
-                            raise ValueError(
-                                "No messages provided in positional or keyword arguments"
-                            )
-
-                        # Get the user's latest message after each interaction to chat observability.
-                        user_messages = [
-                            msg for msg in input_chat_messages if msg.role == "user"
-                        ]
-                        last_user_message = (
-                            user_messages[-1].content if user_messages else None
-                        )
-
-                        # Get the system/instruct (first) message to chat observability.
-                        system_messages = [
-                            msg for msg in input_chat_messages if msg.role == "system"
-                        ]
-                        system_message = (
-                            system_messages[0].content if system_messages else None
+                            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,
                             )
                         )
@@ -151,7 +86,7 @@ def llm_chat_monitor() -> Callable:
                             asyncio.run(callback)
 
                     except Exception as e:
-                        logger.error(f"Observability callback error: {e}")
+                        logger.error(f"Observability callback: {e}")
 
                 threading.Thread(target=async_callback_thread).start()
 

beekeeper/core/llms/types.py

@@ -22,6 +22,26 @@ class ChatMessage(BaseModel):
         """Convert ChatMessage to dict."""
         return self.model_dump(exclude_none=True)
 
+    @classmethod
+    def from_value(cls, value: dict) -> "ChatMessage":
+        if value is None:
+            raise ValueError("Invalid 'ChatMessage', cannot be None")
+
+        if isinstance(value, cls):
+            return value
+
+        if isinstance(value, dict):
+            try:
+                return cls.model_validate(value)
+            except Exception as e:
+                raise ValueError(
+                    "Invalid 'ChatMessage' dict. Received: '{}'.".format(e)
+                )
+
+        raise TypeError(
+            f"Invalid 'ChatMessage' type. Expected dict or ChatMessage, but received {type(value).__name__}."
+        )
+
 
 class GenerateResponse(BaseModel):
     """Generate response."""

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-1.0.10.dist-info → beekeeper_core-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beekeeper-core
-Version: 1.0.10
+Version: 1.0.12
 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.10.dist-info → beekeeper_core-1.0.12.dist-info}/RECORD

@@ -12,12 +12,12 @@ beekeeper/core/guardrails/__init__.py,sha256=onznwYWAyOaxOVeYZle7oDtj3QJODQvJHcf
 beekeeper/core/guardrails/base.py,sha256=T-Ywr80iTL0EFYarCymFEEI3QkMsrw27JVh_0407sEU,427
 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=jFU1om9Qk6KTIsZXeke7lMp--x009G6-fnM1615l2BQ,1292
-beekeeper/core/llms/decorators.py,sha256=wRYXlKD5Cc8k1qPGYEEv-RSJdoHj-MQqKuAAQzkN9Fc,6534
-beekeeper/core/llms/types.py,sha256=lWswZ_bJkPmoTeheWxB1-OnABTYIVAcASkZCwjaTLzE,847
+beekeeper/core/llms/base.py,sha256=fxjOJJR3pNJxtvkICr0Nq9A9wnqf3SMM4cm4sAhA9-o,1308
+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
@@ -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.10.dist-info/METADATA,sha256=6yt3XFndeAKudQ_UsnQFZ_B_MeibOrrrIk_yt_zRV_0,1331
-beekeeper_core-1.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beekeeper_core-1.0.10.dist-info/RECORD,,
+beekeeper_core-1.0.12.dist-info/METADATA,sha256=6ZkWc4BXq7HnmKUADUKCmRGR2QRPLHVd1dxegvYUj-k,1331
+beekeeper_core-1.0.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beekeeper_core-1.0.12.dist-info/RECORD,,