[libraries/ktextaddons/2.1] textautogeneratetext/plugins: Reduce duplicate code
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 224ae5be59433fe33593b49967aa86dc04b952fa by Laurent Montel.
Committed on 21/07/2026 at 11:26.
Pushed by mlaurent into branch '2.1'.
Reduce duplicate code
M +0 -12 textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.cpp
M +0 -4 textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.h
M +0 -20 textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.cpp
M +0 -4 textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.h
M +19 -0 textautogeneratetext/plugins/plugincommon/plugincommonsettings.cpp
M +5 -0 textautogeneratetext/plugins/plugincommon/plugincommonsettings.h
https://invent.kde.org/libraries/ktextaddons/-/commit/224ae5be59433fe33593b49967aa86dc04b952fa
diff --git a/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.cpp b/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.cpp
index d6cb41450..c6ea340cd 100644
--- a/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.cpp
+++ b/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.cpp
@@ -20,16 +20,6 @@ void GenericNetworkSettings::setMaxTokens(int newMaxTokens)
mMaxTokens = newMaxTokens;
}
-double GenericNetworkSettings::temperature() const
-{
- return mTemperature;
-}
-
-void GenericNetworkSettings::setTemperature(double newTemperature)
-{
- mTemperature = newTemperature;
-}
-
int GenericNetworkSettings::seed() const
{
return mSeed;
@@ -43,7 +33,6 @@ void GenericNetworkSettings::setSeed(int newSeed)
void GenericNetworkSettings::load(const KConfigGroup &config)
{
PluginCommonSettings::load(config);
- setTemperature(config.readEntry(u"Temperature"_s, 0.8));
setMaxTokens(config.readEntry(u"MaxToken"_s, 2048));
setSeed(config.readEntry(u"Seed"_s, 0));
}
@@ -52,6 +41,5 @@ void GenericNetworkSettings::save(KConfigGroup &config)
{
PluginCommonSettings::save(config);
config.writeEntry(u"MaxToken"_s, maxTokens());
- config.writeEntry(u"Temperature"_s, temperature());
config.writeEntry(u"Seed"_s, seed());
}
diff --git a/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.h b/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.h
index 5c6d99e44..9b18f5b44 100644
--- a/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.h
+++ b/textautogeneratetext/plugins/genericnetworkplugin/genericnetworksettings.h
@@ -17,9 +17,6 @@ public:
[[nodiscard]] int maxTokens() const;
void setMaxTokens(int newMaxTokens);
- [[nodiscard]] double temperature() const;
- void setTemperature(double newTemperature);
-
[[nodiscard]] int seed() const;
void setSeed(int newSeed);
@@ -29,5 +26,4 @@ public:
private:
int mMaxTokens = 2048;
int mSeed = 0;
- double mTemperature = 0.8;
};
diff --git a/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.cpp b/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.cpp
index e5c7d1aad..4837804de 100644
--- a/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.cpp
+++ b/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.cpp
@@ -23,16 +23,6 @@ void OllamaCommonSettings::setSeed(int newSeed)
mSeed = newSeed;
}
-double OllamaCommonSettings::temperature() const
-{
- return mTemperature;
-}
-
-void OllamaCommonSettings::setTemperature(double newTemperature)
-{
- mTemperature = newTemperature;
-}
-
int OllamaCommonSettings::keepAliveMinutes() const
{
return mKeepAliveMinutes;
@@ -43,11 +33,6 @@ void OllamaCommonSettings::setKeepAliveMinutes(int newKeepAliveMinutes)
mKeepAliveMinutes = newKeepAliveMinutes;
}
-double OllamaCommonSettings::defaultTemperature() const
-{
- return 0.8;
-}
-
int OllamaCommonSettings::defaultSeed() const
{
return 0;
@@ -76,10 +61,6 @@ OllamaCommonSettings::KeepAliveType OllamaCommonSettings::defaultKeepAliveType()
void OllamaCommonSettings::load(const KConfigGroup &config)
{
PluginCommonSettings::load(config);
-
- if (config.hasKey(u"Temperature"_s)) {
- setTemperature(config.readEntry(u"Temperature"_s, defaultTemperature()));
- }
setSeed(config.readEntry(u"Seed"_s, defaultSeed()));
setKeepAliveMinutes(config.readEntry(u"KeepAliveMinutes"_s, defaultKeepAliveMinutes()));
setContextWindowSize(config.readEntry(u"ContextWindowSize"_s, defaultContextWindowSize()));
@@ -94,7 +75,6 @@ void OllamaCommonSettings::save(KConfigGroup &config)
{
PluginCommonSettings::save(config);
config.writeEntry(u"Seed"_s, seed());
- config.writeEntry(u"Temperature"_s, temperature());
config.writeEntry(u"KeepAliveMinutes"_s, keepAliveMinutes());
config.writeEntry(u"ContextWindowSize"_s, contextWindowSize());
config.writeEntry(u"KeepAliveType"_s, OllamaCommonSettings::convertKeepAliveTypeToString(mKeepAliveType));
diff --git a/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.h b/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.h
index 6e48692ed..9d4eeeba2 100644
--- a/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.h
+++ b/textautogeneratetext/plugins/ollamacommon/ollamacommonsettings.h
@@ -28,9 +28,6 @@ public:
[[nodiscard]] int seed() const;
void setSeed(int newSeed);
- [[nodiscard]] double temperature() const;
- void setTemperature(double newTemperature);
-
[[nodiscard]] int keepAliveMinutes() const;
void setKeepAliveMinutes(int newKeepAliveMinutes);
@@ -46,7 +43,6 @@ public:
[[nodiscard]] qint64 contextWindowSize() const;
void setContextWindowSize(qint64 newContextWindowSize);
- [[nodiscard]] double defaultTemperature() const;
[[nodiscard]] int defaultSeed() const;
[[nodiscard]] int defaultKeepAliveMinutes() const;
[[nodiscard]] qint64 defaultContextWindowSize() const;
diff --git a/textautogeneratetext/plugins/plugincommon/plugincommonsettings.cpp b/textautogeneratetext/plugins/plugincommon/plugincommonsettings.cpp
index b5da98c77..f1be85cce 100644
--- a/textautogeneratetext/plugins/plugincommon/plugincommonsettings.cpp
+++ b/textautogeneratetext/plugins/plugincommon/plugincommonsettings.cpp
@@ -5,22 +5,31 @@
*/
#include "plugincommonsettings.h"
+#include "autogeneratetext_plugincommon_debug.h"
#include <KConfigGroup>
using namespace Qt::Literals::StringLiterals;
PluginCommonSettings::PluginCommonSettings() = default;
PluginCommonSettings::~PluginCommonSettings() = default;
+double PluginCommonSettings::defaultTemperature() const
+{
+ return 0.8;
+}
void PluginCommonSettings::load(const KConfigGroup &config)
{
setDisplayName(config.readEntry(u"Name"_s));
setCurrentModel(config.readEntry(u"CurrentModel"_s));
+ if (config.hasKey(u"Temperature"_s)) {
+ setTemperature(config.readEntry(u"Temperature"_s, defaultTemperature()));
+ }
}
void PluginCommonSettings::save(KConfigGroup &config)
{
config.writeEntry(u"Name"_s, displayName());
config.writeEntry(u"CurrentModel"_s, currentModel());
+ config.writeEntry(u"Temperature"_s, temperature());
}
QString PluginCommonSettings::displayName() const
@@ -95,4 +104,14 @@ void PluginCommonSettings::setThoughtProcessing(bool newThoughtProcessing)
mThoughtProcessing = newThoughtProcessing;
}
+double PluginCommonSettings::temperature() const
+{
+ return mTemperature;
+}
+
+void PluginCommonSettings::setTemperature(double newTemperature)
+{
+ mTemperature = newTemperature;
+}
+
#include "moc_plugincommonsettings.cpp"
diff --git a/textautogeneratetext/plugins/plugincommon/plugincommonsettings.h b/textautogeneratetext/plugins/plugincommon/plugincommonsettings.h
index 165eeafbc..810e242b8 100644
--- a/textautogeneratetext/plugins/plugincommon/plugincommonsettings.h
+++ b/textautogeneratetext/plugins/plugincommon/plugincommonsettings.h
@@ -42,9 +42,14 @@ public:
virtual void load(const KConfigGroup &config);
virtual void save(KConfigGroup &config);
+ [[nodiscard]] double temperature() const;
+ void setTemperature(double newTemperature);
+ [[nodiscard]] double defaultTemperature() const;
+
protected:
PluginCommonSettings::ShareNameType mShareNameType = ShareNameType::DoNotShare;
QString mDisplayName;
QString mCurrentModel;
bool mThoughtProcessing = false;
+ double mTemperature = 0.8;
};