upgraded

lollms/app.py

@@ -6,6 +6,7 @@ from lollms.extension import LOLLMSExtension, ExtensionBuilder
 from lollms.config import InstallOption
 from lollms.helpers import trace_exception
 from lollms.terminal import MainMenu
+from lollms.utilities import PromptReshaper
 from typing import Callable
 from ascii_colors import ASCIIColors
 
@@ -114,7 +115,7 @@ class LollmsApplication:
 
         return string
 
-    def safe_generate(self, full_discussion:str, n_predict=None, callback: Callable[[str, int, dict], bool]=None):
+    def safe_generate(self, full_discussion:str, n_predict=None, callback: Callable[[str, int, dict], bool]=None, placeholder={}, place_holders_to_sacrifice=[], debug=False):
         """safe_generate
 
         Args:
@@ -124,18 +125,18 @@ class LollmsApplication:
         Returns:
             str: Model output
         """
+        full_discussion = PromptReshaper(full_discussion).build(placeholder, self.model.tokenize, self.model.detokenize, max_nb_tokens=self.config.ctx_size-n_predict, place_holders_to_sacrifice=place_holders_to_sacrifice )
+        if debug:
+            ASCIIColors.yellow(full_discussion)
         if n_predict == None:
             n_predict =self.personality.model_n_predicts
-        tk = self.personality.model.tokenize(full_discussion)
-        n_tokens = len(tk)
-        fd = self.personality.model.detokenize(tk[-min(self.config.ctx_size-self.n_cond_tk,n_tokens):])
         self.bot_says = ""
         if self.personality.processor is not None and self.personality.processor_cfg["custom_workflow"]:
             ASCIIColors.info("processing...")
             generated_text = self.personality.processor.run_workflow(full_discussion.split("!@>")[-1] if "!@>" in full_discussion else full_discussion, previous_discussion_text=self.personality.personality_conditioning+fd, callback=callback)
         else:
             ASCIIColors.info("generating...")
-            generated_text = self.personality.model.generate(self.personality.personality_conditioning+fd, n_predict=n_predict, callback=callback)
+            generated_text = self.personality.model.generate(full_discussion, n_predict=n_predict, callback=callback)
         return generated_text
 
     def notify(self, content, is_success, client_id=None):

lollms/apps/discord_bot/__init__.py

@@ -63,8 +63,8 @@ async def on_message(message):
     if message.author == client.user:
         return
     if message.content.startswith(config["summoning_word"]):
-        prompt = message.content[len(config["summoning_word"]):]
+        prompt = message.content[len(config["summoning_word"])+1:]
-        context['discussion']+= message.author.name +":"+  prompt + "\n" + f"{lollms_app.personality.ai_message_prefix}"
+        context['discussion']+= "\n!@>" + message.author.name +": "+  prompt + "\n" + f"{lollms_app.personality.ai_message_prefix}"
         context['current_response']=""
         print("Chatting")
         try:
@@ -72,14 +72,12 @@ async def on_message(message):
             docs = "!@>Documentation:\n"+'\n'.join(docs)
         except:
             docs=""
-        context_text = f"""!@>instruction:
+        context_text = f"""{lollms_app.personality.personality_conditioning}
-{lollms_app.personality.personality_conditioning}
+!@>informations:
-!@>Informations:
 Current model:{lollms_app.config.model_name}
 Current personality:{lollms_app.personality.name}
 {docs}
-{context['discussion']}"""
+"""+"{{discussion}}"
-        print("Context:"+context_text)
         def callback(text, type=None):
             antiprompt = lollms_app.personality.detect_antiprompt(context['current_response'])
             if antiprompt:
@@ -91,20 +89,32 @@ Current personality:{lollms_app.personality.name}
             print(text,end="")
             return True
         
-        ASCIIColors.green("Warming up")
+        ASCIIColors.green("Warming up ...")
-        lollms_app.safe_generate(context_text, n_predict=1024, callback=callback)
+        lollms_app.safe_generate(context_text, n_predict=1024, callback=callback, placeholder={"discussion":context['discussion']},place_holders_to_sacrifice=["discussion"], debug=True)
 
         print()
-        context['discussion'] += context['current_response']
+        context['discussion'] += context['current_response'][0:2000]
-        await message.channel.send(context['current_response'])
+        await message.channel.send(context['current_response'][0:2000])
     elif message.content.startswith('!mount'):
         personality_name =  message.content[len('!mount')+1:]
         lollms_app.config.personalities.append(personality_name)
-        lollms_app.mount_personality(len(lollms_app.config.personalities)-1)
+        lollms_app.personality = lollms_app.mount_personality(len(lollms_app.config.personalities)-1)
+        lollms_app.config.active_personality_id = len(lollms_app.config.personalities)-1
+        
         await message.channel.send(f"Personality {personality_name} mounted successfuly")
     elif message.content.startswith('!list'):
-        personality_name =  message.content[len('!mount')+1:]
         await message.channel.send(f"Mounted personalities:\n{[p.name for p in lollms_app.mounted_personalities]}")
+    elif message.content.startswith('!select'):
+        personality_name =  message.content[len('!select')+1:]
+        index = 0
+        for i in range(len(lollms_app.mounted_personalities)):
+            if lollms_app.mounted_personalities[i].name.lower().strip()==personality_name.lower():
+                index = i
+        lollms_app.config.active_personality_id = index
+        await message.channel.send(f"Activated personality:\n{personality_name}")
+    elif message.content.startswith('!reset'):
+        context["discussion"]=""
+        await message.channel.send(f"Content reset")
 
     elif message.content.startswith('!install'):
         response = "To install lollms, make sure you have installed the currently supported python version (consult the repository to verify what version is currently supported, but as of 10/22/2023, the version is 3.10).\nThen you can follow these steps:\n1. Open your command line interface.\n2. Navigate to the directory where you want to install lollms.\n3. Run the following command to clone the lollms repository: `git clone https://github.com/lollms/lollms.git`.\n4. Once the repository is cloned, navigate into the lollms directory.\n5. Run `pip install -r requirements.txt` to install the required dependencies.\n6. You can now use lollms by importing it in your Python code."

lollms/apps/settings/__init__.py

@@ -253,7 +253,16 @@ def main():
         settings_app.model = settings_app.binding.build_model()
         settings_app.config.save_config()
 
-
+    if args.mount_personalities:
+        for entry in args.mount_personalities:
+            try:
+                settings_app.config.personalities.append(entry)
+                settings_app.mount_personality(-1)
+                ASCIIColors.green(f"Personality : {entry} mounted")
+            except:
+                settings_app.config.personalities.pop()
+                ASCIIColors.red(f"Personality : {entry} couldn't be mounted")
+                
     if not args.silent:
         settings_app.start()
 

lollms/utilities.py

@@ -694,8 +694,6 @@ class PromptReshaper:
     def build(self, placeholders:dict, tokenize, detokenize, max_nb_tokens:int, place_holders_to_sacrifice:list=[])->str:
         # Tokenize the template without placeholders
         template_text = self.template
-        for placeholder in placeholders:
-            template_text = template_text.replace("{{" + placeholder + "}}", "")
         template_tokens = tokenize(template_text)
         
         # Calculate the number of tokens in the template without placeholders

setup.py

@@ -26,7 +26,7 @@ def get_all_files(path):
 
 setuptools.setup(
     name="lollms",
-    version="6.0.5",
+    version="6.0.6",
     author="Saifeddine ALOUI",
     author_email="aloui.saifeddine@gmail.com",
     description="A python library for AI personality definition",