From a7f6fab760924957960f96030f12dd9b8520d356 Mon Sep 17 00:00:00 2001 From: Dustin Date: Fri, 22 Dec 2023 20:04:01 -0500 Subject: [PATCH 1/3] default model change --- ollamarama.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ollamarama.py b/ollamarama.py index d9d6651..d440fd2 100644 --- a/ollamarama.py +++ b/ollamarama.py @@ -55,7 +55,7 @@ class ollamarama: } #set model - self.default_model = self.models['solar'] + self.default_model = self.models['zephyr'] self.model = self.default_model #authorized users for changing models From 94db6a5d0411d5c354a5718967f81a166fed43ee Mon Sep 17 00:00:00 2001 From: Dustin Date: Fri, 22 Dec 2023 23:40:53 -0500 Subject: [PATCH 2/3] fine tuning controls --- README.md | 11 ++++++- ollamarama.py | 89 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 89 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 079bd58..b6fa821 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,17 @@ python3 launcher.py **.model _reset_** Reset to default model (admin only) +**.temperature** + Set temperature value between 0 and 1. To reset to default, type reset instead of a number. (bot owner only) + +**.top_p** + Set top_p value between 0 and 1. To reset to default, type reset instead of a number. (bot owner only) + +**.repeat_penalty** + Set repeat_penalty between 0 and 2. To reset to default, type reset instead of a number. (bot owner only) + **.clear** - Resets all bot history and sets default model (admin only) + Resets all bot history and sets default model (bot owner only) **.auth _user_** Add user to admins (bot owner only) diff --git a/ollamarama.py b/ollamarama.py index d440fd2..3481b68 100644 --- a/ollamarama.py +++ b/ollamarama.py @@ -58,6 +58,10 @@ class ollamarama: self.default_model = self.models['zephyr'] self.model = self.default_model + self.temperature = .9 + self.top_p = .7 + self.repeat_penalty = 1.5 + #authorized users for changing models self.admins = admins @@ -109,11 +113,12 @@ class ollamarama: response = completion( api_base="http://localhost:11434", model=self.model, - temperature=.9, - top_p=.7, - repeat_penalty=1.5, + temperature=self.temperature, + top_p=self.top_p, + repeat_penalty=self.repeat_penalty, messages=message, - timeout=60) + timeout=60 + ) except Exception as e: await self.send_message(channel, "Something went wrong") print(e) @@ -199,12 +204,7 @@ Available models: {', '.join(sorted(list(self.models)))}''') self.model = self.default_model await self.send_message(room_id, f"Model set to {self.model.removeprefix('ollama/')}") - #reset history for all users - if message == ".clear": - self.messages.clear() - self.model = self.default_model - await self.send_message(room_id, "Bot has been reset for everyone") - + #bot owner commands if sender_display == self.admins[0]: #add admins if message.startswith(".auth "): @@ -234,6 +234,63 @@ Available models: {', '.join(sorted(list(self.models)))}''') if message == ".gstock": pass #i'll figure this out later + #reset history for all users + if message == ".clear": + self.messages.clear() + self.model = self.default_model + self.temperature = .9 + self.top_p = .7 + self.repeat_penalty = 1.5 + await self.send_message(room_id, "Bot has been reset for everyone") + + #temperature setting + if message.startswith(".temperature "): + if message == ".temperature reset": + self.temperature = .9 + await self.send_message(room_id, f"Temperature set to {self.temperature}") + else: + try: + temp = float(message.split(" ", 1)[1]) + if 0 <= temp <=1: + self.temperature = temp + await self.send_message(room_id, f"Temperature set to {self.temperature}") + else: + await self.send_message(room_id, f"Invalid input, temperature is still {self.temperature}") + except: + await self.send_message(room_id, f"Invalid input, temperature is still {self.temperature}") + + #top_p setting + if message.startswith(".top_p "): + if message == ".top_p reset": + self.top_p = .7 + await self.send_message(room_id, f"Top_p set to {self.top_p}") + else: + try: + top_p = float(message.split(" ", 1)[1]) + if 0 <= top_p <=1: + self.top_p = top_p + await self.send_message(room_id, f"Top_p set to {self.top_p}") + else: + await self.send_message(room_id, f"Invalid input, top_p is still {self.top_p}") + except: + await self.send_message(room_id, f"Invalid input, top_p is still {self.top_p}") + + #repeat_penalty setting + if message.startswith(".repeat_penalty "): + if message == ".repeat_penalty reset": + self.repeat_penalty = 1.5 + await self.send_message(room_id, f"Repeat_penalty set to {self.repeat_penalty}") + else: + try: + repeat_penalty = float(message.split(" ", 1)[1]) + if 0 <= repeat_penalty <=2: + self.repeat_penalty = repeat_penalty + await self.send_message(room_id, f"Repeat_penalty set to {self.repeat_penalty}") + else: + await self.send_message(room_id, f"Invalid input, repeat_penalty is still {self.repeat_penalty}") + except: + await self.send_message(room_id, f"Invalid input, repeat_penalty is still {self.repeat_penalty}") + # main AI response functionality if message.startswith(".ai ") or message.startswith(self.bot_id): if message != ".ai reset": @@ -345,6 +402,18 @@ Available at https://github.com/h1ddenpr0cess20/ollamarama-matrix .model Change the model +.temperature <#> + Set temperature value between 0 and 1. To reset to default, type reset instead of a number. (bot owner only) + +.top_p <#> + Set top_p value between 0 and 1. To reset to default, type reset instead of a number. (bot owner only) + +.repeat_penalty <#> + Set repeat_penalty between 0 and 2. To reset to default, type reset instead of a number. (bot owner only) + +.clear + Reset bot for everyone (bot owner only) + .gpersona Change default global personality (bot owner only) From 2b6d3abf46deba494890454d361ea5c440c717f8 Mon Sep 17 00:00:00 2001 From: Dustin Date: Fri, 22 Dec 2023 23:41:47 -0500 Subject: [PATCH 3/3] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6fa821..37a1701 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ python3 launcher.py **.deauth _user_** Remove user from admins (bot owner only) -**.gpersona _persona_*** +**.gpersona _persona_** Change global personality (bot owner only) **.gpersona reset**