ExternalVendorCode/lollms
1
0
Fork 0
mirror of https://github.com/ParisNeo/lollms.git synced 2025-02-08 03:50:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enhanced function call parsing

Browse Source
This commit is contained in:
Saifeddine ALOUI 2024-06-04 20:24:08 +02:00
parent ae04d81b3e
commit 8174d2724b
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lollms/personality.py
View File

@ -2985,6 +2985,8 @@ The AI should respond in this format using data from actions_list:
except: except:
find_return = int(1e10) find_return = int(1e10)
next_index = min(find_return, find_space) next_index = min(find_return, find_space)
if '{' in sub_text[:next_index]:
next_index =0
start_pos = next_index start_pos = next_index
if code_delimiter_position+3<len(text) and text[code_delimiter_position+3] in ["\n"," ","\t"] : if code_delimiter_position+3<len(text) and text[code_delimiter_position+3] in ["\n"," ","\t"] :
# No # No
@ -3360,18 +3362,19 @@ The AI should respond in this format using data from actions_list:
""" """
results = [] results = []
# Convert function_definitions to a dict for easier lookup # Convert function_definitions to a dict for easier lookup
functions_dict = {func['function_name']: func['function'] for func in function_definitions} functions_dict = {func['function_name']: func for func in function_definitions}
for call in function_calls: for call in function_calls:
function_name = call.get("function_name") function_name = call.get("function_name", None) or call.get("function", None)
parameters = call.get("function_parameters", []) parameters = call.get("function_parameters", [])
function = functions_dict.get(function_name) fn = functions_dict.get(function_name)
if fn:
if function: function = fn['function']
try: try:
# Assuming parameters is a dictionary that maps directly to the function's arguments. # Assuming parameters is a dictionary that maps directly to the function's arguments.
if type(parameters)==list: if type(parameters)==list:
result = function(*parameters) f_parameters ={k['name']:v for k,v in zip(fn['function_parameters'],parameters)}
result = function(**f_parameters)
elif type(parameters)==dict: elif type(parameters)==dict:
result = function(**parameters) result = function(**parameters)
results.append(result) results.append(result)
@ -3449,6 +3452,7 @@ The AI should respond in this format using data from actions_list:
function_descriptions = [ function_descriptions = [
f"{start_header_id_template}Available functions{end_header_id_template}\n", f"{start_header_id_template}Available functions{end_header_id_template}\n",
tools, tools,
"",
cd["conditionning"], cd["conditionning"],
"Your objective is interact with the user and if you need to call a function, then use the available functions above and call them using the following json format inside a markdown tag:" "Your objective is interact with the user and if you need to call a function, then use the available functions above and call them using the following json format inside a markdown tag:"
"```function", "```function",
@ -3486,7 +3490,7 @@ The AI should respond in this format using data from actions_list:
# Filter out and parse JSON entries. # Filter out and parse JSON entries.
function_calls = [] function_calls = []
for block in code_blocks: for block in code_blocks:
if block["type"]=="function" or block["type"]=="json": if block["type"]=="function" or block["type"]=="json" or block["type"]=="":
content = block.get("content", "") content = block.get("content", "")
try: try:
# Attempt to parse the JSON content of the code block. # Attempt to parse the JSON content of the code block.
@ -3525,7 +3529,11 @@ The AI should respond in this format using data from actions_list:
out, function_calls = self.generate_with_function_calls(context_details, function_definitions, callback=callback) out, function_calls = self.generate_with_function_calls(context_details, function_definitions, callback=callback)
if len(function_calls)>0: if len(function_calls)>0:
if hide_function_call: if hide_function_call:
self.full("") #Hide function call self.full("") #Hide function
if self.config.debug:
self.print_prompt("Function calls", json.dumps(function_calls, indent=4))
outputs = self.execute_function_calls(function_calls,function_definitions) outputs = self.execute_function_calls(function_calls,function_definitions)
final_output = "\n".join([str(o) if type(o)==str else str(o[0]) if (type(o)==tuple or type(0)==list) and len(o)>0 else "" for o in outputs]) final_output = "\n".join([str(o) if type(o)==str else str(o[0]) if (type(o)==tuple or type(0)==list) and len(o)>0 else "" for o in outputs])
out += f"{separator_template}{start_header_id_template}function calls results{end_header_id_template}\n" + final_output out += f"{separator_template}{start_header_id_template}function calls results{end_header_id_template}\n" + final_output