Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
924ec403bd | ||
|
|
0c91f09113 |
+10
-1
@@ -3,7 +3,16 @@
|
|||||||
All notable changes to this project are documented here.
|
All notable changes to this project are documented here.
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/).
|
The format is based on [Keep a Changelog](https://keepachangelog.com/).
|
||||||
|
|
||||||
## [0.2.24] - 2026-07-21
|
## [0.2.26] - 2026-07-21
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Multi-GB Ready CMF Download Stream**: Replaced HTTP stream decoder with a streaming process downloader (`curl`) for pre-converted `.cmf` models to support multi-gigabyte Hugging Face LFS repositories without 30s/60s socket timeouts.
|
||||||
|
- **Ready CMF Quantization & UI Labels**: Set correct quantization badges (`Q1`, `Q1T`) for featured ready-to-run `.cmf` models and removed misleading "converting" log messages for direct downloads.
|
||||||
|
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Direct Ready CMF Download**: Importing pre-converted `.cmf` model repositories (e.g. `infosave/Bonsai-8B_2bit_cmf`) directly streams the ready `.cmf` file from Hugging Face instead of attempting a safetensors conversion without `config.json`.
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- **New Quantization Schemes**: Added support for `Q4_TILED` (q4t), `Q1T` (1.58-bit ternary), `Q1S` (1-bit sparse), `Q1P` (1-bit PTQ error diffusion), and `Q1` (pure binary) in converter backend and web admin UI.
|
- **New Quantization Schemes**: Added support for `Q4_TILED` (q4t), `Q1T` (1.58-bit ternary), `Q1S` (1-bit sparse), `Q1P` (1-bit PTQ error diffusion), and `Q1` (pure binary) in converter backend and web admin UI.
|
||||||
|
|||||||
Generated
+1
-1
@@ -285,7 +285,7 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cortiq-gateway"
|
name = "cortiq-gateway"
|
||||||
version = "0.2.24"
|
version = "0.2.26"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cortiq-gateway"
|
name = "cortiq-gateway"
|
||||||
version = "0.2.24"
|
version = "0.2.26"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.75"
|
rust-version = "1.75"
|
||||||
license = "Apache-2.0"
|
license = "Apache-2.0"
|
||||||
|
|||||||
+167
-2
@@ -273,6 +273,138 @@ fn map_quant(q: &str) -> &'static str {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_cmf_repo(repo: &str) -> bool {
|
||||||
|
let lower = repo.to_ascii_lowercase();
|
||||||
|
lower.contains("cmf") || lower.ends_with(".cmf")
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn download_cmf_repo(
|
||||||
|
repo: String,
|
||||||
|
output_abs: String,
|
||||||
|
hf_token: Option<String>,
|
||||||
|
store: Arc<JobStore>,
|
||||||
|
id: String,
|
||||||
|
cancel: Arc<Notify>,
|
||||||
|
) {
|
||||||
|
store.set_progress(&id, 0.0, "listing files".into());
|
||||||
|
|
||||||
|
let tree_url = format!("https://huggingface.co/api/models/{repo}/tree/main?recursive=true");
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let mut req = client.get(&tree_url).header("User-Agent", "cortiq-gateway");
|
||||||
|
if let Some(t) = &hf_token {
|
||||||
|
req = req.bearer_auth(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cmf_rel_path = None;
|
||||||
|
if let Ok(resp) = req.send().await {
|
||||||
|
if resp.status().is_success() {
|
||||||
|
if let Ok(json) = resp.json::<serde_json::Value>().await {
|
||||||
|
if let Some(arr) = json.as_array() {
|
||||||
|
for item in arr {
|
||||||
|
if let Some(path) = item.get("path").and_then(|p| p.as_str()) {
|
||||||
|
if path.to_ascii_lowercase().ends_with(".cmf") {
|
||||||
|
cmf_rel_path = Some(path.to_string());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let cmf_path = match cmf_rel_path {
|
||||||
|
Some(p) => p,
|
||||||
|
None => {
|
||||||
|
let repo_name = repo.split('/').last().unwrap_or(&repo);
|
||||||
|
format!("{repo_name}.cmf")
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
store.push_line(&id, format!("→ downloading {cmf_path} from HuggingFace..."));
|
||||||
|
store.set_progress(&id, 0.05, "downloading".into());
|
||||||
|
|
||||||
|
let download_url = format!("https://huggingface.co/{repo}/resolve/main/{cmf_path}");
|
||||||
|
|
||||||
|
let mut cmd = tokio::process::Command::new("curl");
|
||||||
|
cmd.arg("-f").arg("-L").arg("-#").arg("-o").arg(&output_abs);
|
||||||
|
|
||||||
|
if let Some(t) = &hf_token {
|
||||||
|
cmd.arg("-H").arg(format!("Authorization: Bearer {t}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd.arg(&download_url);
|
||||||
|
cmd.stderr(std::process::Stdio::piped());
|
||||||
|
cmd.stdout(std::process::Stdio::null());
|
||||||
|
|
||||||
|
let mut child = match cmd.spawn() {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => {
|
||||||
|
store.push_line(&id, format!("✗ failed to start curl download: {e}"));
|
||||||
|
store.finish(&id, false);
|
||||||
|
store.drop_cancel(&id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let stderr = child.stderr.take();
|
||||||
|
let mut t_err = None;
|
||||||
|
if let Some(err_stream) = stderr {
|
||||||
|
let store_clone = store.clone();
|
||||||
|
let id_clone = id.clone();
|
||||||
|
t_err = Some(tokio::spawn(async move {
|
||||||
|
use tokio::io::AsyncReadExt;
|
||||||
|
let mut reader = err_stream;
|
||||||
|
let mut buf = [0u8; 256];
|
||||||
|
while let Ok(n) = reader.read(&mut buf).await {
|
||||||
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let text = String::from_utf8_lossy(&buf[..n]);
|
||||||
|
for word in text.split_whitespace() {
|
||||||
|
if let Some(num_str) = word.strip_suffix('%') {
|
||||||
|
if let Ok(pct) = num_str.parse::<f32>() {
|
||||||
|
let frac = (pct / 100.0).clamp(0.0, 1.0);
|
||||||
|
store_clone.set_progress(&id_clone, frac, "downloading".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
tokio::select! {
|
||||||
|
status_res = child.wait() => {
|
||||||
|
if let Some(t) = t_err { t.abort(); }
|
||||||
|
match status_res {
|
||||||
|
Ok(status) if status.success() => {
|
||||||
|
store.push_line(&id, "✓ done".into());
|
||||||
|
store.finish(&id, true);
|
||||||
|
}
|
||||||
|
Ok(status) => {
|
||||||
|
cleanup_output(&output_abs);
|
||||||
|
store.push_line(&id, format!("✗ download failed: exit code {:?}", status.code()));
|
||||||
|
store.finish(&id, false);
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
cleanup_output(&output_abs);
|
||||||
|
store.push_line(&id, format!("✗ download process error: {e}"));
|
||||||
|
store.finish(&id, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = cancel.notified() => {
|
||||||
|
let _ = child.start_kill();
|
||||||
|
let _ = child.wait().await;
|
||||||
|
if let Some(t) = t_err { t.abort(); }
|
||||||
|
cleanup_output(&output_abs);
|
||||||
|
store.push_line(&id, "✗ cancelled by user — partial output removed".into());
|
||||||
|
store.set_state(&id, "cancelled");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
store.drop_cancel(&id);
|
||||||
|
}
|
||||||
|
|
||||||
/// into the job log. Fails fast if the converter script is missing.
|
/// into the job log. Fails fast if the converter script is missing.
|
||||||
pub fn start_import(store: Arc<JobStore>, cfg: &CmfCfg, p: ImportParams) -> Result<String, String> {
|
pub fn start_import(store: Arc<JobStore>, cfg: &CmfCfg, p: ImportParams) -> Result<String, String> {
|
||||||
if p.repo.trim().is_empty() {
|
if p.repo.trim().is_empty() {
|
||||||
@@ -331,13 +463,30 @@ pub fn start_import(store: Arc<JobStore>, cfg: &CmfCfg, p: ImportParams) -> Resu
|
|||||||
.unwrap_or_else(|_| output.clone());
|
.unwrap_or_else(|_| output.clone());
|
||||||
|
|
||||||
let id = gen_id(&p.repo);
|
let id = gen_id(&p.repo);
|
||||||
|
let is_cmf = is_cmf_repo(&p.repo);
|
||||||
|
let quant_display = if p.quant.is_empty() || p.quant == "auto" {
|
||||||
|
if is_cmf {
|
||||||
|
"READY_CMF".to_string()
|
||||||
|
} else {
|
||||||
|
"q8".to_string()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
p.quant.clone()
|
||||||
|
};
|
||||||
store.insert(Job {
|
store.insert(Job {
|
||||||
id: id.clone(),
|
id: id.clone(),
|
||||||
repo: p.repo.clone(),
|
repo: p.repo.clone(),
|
||||||
quant: p.quant.clone(),
|
quant: quant_display.clone(),
|
||||||
output: output_abs.clone(),
|
output: output_abs.clone(),
|
||||||
state: "running".into(),
|
state: "running".into(),
|
||||||
log: vec![format!("→ converting {} to {} ({})", p.repo, base, p.quant)],
|
log: if is_cmf {
|
||||||
|
vec![format!(
|
||||||
|
"→ downloading ready .cmf model {} ({})",
|
||||||
|
p.repo, quant_display
|
||||||
|
)]
|
||||||
|
} else {
|
||||||
|
vec![format!("→ converting {} to {} ({})", p.repo, base, p.quant)]
|
||||||
|
},
|
||||||
started: now(),
|
started: now(),
|
||||||
finished: None,
|
finished: None,
|
||||||
size_bytes: None,
|
size_bytes: None,
|
||||||
@@ -353,6 +502,14 @@ pub fn start_import(store: Arc<JobStore>, cfg: &CmfCfg, p: ImportParams) -> Resu
|
|||||||
std::env::var(&cfg.hf_token_env).ok()
|
std::env::var(&cfg.hf_token_env).ok()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if is_cmf && !use_python {
|
||||||
|
let ret_id = id.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
download_cmf_repo(p.repo, output_abs, hf_token, store, id, cancel).await;
|
||||||
|
});
|
||||||
|
return Ok(ret_id);
|
||||||
|
}
|
||||||
|
|
||||||
// Program + args: `cortiq convert` by default, or the Python converter for
|
// Program + args: `cortiq convert` by default, or the Python converter for
|
||||||
// advanced options. Both stream `@PROGRESS <frac>` markers into the log.
|
// advanced options. Both stream `@PROGRESS <frac>` markers into the log.
|
||||||
let (program, args, workdir): (String, Vec<String>, std::path::PathBuf) = if use_python {
|
let (program, args, workdir): (String, Vec<String>, std::path::PathBuf) = if use_python {
|
||||||
@@ -555,4 +712,12 @@ mod tests {
|
|||||||
assert_eq!(map_quant("Q1T"), "q1t");
|
assert_eq!(map_quant("Q1T"), "q1t");
|
||||||
assert_eq!(map_quant("F16"), "f16");
|
assert_eq!(map_quant("F16"), "f16");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_is_cmf_repo_check() {
|
||||||
|
assert!(is_cmf_repo("infosave/Bonsai-8B_2bit_cmf"));
|
||||||
|
assert!(is_cmf_repo("infosave/Bonsai-1.7Bcmf"));
|
||||||
|
assert!(is_cmf_repo("user/model.cmf"));
|
||||||
|
assert!(!is_cmf_repo("Qwen/Qwen2.5-0.5B-Instruct"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+4
-4
@@ -21,9 +21,9 @@ const QUANTS = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
const FEATURED_REPOS = [
|
const FEATURED_REPOS = [
|
||||||
{ id: "infosave/Bonsai-1.7Bcmf", label: "Bonsai 1.7B CMF", badge: "1.7B · Ready .cmf" },
|
{ id: "infosave/Bonsai-1.7Bcmf", label: "Bonsai 1.7B CMF", badge: "1.7B · Q1", quant: "Q1" },
|
||||||
{ id: "infosave/Bonsai-8B_2bit_cmf", label: "Bonsai 8B 2-bit CMF", badge: "8B · Ready .cmf" },
|
{ id: "infosave/Bonsai-8B_2bit_cmf", label: "Bonsai 8B 2-bit CMF", badge: "8B · Q1T", quant: "Q1T" },
|
||||||
{ id: "infosave/Bonsai-27Bcmf", label: "Bonsai 27B CMF", badge: "27B · Ready .cmf" },
|
{ id: "infosave/Bonsai-27Bcmf", label: "Bonsai 27B CMF", badge: "27B · Q1", quant: "Q1" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
@@ -390,7 +390,7 @@ export function renderImport() {
|
|||||||
try {
|
try {
|
||||||
await api.startImport({
|
await api.startImport({
|
||||||
repo: item.id,
|
repo: item.id,
|
||||||
quant: "Q8_2F",
|
quant: item.quant || "READY_CMF",
|
||||||
name: item.id.split("/").pop().toLowerCase(),
|
name: item.id.split("/").pop().toLowerCase(),
|
||||||
});
|
});
|
||||||
toast(t("import.started"), "ok");
|
toast(t("import.started"), "ok");
|
||||||
|
|||||||
Reference in New Issue
Block a user