lollms-client 0.20.2__py3-none-any.whl → 0.20.3__py3-none-any.whl

lollms_client/__init__.py

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

lollms_client/lollms_core.py

@@ -666,7 +666,7 @@ Respond with a JSON object containing ONE of the following structures:
 """ # No {self.ai_full_header} here, generate_code will get raw JSON
 
             if streaming_callback:
-                streaming_callback(f"LLM deciding next step (iteration {llm_iterations})...", MSG_TYPE.MSG_TYPE_STEP_START, {"type": "decision_making"}, turn_history)
+                streaming_callback(f"LLM deciding next step (iteration {llm_iterations})...", MSG_TYPE.MSG_TYPE_STEP_START, {"id": "decision_making"}, turn_history)
 
             # Use generate_code to get structured JSON output from LLM
             # Note: generate_code itself uses generate_text. We are asking for JSON here.
@@ -679,7 +679,7 @@ Respond with a JSON object containing ONE of the following structures:
                 # streaming_callback=None, # Decisions are usually not streamed chunk by chunk
             )
             if streaming_callback:
-                streaming_callback(f"LLM decision received.", MSG_TYPE.MSG_TYPE_STEP_END, {"type": "decision_making"}, turn_history)
+                streaming_callback(f"LLM decision received.", MSG_TYPE.MSG_TYPE_STEP_END, {"id": "decision_making"}, turn_history)
 
 
             if not raw_llm_decision_json:
@@ -733,10 +733,11 @@ Respond with a JSON object containing ONE of the following structures:
                     current_conversation.append({"role":"assistant", "content":"(I decided to use a tool, but I'm unsure which one. Could you clarify?)"})
                     break # Or ask LLM to try again without this faulty decision in history
 
-                tool_call_info = {"type": "tool_call_request", "name": tool_name, "params": tool_params}
+                tool_call_info = {"id": "tool_call_request", "name": tool_name, "params": tool_params}
                 turn_history.append(tool_call_info)
                 if streaming_callback:
                      streaming_callback(f"LLM requests to call tool: {tool_name} with params: {tool_params}", MSG_TYPE.MSG_TYPE_INFO, tool_call_info, turn_history)
+                     streaming_callback("", MSG_TYPE.MSG_TYPE_TOOL_CALL, tool_call_info, turn_history)
                 
                 # Interactive execution if enabled
                 if interactive_tool_execution:
@@ -760,15 +761,17 @@ Respond with a JSON object containing ONE of the following structures:
 
 
                 if streaming_callback:
-                    streaming_callback(f"Executing tool: {tool_name}...", MSG_TYPE.MSG_TYPE_STEP_START, {"type": "tool_execution", "tool_name": tool_name}, turn_history)
+                    streaming_callback(f"Executing tool: {tool_name}...", MSG_TYPE.MSG_TYPE_STEP_START, {"id": "tool_execution", "tool_name": tool_name}, turn_history)
                 
                 tool_result = self.mcp.execute_tool(tool_name, tool_params, lollms_client_instance=self)
                 
                 tool_call_info["result"] = tool_result # Add result to this call's info
                 tool_calls_made_this_turn.append(tool_call_info) # Log the completed call
+                if streaming_callback:
+                     streaming_callback(f"", MSG_TYPE.MSG_TYPE_TOOL_OUTPUT, tool_result, turn_history)
 
                 if streaming_callback:
-                    streaming_callback(f"Tool {tool_name} execution finished. Result: {json.dumps(tool_result)}", MSG_TYPE.MSG_TYPE_STEP_END, {"type": "tool_execution", "tool_name": tool_name, "result": tool_result}, turn_history)
+                    streaming_callback(f"Tool {tool_name} execution finished. Result: {json.dumps(tool_result)}", MSG_TYPE.MSG_TYPE_STEP_END, {"id": "tool_execution", "tool_name": tool_name, "result": tool_result}, turn_history)
 
                 # Add tool execution result to conversation for the LLM
                 # The format of this message can influence how the LLM uses the tool output.
@@ -972,12 +975,14 @@ Respond with a JSON object containing ONE of the following structures:
             hop_details = {"query": current_query_for_rag, "retrieved_chunks_details": [], "status": ""}
             previous_queries.append(current_query_for_rag)
             new_unique = 0
+            documents = []
             for chunk in retrieved:
                 doc = chunk.get("file_path", "Unknown")
                 content = str(chunk.get("chunk_text", ""))
                 sim = float(chunk.get("similarity_percent", 0.0))
                 detail = {"document": doc, "similarity": sim, "content": content,
                           "retrieved_in_hop": hop_count + 1, "query_used": current_query_for_rag}
+                documents.append(doc)
                 hop_details["retrieved_chunks_details"].append(detail)
                 key = f"{doc}::{content[:100]}"
                 if key not in all_unique_retrieved_chunks_map:
@@ -987,6 +992,8 @@ Respond with a JSON object containing ONE of the following structures:
             if hop_count > 0 and new_unique == 0:
                 hop_details["status"] = "No *new* unique chunks retrieved"
             rag_hops_details_list.append(hop_details)
+            if streaming_callback:
+                streaming_callback(f"Retreived {len(retrieved)} data chunks from {set(documents)}", MSG_TYPE.MSG_TYPE_STEP, {"id": f"retreival {hop_count + 1}", "hop": hop_count + 1}, turn_rag_history_for_callback)
 
             if streaming_callback:
                 streaming_callback(f"RAG Hop {hop_count + 1} done", MSG_TYPE.MSG_TYPE_STEP_END, {"id": f"rag_hop_{hop_count + 1}", "hop": hop_count + 1}, turn_rag_history_for_callback)

lollms_client/lollms_types.py

@@ -28,6 +28,9 @@ class MSG_TYPE(Enum):
     MSG_TYPE_NEW_MESSAGE            = 15# A new message
     MSG_TYPE_FINISHED_MESSAGE       = 17# End of current message
 
+    #Tool calling
+    MSG_TYPE_TOOL_CALL              = 18# a tool call
+    MSG_TYPE_TOOL_OUTPUT            = 19# the output of the tool
 
 
 class SENDER_TYPES(Enum):

{lollms_client-0.20.2.dist-info → lollms_client-0.20.3.dist-info}/METADATA

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

{lollms_client-0.20.2.dist-info → lollms_client-0.20.3.dist-info}/RECORD

@@ -23,9 +23,9 @@ examples/personality_test/chat_test.py,sha256=o2jlpoddFc-T592iqAiA29xk3x27KsdK5D
 examples/personality_test/chat_with_aristotle.py,sha256=4X_fwubMpd0Eq2rCReS2bgVlUoAqJprjkLXk2Jz6pXU,1774
 examples/personality_test/tesks_test.py,sha256=7LIiwrEbva9WWZOLi34fsmCBN__RZbPpxoUOKA_AtYk,1924
 examples/test_local_models/local_chat.py,sha256=slakja2zaHOEAUsn2tn_VmI4kLx6luLBrPqAeaNsix8,456
-lollms_client/__init__.py,sha256=gtclROjgcwwzB6fNJbrrqZ0l5F80i-cDHOAVlLB7P1w,910
+lollms_client/__init__.py,sha256=wRi23qidXTyMK09HNTzeoYEMKhB_7ZImWScltfYgntE,910
 lollms_client/lollms_config.py,sha256=goEseDwDxYJf3WkYJ4IrLXwg3Tfw73CXV2Avg45M_hE,21876
-lollms_client/lollms_core.py,sha256=NErsbmV22p8PPkjYhRyexlEd9WmK2OFSbjXQD3jk5cE,114308
+lollms_client/lollms_core.py,sha256=iKvH20tckzdYLlIpp-srWswdI4lb0vo5po7xo3Ogsgk,114865
 lollms_client/lollms_discussion.py,sha256=EV90dIgw8a-f-82vB2GspR60RniYz7WnBmAWSIg5mW0,2158
 lollms_client/lollms_js_analyzer.py,sha256=01zUvuO2F_lnUe_0NLxe1MF5aHE1hO8RZi48mNPv-aw,8361
 lollms_client/lollms_llm_binding.py,sha256=bdElz_IBx0zZ-85YTT1fyY_mSoHo46tKIMiHYJlKCkM,9809
@@ -36,7 +36,7 @@ lollms_client/lollms_tti_binding.py,sha256=afO0-d-Kqsmh8UHTijTvy6dZAt-XDB6R-IHmd
 lollms_client/lollms_ttm_binding.py,sha256=FjVVSNXOZXK1qvcKEfxdiX6l2b4XdGOSNnZ0utAsbDg,4167
 lollms_client/lollms_tts_binding.py,sha256=5cJYECj8PYLJAyB6SEH7_fhHYK3Om-Y3arkygCnZ24o,4342
 lollms_client/lollms_ttv_binding.py,sha256=KkTaHLBhEEdt4sSVBlbwr5i_g_TlhcrwrT-7DjOsjWQ,4131
-lollms_client/lollms_types.py,sha256=cfc1sremM8KR4avkYX99fIVkkdRvXErrCWKGjLrgv50,2723
+lollms_client/lollms_types.py,sha256=CLiodudFgTbuXTGgupDt6IgMvJkrfiOHdw1clx_5UjA,2863
 lollms_client/lollms_utilities.py,sha256=WiG-HHMdo86j3LBndcBQ-PbMqQ8kGKLp1e9WuLDzRVU,7048
 lollms_client/llm_bindings/__init__.py,sha256=9sWGpmWSSj6KQ8H4lKGCjpLYwhnVdL_2N7gXCphPqh4,14
 lollms_client/llm_bindings/llamacpp/__init__.py,sha256=tUdCh00Tcg2VtavM5uRNsAoEkdeHI4p3nFsF9YUcYuk,58402
@@ -75,8 +75,8 @@ lollms_client/tts_bindings/piper_tts/__init__.py,sha256=0IEWG4zH3_sOkSb9WbZzkeV5
 lollms_client/tts_bindings/xtts/__init__.py,sha256=FgcdUH06X6ZR806WQe5ixaYx0QoxtAcOgYo87a2qxYc,18266
 lollms_client/ttv_bindings/__init__.py,sha256=UZ8o2izQOJLQgtZ1D1cXoNST7rzqW22rL2Vufc7ddRc,3141
 lollms_client/ttv_bindings/lollms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lollms_client-0.20.2.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-lollms_client-0.20.2.dist-info/METADATA,sha256=rj4bqIZvMDqNnI1CswGJXPY8opCozNPFjve9-DZ8IFU,13374
-lollms_client-0.20.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lollms_client-0.20.2.dist-info/top_level.txt,sha256=NI_W8S4OYZvJjb0QWMZMSIpOrYzpqwPGYaklhyWKH2w,23
-lollms_client-0.20.2.dist-info/RECORD,,
+lollms_client-0.20.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+lollms_client-0.20.3.dist-info/METADATA,sha256=ShF3nPm1Y3KT9UkJ_3zkA8BudOb8O-zNn9iuo3KxCe4,13374
+lollms_client-0.20.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lollms_client-0.20.3.dist-info/top_level.txt,sha256=NI_W8S4OYZvJjb0QWMZMSIpOrYzpqwPGYaklhyWKH2w,23
+lollms_client-0.20.3.dist-info/RECORD,,