From 47fd008e2c09e16f44fbf79e4eb07d28a93664be Mon Sep 17 00:00:00 2001
From: Umberto Griffo <1609440+umbertogriffo@users.noreply.github.com>
Date: Mon, 9 Dec 2024 17:06:49 +0000
Subject: [PATCH] refactor: unified model settings

---
 chatbot/bot/client/lama_cpp_client.py         | 2 +-
 chatbot/bot/model/model_settings.py           | 9 +++++++++
 chatbot/bot/model/modelsetting.py             | 9 ---------
 chatbot/bot/model/settings/llama.py           | 2 +-
 chatbot/bot/model/settings/openchat.py        | 2 +-
 chatbot/bot/model/settings/phi.py             | 2 +-
 chatbot/bot/model/settings/stablelm_zephyr.py | 2 +-
 chatbot/bot/model/settings/starling.py        | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 chatbot/bot/model/modelsetting.py

diff --git a/chatbot/bot/client/lama_cpp_client.py b/chatbot/bot/client/lama_cpp_client.py
index f672a6c..5f3ebd7 100644
--- a/chatbot/bot/client/lama_cpp_client.py
+++ b/chatbot/bot/client/lama_cpp_client.py
@@ -18,7 +18,7 @@
     generate_qa_prompt,
     generate_refined_ctx_prompt,
 )
-from bot.model.modelsetting import ModelSetting
+from bot.model.model_settings import ModelSetting
 
 
 class LamaCppClient:
diff --git a/chatbot/bot/model/model_settings.py b/chatbot/bot/model/model_settings.py
index 0a54c53..b94569a 100644
--- a/chatbot/bot/model/model_settings.py
+++ b/chatbot/bot/model/model_settings.py
@@ -1,4 +1,6 @@
+from abc import ABC
 from enum import Enum
+from typing import Any
 
 from bot.model.settings.llama import Llama31Settings, Llama32Settings
 from bot.model.settings.openchat import OpenChat35Settings, OpenChat36Settings
@@ -7,6 +9,13 @@
 from bot.model.settings.starling import StarlingSettings
 
 
+class ModelSetting(ABC):
+    url: str
+    file_name: str
+    config: dict[str, Any]
+    config_answer: dict[str, Any] | None
+
+
 class ModelType(Enum):
     ZEPHYR = "zephyr"
     MISTRAL = "mistral"
diff --git a/chatbot/bot/model/modelsetting.py b/chatbot/bot/model/modelsetting.py
deleted file mode 100644
index 080ce92..0000000
--- a/chatbot/bot/model/modelsetting.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from abc import ABC
-from typing import Any
-
-
-class ModelSetting(ABC):
-    url: str
-    file_name: str
-    config: dict[str, Any]
-    config_answer: dict[str, Any] | None
diff --git a/chatbot/bot/model/settings/llama.py b/chatbot/bot/model/settings/llama.py
index 31e263e..a6454ad 100644
--- a/chatbot/bot/model/settings/llama.py
+++ b/chatbot/bot/model/settings/llama.py
@@ -1,4 +1,4 @@
-from bot.model.modelsetting import ModelSetting
+from bot.model.model_settings import ModelSetting
 
 
 class Llama31Settings(ModelSetting):
diff --git a/chatbot/bot/model/settings/openchat.py b/chatbot/bot/model/settings/openchat.py
index 632410a..1afdfec 100644
--- a/chatbot/bot/model/settings/openchat.py
+++ b/chatbot/bot/model/settings/openchat.py
@@ -1,4 +1,4 @@
-from bot.model.modelsetting import ModelSetting
+from bot.model.model_settings import ModelSetting
 
 
 class OpenChat35Settings(ModelSetting):
diff --git a/chatbot/bot/model/settings/phi.py b/chatbot/bot/model/settings/phi.py
index a0f1409..9fdb59e 100644
--- a/chatbot/bot/model/settings/phi.py
+++ b/chatbot/bot/model/settings/phi.py
@@ -1,4 +1,4 @@
-from bot.model.modelsetting import ModelSetting
+from bot.model.model_settings import ModelSetting
 
 
 class Phi31Settings(ModelSetting):
diff --git a/chatbot/bot/model/settings/stablelm_zephyr.py b/chatbot/bot/model/settings/stablelm_zephyr.py
index 896663a..778f6ae 100644
--- a/chatbot/bot/model/settings/stablelm_zephyr.py
+++ b/chatbot/bot/model/settings/stablelm_zephyr.py
@@ -1,4 +1,4 @@
-from bot.model.modelsetting import ModelSetting
+from bot.model.model_settings import ModelSetting
 
 
 class StableLMZephyrSettings(ModelSetting):
diff --git a/chatbot/bot/model/settings/starling.py b/chatbot/bot/model/settings/starling.py
index 059cf86..ddf73ba 100644
--- a/chatbot/bot/model/settings/starling.py
+++ b/chatbot/bot/model/settings/starling.py
@@ -1,4 +1,4 @@
-from bot.model.modelsetting import ModelSetting
+from bot.model.model_settings import ModelSetting
 
 
 class StarlingSettings(ModelSetting):