lollms-client 0.25.6__py3-none-any.whl → 0.26.0__py3-none-any.whl

lollms_client/llm_bindings/mistral/__init__.py

@@ -0,0 +1,298 @@
+import os
+from typing import Optional, Callable, List, Union, Dict
+
+from lollms_client.lollms_discussion import LollmsDiscussion, LollmsMessage
+from lollms_client.lollms_llm_binding import LollmsLLMBinding
+from lollms_client.lollms_types import MSG_TYPE
+from ascii_colors import ASCIIColors, trace_exception
+
+import pipmaster as pm
+
+# Ensure the required packages are installed
+pm.ensure_packages(["mistralai", "pillow", "tiktoken"])
+
+from mistralai.client import MistralClient
+from mistralai.models.chat_completion import ChatMessage
+from PIL import Image, ImageDraw
+import tiktoken
+
+BindingName = "MistralBinding"
+
+class MistralBinding(LollmsLLMBinding):
+    """
+    Mistral AI API binding implementation.
+
+    This binding allows communication with Mistral's API for both their
+    open-weight and proprietary models.
+    """
+
+    def __init__(self,
+                 model_name: str = "mistral-large-latest",
+                 mistral_api_key: str = None,
+                 **kwargs
+                 ):
+        """
+        Initialize the MistralBinding.
+
+        Args:
+            model_name (str): The name of the Mistral model to use.
+            mistral_api_key (str): The API key for the Mistral service.
+        """
+        super().__init__(binding_name=BindingName)
+        self.model_name = model_name
+        self.mistral_api_key = mistral_api_key or os.getenv("MISTRAL_API_KEY")
+
+        if not self.mistral_api_key:
+            raise ValueError("Mistral API key is required. Set it via 'mistral_api_key' or MISTRAL_API_KEY env var.")
+
+        try:
+            self.client = MistralClient(api_key=self.mistral_api_key)
+        except Exception as e:
+            ASCIIColors.error(f"Failed to configure Mistral client: {e}")
+            self.client = None
+            raise ConnectionError(f"Could not configure Mistral client: {e}") from e
+
+    def _construct_parameters(self,
+                              temperature: float,
+                              top_p: float,
+                              n_predict: int,
+                              seed: Optional[int]) -> Dict[str, any]:
+        """Builds a parameters dictionary for the Mistral API."""
+        params = {}
+        if temperature is not None: params['temperature'] = float(temperature)
+        if top_p is not None: params['top_p'] = top_p
+        if n_predict is not None: params['max_tokens'] = n_predict
+        if seed is not None: params['random_seed'] = seed # Mistral uses 'random_seed'
+        return params
+
+    def _prepare_messages(self, discussion: LollmsDiscussion, branch_tip_id: Optional[str] = None) -> List[ChatMessage]:
+        """Prepares the message list for the Mistral API from a LollmsDiscussion."""
+        history = []
+        if discussion.system_prompt:
+            # Mistral prefers the system prompt as the first message with a user/assistant turn.
+            # A lone system message is not ideal. We will prepend it to the first user message.
+            # However, for API consistency, we will treat it as a separate message if it exists.
+            # The official client will likely handle this.
+            history.append(ChatMessage(role="system", content=discussion.system_prompt))
+
+        for msg in discussion.get_messages(branch_tip_id):
+            role = 'user' if msg.sender_type == "user" else 'assistant'
+            # Note: Mistral API currently does not support image inputs via the chat endpoint.
+            if msg.content:
+                history.append(ChatMessage(role=role, content=msg.content))
+        return history
+
+    def generate_text(self, prompt: str, **kwargs) -> Union[str, dict]:
+        """
+        Generate text using Mistral. This is a wrapper around the chat method.
+        """
+        temp_discussion = LollmsDiscussion.from_messages([
+            LollmsMessage.new_message(sender_type="user", content=prompt)
+        ])
+        if kwargs.get("system_prompt"):
+            temp_discussion.system_prompt = kwargs.get("system_prompt")
+        
+        return self.chat(temp_discussion, **kwargs)
+
+    def chat(self,
+             discussion: LollmsDiscussion,
+             branch_tip_id: Optional[str] = None,
+             n_predict: Optional[int] = 2048,
+             stream: Optional[bool] = False,
+             temperature: float = 0.7,
+             top_p: float = 0.9,
+             seed: Optional[int] = None,
+             streaming_callback: Optional[Callable[[str, MSG_TYPE], None]] = None,
+             **kwargs
+             ) -> Union[str, dict]:
+        """
+        Conduct a chat session with a Mistral model.
+        """
+        if not self.client:
+            return {"status": "error", "message": "Mistral client not initialized."}
+
+        messages = self._prepare_messages(discussion, branch_tip_id)
+        api_params = self._construct_parameters(temperature, top_p, n_predict, seed)
+        full_response_text = ""
+
+        try:
+            if stream:
+                response = self.client.chat_stream(
+                    model=self.model_name,
+                    messages=messages,
+                    **api_params
+                )
+                for chunk in response:
+                    delta = chunk.choices[0].delta.content
+                    if delta:
+                        full_response_text += delta
+                        if streaming_callback:
+                            if not streaming_callback(delta, MSG_TYPE.MSG_TYPE_CHUNK):
+                                break
+                return full_response_text
+            else:
+                response = self.client.chat(
+                    model=self.model_name,
+                    messages=messages,
+                    **api_params
+                )
+                return response.choices[0].message.content
+
+        except Exception as ex:
+            error_message = f"An unexpected error occurred with Mistral API: {str(ex)}"
+            trace_exception(ex)
+            return {"status": "error", "message": error_message}
+
+    def tokenize(self, text: str) -> list:
+        """Tokenize text using tiktoken as a fallback."""
+        try:
+            encoding = tiktoken.get_encoding("cl100k_base")
+            return encoding.encode(text)
+        except Exception:
+            return list(text.encode('utf-8'))
+
+    def detokenize(self, tokens: list) -> str:
+        """Detokenize tokens using tiktoken."""
+        try:
+            encoding = tiktoken.get_encoding("cl100k_base")
+            return encoding.decode(tokens)
+        except Exception:
+            return bytes(tokens).decode('utf-8', errors='ignore')
+
+    def count_tokens(self, text: str) -> int:
+        """Count tokens in a text using the fallback tokenizer."""
+        return len(self.tokenize(text))
+
+    def embed(self, text: str, **kwargs) -> List[float]:
+        """
+        Get embeddings for the input text using the Mistral embedding API.
+        """
+        if not self.client:
+            raise Exception("Mistral client not initialized.")
+        
+        # Default to the recommended embedding model
+        model_to_use = kwargs.get("model", "mistral-embed")
+
+        try:
+            response = self.client.embeddings(
+                model=model_to_use,
+                input=[text] # API expects a list of strings
+            )
+            return response.data[0].embedding
+        except Exception as ex:
+            trace_exception(ex)
+            raise Exception(f"Mistral embedding failed: {str(ex)}") from ex
+
+    def get_model_info(self) -> dict:
+        """Return information about the current Mistral setup."""
+        return {
+            "name": self.binding_name,
+            "version": "unknown", # mistralai library doesn't expose a version attribute easily
+            "host_address": "https://api.mistral.ai",
+            "model_name": self.model_name,
+            "supports_structured_output": False,
+            "supports_vision": False, # Mistral API does not currently support vision
+        }
+
+    def listModels(self) -> List[Dict[str, str]]:
+        """Lists available models from the Mistral service."""
+        if not self.client:
+            ASCIIColors.error("Mistral client not initialized. Cannot list models.")
+            return []
+        try:
+            ASCIIColors.debug("Listing Mistral models...")
+            models = self.client.list_models()
+            model_info_list = []
+            for m in models.data:
+                model_info_list.append({
+                    'model_name': m.id,
+                    'display_name': m.id.replace('-', ' ').title(),
+                    'description': f"Owned by: {m.owned_by}",
+                    'owned_by': m.owned_by
+                })
+            return model_info_list
+        except Exception as ex:
+            trace_exception(ex)
+            return []
+
+    def load_model(self, model_name: str) -> bool:
+        """Sets the model name for subsequent operations."""
+        self.model_name = model_name
+        ASCIIColors.info(f"Mistral model set to: {model_name}. It will be used on the next API call.")
+        return True
+
+if __name__ == '__main__':
+    # Environment variable to set for testing:
+    # MISTRAL_API_KEY: Your Mistral API key
+
+    if "MISTRAL_API_KEY" not in os.environ:
+        ASCIIColors.red("Error: MISTRAL_API_KEY environment variable not set.")
+        print("Please get your key from https://console.mistral.ai/api-keys/ and set it.")
+        exit(1)
+
+    ASCIIColors.yellow("--- Testing MistralBinding ---")
+
+    test_model_name = "mistral-small-latest" # Use a smaller, faster model for testing
+    test_embedding_model = "mistral-embed"
+    
+    try:
+        # --- Initialization ---
+        ASCIIColors.cyan("\n--- Initializing Binding ---")
+        binding = MistralBinding(model_name=test_model_name)
+        ASCIIColors.green("Binding initialized successfully.")
+
+        # --- List Models ---
+        ASCIIColors.cyan("\n--- Listing Models ---")
+        models = binding.listModels()
+        if models:
+            ASCIIColors.green(f"Found {len(models)} models on Mistral. Available models:")
+            for m in models:
+                print(f"- {m['model_name']}")
+        else:
+            ASCIIColors.warning("No models found or failed to list models.")
+        
+        # --- Text Generation (Non-Streaming) ---
+        ASCIIColors.cyan("\n--- Text Generation (Non-Streaming) ---")
+        prompt_text = "Who developed the transformer architecture and in what paper?"
+        generated_text = binding.generate_text(prompt_text, n_predict=100, stream=False)
+        if isinstance(generated_text, str):
+            ASCIIColors.green(f"Generated text:\n{generated_text}")
+        else:
+            ASCIIColors.error(f"Generation failed: {generated_text}")
+
+        # --- Text Generation (Streaming) ---
+        ASCIIColors.cyan("\n--- Text Generation (Streaming) ---")
+        full_streamed_text = ""
+        def stream_callback(chunk: str, msg_type: int):
+            nonlocal full_streamed_text
+            ASCIIColors.green(chunk, end="", flush=True)
+            full_streamed_text += chunk
+            return True
+        
+        result = binding.generate_text(prompt_text, n_predict=150, stream=True, streaming_callback=stream_callback)
+        print("\n--- End of Stream ---")
+        ASCIIColors.green(f"Full streamed text (for verification): {result}")
+
+        # --- Embeddings Test ---
+        ASCIIColors.cyan("\n--- Embeddings ---")
+        try:
+            embedding_text = "Mistral AI is based in Paris."
+            embedding_vector = binding.embed(embedding_text, model=test_embedding_model)
+            ASCIIColors.green(f"Embedding for '{embedding_text}' (first 5 dims): {embedding_vector[:5]}...")
+            ASCIIColors.info(f"Embedding vector dimension: {len(embedding_vector)}")
+        except Exception as e:
+            ASCIIColors.error(f"Embedding test failed: {e}")
+
+        # --- Vision Test (should be unsupported) ---
+        ASCIIColors.cyan("\n--- Vision Test (Expecting No Support) ---")
+        model_info = binding.get_model_info()
+        if not model_info.get("supports_vision"):
+            ASCIIColors.green("Binding correctly reports no support for vision.")
+        else:
+            ASCIIColors.warning("Binding reports support for vision, which is unexpected for Mistral.")
+
+    except Exception as e:
+        ASCIIColors.error(f"An error occurred during testing: {e}")
+        trace_exception(e)
+
+    ASCIIColors.yellow("\nMistralBinding test finished.")

