lollms-client 0.25.0__tar.gz → 0.25.1__tar.gz

{lollms_client-0.25.0/lollms_client.egg-info → lollms_client-0.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lollms_client
-Version: 0.25.0
+Version: 0.25.1
 Summary: A client library for LoLLMs generate endpoint
 Author-email: ParisNeo <parisneoai@gmail.com>
 License: Apache Software License

{lollms_client-0.25.0 → lollms_client-0.25.1}/lollms_client/__init__.py

@@ -8,7 +8,7 @@ from lollms_client.lollms_utilities import PromptReshaper # Keep general utiliti
 from lollms_client.lollms_mcp_binding import LollmsMCPBinding, LollmsMCPBindingManager
 
 
-__version__ = "0.25.0" # Updated version
+__version__ = "0.25.1" # Updated version
 
 # Optionally, you could define __all__ if you want to be explicit about exports
 __all__ = [

{lollms_client-0.25.0 → lollms_client-0.25.1}/lollms_client/llm_bindings/openai/__init__.py

@@ -104,15 +104,15 @@ class OpenAIBinding(LollmsLLMBinding):
         """
         count = 0
         output = ""
+        messages = [
+            {
+                "role": "system",
+                "content": system_prompt or "You are a helpful assistant.",
+            }
+        ]
 
         # Prepare messages based on whether images are provided
         if images:
-            messages = [
-                {
-                    "role": "system",
-                    "content": system_prompt,
-                }
-            ]
             if split:
                 messages += self.split_discussion(prompt,user_keyword=user_keyword, ai_keyword=ai_keyword)
                 if images:
@@ -151,7 +151,27 @@ class OpenAIBinding(LollmsLLMBinding):
                 )
             
         else:
-            messages = [{"role": "user", "content": prompt}]
+            
+            if split:
+                messages += self.split_discussion(prompt,user_keyword=user_keyword, ai_keyword=ai_keyword)
+                if images:
+                    messages[-1]["content"] = [
+                        {
+                            "type": "text",
+                            "text": messages[-1]["content"]
+                        }
+                    ]
+            else:
+                messages.append({
+                        'role': 'user', 
+                        'content': [
+                                        {
+                                            "type": "text",
+                                            "text": prompt
+                                        }
+                                    ]
+                    }
+                )
 
         # Generate text using the OpenAI API
         if self.completion_format == ELF_COMPLETION_FORMAT.Chat:

{lollms_client-0.25.0 → lollms_client-0.25.1}/lollms_client/lollms_core.py

@@ -1443,7 +1443,7 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
         use_mcps: Union[None, bool, List[str]] = None,
         use_data_store: Union[None, Dict[str, Callable]] = None,
         system_prompt: str = None,
-        reasoning_system_prompt: str = "You are a logical and adaptive AI assistant.",
+        reasoning_system_prompt: str = "You are a logical AI assistant. Your task is to achieve the user's goal by thinking step-by-step and using the available tools.",
         images: Optional[List[str]] = None,
         max_reasoning_steps: int = None,
         decision_temperature: float = None,
@@ -1529,6 +1529,8 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
         def log_prompt(prompt, type="prompt"):
             ASCIIColors.cyan(f"** DEBUG: {type} **")
             ASCIIColors.magenta(prompt[-15000:])
+            prompt_size = self.count_tokens(prompt)
+            ASCIIColors.red(f"Prompt size:{prompt_size}/{self.default_ctx_size}")
             ASCIIColors.cyan(f"** DEBUG: DONE **")
 
         # --- Define Inner Helper Functions ---
@@ -1578,9 +1580,9 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
         
         # Add the new put_code_in_buffer tool definition
         available_tools.append({
-            "name": "put_code_in_buffer",
-            "description": "Generates a block of code (e.g., Python, SQL) to be used by another tool. It returns a unique 'code_id'. You must then use this 'code_id' as the value for the code parameter in the subsequent tool call. This **does not** execute the code. It only buffers it for future use. Only use it if another tool requires code.",
-            "input_schema": {"type": "object", "properties": {"prompt": {"type": "string", "description": "A detailed natural language description of the code's purpose and requirements."}}, "required": ["prompt"]}
+            "name": "generate_code",
+            "description": """Generates and stores code into a buffer to be used by another tool. You can put the uuid of the generated code into the fields that require long code among the tools. If no tool requires code as input do not use generate_code. generate_code do not execute the code nor does it audit it.""",
+            "input_schema": {"type": "object", "properties": {"prompt": {"type": "string", "description": "A detailed natural language description of the code's purpose and requirements."}, "language": {"type": "string", "description": "The programming language of the generated code. By default it uses python."}}, "required": ["prompt"]}
         })
         # Add the new refactor_scratchpad tool definition
         available_tools.append({
@@ -1602,8 +1604,7 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
                 user_context = f'Original User Request: "{original_user_prompt}"'
                 if images: user_context += f'\n(Note: {len(images)} image(s) were provided with this request.)'
                 
-                reasoning_prompt_template = f"""You are a logical AI assistant. Your task is to achieve the user's goal by thinking step-by-step and using the available tools.
-
+                reasoning_prompt_template = f"""
 --- AVAILABLE TOOLS ---
 {formatted_tools_list}
 --- CONTEXT ---
@@ -1762,7 +1763,7 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
         # --- Final Answer Synthesis ---
         synthesis_id = log_event("Synthesizing final answer...", MSG_TYPE.MSG_TYPE_STEP_START)
         
-        final_answer_prompt = f"""You are an AI assistant. Provide a final, comprehensive answer based on your work.
+        final_answer_prompt = f"""
 --- Original User Request ---
 "{original_user_prompt}"
 --- Your Internal Scratchpad (Actions Taken & Findings) ---
@@ -1773,6 +1774,8 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
 - Do not talk about your internal process unless it's necessary to explain why you couldn't find an answer.
 """
         if debug: log_prompt(final_answer_prompt, "FINAL ANSWER SYNTHESIS PROMPT")
+
+            
         final_answer_text = self.generate_text(prompt=final_answer_prompt, system_prompt=system_prompt, images=images, stream=streaming_callback is not None, streaming_callback=streaming_callback, temperature=final_answer_temperature, **llm_generation_kwargs)
         final_answer = self.remove_thinking_blocks(final_answer_text)
         if debug: log_prompt(final_answer_text, "FINAL ANSWER RESPONSE")

{lollms_client-0.25.0 → lollms_client-0.25.1}/lollms_client/lollms_discussion.py

@@ -423,6 +423,10 @@ class LollmsDiscussion:
         else:
             return cls(lollmsClient=lollms_client, discussion_id=kwargs.get('id'), **init_args)
 
+    def get_messages(self):
+        """Returns the list of messages"""
+        return self._db_discussion.messages
+
     def __getattr__(self, name: str) -> Any:
         """Proxies attribute getting to the underlying discussion object."""
         if name == 'metadata':

{lollms_client-0.25.0 → lollms_client-0.25.1}/lollms_client/mcp_bindings/remote_mcp/__init__.py

@@ -119,7 +119,26 @@ class RemoteMCPBinding(LollmsMCPBinding):
         future = asyncio.run_coroutine_threadsafe(coro, self._loop)
         return future.result(timeout)
 
-    ### MODIFIED: Now operates on a specific server identified by alias
+    def _prepare_headers(self, alias: str) -> Dict[str, str]:
+        """Prepares the headers dictionary from the server's auth_config."""
+        server_info = self.servers[alias]
+        auth_config = server_info.get("auth_config", {})
+        headers = {}
+        auth_type = auth_config.get("type")
+        if auth_type == "api_key":
+            api_key = auth_config.get("key")
+            header_name = auth_config.get("header_name", "X-API-Key") # Default to X-API-Key
+            if api_key:
+                headers[header_name] = api_key
+                ASCIIColors.info(f"{self.binding_name}: Using API Key authentication for server '{alias}'.")
+
+        elif auth_type == "bearer": # <-- NEW BLOCK
+            token = auth_config.get("token")
+            if token:
+                headers["Authorization"] = f"Bearer {token}"
+                
+        return headers
+
     async def _initialize_connection_async(self, alias: str) -> bool:
         server_info = self.servers[alias]
         if server_info["initialized"]:
@@ -128,10 +147,13 @@ class RemoteMCPBinding(LollmsMCPBinding):
         server_url = server_info["url"]
         ASCIIColors.info(f"{self.binding_name}: Initializing connection to '{alias}' ({server_url})...")
         try:
+            # Prepare authentication headers
+            auth_headers = self._prepare_headers(alias)
+
             exit_stack = AsyncExitStack()
             
             client_streams = await exit_stack.enter_async_context(
-                streamablehttp_client(server_url)
+                streamablehttp_client(url=server_url, headers=auth_headers) # Pass the headers here
             )
             read_stream, write_stream, _ = client_streams
 
@@ -343,3 +365,59 @@ class RemoteMCPBinding(LollmsMCPBinding):
 
     def get_binding_config(self) -> Dict[str, Any]:
         return self.config
+    
+    
+    def set_auth_config(self, alias: str, auth_config: Dict[str, Any]):
+        """
+        Dynamically updates the authentication configuration for a specific server.
+
+        If a connection was already active for this server, it will be closed to force
+        a new connection with the new authentication details on the next call.
+
+        Args:
+            alias (str): The alias of the server to update (the key in servers_infos).
+            auth_config (Dict[str, Any]): The new authentication configuration dictionary.
+                Example: {"type": "bearer", "token": "new-token-here"}
+        """
+        ASCIIColors.info(f"{self.binding_name}: Updating auth_config for server '{alias}'.")
+        
+        server_info = self.servers.get(alias)
+        if not server_info:
+            raise ValueError(f"Server alias '{alias}' does not exist in the configuration.")
+
+        # Update the configuration in the binding's internal state
+        server_info["config"]["auth_config"] = auth_config
+
+        # If the server was already initialized, its connection is now obsolete.
+        # We must close it and mark it as uninitialized.
+        if server_info["initialized"]:
+            ASCIIColors.warning(f"{self.binding_name}: Existing connection for '{alias}' is outdated due to new authentication. It will be reset.")
+            try:
+                # Execute the close operation asynchronously on the event loop thread
+                self._run_async(self._close_connection_async(alias), timeout=10.0)
+            except Exception as e:
+                ASCIIColors.error(f"{self.binding_name}: Error while closing the outdated connection for '{alias}': {e}")
+                # Even on error, reset the state to force a new connection attempt
+                server_info.update({"session": None, "exit_stack": None, "initialized": False})
+
+
+    # --- NEW INTERNAL HELPER METHOD ---
+    async def _close_connection_async(self, alias: str):
+        """Cleanly closes the connection for a specific server alias."""
+        server_info = self.servers.get(alias)
+        if not server_info or not server_info.get("exit_stack"):
+            return # Nothing to do.
+
+        ASCIIColors.info(f"{self.binding_name}: Closing connection for '{alias}'...")
+        try:
+            await server_info["exit_stack"].aclose()
+        except Exception as e:
+            trace_exception(e)
+            ASCIIColors.error(f"{self.binding_name}: Exception while closing the exit_stack for '{alias}': {e}")
+        finally:
+            # Reset the state for this alias, no matter what.
+            server_info.update({
+                "session": None,
+                "exit_stack": None,
+                "initialized": False
+            })

{lollms_client-0.25.0 → lollms_client-0.25.1/lollms_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lollms_client
-Version: 0.25.0
+Version: 0.25.1
 Summary: A client library for LoLLMs generate endpoint
 Author-email: ParisNeo <parisneoai@gmail.com>
 License: Apache Software License