lollms-client 1.7.10__py3-none-any.whl → 1.7.13__py3-none-any.whl

lollms_client/llm_bindings/ollama/__init__.py

@@ -7,7 +7,7 @@ from lollms_client.lollms_types import MSG_TYPE
 # from lollms_client.lollms_utilities import encode_image 
 from lollms_client.lollms_types import ELF_COMPLETION_FORMAT
 from lollms_client.lollms_discussion import LollmsDiscussion
-from typing import Optional, Callable, List, Union, Dict
+from typing import Optional, Callable, List, Union, Dict, Any
 
 from ascii_colors import ASCIIColors, trace_exception
 import pipmaster as pm
@@ -718,6 +718,44 @@ class OllamaBinding(LollmsLLMBinding):
             trace_exception(ex)
             return {"status": False, "message": msg}
 
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return [
+            {"name": "Llama3 8B", "description": "Meta's Llama 3 8B model. Good for general purpose chat.", "size": "4.7GB", "type": "model", "link": "llama3"},
+            {"name": "Llama3 70B", "description": "Meta's Llama 3 70B model. High capability.", "size": "40GB", "type": "model", "link": "llama3:70b"},
+            {"name": "Phi-3 Mini", "description": "Microsoft's Phi-3 Mini 3.8B model. Lightweight and capable.", "size": "2.3GB", "type": "model", "link": "phi3"},
+            {"name": "Phi-3 Medium", "description": "Microsoft's Phi-3 Medium 14B model.", "size": "7.9GB", "type": "model", "link": "phi3:medium"},
+            {"name": "Mistral 7B", "description": "Mistral AI's 7B model v0.3.", "size": "4.1GB", "type": "model", "link": "mistral"},
+            {"name": "Mixtral 8x7B", "description": "Mistral AI's Mixture of Experts model.", "size": "26GB", "type": "model", "link": "mixtral"},
+            {"name": "Gemma 2 9B", "description": "Google's Gemma 2 9B model.", "size": "5.4GB", "type": "model", "link": "gemma2"},
+            {"name": "Gemma 2 27B", "description": "Google's Gemma 2 27B model.", "size": "16GB", "type": "model", "link": "gemma2:27b"},
+            {"name": "Qwen 2.5 7B", "description": "Alibaba Cloud's Qwen2.5 7B model.", "size": "4.5GB", "type": "model", "link": "qwen2.5"},
+            {"name": "Qwen 2.5 Coder 7B", "description": "Alibaba Cloud's Qwen2.5 Coder 7B model.", "size": "4.5GB", "type": "model", "link": "qwen2.5-coder"},
+            {"name": "CodeLlama 7B", "description": "Meta's CodeLlama 7B model.", "size": "3.8GB", "type": "model", "link": "codellama"},
+            {"name": "LLaVA 7B", "description": "Visual instruction tuning model (Vision).", "size": "4.5GB", "type": "model", "link": "llava"},
+            {"name": "Nomic Embed Text", "description": "A high-performing open embedding model.", "size": "274MB", "type": "embedding", "link": "nomic-embed-text"},
+            {"name": "DeepSeek Coder V2", "description": "DeepSeek Coder V2 model.", "size": "8.9GB", "type": "model", "link": "deepseek-coder-v2"},
+            {"name": "OpenHermes 2.5 Mistral", "description": "High quality finetune of Mistral 7B.", "size": "4.1GB", "type": "model", "link": "openhermes"},
+            {"name": "Dolphin Phi", "description": "Uncensored Dolphin fine-tune of Phi-2.", "size": "1.6GB", "type": "model", "link": "dolphin-phi"},
+            {"name": "TinyLlama", "description": "A compact 1.1B model.", "size": "637MB", "type": "model", "link": "tinyllama"},
+        ]
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        zoo = self.get_zoo()
+        if index < 0 or index >= len(zoo):
+            msg = "Index out of bounds"
+            ASCIIColors.error(msg)
+            return {"status": False, "message": msg}
+        item = zoo[index]
+        return self.pull_model(item["link"], progress_callback=progress_callback)
+
     def install_ollama(self, callback: Callable[[dict], None] = None, **kwargs) -> dict:
         """
         Installs Ollama based on the operating system.
@@ -1157,4 +1195,4 @@ if __name__ == '__main__':
         ASCIIColors.error(f"An error occurred during testing: {e}")
         trace_exception(e)
 
-    ASCIIColors.yellow("\nOllamaBinding test finished.")
+    ASCIIColors.yellow("\nOllamaBinding test finished.")

lollms_client/lollms_discussion.py

@@ -34,8 +34,7 @@ if False:
 
 from lollms_client.lollms_utilities import build_image_dicts, robust_json_parser
 from ascii_colors import ASCIIColors, trace_exception
-# Assuming lollms_types is a local module providing MSG_TYPE enum/constants
-# from .lollms_types import MSG_TYPE 
+from lollms_client.lollms_types import MSG_TYPE 
 
 class EncryptedString(TypeDecorator):
     """A SQLAlchemy TypeDecorator for field-level database encryption.
