forked from Michael-A-Kuykendall/shimmy
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathmodel_registry.rs
More file actions
177 lines (157 loc) · 5.28 KB
/
model_registry.rs
File metadata and controls
177 lines (157 loc) · 5.28 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
use super::engine::ModelSpec;
use crate::auto_discovery::{DiscoveredModel, ModelAutoDiscovery};
use serde::{Deserialize, Serialize};
use std::{collections::HashMap, path::PathBuf};
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ModelEntry {
pub name: String,
pub base_path: PathBuf,
pub lora_path: Option<PathBuf>,
pub template: Option<String>,
pub ctx_len: Option<usize>,
pub n_threads: Option<i32>,
}
#[derive(Default, Clone)]
pub struct Registry {
inner: HashMap<String, ModelEntry>,
pub discovered_models: HashMap<String, DiscoveredModel>,
}
// Alias for backward compatibility and mission expectations
pub type ModelRegistry = Registry;
impl Registry {
pub fn new() -> Self {
Self {
inner: HashMap::new(),
discovered_models: HashMap::new(),
}
}
pub fn with_discovery() -> Self {
let mut registry = Self::new();
registry.refresh_discovered_models();
registry
}
pub fn refresh_discovered_models(&mut self) {
let discovery = ModelAutoDiscovery::new();
if let Ok(models) = discovery.discover_models() {
self.discovered_models.clear();
for model in models {
self.discovered_models.insert(model.name.clone(), model);
}
}
}
pub fn auto_register_discovered(&mut self) {
// Convert discovered models to registry entries
for (name, discovered) in &self.discovered_models {
if !self.inner.contains_key(name) {
let entry = ModelEntry {
name: name.clone(),
base_path: discovered.path.clone(),
lora_path: discovered.lora_path.clone(),
template: Some(self.infer_template(name)),
ctx_len: Some(8192),
n_threads: None,
};
self.inner.insert(name.clone(), entry);
}
}
}
pub fn infer_template(&self, model_name: &str) -> String {
let name_lower = model_name.to_lowercase();
// Check model name patterns for better template detection
if name_lower.contains("llama") {
"llama3".to_string()
} else {
// Default to chatml for most models (phi, mistral, qwen, gemma, etc.)
"chatml".to_string()
}
}
pub fn register(&mut self, e: ModelEntry) {
self.inner.insert(e.name.clone(), e);
}
pub fn get(&self, name: &str) -> Option<&ModelEntry> {
// First check manually registered models, then auto-discovered
self.inner.get(name)
}
pub fn list(&self) -> Vec<&ModelEntry> {
self.inner.values().collect()
}
pub fn list_all_available(&self) -> Vec<String> {
let mut available = Vec::new();
available.extend(self.inner.keys().cloned());
available.extend(self.discovered_models.keys().cloned());
available.sort();
available.dedup();
available
}
pub fn to_spec(&self, name: &str) -> Option<ModelSpec> {
// Try manually registered first
if let Some(e) = self.inner.get(name) {
return Some(ModelSpec {
name: e.name.clone(),
base_path: e.base_path.clone(),
lora_path: e.lora_path.clone(),
template: e.template.clone(),
ctx_len: e.ctx_len.unwrap_or(8192),
n_threads: e.n_threads,
});
}
// Fall back to discovered models
if let Some(discovered) = self.discovered_models.get(name) {
return Some(ModelSpec {
name: discovered.name.clone(),
base_path: discovered.path.clone(),
lora_path: discovered.lora_path.clone(),
template: Some(self.infer_template(&discovered.name)),
ctx_len: 8192,
n_threads: None,
});
}
None
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_registry_new() {
let registry = Registry::new();
assert!(registry.inner.is_empty());
assert!(registry.discovered_models.is_empty());
}
#[test]
fn test_registry_default() {
let registry = Registry::default();
assert!(registry.inner.is_empty());
}
#[test]
fn test_register_model() {
let mut registry = Registry::new();
let entry = ModelEntry {
name: "test-model".to_string(),
base_path: PathBuf::from("/path/to/model"),
lora_path: None,
template: Some("chatml".to_string()),
ctx_len: Some(8192),
n_threads: Some(4),
};
registry.register(entry.clone());
assert_eq!(registry.inner.len(), 1);
assert!(registry.get("test-model").is_some());
}
#[test]
fn test_list_models() {
let mut registry = Registry::new();
let entry = ModelEntry {
name: "test".to_string(),
base_path: PathBuf::from("/test"),
lora_path: None,
template: None,
ctx_len: None,
n_threads: None,
};
registry.register(entry);
let models = registry.list();
assert_eq!(models.len(), 1);
assert_eq!(models[0].name, "test");
}
}