lollms-client 0.27.1__tar.gz → 0.27.2__tar.gz

{lollms_client-0.27.1 → lollms_client-0.27.2}/PKG-INFO

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

{lollms_client-0.27.1 → lollms_client-0.27.2}/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
 from lollms_client.lollms_llm_binding import LollmsLLMBindingManager
 
-__version__ = "0.27.1" # Updated version
+__version__ = "0.27.2" # Updated version
 
 # Optionally, you could define __all__ if you want to be explicit about exports
 __all__ = [

{lollms_client-0.27.1 → lollms_client-0.27.2}/lollms_client/lollms_core.py

@@ -280,6 +280,13 @@ class LollmsClient():
             available = self.binding_manager.get_available_bindings()
             raise ValueError(f"Failed to update LLM binding: {binding_name}. Available: {available}")
 
+    def get_ctx_size(self, model_name=None):
+        if self.binding:
+            ctx_size = self.binding.get_ctx_size(model_name)
+            return ctx_size if ctx_size else self.default_ctx_size
+        else:
+            return None
+
     def update_tts_binding(self, binding_name: str, config: Optional[Dict[str, Any]] = None):
         """Update the TTS binding with a new configuration."""
         self.tts = self.tts_binding_manager.create_binding(
@@ -373,10 +380,6 @@ class LollmsClient():
         pass
 
     # --- Core LLM Binding Methods ---
-    def get_ctx_size(self, model_name):
-        return self.binding.get_ctx_size(model_name)
-
-
     def tokenize(self, text: str) -> list:
         """
         Tokenize text using the active LLM binding.
@@ -1588,6 +1591,11 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
             "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 put_code_in_buffer. put_code_in_buffer 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"]}
         })
+        available_tools.append({
+            "name": "view_generated_code",
+            "description": """Views the code that was generated and stored to the buffer. You need to have a valid uuid of the generated code.""",
+            "input_schema": {"type": "object", "properties": {"code_id": {"type": "string", "description": "The case sensitive uuid of the generated code."}}, "required": ["uuid"]}
+        })
         # Add the new refactor_scratchpad tool definition
         available_tools.append({
             "name": "refactor_scratchpad",
@@ -1599,7 +1607,7 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
         formatted_tools_list += "\n**request_clarification**:\nUse if the user's request is ambiguous and you can not infer a clear idea of his intent. this tool has no parameters."
         formatted_tools_list += "\n**final_answer**:\nUse when you are ready to respond to the user. this tool has no parameters."
 
-        if discovery_step_id: log_event("**Discovering tools**",MSG_TYPE.MSG_TYPE_STEP_END, event_id=discovery_step_id)
+        if discovery_step_id: log_event(f"**Discovering tools** found {len(available_tools)} tools",MSG_TYPE.MSG_TYPE_STEP_END, event_id=discovery_step_id)
 
         # --- 2. Dynamic Reasoning Loop ---
         for i in range(max_reasoning_steps):
@@ -1699,6 +1707,16 @@ Provide your response as a single JSON object inside a JSON markdown tag. Use th
                     if code_gen_id: log_event(f"Generating code...", MSG_TYPE.MSG_TYPE_TOOL_CALL, metadata={"id": code_gen_id, "result": tool_result})
                     if reasoning_step_id: log_event(f"**Reasoning Step {i+1}/{max_reasoning_steps}**", MSG_TYPE.MSG_TYPE_STEP_END, event_id= reasoning_step_id)
                     continue # Go to the next reasoning step immediately
+                if tool_name == 'view_generated_code':
+                    code_id = tool_params.get("code_id")
+                    if code_id:
+                        tool_result = {"status": "success", "code_id": code_id, "generated_code":generated_code_store[code_uuid]}
+                    else:
+                        tool_result = {"status": "error", "code_id": code_id, "error":"Unknown uuid"}
+                    observation_text = f"```json\n{json.dumps(tool_result, indent=2)}\n```"
+                    current_scratchpad += f"\n\n### Step {i+1}: Observation\n- **Action:** Called `{tool_name}`\n- **Result:**\n{observation_text}"
+                    log_event(f"Result from `{tool_name}`:\n```\n{generated_code_store[code_uuid]}\n```\n", MSG_TYPE.MSG_TYPE_TOOL_CALL, metadata={"id": code_gen_id, "result": tool_result})
+                    continue
                 if tool_name == 'refactor_scratchpad':
                     scratchpad_cleaning_prompt = f"""Enhance this scratchpad content to be more organized and comprehensive. Keep relevant experience information and remove any useless redundancies. Try to log learned things from the context so that you won't make the same mistakes again. Do not remove the main objective information or any crucial information that may be useful for the next iterations. Answer directly with the new scratchpad content without any comments.
 --- YOUR INTERNAL SCRATCHPAD (Work History & Analysis) ---

{lollms_client-0.27.1 → lollms_client-0.27.2}/lollms_client/lollms_discussion.py

@@ -372,6 +372,7 @@ class LollmsDiscussion:
         object.__setattr__(self, 'autosave', autosave)
         object.__setattr__(self, 'max_context_size', max_context_size)
         object.__setattr__(self, 'scratchpad', "")
+        object.__setattr__(self, 'images', [])
         
         # Internal state
         object.__setattr__(self, '_session', None)
@@ -1048,6 +1049,61 @@ class LollmsDiscussion:
         self.touch()
         print(f"[INFO] Discussion auto-pruned. {len(messages_to_prune)} messages summarized. History preserved.")
 
+    def count_discussion_tokens(self, format_type: str, branch_tip_id: Optional[str] = None) -> int:
+        """Counts the number of tokens in the exported discussion content.
+
+        This method exports the discussion in the specified format and then uses
+        the lollmsClient's tokenizer to count the tokens in the resulting text.
+
+        Args:
+            format_type: The target format (e.g., "lollms_text", "openai_chat").
+            branch_tip_id: The ID of the message to use as the end of the context.
+                           Defaults to the active branch ID.
+
+        Returns:
+            The total number of tokens.
+        """
+        exported_content = self.export(format_type, branch_tip_id)
+        
+        text_to_count = ""
+        if isinstance(exported_content, str):
+            text_to_count = exported_content
+        elif isinstance(exported_content, list):
+            # Handle list of dicts (OpenAI/Ollama format)
+            full_content = []
+            for message in exported_content:
+                content = message.get("content")
+                if isinstance(content, str):
+                    full_content.append(content)
+                elif isinstance(content, list): # Handle OpenAI content parts
+                    for part in content:
+                        if part.get("type") == "text":
+                            full_content.append(part.get("text", ""))
+            text_to_count = "\n".join(full_content)
+
+        return self.lollmsClient.count_tokens(text_to_count)
+
+    def get_context_status(self, branch_tip_id: Optional[str] = None) -> Dict[str, Optional[int]]:
+        """Returns the current token count and the maximum context size.
+
+        This provides a snapshot of the context usage, taking into account
+        any non-destructive pruning that has occurred. The token count is
+        based on the "lollms_text" export format, which is the format used
+        for pruning calculations.
+
+        Args:
+            branch_tip_id: The ID of the message branch to measure. Defaults
+                           to the active branch.
+
+        Returns:
+            A dictionary with 'current_tokens' and 'max_tokens'.
+        """
+        current_tokens = self.count_discussion_tokens("lollms_text", branch_tip_id)
+        return {
+            "current_tokens": current_tokens,
+            "max_tokens": self.max_context_size
+        }
+
     def switch_to_branch(self, branch_id):
         self.active_branch_id = branch_id
 
@@ -1078,4 +1134,4 @@ class LollmsDiscussion:
         new_metadata = (self.metadata or {}).copy()
         new_metadata[itemname] = item_value
         self.metadata = new_metadata
-        self.commit()
+        self.commit()

{lollms_client-0.27.1 → lollms_client-0.27.2}/lollms_client/lollms_llm_binding.py

@@ -115,8 +115,9 @@ class LollmsLLMBinding(ABC):
         """
         pass
 
-    def get_ctx_size(self, model_name):
-        return 32000
+    def get_ctx_size(self, model_name=None):
+        # if model_name is none use current model name
+        return None
 
 
     @abstractmethod

{lollms_client-0.27.1 → lollms_client-0.27.2}/lollms_client.egg-info/PKG-INFO

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