@@ -1054,7 +1053,7 @@ class LollmsDiscussion:
         debug: bool = False,
         remove_thinking_blocks:bool = True,
         **kwargs
-    ) -> Dict[str, 'LollmsMessage']:
+    ) -> Dict[str, Any]:
         """Main interaction method that can invoke the dynamic, multi-modal agent.
 
         This method orchestrates the entire response generation process. It can
@@ -1095,14 +1094,35 @@ class LollmsDiscussion:
             where the 'ai_message' will contain rich metadata if an agentic turn was used.
         """
         callback = kwargs.get("streaming_callback")
+        collected_sources = []
+        
+
+        # Step 1: Add user message, now including any images.
+        if add_user_message:
+            user_msg = self.add_message(
+                sender=kwargs.get("user_name", "user"), 
+                sender_type="user", 
+                content=user_message,
+                images=images,
+                **kwargs
+            )
+        else: # Regeneration logic
+            # _validate_and_set_active_branch ensures active_branch_id is valid and a leaf.
+            # So, if we are regenerating, active_branch_id must be valid.
+            if self.active_branch_id not in self._message_index: # Redundant check, but safe
+                 raise ValueError("Regeneration failed: active branch tip not found or is invalid.")
+            user_msg_orm = self._message_index[self.active_branch_id]
+            if user_msg_orm.sender_type != 'user':
+                raise ValueError(f"Regeneration failed: active branch tip is a '{user_msg_orm.sender_type}' message, not 'user'.")
+            user_msg = LollmsMessage(self, user_msg_orm)
+            images = user_msg.images
+                    
         # extract personality data
         if personality is not None:
             object.__setattr__(self, '_system_prompt', personality.system_prompt)
 
             # --- New Data Source Handling Logic ---
             if hasattr(personality, 'data_source') and personality.data_source is not None:
-                # Placeholder for MSG_TYPE if not imported
-                MSG_TYPE = SimpleNamespace(MSG_TYPE_STEP="step", MSG_TYPE_STEP_START="step_start", MSG_TYPE_STEP_END="step_end", MSG_TYPE_EXCEPTION="exception")
 
                 if isinstance(personality.data_source, str):
                     # --- Static Data Source ---
@@ -1154,6 +1174,15 @@ class LollmsDiscussion:
                                 
                                 if retrieved_data:
                                     self.personality_data_zone = retrieved_data.strip()
+                                    source_item = {
+                                        "title": "Personality Data Source",
+                                        "content": retrieved_data,
+                                        "source": personality.name if hasattr(personality, 'name') else "Personality",
+                                        "query": generated_query
+                                    }
+                                    collected_sources.append(source_item)
+                                    if callback:
+                                        callback([source_item], MSG_TYPE.MSG_TYPE_SOURCES_LIST)
 
                             except Exception as e:
                                 trace_exception(e)
@@ -1175,26 +1204,6 @@ class LollmsDiscussion:
         if self.max_context_size is not None:
             self.summarize_and_prune(self.max_context_size)
 
-        # Step 1: Add user message, now including any images.
-        if add_user_message:
-            user_msg = self.add_message(
-                sender=kwargs.get("user_name", "user"), 
-                sender_type="user", 
-                content=user_message,
-                images=images,
-                **kwargs
-            )
-        else: # Regeneration logic
-            # _validate_and_set_active_branch ensures active_branch_id is valid and a leaf.
-            # So, if we are regenerating, active_branch_id must be valid.
-            if self.active_branch_id not in self._message_index: # Redundant check, but safe
-                 raise ValueError("Regeneration failed: active branch tip not found or is invalid.")
-            user_msg_orm = self._message_index[self.active_branch_id]
-            if user_msg_orm.sender_type != 'user':
-                raise ValueError(f"Regeneration failed: active branch tip is a '{user_msg_orm.sender_type}' message, not 'user'.")
-            user_msg = LollmsMessage(self, user_msg_orm)
-            images = user_msg.images
-
         is_agentic_turn = (effective_use_mcps is not None and effective_use_mcps) or (use_data_store is not None and use_data_store)
         
         start_time = datetime.now()
@@ -1262,9 +1271,12 @@ class LollmsDiscussion:
         message_meta = {}
         if is_agentic_turn and isinstance(agent_result, dict):
             if "tool_calls" in agent_result: message_meta["tool_calls"] = agent_result["tool_calls"]
-            if "sources" in agent_result: message_meta["sources"] = agent_result["sources"]
+            if "sources" in agent_result: collected_sources.extend(agent_result["sources"])
             if agent_result.get("clarification_required", False): message_meta["clarification_required"] = True
 
