mirror of
https://github.com/ParisNeo/lollms.git
synced 2024-12-18 20:27:58 +00:00
Upgraded coding system
This commit is contained in:
Saifeddine ALOUI
parent
d259103fdf
commit
759810a349
@ -252,11 +252,6 @@ class LollmsApplication(LoLLMsCom):
|
||||
|
||||
|
||||
def add_discussion_to_skills_library(self, client: Client):
|
||||
end_header_id_template = self.config.end_header_id_template
|
||||
separator_template = self.config.separator_template
|
||||
system_message_template = self.config.system_message_template
|
||||
|
||||
|
||||
messages = client.discussion.get_messages()
|
||||
|
||||
# Extract relevant information from messages
|
||||
@ -269,21 +264,19 @@ class LollmsApplication(LoLLMsCom):
|
||||
self.tasks_library.callback = bk_cb
|
||||
|
||||
# Generate title
|
||||
title_prompt = f"{separator_template}".join([
|
||||
f"{self.start_header_id_template}{system_message_template}{end_header_id_template}Generate a concise and descriptive title for the following content.",
|
||||
"The title should summarize the main topic or subject of the content.",
|
||||
"Do not mention the format of the content (e.g., bullet points, discussion, etc.) in the title.",
|
||||
"Provide only the title without any additional explanations or context.",
|
||||
f"{self.start_header_id_template}content{end_header_id_template}",
|
||||
f"{content}",
|
||||
f"{self.start_header_id_template}title{end_header_id_template}"
|
||||
title_prompt = f"{self.separator_template}".join([
|
||||
f"{self.system_full_header}Generate a concise and descriptive title and category for the following content:",
|
||||
content
|
||||
])
|
||||
|
||||
title = self._generate_text(title_prompt)
|
||||
|
||||
# Determine category
|
||||
category_prompt = f"{self.system_full_header}Analyze the following title, and determine the most appropriate generic category that encompasses the main subject or theme. The category should be broad enough to include multiple related skill entries. Provide only the category name without any additional explanations or context:\n\nTitle:\n{title}\n{separator_template}{self.start_header_id_template}Category:\n"
|
||||
category = self._generate_text(category_prompt)
|
||||
template = f"{self.separator_template}".join([
|
||||
"{",
|
||||
' "title":"here you put the title"',
|
||||
' "category":"here you put the category"',
|
||||
"}"])
|
||||
language = "json"
|
||||
title_category_json = json.loads(self._generate_code(title_prompt, template, language))
|
||||
title = title_category_json["title"]
|
||||
category = title_category_json["category"]
|
||||
|
||||
# Add entry to skills library
|
||||
self.skills_library.add_entry(1, category, title, content)
|
||||
@ -319,6 +312,10 @@ class LollmsApplication(LoLLMsCom):
|
||||
generated_text = self.model.generate(prompt, max_tokens)
|
||||
return generated_text.strip()
|
||||
|
||||
def _generate_code(self, prompt, template, language):
|
||||
max_tokens = min(self.config.ctx_size - self.model.get_nb_tokens(prompt),self.config.max_n_predict if self.config.max_n_predict else self.config.ctx_size- self.model.get_nb_tokens(prompt))
|
||||
generated_code = self.personality.generate_code(prompt, self.personality.image_files, template, language, max_size= max_tokens)
|
||||
return generated_code
|
||||
|
||||
def get_uploads_path(self, client_id):
|
||||
return self.lollms_paths.personal_uploads_path
|
||||
@ -888,7 +885,7 @@ class LollmsApplication(LoLLMsCom):
|
||||
def recover_discussion(self,client_id, message_index=-1):
|
||||
messages = self.session.get_client(client_id).discussion.get_messages()
|
||||
discussion=""
|
||||
for msg in messages:
|
||||
for msg in messages[:-1]:
|
||||
if message_index!=-1 and msg>message_index:
|
||||
break
|
||||
discussion += "\n" + self.config.discussion_prompt_separator + msg.sender + ": " + msg.content.strip()
|
||||
@ -1252,17 +1249,12 @@ class LollmsApplication(LoLLMsCom):
|
||||
if discussion is None:
|
||||
discussion = self.recover_discussion(client_id)
|
||||
self.personality.step_start("Building query")
|
||||
query = self.personality.generate_code(f"""{self.system_full_header}
|
||||
Your task is to carefully read the provided discussion and reformulate {self.config.user_name}'s request concisely.
|
||||
The reformulation must be placed inside a json markdown tag like this:
|
||||
```json
|
||||
{{
|
||||
"request": the reformulated request
|
||||
}}
|
||||
```
|
||||
{self.system_custom_header("discussion:")}
|
||||
query = self.personality.generate_code(f"""Your task is to carefully read the provided discussion and reformulate {self.config.user_name}'s request concisely.
|
||||
{self.system_custom_header("discussion")}
|
||||
{discussion[-2048:]}
|
||||
{self.system_custom_header("search query:")}""", callback=self.personality.sink)
|
||||
""", template="""{
|
||||
"request": "the reformulated request"
|
||||
}""", callback=self.personality.sink)
|
||||
query_code = json.loads(query)
|
||||
query = query_code["request"]
|
||||
self.personality.step_end("Building query")
|
||||
|
||||
@ -43,13 +43,18 @@ from lollms.com import LoLLMsCom
|
||||
from lollms.helpers import trace_exception
|
||||
from lollms.utilities import PackageManager
|
||||
|
||||
import pipmaster as pm
|
||||
import inspect
|
||||
|
||||
from lollms.code_parser import compress_js, compress_python, compress_html
|
||||
|
||||
import requests
|
||||
from bs4 import BeautifulSoup
|
||||
import pipmaster as pm
|
||||
if not pm.is_installed("PyQt5"):
|
||||
pm.install("PyQt5")
|
||||
|
||||
import sys
|
||||
from PyQt5.QtWidgets import QApplication, QLineEdit, QButtonGroup, QRadioButton, QVBoxLayout, QWidget, QMessageBox
|
||||
|
||||
def get_element_id(url, text):
|
||||
response = requests.get(url)
|
||||
@ -721,17 +726,100 @@ class AIPersonality:
|
||||
|
||||
return gen
|
||||
|
||||
def generate_codes(self, prompt, max_size = None, temperature = None, top_k = None, top_p=None, repeat_penalty=None, repeat_last_n=None, callback=None, debug=False ):
|
||||
def generate_codes(
|
||||
self,
|
||||
prompt,
|
||||
images=[],
|
||||
template=None,
|
||||
language="json",
|
||||
code_tag_format="markdown", # or "html"
|
||||
max_size = None,
|
||||
temperature = None,
|
||||
top_k = None,
|
||||
top_p=None,
|
||||
repeat_penalty=None,
|
||||
repeat_last_n=None,
|
||||
callback=None,
|
||||
debug=False,
|
||||
return_full_generated_code=False,
|
||||
):
|
||||
response_full = ""
|
||||
full_prompt = f"""{self.system_full_header}Act as code generation assistant who answers with a single code tag content.
|
||||
{prompt}
|
||||
Make sure only a single code tag is generated at each dialogue turn.
|
||||
"""
|
||||
if template:
|
||||
full_prompt += "Here is a template of the answer:\n"
|
||||
if code_tag_format=="markdown":
|
||||
full_prompt += f"""```{language}
|
||||
{template}
|
||||
```
|
||||
The generated code must be placed inside the markdown code tag.
|
||||
"""
|
||||
elif code_tag_format=="html":
|
||||
full_prompt +=f"""<code language="{language}">
|
||||
{template}
|
||||
</code>
|
||||
The generated code must be placed inside the html code tag.
|
||||
"""
|
||||
|
||||
full_prompt += self.ai_custom_header("assistant")
|
||||
if len(self.image_files)>0:
|
||||
response = self.generate_with_images(self.system_custom_header("Generation infos")+ "Generated code must be put inside the adequate markdown code tag. Use this template:\n```language name\nCode\n```\n" + self.separator_template + prompt, self.image_files, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response = self.generate_with_images(full_prompt, self.image_files, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
elif len(images)>0:
|
||||
response = self.generate_with_images(full_prompt, images, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
else:
|
||||
response = self.generate(self.system_custom_header("Generation infos")+ "Generated code must be put inside the adequate markdown code tag. Use this template:\n```language name\nCode\n```\n" + self.separator_template + prompt, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response = self.generate(full_prompt, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response_full += response
|
||||
codes = self.extract_code_blocks(response)
|
||||
if return_full_generated_code:
|
||||
return codes, response_full
|
||||
else:
|
||||
return codes
|
||||
|
||||
def generate_code(self, prompt, images=[], max_size = None, temperature = None, top_k = None, top_p=None, repeat_penalty=None, repeat_last_n=None, callback=None, debug=False, return_full_generated_code=False, accept_all_if_no_code_tags_is_present=False, max_continues=5):
|
||||
def generate_code(
|
||||
self,
|
||||
prompt,
|
||||
images=[],
|
||||
template=None,
|
||||
language="json",
|
||||
code_tag_format="markdown", # or "html"
|
||||
max_size = None,
|
||||
temperature = None,
|
||||
top_k = None,
|
||||
top_p=None,
|
||||
repeat_penalty=None,
|
||||
repeat_last_n=None,
|
||||
callback=None,
|
||||
debug=False,
|
||||
return_full_generated_code=False,
|
||||
accept_all_if_no_code_tags_is_present=False,
|
||||
max_continues=5
|
||||
):
|
||||
response_full = ""
|
||||
full_prompt = self.system_custom_header("Generation infos")+ "Generated code must be put inside the adequate markdown code tag. Use this template:\n```language name\nCode\n```\nMake sure only a single code tag is generated at each dialogue turn." + self.separator_template + self.system_custom_header("User prompt")+ prompt + self.separator_template + self.ai_custom_header("generated code")
|
||||
full_prompt = f"""{self.system_full_header}Act as a code generation assistant who answers with a single code tag content.
|
||||
{self.system_custom_header("user")}
|
||||
{prompt}
|
||||
Make sure only a single code tag is generated at each dialogue turn.
|
||||
"""
|
||||
if template:
|
||||
full_prompt += "Here is a template of the answer:\n"
|
||||
if code_tag_format=="markdown":
|
||||
full_prompt += f"""You must answer with the code placed inside the markdown code tag like this:
|
||||
```{language}
|
||||
{template}
|
||||
```
|
||||
Don't forget to close the markdown code tag
|
||||
"""
|
||||
elif code_tag_format=="html":
|
||||
full_prompt +=f"""You must answer with the code placed inside the html code tag like this:
|
||||
<code language="{language}">
|
||||
{template}
|
||||
</code>
|
||||
Don't forget to close the html code tag
|
||||
"""
|
||||
|
||||
full_prompt += self.ai_custom_header("assistant")
|
||||
if len(self.image_files)>0:
|
||||
response = self.generate_with_images(full_prompt, self.image_files, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
elif len(images)>0:
|
||||
@ -771,9 +859,49 @@ class AIPersonality:
|
||||
else:
|
||||
return None
|
||||
|
||||
def generate_text(self, prompt, images=[], max_size = None, temperature = None, top_k = None, top_p=None, repeat_penalty=None, repeat_last_n=None, callback=None, debug=False, return_full_generated_code=False, accept_all_if_no_code_tags_is_present=False):
|
||||
|
||||
def generate_text(
|
||||
self,
|
||||
prompt,
|
||||
images=[],
|
||||
template=None,
|
||||
code_tag_format="markdown", # or "html"
|
||||
max_size = None,
|
||||
temperature = None,
|
||||
top_k = None,
|
||||
top_p=None,
|
||||
repeat_penalty=None,
|
||||
repeat_last_n=None,
|
||||
callback=None,
|
||||
debug=False,
|
||||
return_full_generated_code=False,
|
||||
accept_all_if_no_code_tags_is_present=False,
|
||||
max_continues=5
|
||||
):
|
||||
response_full = ""
|
||||
full_prompt = self.system_custom_header("Generation infos")+ "Generated text content must be put inside a markdown code tag. Use this template:\n```\nText\n```\nMake sure only a single text tag is generated at each dialogue turn." + self.separator_template + self.system_custom_header("User prompt")+ prompt + self.separator_template + self.ai_custom_header("generated answer")
|
||||
full_prompt = f"""{self.system_full_header}Act as a json generation assistant who answers with a single json code tag content.
|
||||
{self.system_custom_header("user")}
|
||||
{prompt}
|
||||
Make sure only a single code tag is generated at each dialogue turn.
|
||||
"""
|
||||
if template:
|
||||
full_prompt += "Here is a template of the answer:\n"
|
||||
if code_tag_format=="markdown":
|
||||
full_prompt += f"""You must answer with the code placed inside the markdown code tag like this:
|
||||
```json
|
||||
{template}
|
||||
```
|
||||
Don't forget to close the markdown code tag
|
||||
"""
|
||||
elif code_tag_format=="html":
|
||||
full_prompt +=f"""You must answer with the code placed inside the html code tag like this:
|
||||
<code language="json">
|
||||
{template}
|
||||
</code>
|
||||
Don't forget to close the html code tag
|
||||
"""
|
||||
|
||||
full_prompt += self.ai_custom_header("assistant")
|
||||
if len(self.image_files)>0:
|
||||
response = self.generate_with_images(full_prompt, self.image_files, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
elif len(images)>0:
|
||||
@ -790,8 +918,9 @@ class AIPersonality:
|
||||
if len(codes)>0:
|
||||
if not codes[-1]["is_complete"]:
|
||||
code = "\n".join(codes[-1]["content"].split("\n")[:-1])
|
||||
while not codes[-1]["is_complete"]:
|
||||
response = self.generate(prompt+code+self.user_full_header+"continue the text. Start from last line and continue the text. Put the text inside a markdown code tag."+self.separator_template+self.ai_full_header, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
nb_continues = 0
|
||||
while not codes[-1]["is_complete"] and nb_continues<max_continues:
|
||||
response = self.generate(full_prompt+code+self.user_full_header+"continue the code. Start from last line and continue the code. Put the code inside a markdown code tag."+self.separator_template+self.ai_full_header, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response_full += response
|
||||
codes = self.extract_code_blocks(response)
|
||||
if len(codes)==0:
|
||||
@ -801,6 +930,7 @@ class AIPersonality:
|
||||
code +="\n"+ "\n".join(codes[-1]["content"].split("\n")[:-1])
|
||||
else:
|
||||
code +="\n"+ "\n".join(codes[-1]["content"].split("\n"))
|
||||
nb_continues += 1
|
||||
else:
|
||||
code = codes[-1]["content"]
|
||||
|
||||
@ -813,9 +943,10 @@ class AIPersonality:
|
||||
|
||||
def generate_structured_content(self,
|
||||
prompt,
|
||||
template,
|
||||
images = [],
|
||||
template = {},
|
||||
single_shot=False,
|
||||
output_format="yaml"):
|
||||
output_format="json"):
|
||||
"""
|
||||
Generate structured content (YAML/JSON) either in single-shot or step-by-step mode.
|
||||
|
||||
@ -836,26 +967,25 @@ class AIPersonality:
|
||||
|
||||
if single_shot:
|
||||
# Generate all content at once for powerful LLMs
|
||||
full_prompt = f"""Generate {output_format.upper()} content for: {prompt}
|
||||
Use this structure:
|
||||
{output_data}
|
||||
full_prompt = f"""Generate {output_format} content for: {prompt}
|
||||
"""
|
||||
if self.config.debug and not self.processor:
|
||||
ASCIIColors.highlight(full_prompt,"source_document_title", ASCIIColors.color_yellow, ASCIIColors.color_red, False)
|
||||
|
||||
response = self.generate_code(full_prompt, callback=self.sink, accept_all_if_no_code_tags_is_present=True)
|
||||
if output_format=="yaml":
|
||||
output_data = yaml.dumps(output_data)
|
||||
|
||||
code = self.generate_code(full_prompt, images, output_data, output_format, callback=self.sink, accept_all_if_no_code_tags_is_present=True)
|
||||
# Parse the response based on format
|
||||
if output_format == "yaml":
|
||||
try:
|
||||
cleaned_response = response.replace("```yaml", "").replace("```", "").strip()
|
||||
output_data = yaml.safe_load(cleaned_response)
|
||||
output_data = yaml.safe_load(code)
|
||||
except yaml.YAMLError:
|
||||
# If parsing fails, fall back to step-by-step
|
||||
single_shot = False
|
||||
elif output_format == "json":
|
||||
try:
|
||||
cleaned_response = response.replace("```json", "").replace("```", "").strip()
|
||||
output_data = json.loads(cleaned_response)
|
||||
output_data = json.loads(code)
|
||||
except json.JSONDecodeError:
|
||||
# If parsing fails, fall back to step-by-step
|
||||
single_shot = False
|
||||
@ -865,12 +995,10 @@ Use this structure:
|
||||
for field, field_info in template.items():
|
||||
if "prompt" in field_info:
|
||||
field_prompt = field_info["prompt"].format(main_prompt=prompt)
|
||||
response = self.generate_code(field_prompt, callback=self.sink, accept_all_if_no_code_tags_is_present=True )
|
||||
# Clean up the response
|
||||
cleaned_response = response.strip()
|
||||
code = self.generate_code(field_prompt, images, output_data, callback=self.sink, accept_all_if_no_code_tags_is_present=True )
|
||||
# Apply any field-specific processing
|
||||
if "processor" in field_info:
|
||||
cleaned_response = field_info["processor"](cleaned_response)
|
||||
cleaned_response = field_info["processor"](code)
|
||||
output_data[field] = cleaned_response
|
||||
|
||||
# Format the output string
|
||||
@ -3002,113 +3130,79 @@ class APScript(StateMachine):
|
||||
codes = self.extract_code_blocks(response)
|
||||
return codes
|
||||
|
||||
def generate_code(self, prompt, images=[], max_size = None, temperature = None, top_k = None, top_p=None, repeat_penalty=None, repeat_last_n=None, callback=None, debug=False, return_full_generated_code=False, accept_all_if_no_code_tags_is_present=False):
|
||||
response_full = ""
|
||||
full_prompt = f"""{self.system_custom_header("system")}You are a code generation assistant.
|
||||
Your objective is to generate code as requested by the user and format the output as markdown.
|
||||
Generated code must be put inside the adequate markdown code tag.
|
||||
Use this code generation template:
|
||||
```language name (ex: python, json, javascript...)
|
||||
Code
|
||||
```
|
||||
Make sure only a single code tag is generated at each dialogue turn.
|
||||
{self.separator_template}{self.system_custom_header("user")}{prompt}
|
||||
{self.separator_template}{self.ai_custom_header("assistant")}"""
|
||||
if self.config.debug:
|
||||
ASCIIColors.red("Generation request prompt:")
|
||||
ASCIIColors.yellow(full_prompt)
|
||||
if len(self.personality.image_files)>0:
|
||||
response = self.personality.generate_with_images(full_prompt, self.personality.image_files, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
elif len(images)>0:
|
||||
response = self.personality.generate_with_images(full_prompt, images, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
else:
|
||||
response = self.personality.generate(full_prompt, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response_full += response
|
||||
codes = self.extract_code_blocks(response)
|
||||
if self.config.debug:
|
||||
ASCIIColors.red("Generated codes:")
|
||||
ASCIIColors.green(codes)
|
||||
if len(codes)==0 and accept_all_if_no_code_tags_is_present:
|
||||
if return_full_generated_code:
|
||||
return response, response_full
|
||||
else:
|
||||
return response
|
||||
if len(codes)>0:
|
||||
if not codes[-1]["is_complete"]:
|
||||
code = "\n".join(codes[-1]["content"].split("\n")[:-1])
|
||||
while not codes[-1]["is_complete"]:
|
||||
response = self.personality.generate(prompt+code+self.user_full_header+"continue the code. Start from last line and continue the code. Put the code inside a markdown code tag."+self.separator_template+self.ai_full_header, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response_full += response
|
||||
codes = self.extract_code_blocks(response)
|
||||
if len(codes)==0:
|
||||
break
|
||||
else:
|
||||
if not codes[-1]["is_complete"]:
|
||||
code +="\n"+ "\n".join(codes[-1]["content"].split("\n")[:-1])
|
||||
else:
|
||||
code +="\n"+ "\n".join(codes[-1]["content"].split("\n"))
|
||||
else:
|
||||
code = codes[-1]["content"]
|
||||
|
||||
if return_full_generated_code:
|
||||
return code, response_full
|
||||
else:
|
||||
return code
|
||||
else:
|
||||
if return_full_generated_code:
|
||||
return None, None
|
||||
else:
|
||||
return None
|
||||
|
||||
def generate_text(self, prompt, images=[], max_size = None, temperature = None, top_k = None, top_p=None, repeat_penalty=None, repeat_last_n=None, callback=None, debug=False, return_full_generated_code=False, accept_all_if_no_code_tags_is_present=False):
|
||||
response_full = ""
|
||||
full_prompt = f"""
|
||||
{self.system_custom_header("system")}
|
||||
You are a text generation assistant.
|
||||
Generated text content must be put inside a markdown code tag.
|
||||
Use this template:
|
||||
```
|
||||
Text
|
||||
```
|
||||
Make sure only a single text tag is generated at each dialogue turn.
|
||||
{self.separator_template}{self.system_custom_header("User prompt")}{prompt}
|
||||
{self.separator_template}{self.ai_custom_header("assistant")}"""
|
||||
if len(self.personality.image_files)>0:
|
||||
response = self.personality.generate_with_images(full_prompt, self.personality.image_files, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
elif len(images)>0:
|
||||
response = self.personality.generate_with_images(full_prompt, images, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
else:
|
||||
response = self.personality.generate(full_prompt, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response_full += response
|
||||
codes = self.extract_code_blocks(response)
|
||||
if len(codes)==0 and accept_all_if_no_code_tags_is_present:
|
||||
if return_full_generated_code:
|
||||
return response, response_full
|
||||
else:
|
||||
return response
|
||||
if len(codes)>0:
|
||||
if not codes[-1]["is_complete"]:
|
||||
code = "\n".join(codes[-1]["content"].split("\n")[:-1])
|
||||
while not codes[-1]["is_complete"]:
|
||||
response = self.personality.generate(prompt+code+self.user_full_header+"continue the text. Start from last line and continue the text. Put the text inside a markdown code tag."+self.separator_template+self.ai_full_header, max_size, temperature, top_k, top_p, repeat_penalty, repeat_last_n, callback, debug=debug)
|
||||
response_full += response
|
||||
codes = self.extract_code_blocks(response)
|
||||
if len(codes)==0:
|
||||
break
|
||||
else:
|
||||
if not codes[-1]["is_complete"]:
|
||||
code +="\n"+ "\n".join(codes[-1]["content"].split("\n")[:-1])
|
||||
else:
|
||||
code +="\n"+ "\n".join(codes[-1]["content"].split("\n"))
|
||||
else:
|
||||
code = codes[-1]["content"]
|
||||
def generate_code(
|
||||
self,
|
||||
prompt,
|
||||
images=[],
|
||||
template=None,
|
||||
language="json",
|
||||
code_tag_format="markdown", # or "html"
|
||||
max_size = None,
|
||||
temperature = None,
|
||||
top_k = None,
|
||||
top_p=None,
|
||||
repeat_penalty=None,
|
||||
repeat_last_n=None,
|
||||
callback=None,
|
||||
debug=False,
|
||||
return_full_generated_code=False,
|
||||
accept_all_if_no_code_tags_is_present=False,
|
||||
max_continues=5
|
||||
):
|
||||
return self.personality.generate_code(prompt,
|
||||
images,
|
||||
template,
|
||||
language,
|
||||
code_tag_format, # or "html"
|
||||
max_size,
|
||||
temperature,
|
||||
top_k,
|
||||
top_p,
|
||||
repeat_penalty,
|
||||
repeat_last_n,
|
||||
callback,
|
||||
debug,
|
||||
return_full_generated_code,
|
||||
accept_all_if_no_code_tags_is_present,
|
||||
max_continues
|
||||
)
|
||||
|
||||
if return_full_generated_code:
|
||||
return code, response_full
|
||||
else:
|
||||
return code
|
||||
else:
|
||||
return None
|
||||
def generate_text(
|
||||
self,
|
||||
prompt,
|
||||
images=[],
|
||||
template=None,
|
||||
code_tag_format="markdown", # or "html"
|
||||
max_size = None,
|
||||
temperature = None,
|
||||
top_k = None,
|
||||
top_p=None,
|
||||
repeat_penalty=None,
|
||||
repeat_last_n=None,
|
||||
callback=None,
|
||||
debug=False,
|
||||
return_full_generated_code=False,
|
||||
accept_all_if_no_code_tags_is_present=False,
|
||||
max_continues=5
|
||||
):
|
||||
return self.personality.generate_text(prompt,
|
||||
images,
|
||||
template,
|
||||
code_tag_format, # or "html"
|
||||
max_size,
|
||||
temperature,
|
||||
top_k,
|
||||
top_p,
|
||||
repeat_penalty,
|
||||
repeat_last_n,
|
||||
callback,
|
||||
debug,
|
||||
return_full_generated_code,
|
||||
accept_all_if_no_code_tags_is_present,
|
||||
max_continues
|
||||
)
|
||||
|
||||
def generate_structured_content(self,
|
||||
prompt,
|
||||
@ -3131,42 +3225,33 @@ Make sure only a single text tag is generated at each dialogue turn.
|
||||
# Initialize the output dictionary with default values
|
||||
output_data = {}
|
||||
for field, field_info in template.items():
|
||||
output_data[field] = field_info.get("default", "")
|
||||
output_data[field] = field_info.get("default", f'[{field_info.get(f"prompt","")}]')
|
||||
|
||||
if single_shot:
|
||||
# Generate all content at once for powerful LLMs
|
||||
full_prompt = f"Generate {output_format.lower()} content for: {prompt}"
|
||||
if output_format=="yaml":
|
||||
full_prompt = f"""Generate {output_format.upper()} content for: {prompt}
|
||||
Use this structure:
|
||||
```yaml
|
||||
{yaml.dump(output_data, default_flow_style=False)}
|
||||
```
|
||||
template = f"""{yaml.dump(output_data, default_flow_style=False)}
|
||||
"""
|
||||
elif output_format=="json":
|
||||
full_prompt = f"""Generate {output_format.lower()} content for: {prompt}
|
||||
Use this structure:
|
||||
```json
|
||||
{json.dumps(output_data)}
|
||||
```
|
||||
template = f"""{json.dumps(output_data)}
|
||||
"""
|
||||
if self.config.debug:
|
||||
ASCIIColors.green(full_prompt)
|
||||
if self.config.debug and not self.personality.processor:
|
||||
ASCIIColors.highlight(full_prompt,"source_document_title", ASCIIColors.color_yellow, ASCIIColors.color_red, False)
|
||||
|
||||
response = self.generate_code(full_prompt, callback=self.sink, accept_all_if_no_code_tags_is_present=True)
|
||||
code = self.generate_code(full_prompt, self.personality.image_files, template, language=output_format, callback=self.sink, accept_all_if_no_code_tags_is_present=True)
|
||||
# Parse the response based on format
|
||||
if output_format == "yaml":
|
||||
try:
|
||||
cleaned_response = response.replace("```yaml", "").replace("```", "").strip()
|
||||
output_data = yaml.safe_load(cleaned_response)
|
||||
output_data = yaml.safe_load(code)
|
||||
except yaml.YAMLError:
|
||||
# If parsing fails, fall back to step-by-step
|
||||
single_shot = False
|
||||
elif output_format == "json":
|
||||
try:
|
||||
cleaned_response = response.replace("```json", "").replace("```", "").strip()
|
||||
output_data = json.loads(cleaned_response)
|
||||
output_data = json.loads(code)
|
||||
except json.JSONDecodeError:
|
||||
# If parsing fails, fall back to step-by-step
|
||||
single_shot = False
|
||||
@ -3176,9 +3261,13 @@ Use this structure:
|
||||
for field, field_info in template.items():
|
||||
if "prompt" in field_info:
|
||||
field_prompt = field_info["prompt"].format(main_prompt=prompt)
|
||||
response = self.generate_text(field_prompt, callback=self.sink, accept_all_if_no_code_tags_is_present=True )
|
||||
template = f"""{{
|
||||
"{field}": [The value of {field}]
|
||||
}}
|
||||
"""
|
||||
code = self.generate_code(field_prompt, self.personality.image_files, template, "json", callback=self.sink, accept_all_if_no_code_tags_is_present=True )
|
||||
# Clean up the response
|
||||
cleaned_response = response.strip()
|
||||
cleaned_response = json.loads(code)[field]
|
||||
# Apply any field-specific processing
|
||||
if "processor" in field_info:
|
||||
cleaned_response = field_info["processor"](cleaned_response)
|
||||
@ -4401,28 +4490,20 @@ transition-all duration-300 ease-in-out">
|
||||
def build_and_execute_python_code(self,context, instructions, execution_function_signature, extra_imports=""):
|
||||
start_header_id_template = self.config.start_header_id_template
|
||||
end_header_id_template = self.config.end_header_id_template
|
||||
system_message_template = self.config.system_message_template
|
||||
|
||||
code = "```python\n"+self.fast_gen(
|
||||
self.build_prompt([
|
||||
f"{start_header_id_template}context{end_header_id_template}",
|
||||
code = self.generate_code(self.build_prompt([
|
||||
self.system_custom_header('context'),
|
||||
context,
|
||||
f"{start_header_id_template}{system_message_template}{end_header_id_template}",
|
||||
self.system_full_header,
|
||||
f"{instructions}",
|
||||
f"Here is the signature of the function:\n{execution_function_signature}",
|
||||
"Don't call the function, just write it",
|
||||
"Do not provide usage example.",
|
||||
"The code must me without comments",
|
||||
f"{start_header_id_template}coder{end_header_id_template}Sure, in the following code, I import the necessary libraries, then define the function as you asked.",
|
||||
"The function is ready to be used in your code and performs the task as you asked:",
|
||||
"```python\n"
|
||||
],2), callback=self.sink)
|
||||
code = code.replace("```python\n```python\n", "```python\n").replace("```\n```","```")
|
||||
code=self.extract_code_blocks(code)
|
||||
],2), self.personality.image_files, execution_function_signature, "python")
|
||||
|
||||
|
||||
if len(code)>0:
|
||||
# Perform the search query
|
||||
code = code[0]["content"]
|
||||
code = code["content"]
|
||||
code = "\n".join([
|
||||
extra_imports,
|
||||
code
|
||||
@ -4448,7 +4529,7 @@ transition-all duration-300 ease-in-out">
|
||||
"""
|
||||
return self.multichoice_question(question, ["no","yes"], context, max_answer_length, conditionning=conditionning)>0
|
||||
|
||||
def multichoice_question(self, question: str, possible_answers:list, context:str = "", max_answer_length: int = 50, conditionning="") -> int:
|
||||
def multichoice_question(self, question: str, possible_answers:list, context:str = "", max_answer_length: int = 1024, conditionning="", return_justification=False) -> int:
|
||||
"""
|
||||
Interprets a multi-choice question from a users response. This function expects only one choice as true. All other choices are considered false. If none are correct, returns -1.
|
||||
|
||||
@ -4463,37 +4544,44 @@ transition-all duration-300 ease-in-out">
|
||||
"""
|
||||
choices = "\n".join([f"{i}. {possible_answer}" for i, possible_answer in enumerate(possible_answers)])
|
||||
elements = [conditionning] if conditionning!="" else []
|
||||
elements += [
|
||||
f"{self.system_full_header}",
|
||||
"Answer this multi choices question in form of a json in this form:\n",
|
||||
"""```json
|
||||
{
|
||||
"justification": "A justification for your choice",
|
||||
"choice_index": the index of the choice made
|
||||
}
|
||||
```
|
||||
""",
|
||||
]
|
||||
if context!="":
|
||||
elements+=[
|
||||
self.system_custom_header("Context"),
|
||||
self.system_custom_header("context"),
|
||||
f"{context}",
|
||||
]
|
||||
elements += [
|
||||
"Answer this multi choices question about the context:\n",
|
||||
]
|
||||
elements += [
|
||||
self.system_custom_header("question"),
|
||||
question,
|
||||
self.system_custom_header("possible answers"),
|
||||
f"{choices}",
|
||||
]
|
||||
elements += [self.system_custom_header("answer")]
|
||||
prompt = self.build_prompt(elements)
|
||||
|
||||
code = self.generate_code(prompt, self.personality.image_files, max_answer_length, temperature=0.1, top_k=50, top_p=0.9, repeat_penalty=1.0, repeat_last_n=50, callback=self.sink).strip().replace("</s>","").replace("<s>","")
|
||||
code = self.generate_code(
|
||||
prompt,
|
||||
self.personality.image_files,"""{
|
||||
"choice_index": [an int representing the index of the choice made]
|
||||
"justification": "[Justify the choice]",
|
||||
}""",
|
||||
max_size= max_answer_length,
|
||||
temperature=0.1,
|
||||
top_k=50,
|
||||
top_p=0.9,
|
||||
repeat_penalty=1.0,
|
||||
repeat_last_n=50,
|
||||
callback=self.sink
|
||||
)
|
||||
if len(code)>0:
|
||||
json_code = json.loads(code)
|
||||
selection = json_code["choice_index"]
|
||||
self.print_prompt("Multi choice selection",prompt+code)
|
||||
try:
|
||||
if return_justification:
|
||||
return int(selection), json_code["justification"]
|
||||
else:
|
||||
return int(selection)
|
||||
except:
|
||||
ASCIIColors.cyan("Model failed to answer the question")
|
||||
@ -4608,58 +4696,71 @@ transition-all duration-300 ease-in-out">
|
||||
if callback:
|
||||
callback(step_text, MSG_OPERATION_TYPE.MSG_OPERATION_TYPE_STEP_PROGRESS, {'progress':progress})
|
||||
|
||||
|
||||
def ask_user(self, question):
|
||||
import tkinter as tk
|
||||
from tkinter import simpledialog
|
||||
root = tk.Tk()
|
||||
root.withdraw() # Hide the main window
|
||||
|
||||
answer = simpledialog.askstring("Input", question, parent=root)
|
||||
|
||||
root.destroy() # Ensure the hidden root window is properly closed
|
||||
|
||||
try:
|
||||
app = QApplication(sys.argv)
|
||||
input_field = QLineEdit(question)
|
||||
input_field.setWindowTitle("Input")
|
||||
input_field.exec_()
|
||||
answer = input_field.text()
|
||||
input_field.deleteLater()
|
||||
return answer
|
||||
except:
|
||||
ASCIIColors.warning(question)
|
||||
|
||||
def ask_user_yes_no(self, question):
|
||||
import tkinter as tk
|
||||
from tkinter import messagebox
|
||||
root = tk.Tk()
|
||||
root.withdraw() # Hide the main window
|
||||
try:
|
||||
app = QApplication(sys.argv)
|
||||
msg = QMessageBox()
|
||||
msg.setIcon(QMessageBox.Question)
|
||||
msg.setText(question)
|
||||
msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
|
||||
response = msg.exec_()
|
||||
return response == QMessageBox.Yes
|
||||
except:
|
||||
print(question)
|
||||
|
||||
response = messagebox.askyesno("Question", question)
|
||||
|
||||
root.destroy() # Ensure the hidden root window is properly closed
|
||||
|
||||
return response
|
||||
def ask_user_multichoice_question(self, question, choices, default=None):
|
||||
import tkinter as tk
|
||||
from tkinter import ttk
|
||||
try:
|
||||
app = QApplication(sys.argv)
|
||||
window = QWidget()
|
||||
layout = QVBoxLayout()
|
||||
window.setLayout(layout)
|
||||
|
||||
label = QLabel(question)
|
||||
layout.addWidget(label)
|
||||
|
||||
button_group = QButtonGroup()
|
||||
for i, choice in enumerate(choices):
|
||||
button = QRadioButton(choice)
|
||||
button_group.addButton(button)
|
||||
layout.addWidget(button)
|
||||
|
||||
if default is not None:
|
||||
for button in button_group.buttons():
|
||||
if button.text() == default:
|
||||
button.setChecked(True)
|
||||
break
|
||||
|
||||
def on_ok():
|
||||
nonlocal result
|
||||
result = var.get()
|
||||
root.quit()
|
||||
result = [button.text() for button in button_group.buttons() if button.isChecked()]
|
||||
window.close()
|
||||
|
||||
root = tk.Tk()
|
||||
root.title("Question")
|
||||
|
||||
frame = ttk.Frame(root, padding="10")
|
||||
frame.grid(row=0, column=0, sticky=(tk.W, tk.E, tk.N, tk.S))
|
||||
|
||||
ttk.Label(frame, text=question).grid(column=0, row=0, sticky=tk.W, pady=5)
|
||||
|
||||
var = tk.StringVar(value=default if default in choices else choices[0])
|
||||
|
||||
for i, choice in enumerate(choices):
|
||||
ttk.Radiobutton(frame, text=choice, variable=var, value=choice).grid(column=0, row=i+1, sticky=tk.W, padx=20)
|
||||
|
||||
ttk.Button(frame, text="OK", command=on_ok).grid(column=0, row=len(choices)+1, pady=10)
|
||||
|
||||
root.protocol("WM_DELETE_WINDOW", on_ok) # Handle window close
|
||||
button = QPushButton("OK")
|
||||
button.clicked.connect(on_ok)
|
||||
layout.addWidget(button)
|
||||
|
||||
window.show()
|
||||
result = None
|
||||
root.mainloop()
|
||||
sys.exit(app.exec_())
|
||||
|
||||
return result
|
||||
except:
|
||||
ASCIIColors.error(question)
|
||||
|
||||
def new_message(self, message_text:str, message_type:MSG_OPERATION_TYPE= MSG_OPERATION_TYPE.MSG_OPERATION_TYPE_SET_CONTENT, metadata=[], callback: Callable[[str, int, dict, list, AIPersonality], bool]=None):
|
||||
"""This sends step rogress to front end
|
||||
|
||||
@ -24,105 +24,115 @@ from functools import partial
|
||||
import os
|
||||
import re
|
||||
import threading
|
||||
|
||||
import pipmaster as pm
|
||||
if not pm.is_installed("PyQt5"):
|
||||
pm.install("PyQt5")
|
||||
|
||||
import sys
|
||||
from PyQt5.QtWidgets import QApplication, QFileDialog, QInputDialog
|
||||
from pathlib import Path
|
||||
from PyQt5.QtCore import Qt
|
||||
from typing import Optional, Dict
|
||||
# ----------------------- Defining router and main class ------------------------------
|
||||
router = APIRouter()
|
||||
lollmsElfServer = LOLLMSElfServer.get_instance()
|
||||
|
||||
|
||||
# Tools
|
||||
|
||||
def open_folder() -> Optional[Path]:
|
||||
"""
|
||||
Opens a folder selection dialog and returns the selected folder path.
|
||||
|
||||
Returns:
|
||||
Optional[Path]: The path of the selected folder or None if no folder was selected.
|
||||
"""
|
||||
import tkinter as tk
|
||||
from tkinter import filedialog
|
||||
try:
|
||||
# Create a new Tkinter root window and hide it
|
||||
root = tk.Tk()
|
||||
root.withdraw()
|
||||
app = QApplication(sys.argv)
|
||||
|
||||
# Make the window appear on top
|
||||
root.attributes('-topmost', True)
|
||||
# Créer une instance de QFileDialog au lieu d'utiliser la méthode statique
|
||||
dialog = QFileDialog()
|
||||
dialog.setOption(QFileDialog.DontUseNativeDialog, True)
|
||||
dialog.setWindowFlag(Qt.WindowStaysOnTopHint, True)
|
||||
dialog.setFileMode(QFileDialog.Directory)
|
||||
dialog.setOption(QFileDialog.ShowDirsOnly, True)
|
||||
|
||||
# Open the folder selection dialog
|
||||
folder_path = filedialog.askdirectory()
|
||||
# Afficher le dialogue et le mettre au premier plan
|
||||
dialog.show()
|
||||
dialog.raise_()
|
||||
dialog.activateWindow()
|
||||
|
||||
# Destroy the root window
|
||||
root.destroy()
|
||||
|
||||
if folder_path:
|
||||
return Path(folder_path)
|
||||
if dialog.exec_() == QFileDialog.Accepted:
|
||||
selected_folder = dialog.selectedFiles()[0]
|
||||
return Path(selected_folder)
|
||||
else:
|
||||
return None
|
||||
except Exception as e:
|
||||
print(f"An error occurred: {e}")
|
||||
print(f"Une erreur s'est produite : {e}")
|
||||
return None
|
||||
|
||||
def open_file(file_types: List[str]) -> Optional[Path]:
|
||||
"""
|
||||
Opens a file selection dialog and returns the selected file path.
|
||||
|
||||
Args:
|
||||
file_types (List[str]): A list of file types to filter in the dialog (e.g., ["*.txt", "*.pdf"]).
|
||||
|
||||
Returns:
|
||||
Optional[Path]: The path of the selected file or None if no file was selected.
|
||||
"""
|
||||
import tkinter as tk
|
||||
from tkinter import filedialog
|
||||
try:
|
||||
# Create a new Tkinter root window and hide it
|
||||
root = tk.Tk()
|
||||
root.withdraw()
|
||||
app = QApplication(sys.argv)
|
||||
|
||||
# Make the window appear on top
|
||||
root.attributes('-topmost', True)
|
||||
# Créer une instance de QFileDialog
|
||||
dialog = QFileDialog()
|
||||
dialog.setOption(QFileDialog.DontUseNativeDialog, True)
|
||||
dialog.setWindowFlag(Qt.WindowStaysOnTopHint, True)
|
||||
dialog.setFileMode(QFileDialog.ExistingFile)
|
||||
dialog.setNameFilter(';;'.join(file_types))
|
||||
|
||||
# Open the file selection dialog
|
||||
file_path = filedialog.askopenfilename(filetypes=[("Files", file_types)])
|
||||
# Afficher le dialogue et le mettre au premier plan
|
||||
dialog.show()
|
||||
dialog.raise_()
|
||||
dialog.activateWindow()
|
||||
|
||||
# Destroy the root window
|
||||
root.destroy()
|
||||
|
||||
if file_path:
|
||||
return Path(file_path)
|
||||
if dialog.exec_() == QFileDialog.Accepted:
|
||||
selected_file = dialog.selectedFiles()[0]
|
||||
return Path(selected_file)
|
||||
else:
|
||||
return None
|
||||
except Exception as e:
|
||||
print(f"An error occurred: {e}")
|
||||
print(f"Une erreur s'est produite : {e}")
|
||||
return None
|
||||
|
||||
|
||||
|
||||
def select_rag_database(client) -> Optional[Dict[str, Path]]:
|
||||
"""
|
||||
Opens a folder selection dialog and then a string input dialog to get the database name.
|
||||
Opens a folder selection dialog and then a string input dialog to get the database name using PyQt5.
|
||||
|
||||
Returns:
|
||||
Optional[Dict[str, Path]]: A dictionary with the database name and the database path, or None if no folder was selected.
|
||||
"""
|
||||
try:
|
||||
import tkinter as tk
|
||||
from tkinter import simpledialog, filedialog
|
||||
# Create a new Tkinter root window and hide it
|
||||
root = tk.Tk()
|
||||
root.withdraw()
|
||||
|
||||
# Make the window appear on top
|
||||
root.attributes('-topmost', True)
|
||||
# Create a QApplication instance
|
||||
app = QApplication.instance()
|
||||
if not app:
|
||||
app = QApplication(sys.argv)
|
||||
|
||||
# Open the folder selection dialog
|
||||
folder_path = filedialog.askdirectory()
|
||||
dialog = QFileDialog()
|
||||
dialog.setOption(QFileDialog.DontUseNativeDialog, True)
|
||||
dialog.setWindowFlag(Qt.WindowStaysOnTopHint, True)
|
||||
dialog.setWindowModality(Qt.ApplicationModal)
|
||||
dialog.raise_()
|
||||
dialog.activateWindow()
|
||||
|
||||
# Add a custom filter to show network folders
|
||||
dialog.setNameFilter("All Files (*)")
|
||||
dialog.setViewMode(QFileDialog.List)
|
||||
|
||||
# Show the dialog modally
|
||||
if dialog.exec_() == QFileDialog.Accepted:
|
||||
folder_path = dialog.selectedFiles()[0] # Get the selected folder path
|
||||
if folder_path:
|
||||
# Ask for the database name
|
||||
db_name = simpledialog.askstring("Database Name", "Please enter the database name:")
|
||||
# Bring the input dialog to the foreground as well
|
||||
input_dialog = QInputDialog()
|
||||
input_dialog.setWindowFlags(input_dialog.windowFlags() | Qt.WindowStaysOnTopHint)
|
||||
input_dialog.setWindowModality(Qt.ApplicationModal)
|
||||
input_dialog.setOption(QInputDialog.DontUseNativeDialog, True)
|
||||
input_dialog.setWindowFlag(Qt.WindowStaysOnTopHint, True)
|
||||
input_dialog.setWindowModality(Qt.ApplicationModal)
|
||||
input_dialog.raise_()
|
||||
input_dialog.activateWindow()
|
||||
db_name, ok = input_dialog.getText(None, "Database Name", "Please enter the database name:")
|
||||
|
||||
# Destroy the root window
|
||||
root.destroy()
|
||||
|
||||
if db_name:
|
||||
if ok and db_name:
|
||||
try:
|
||||
lollmsElfServer.ShowBlockingMessage("Adding a new database.")
|
||||
if not PackageManager.check_package_installed_with_version("lollmsvectordb","0.6.0"):
|
||||
@ -132,7 +142,6 @@ def select_rag_database(client) -> Optional[Dict[str, Path]]:
|
||||
from lollmsvectordb.text_document_loader import TextDocumentsLoader
|
||||
from lollmsvectordb.lollms_tokenizers.tiktoken_tokenizer import TikTokenTokenizer
|
||||
|
||||
|
||||
if lollmsElfServer.config.rag_vectorizer == "semantic":
|
||||
from lollmsvectordb.lollms_vectorizers.semantic_vectorizer import SemanticVectorizer
|
||||
v = SemanticVectorizer(lollmsElfServer.config.rag_vectorizer_model)
|
||||
@ -175,16 +184,18 @@ def select_rag_database(client) -> Optional[Dict[str, Path]]:
|
||||
except Exception as ex:
|
||||
trace_exception(ex)
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
|
||||
return {"database_name": db_name, "database_path": Path(folder_path)}
|
||||
else:
|
||||
return None
|
||||
else:
|
||||
# Destroy the root window if no folder was selected
|
||||
root.destroy()
|
||||
return None
|
||||
except Exception as e:
|
||||
print(f"An error occurred: {e}")
|
||||
return None
|
||||
|
||||
|
||||
|
||||
def find_rag_database_by_name(entries: List[str], name: str) -> Optional[str]:
|
||||
"""
|
||||
Finds an entry in the list by its name.
|
||||
@ -315,21 +326,18 @@ async def vectorize_folder(database_infos: FolderInfos):
|
||||
db_name = parts[0]
|
||||
folder_path = sanitize_path(parts[1], True)
|
||||
else:
|
||||
import tkinter as tk
|
||||
from tkinter import simpledialog, filedialog
|
||||
# Create a new Tkinter root window and hide it
|
||||
root = tk.Tk()
|
||||
root.withdraw()
|
||||
|
||||
# Make the window appear on top
|
||||
root.attributes('-topmost', True)
|
||||
# Create a QApplication instance
|
||||
app = QApplication.instance()
|
||||
if not app:
|
||||
app = QApplication(sys.argv)
|
||||
|
||||
# Ask for the database name
|
||||
db_name = simpledialog.askstring("Database Name", "Please enter the database name:")
|
||||
db_name, ok = QInputDialog.getText(None, "Database Name", "Please enter the database name:")
|
||||
folder_path = database_infos.db_path
|
||||
|
||||
if not ok or not db_name:
|
||||
return
|
||||
|
||||
if db_name:
|
||||
try:
|
||||
lollmsElfServer.ShowBlockingMessage("Revectorizing the database.")
|
||||
if not PackageManager.check_package_installed_with_version("lollmsvectordb","0.6.0"):
|
||||
@ -340,7 +348,6 @@ async def vectorize_folder(database_infos: FolderInfos):
|
||||
from lollmsvectordb.text_document_loader import TextDocumentsLoader
|
||||
from lollmsvectordb.lollms_tokenizers.tiktoken_tokenizer import TikTokenTokenizer
|
||||
|
||||
|
||||
if lollmsElfServer.config.rag_vectorizer == "semantic":
|
||||
from lollmsvectordb.lollms_vectorizers.semantic_vectorizer import SemanticVectorizer
|
||||
v = SemanticVectorizer(lollmsElfServer.config.rag_vectorizer_model)
|
||||
@ -385,5 +392,6 @@ async def vectorize_folder(database_infos: FolderInfos):
|
||||
except Exception as ex:
|
||||
trace_exception(ex)
|
||||
lollmsElfServer.HideBlockingMessage()
|
||||
|
||||
lollmsElfServer.rag_thread = threading.Thread(target=process)
|
||||
lollmsElfServer.rag_thread.start()
|
||||
@ -45,6 +45,13 @@ import pipmaster as pm
|
||||
if not pm.is_installed("Pillow"):
|
||||
pm.install("Pillow")
|
||||
from PIL import Image
|
||||
|
||||
if not pm.is_installed("PyQt5"):
|
||||
pm.install("PyQt5")
|
||||
import sys
|
||||
from PyQt5.QtWidgets import QApplication, QButtonGroup, QRadioButton, QVBoxLayout, QWidget, QPushButton, QMessageBox
|
||||
from PyQt5.QtCore import Qt
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
@ -397,72 +404,60 @@ def show_console_custom_dialog(title, text, options):
|
||||
|
||||
def show_custom_dialog(title, text, options):
|
||||
try:
|
||||
import tkinter as tk
|
||||
from tkinter import simpledialog
|
||||
class CustomDialog(simpledialog.Dialog):
|
||||
def __init__(self, parent, title, options, root):
|
||||
self.options = options
|
||||
self.root = root
|
||||
self.buttons = []
|
||||
self.result_value = ""
|
||||
super().__init__(parent, title)
|
||||
def do_ok(self, option):
|
||||
self.result_value = option
|
||||
self.ok(option)
|
||||
self.root.destroy()
|
||||
def body(self, master):
|
||||
for option in self.options:
|
||||
button = tk.Button(master, text=option, command=partial(self.do_ok, option))
|
||||
button.pack(side="left", fill="x")
|
||||
self.buttons.append(button)
|
||||
app = QApplication(sys.argv)
|
||||
window = QWidget()
|
||||
layout = QVBoxLayout()
|
||||
window.setLayout(layout)
|
||||
|
||||
label = QLabel(text)
|
||||
layout.addWidget(label)
|
||||
|
||||
button_group = QButtonGroup()
|
||||
for i, option in enumerate(options):
|
||||
button = QRadioButton(option)
|
||||
button_group.addButton(button)
|
||||
layout.addWidget(button)
|
||||
|
||||
def on_ok():
|
||||
nonlocal result
|
||||
result = [button.text() for button in button_group.buttons() if button.isChecked()]
|
||||
window.close()
|
||||
|
||||
button = QPushButton("OK")
|
||||
button.clicked.connect(on_ok)
|
||||
layout.addWidget(button)
|
||||
|
||||
window.show()
|
||||
result = None
|
||||
sys.exit(app.exec_())
|
||||
|
||||
def apply(self):
|
||||
self.result = self.options[0] # Default value
|
||||
root = tk.Tk()
|
||||
root.withdraw()
|
||||
root.attributes('-topmost', True)
|
||||
d = CustomDialog(root, title=title, options=options, root=root)
|
||||
try:
|
||||
d.mainloop()
|
||||
except Exception as ex:
|
||||
pass
|
||||
result = d.result_value
|
||||
return result
|
||||
except Exception as ex:
|
||||
ASCIIColors.error(ex)
|
||||
return show_console_custom_dialog(title, text, options)
|
||||
except:
|
||||
print(title)
|
||||
|
||||
|
||||
def show_yes_no_dialog(title, text):
|
||||
try:
|
||||
if sys.platform.startswith('win'):
|
||||
return show_windows_dialog(title, text)
|
||||
elif sys.platform.startswith('darwin'):
|
||||
return show_macos_dialog(title, text)
|
||||
elif sys.platform.startswith('linux'):
|
||||
return show_linux_dialog(title, text)
|
||||
else:
|
||||
return console_dialog(title, text)
|
||||
app = QApplication.instance() or QApplication(sys.argv)
|
||||
|
||||
# Create a message box with Yes/No buttons
|
||||
msg = QMessageBox()
|
||||
msg.setIcon(QMessageBox.Question)
|
||||
msg.setText(text)
|
||||
msg.setWindowTitle(title)
|
||||
msg.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
|
||||
|
||||
# Ensure the dialog comes to the foreground
|
||||
msg.setWindowFlags(msg.windowFlags() | Qt.WindowStaysOnTopHint)
|
||||
msg.raise_()
|
||||
msg.activateWindow()
|
||||
|
||||
# Execute the dialog and return True if 'Yes' was clicked, False otherwise
|
||||
return msg.exec_() == QMessageBox.Yes
|
||||
except Exception as ex:
|
||||
print(f"Error: {ex}")
|
||||
return console_dialog(title, text)
|
||||
|
||||
def show_windows_dialog(title, text):
|
||||
from ctypes import windll
|
||||
result = windll.user32.MessageBoxW(0, text, title, 4 | 0x40000)
|
||||
return result == 6 # 6 means "Yes"
|
||||
|
||||
def show_macos_dialog(title, text):
|
||||
script = f'tell app "System Events" to display dialog "{text}" buttons {{"No", "Yes"}} default button "Yes" with title "{title}"'
|
||||
result = subprocess.run(['osascript', '-e', script], capture_output=True, text=True)
|
||||
return "Yes" in result.stdout
|
||||
|
||||
def show_linux_dialog(title, text):
|
||||
zenity_path = Path('/usr/bin/zenity')
|
||||
if zenity_path.exists():
|
||||
result = subprocess.run([str(zenity_path), '--question', '--title', title, '--text', text], capture_output=True)
|
||||
return result.returncode == 0
|
||||
else:
|
||||
return console_dialog(title, text)
|
||||
|
||||
def console_dialog(title, text):
|
||||
print(f"{title}\n{text}")
|
||||
@ -473,22 +468,18 @@ def console_dialog(title, text):
|
||||
print("Invalid input. Please enter 'yes' or 'no'.")
|
||||
|
||||
def show_message_dialog(title, text):
|
||||
import tkinter as tk
|
||||
from tkinter import messagebox
|
||||
# Create a new Tkinter root window and hide it
|
||||
root = tk.Tk()
|
||||
root.withdraw()
|
||||
|
||||
# Make the window appear on top
|
||||
root.attributes('-topmost', True)
|
||||
|
||||
# Show the dialog box
|
||||
result = messagebox.askquestion(title, text)
|
||||
|
||||
# Destroy the root window
|
||||
root.destroy()
|
||||
|
||||
return result
|
||||
try:
|
||||
app = QApplication(sys.argv)
|
||||
msg = QMessageBox()
|
||||
msg.setOption(QMessageBox.DontUseNativeDialog, True)
|
||||
msg.setWindowFlag(Qt.WindowStaysOnTopHint, True)
|
||||
msg.setIcon(QMessageBox.Information)
|
||||
msg.setText(text)
|
||||
msg.setWindowTitle(title)
|
||||
result = msg.question(None, title, text, QMessageBox.Yes | QMessageBox.No)
|
||||
return result == QMessageBox.Yes
|
||||
except:
|
||||
print(title)
|
||||
|
||||
|
||||
def is_linux():
|
||||
|
||||
Loading…
Reference in New Issue
Block a user