beekeeper-core 1.0.9__tar.gz → 1.0.11__tar.gz

{beekeeper_core-1.0.9 → beekeeper_core-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beekeeper-core
-Version: 1.0.9
+Version: 1.0.11
 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>
@@ -9,7 +9,7 @@ Keywords: AI,LLM,QA,RAG,data,observability,retrieval,semantic-search
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4.0,>=3.11
+Requires-Python: <3.14,>=3.11
 Requires-Dist: deprecated<2.0.0,>=1.3.1
 Requires-Dist: nltk<4.0.0,>=3.9.2
 Requires-Dist: numpy<1.27.0,>=1.26.4

{beekeeper_core-1.0.9 → beekeeper_core-1.0.11}/beekeeper/core/llms/base.py

@@ -1,35 +1,40 @@
 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
     def class_name(cls) -> str:
         return "BaseLLM"
 
-    def convert_chat_messages(self, messages: List[ChatMessage]) -> List[dict]:
-        """Convert ChatMessage to LLM message dict format."""
-        return [message.model_dump() for message in messages]
+    def text_completion(self, prompt: str, **kwargs: Any) -> str:
+        """
+        Generates a chat completion for LLM. Using OpenAI's standard endpoint (/completions).
+
+        Args:
+            prompt (str): The input prompt to generate a completion for.
+            **kwargs (Any): Additional keyword arguments to customize the LLM completion request.
+        """
+        response = self.completion(prompt=prompt, **kwargs)
+
+        return response.text
 
     @abstractmethod
     def completion(self, prompt: str, **kwargs: Any) -> GenerateResponse:
         """Generates a completion for LLM."""
 
-    @abstractmethod
-    def text_completion(self, prompt: str, **kwargs: Any) -> str:
-        """Generates a text completion for LLM."""
-
     @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-1.0.11/beekeeper/core/llms/decorators.py

@@ -0,0 +1,83 @@
+import asyncio
+import threading
+import time
+from logging import getLogger
+from typing import Callable
+
+from beekeeper.core.llms.types import ChatMessage
+from beekeeper.core.monitors.types import PayloadRecord
+
+logger = getLogger(__name__)
+
+
+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
+                        )
+
+                        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,
+                            )
+                        )
+
+                        if asyncio.iscoroutine(callback):
+                            asyncio.run(callback)
+
+                    except Exception as e:
+                        logger.error(f"Observability callback: {e}")
+
+                threading.Thread(target=async_callback_thread).start()
+
+            return llm_return_val
+
+        return async_wrapper
+
+    return decorator

beekeeper_core-1.0.11/beekeeper/core/llms/types.py

@@ -0,0 +1,57 @@
+from enum import Enum
+from typing import Any, Optional
+
+from pydantic import BaseModel, Field
+
+
+class MessageRole(str, Enum):
+    ASSISTANT = "assistant"
+    SYSTEM = "system"
+    USER = "user"
+    TOOL = "tool"
+
+
+class ChatMessage(BaseModel):
+    """Chat message."""
+
+    model_config = {"use_enum_values": True}
+    role: MessageRole = Field(default=MessageRole.USER)
+    content: Optional[str] = Field(default=None)
+
+    def to_dict(self) -> dict:
+        """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."""
+
+    text: str = Field(..., description="Generated text response")
+    raw: Optional[Any] = Field(default=None)
+
+
+class ChatResponse(BaseModel):
+    """Chat completion response."""
+
+    message: ChatMessage
+    raw: Optional[Any] = None

{beekeeper_core-1.0.9 → beekeeper_core-1.0.11}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "beekeeper-core"
-version = "1.0.9"
+version = "1.0.11"
 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" }
 readme = "README.md"
-requires-python = ">=3.11,<4.0"
+requires-python = ">=3.11,<3.14"
 keywords = ["AI", "LLM", "QA", "RAG", "data", "observability", "retrieval", "semantic-search"]
 classifiers = [
     "Topic :: Scientific/Engineering :: Artificial Intelligence",

beekeeper_core-1.0.9/beekeeper/core/llms/decorators.py

@@ -1,162 +0,0 @@
-import asyncio
-import threading
-import time
-from logging import getLogger
-from typing import Callable
-
-from beekeeper.core.llms.types import ChatMessage
-from beekeeper.core.monitors.types import PayloadRecord
-from deprecated import deprecated
-
-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:
-    """
-    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
-                        )
-
-                        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,
-                            )
-                        )
-
-                        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
-                        )
-
-                        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,
-                            )
-                        )
-
-                        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

beekeeper_core-1.0.9/beekeeper/core/llms/types.py

@@ -1,33 +0,0 @@
-from enum import Enum
-from typing import Any, Optional
-
-from pydantic import BaseModel, Field
-
-
-class MessageRole(str, Enum):
-    ASSISTANT = "assistant"
-    SYSTEM = "system"
-    USER = "user"
-    TOOL = "tool"
-
-
-class ChatMessage(BaseModel):
-    """Chat message."""
-
-    model_config = {"use_enum_values": True}
-    role: MessageRole = Field(default=MessageRole.USER)
-    content: Optional[str] = Field(default=None)
-
-
-class GenerateResponse(BaseModel):
-    """Generate response."""
-
-    text: str = Field(..., description="Generated text response")
-    raw: Optional[Any] = Field(default=None)
-
-
-class ChatResponse(BaseModel):
-    """Chat completion response."""
-
-    message: ChatMessage
-    raw: Optional[Any] = None