lollms_client/llm_bindings/open_router/__init__.py

@@ -0,0 +1,304 @@
+import os
+from typing import Optional, Callable, List, Union, Dict
+
+from lollms_client.lollms_discussion import LollmsDiscussion, LollmsMessage
+from lollms_client.lollms_llm_binding import LollmsLLMBinding
+from lollms_client.lollms_types import MSG_TYPE
+from ascii_colors import ASCIIColors, trace_exception
+
+import pipmaster as pm
+
+# Ensure the required packages are installed
+pm.ensure_packages(["openai", "pillow", "tiktoken"])
+
+import openai
+from PIL import Image, ImageDraw
+import tiktoken
+
+BindingName = "OpenRouterBinding"
+
+class OpenRouterBinding(LollmsLLMBinding):
+    """
+    OpenRouter API binding implementation.
+
+    This binding allows communication with the OpenRouter service, which acts as a
+    aggregator for a vast number of AI models from different providers. It uses
+    an OpenAI-compatible API structure.
+    """
+    BASE_URL = "https://openrouter.ai/api/v1"
+
+    def __init__(self,
+                 model_name: str = "google/gemini-flash-1.5", # A good, fast default
+                 open_router_api_key: str = None,
+                 **kwargs
+                 ):
+        """
+        Initialize the OpenRouterBinding.
+
+        Args:
+            model_name (str): The name of the model to use from OpenRouter (e.g., 'anthropic/claude-3-haiku-20240307').
+            open_router_api_key (str): The API key for the OpenRouter service.
+        """
+        super().__init__(binding_name=BindingName)
+        self.model_name = model_name
+        self.api_key = open_router_api_key or os.getenv("OPENROUTER_API_KEY")
+
+        if not self.api_key:
+            raise ValueError("OpenRouter API key is required. Set it via 'open_router_api_key' or OPENROUTER_API_KEY env var.")
+
+        try:
+            self.client = openai.OpenAI(
+                base_url=self.BASE_URL,
+                api_key=self.api_key,
+            )
+        except Exception as e:
+            ASCIIColors.error(f"Failed to configure OpenRouter client: {e}")
+            self.client = None
+            raise ConnectionError(f"Could not configure OpenRouter client: {e}") from e
+
+    def _construct_parameters(self,
+                              temperature: float,
+                              top_p: float,
+                              n_predict: int,
+                              seed: Optional[int]) -> Dict[str, any]:
+        """Builds a parameters dictionary for the API."""
+        params = {}
+        if temperature is not None: params['temperature'] = float(temperature)
+        if top_p is not None: params['top_p'] = top_p
+        if n_predict is not None: params['max_tokens'] = n_predict
+        if seed is not None: params['seed'] = seed
+        return params
+
+    def _prepare_messages(self, discussion: LollmsDiscussion, branch_tip_id: Optional[str] = None) -> List[Dict[str, any]]:
+        """Prepares the message list for the API from a LollmsDiscussion."""
+        history = []
+        if discussion.system_prompt:
+            history.append({"role": "system", "content": discussion.system_prompt})
+
+        for msg in discussion.get_messages(branch_tip_id):
+            role = 'user' if msg.sender_type == "user" else 'assistant'
+            # Note: Vision support depends on the specific model being called via OpenRouter.
+            # We will not implement it in this generic binding to avoid complexity,
+            # as different models might expect different formats.
+            if msg.content:
+                history.append({'role': role, 'content': msg.content})
+        return history
+
+    def generate_text(self, prompt: str, **kwargs) -> Union[str, dict]:
+        """
+        Generate text using OpenRouter. This is a wrapper around the chat method.
+        """
+        temp_discussion = LollmsDiscussion.from_messages([
+            LollmsMessage.new_message(sender_type="user", content=prompt)
+        ])
+        if kwargs.get("system_prompt"):
+            temp_discussion.system_prompt = kwargs.get("system_prompt")
+        
+        return self.chat(temp_discussion, **kwargs)
+
+    def chat(self,
+             discussion: LollmsDiscussion,
+             branch_tip_id: Optional[str] = None,
+             n_predict: Optional[int] = 2048,
+             stream: Optional[bool] = False,
+             temperature: float = 0.7,
+             top_p: float = 0.9,
+             seed: Optional[int] = None,
+             streaming_callback: Optional[Callable[[str, MSG_TYPE], None]] = None,
+             **kwargs
+             ) -> Union[str, dict]:
+        """
+        Conduct a chat session with a model via OpenRouter.
+        """
+        if not self.client:
+            return {"status": "error", "message": "OpenRouter client not initialized."}
+
+        messages = self._prepare_messages(discussion, branch_tip_id)
+        api_params = self._construct_parameters(temperature, top_p, n_predict, seed)
+        full_response_text = ""
+
+        try:
+            response = self.client.chat.completions.create(
+                model=self.model_name,
+                messages=messages,
+                stream=stream,
+                **api_params
+            )
+
+            if stream:
+                for chunk in response:
+                    delta = chunk.choices[0].delta.content
+                    if delta:
+                        full_response_text += delta
+                        if streaming_callback:
+                            if not streaming_callback(delta, MSG_TYPE.MSG_TYPE_CHUNK):
+                                break
+                return full_response_text
+            else:
+                return response.choices[0].message.content
+
+        except Exception as ex:
+            error_message = f"An unexpected error occurred with OpenRouter API: {str(ex)}"
+            trace_exception(ex)
+            return {"status": "error", "message": error_message}
+
+    def tokenize(self, text: str) -> list:
+        """Tokenize text using tiktoken as a general-purpose fallback."""
+        try:
+            encoding = tiktoken.get_encoding("cl100k_base")
+            return encoding.encode(text)
+        except Exception:
+            return list(text.encode('utf-8'))
+
+    def detokenize(self, tokens: list) -> str:
+        """Detokenize tokens using tiktoken."""
+        try:
+            encoding = tiktoken.get_encoding("cl100k_base")
+            return encoding.decode(tokens)
+        except Exception:
+            return bytes(tokens).decode('utf-8', errors='ignore')
+
+    def count_tokens(self, text: str) -> int:
+        """Count tokens in a text using the fallback tokenizer."""
+        return len(self.tokenize(text))
+
+    def embed(self, text: str, **kwargs) -> List[float]:
+        """
+        Get embeddings for the input text using an OpenRouter embedding model.
+        """
+        if not self.client:
+             raise Exception("OpenRouter client not initialized.")
+        
+        # User must specify an embedding model, e.g., 'text-embedding-ada-002'
+        embedding_model = kwargs.get("model")
+        if not embedding_model:
+            raise ValueError("An embedding model name must be provided via the 'model' kwarg for the embed method.")
+        
+        try:
+            # The client is already configured for OpenRouter's base URL
+            response = self.client.embeddings.create(
+                model=embedding_model,
+                input=text
+            )
+            return response.data[0].embedding
+        except Exception as ex:
+            trace_exception(ex)
+            raise Exception(f"OpenRouter embedding failed: {str(ex)}") from ex
+
+    def get_model_info(self) -> dict:
+        """Return information about the current OpenRouter setup."""
+        return {
+            "name": self.binding_name,
+            "version": openai.__version__,
+            "host_address": self.BASE_URL,
+            "model_name": self.model_name,
+            "supports_structured_output": False,
+            "supports_vision": "Depends on the specific model selected. This generic binding does not support vision.",
+        }
+
+    def listModels(self) -> List[Dict[str, str]]:
+        """Lists available models from the OpenRouter service."""
+        if not self.client:
+            ASCIIColors.error("OpenRouter client not initialized. Cannot list models.")
+            return []
+        try:
+            ASCIIColors.debug("Listing OpenRouter models...")
+            models = self.client.models.list()
+            model_info_list = []
+            for m in models.data:
+                model_info_list.append({
+                    'model_name': m.id,
+                    'display_name': m.name if hasattr(m, 'name') else m.id,
+                    'description': m.description if hasattr(m, 'description') else "No description available.",
+                    'owned_by': m.id.split('/')[0] # Heuristic to get the provider
+                })
+            return model_info_list
+        except Exception as ex:
+            trace_exception(ex)
+            return []
+
+    def load_model(self, model_name: str) -> bool:
+        """Sets the model name for subsequent operations."""
+        self.model_name = model_name
+        ASCIIColors.info(f"OpenRouter model set to: {model_name}. It will be used on the next API call.")
+        return True
+
+if __name__ == '__main__':
+    # Environment variable to set for testing:
+    # OPENROUTER_API_KEY: Your OpenRouter API key (starts with sk-or-...)
+
+    if "OPENROUTER_API_KEY" not in os.environ:
+        ASCIIColors.red("Error: OPENROUTER_API_KEY environment variable not set.")
+        print("Please get your key from https://openrouter.ai/keys and set it.")
+        exit(1)
+
+    ASCIIColors.yellow("--- Testing OpenRouterBinding ---")
+
+    try:
+        # --- Initialization ---
+        ASCIIColors.cyan("\n--- Initializing Binding ---")
+        # Initialize with a fast, cheap, and well-known model
+        binding = OpenRouterBinding(model_name="mistralai/mistral-7b-instruct")
+        ASCIIColors.green("Binding initialized successfully.")
+
+        # --- List Models ---
+        ASCIIColors.cyan("\n--- Listing Models ---")
+        models = binding.listModels()
+        if models:
+            ASCIIColors.green(f"Successfully fetched {len(models)} models from OpenRouter.")
+            ASCIIColors.info("Sample of available models:")
+            # Print a few examples from different providers
+            providers_seen = set()
+            count = 0
+            for m in models:
+                provider = m['owned_by']
+                if provider not in providers_seen:
+                    print(f"- {m['model_name']}")
+                    providers_seen.add(provider)
+                    count += 1
+                if count >= 5:
+                    break
+        else:
+            ASCIIColors.warning("No models found or failed to list models.")
+        
+        # --- Text Generation (Testing with a Claude model) ---
+        ASCIIColors.cyan("\n--- Text Generation (Claude via OpenRouter) ---")
+        binding.load_model("anthropic/claude-3-haiku-20240307")
+        prompt_text = "Why is Claude Haiku a good choice for fast-paced chat applications?"
+        generated_text = binding.generate_text(prompt_text, n_predict=100, stream=False)
+        if isinstance(generated_text, str):
+            ASCIIColors.green(f"Generated text:\n{generated_text}")
+        else:
+            ASCIIColors.error(f"Generation failed: {generated_text}")
+
+        # --- Text Generation (Streaming with a Groq model) ---
+        ASCIIColors.cyan("\n--- Text Generation (Llama3 on Groq via OpenRouter) ---")
+        binding.load_model("meta-llama/llama-3-8b-instruct:free") # Use the free tier on OpenRouter
+        full_streamed_text = ""
+        def stream_callback(chunk: str, msg_type: int):
+            nonlocal full_streamed_text
+            ASCIIColors.green(chunk, end="", flush=True)
+            full_streamed_text += chunk
+            return True
+        
+        stream_prompt = "Write a very short, 3-line poem about the speed of Groq."
+        result = binding.generate_text(stream_prompt, n_predict=50, stream=True, streaming_callback=stream_callback)
+        print("\n--- End of Stream ---")
+        ASCIIColors.green(f"Full streamed text (for verification): {result}")
+
+        # --- Embeddings Test ---
+        ASCIIColors.cyan("\n--- Embeddings (OpenAI model via OpenRouter) ---")
+        try:
+            embedding_model = "openai/text-embedding-ada-002"
+            embedding_text = "OpenRouter simplifies everything."
+            embedding_vector = binding.embed(embedding_text, model=embedding_model)
+            ASCIIColors.green(f"Embedding for '{embedding_text}' (first 5 dims): {embedding_vector[:5]}...")
+            ASCIIColors.info(f"Embedding vector dimension: {len(embedding_vector)}")
+        except Exception as e:
+            ASCIIColors.error(f"Embedding test failed: {e}")
+
+    except Exception as e:
+        ASCIIColors.error(f"An error occurred during testing: {e}")
+        trace_exception(e)
+
+    ASCIIColors.yellow("\nOpenRouterBinding test finished.")

