Implement DS4 model intake
This commit is contained in:
@@ -314,18 +314,19 @@ impl App {
|
||||
let effective = self
|
||||
.preference_draft
|
||||
.generation()
|
||||
.ok()
|
||||
.map(|generation| generation.turn_settings(self.preference_draft.model));
|
||||
let engine = self
|
||||
.preference_draft
|
||||
.runtime()
|
||||
.ok()
|
||||
.and_then(|runtime| runtime.engine_settings(self.preference_draft.model).ok());
|
||||
let artifacts = model::engine_artifacts(
|
||||
self.preference_draft.model,
|
||||
self.preference_draft.dspark_enabled,
|
||||
&models_path(),
|
||||
);
|
||||
.and_then(|generation| {
|
||||
self.preference_draft.runtime().and_then(|runtime| {
|
||||
crate::settings::effective_settings(
|
||||
self.preference_draft.model,
|
||||
&generation,
|
||||
&runtime,
|
||||
&models_path(),
|
||||
)
|
||||
})
|
||||
})
|
||||
.ok();
|
||||
let engine = effective.as_ref().map(|settings| &settings.engine);
|
||||
let turn = effective.as_ref().map(|settings| &settings.turn);
|
||||
let mut power = text_input("100", &self.preference_draft.power_percent);
|
||||
let mut prefill = text_input("Automatic", &self.preference_draft.prefill_chunk);
|
||||
let mut ssd_full_layers = text_input("Automatic", &self.preference_draft.ssd_full_layers);
|
||||
@@ -364,10 +365,12 @@ impl App {
|
||||
.width(Length::Fill),
|
||||
text(format!(
|
||||
"Main: {}{}",
|
||||
artifacts.model.display(),
|
||||
artifacts
|
||||
.mtp
|
||||
.as_ref()
|
||||
engine.map_or_else(
|
||||
|| "Invalid settings".to_owned(),
|
||||
|engine| engine.artifacts.model.display().to_string(),
|
||||
),
|
||||
engine
|
||||
.and_then(|engine| engine.artifacts.mtp.as_ref())
|
||||
.map_or_else(String::new, |path| format!(" • support: {}", path.display())),
|
||||
))
|
||||
.size(12),
|
||||
@@ -577,7 +580,7 @@ impl App {
|
||||
.align_y(Alignment::Center),
|
||||
text("Blank sampling values retain DS4's model-family defaults. Think Max needs at least 393216 context tokens.")
|
||||
.size(12),
|
||||
text(effective.map_or_else(
|
||||
text(turn.map_or_else(
|
||||
|| "Effective settings will appear after valid values are entered.".to_owned(),
|
||||
|settings| format!(
|
||||
"Effective: {} context • {} max • temp {} • top-p {} • min-p {} • seed {} • {} • system prompt {}",
|
||||
|
||||
Reference in New Issue
Block a user