+        if collected_sources:
+             message_meta["sources"] = collected_sources
+
         ai_message_obj = self.add_message(
             sender=personality.name if personality else "assistant",
             sender_type="assistant",
@@ -1282,9 +1294,9 @@ class LollmsDiscussion:
         if self._is_db_backed and self.autosave:
             self.commit()
             
-        return {"user_message": user_msg, "ai_message": ai_message_obj}
+        return {"user_message": user_msg, "ai_message": ai_message_obj, "sources": collected_sources}
 
-    def regenerate_branch(self, branch_tip_id: Optional[str] = None, **kwargs) -> Dict[str, 'LollmsMessage']:
+    def regenerate_branch(self, branch_tip_id: Optional[str] = None, **kwargs) -> Dict[str, Any]:
         """Regenerates the AI response for a given message or the active branch's AI response.
 
         If the target is an AI message, it's deleted and its children are re-parented to its parent

lollms_client/lollms_llm_binding.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, Callable, List, Union, Dict
+from typing import Optional, Callable, List, Union, Dict, Any
 from ascii_colors import trace_exception, ASCIIColors
 from lollms_client.lollms_types import MSG_TYPE
 from lollms_client.lollms_discussion import LollmsDiscussion
@@ -212,6 +212,20 @@ class LollmsLLMBinding(LollmsBaseBinding):
         """
         pass
 
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
+
     @abstractmethod
     def load_model(self, model_name: str) -> bool:
         """

lollms_client/lollms_mcp_binding.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, List, Dict, Any, Union
+from typing import Optional, List, Dict, Any, Union, Callable
 from ascii_colors import trace_exception, ASCIIColors
 import yaml
 from lollms_client.lollms_base_binding import LollmsBaseBinding
@@ -52,6 +52,20 @@ class LollmsMCPBinding(LollmsBaseBinding):
         Or could be implemented to return available tools as models if desired.
         """
         return []
+    
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
 
 class LollmsMCPBindingManager:
     """
@@ -67,7 +81,6 @@ class LollmsMCPBindingManager:
             self.mcp_bindings_dir = (Path(__file__).parent.parent / mcp_bindings_dir).resolve()
 
         self.available_bindings: Dict[str, type[LollmsMCPBinding]] = {}
-        ASCIIColors.info(f"LollmsMCPBindingManager initialized. Bindings directory: {self.mcp_bindings_dir}")
 
 
     def _load_binding_class(self, binding_name: str) -> Optional[type[LollmsMCPBinding]]:

lollms_client/lollms_stt_binding.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, List, Dict, Any, Union
+from typing import Optional, List, Dict, Any, Union, Callable
 from ascii_colors import trace_exception
 import yaml
 from lollms_client.lollms_base_binding import LollmsBaseBinding
@@ -32,6 +32,20 @@ class LollmsSTTBinding(LollmsBaseBinding):
         """
         pass
 
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
+
 class LollmsSTTBindingManager:
     """Manages STT binding discovery and instantiation."""
 

lollms_client/lollms_tti_binding.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, List, Dict, Any, Union
+from typing import Optional, List, Dict, Any, Union, Callable
 from ascii_colors import trace_exception
 import yaml
 from lollms_client.lollms_base_binding import LollmsBaseBinding
@@ -57,6 +57,20 @@ class LollmsTTIBinding(LollmsBaseBinding):
     def list_models(self) -> list:
         """Lists models"""
         pass
+    
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
 
     @abstractmethod
     def set_settings(self, settings: Dict[str, Any], **kwargs) -> bool:

lollms_client/lollms_ttm_binding.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, List, Dict, Any, Union
+from typing import Optional, List, Dict, Any, Union, Callable
 from ascii_colors import trace_exception
 from lollms_client.lollms_base_binding import LollmsBaseBinding
 
@@ -32,6 +32,20 @@ class LollmsTTMBinding(LollmsBaseBinding):
         """
         pass
 
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
+
 class LollmsTTMBindingManager:
     """Manages TTM binding discovery and instantiation."""
 

lollms_client/lollms_tts_binding.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, List, Dict, Any, Union
+from typing import Optional, List, Dict, Any, Union, Callable
 import yaml
 from ascii_colors import trace_exception
 from lollms_client.lollms_base_binding import LollmsBaseBinding
@@ -27,7 +27,21 @@ class LollmsTTSBinding(LollmsBaseBinding):
     @abstractmethod
     def list_models(self, **kwargs) -> List[str]:
         pass
+
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
         
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
+
     def get_settings(self, **kwargs) -> Dict[str, Any]:
         return self.settings
 

lollms_client/lollms_ttv_binding.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, List, Dict, Any, Union
+from typing import Optional, List, Dict, Any, Union, Callable
 from ascii_colors import trace_exception
 from lollms_client.lollms_base_binding import LollmsBaseBinding
 
@@ -31,6 +31,20 @@ class LollmsTTVBinding(LollmsBaseBinding):
         """
         pass
 
+    def get_zoo(self) -> List[Dict[str, Any]]:
+        """
+        Returns a list of models available for download.
+        each entry is a dict with:
+        name, description, size, type, link
+        """
+        return []
+
+    def download_from_zoo(self, index: int, progress_callback: Callable[[dict], None] = None) -> dict:
+        """
+        Downloads a model from the zoo using its index.
+        """
+        return {"status": False, "message": "Not implemented"}
+
 class LollmsTTVBindingManager:
     """Manages TTV binding discovery and instantiation."""