lollms_client/lollms_discussion.py

@@ -423,33 +423,29 @@ class LollmsDiscussion:
         else:
             return cls(lollmsClient=lollms_client, discussion_id=kwargs.get('id'), **init_args)
 
-    def get_messages(self, branch_id: Optional[str] = None) -> Union[List[LollmsMessage], Optional[LollmsMessage]]:
+    def get_messages(self, branch_id: Optional[str] = None) -> Optional[List[LollmsMessage]]:
         """
-        Returns messages from the discussion with branch-aware logic.
+        Returns a list of messages forming a branch, from root to a specific leaf.
 
-        - If no branch_id is provided, it returns a list of all messages
-          in the currently active branch, ordered from root to leaf.
-        - If a branch_id is provided, it returns the single message object
-          (the "leaf") corresponding to that ID.
+        - If no branch_id is provided, it returns the full message list of the
+          currently active branch.
+        - If a branch_id is provided, it returns the list of all messages from the
+          root up to (and including) the message with that ID.
 
         Args:
-            branch_id: The ID of the leaf message. If provided, only this
-                       message is returned. If None, the full active branch is returned.
+            branch_id: The ID of the leaf message of the desired branch.
+                       If None, the active branch's leaf is used.
 
         Returns:
-            A list of LollmsMessage objects for the active branch, or a single
-            LollmsMessage if a branch_id is specified, or None if the ID is not found.
+            A list of LollmsMessage objects for the specified branch, ordered
+            from root to leaf, or None if the branch_id does not exist.
         """
-        if branch_id is None:
-            # Case 1: No ID, return the current active branch as a list of messages
-            leaf_id = self.active_branch_id
-            return self.get_branch(leaf_id)
-        else:
-            # Case 2: ID provided, return just the single leaf message
-            if branch_id in self._message_index:
-                return LollmsMessage(self, self._message_index[branch_id])
-            else:
-                return None
+        # Determine which leaf message ID to use
+        leaf_id = branch_id if branch_id is not None else self.active_branch_id
+
+        # Return the full branch leading to that leaf
+        # We assume self.get_branch() correctly handles non-existent IDs by returning None or an empty list.
+        return self.get_branch(leaf_id)
 
 
     def __getattr__(self, name: str) -> Any: