Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "gen-worker"
version = "0.26.1"
version = "0.26.2"
description = "A library used to build custom functions in Cozy Creator's serverless function platform."
readme = "README.md"
license = "MIT"
Expand Down
11 changes: 8 additions & 3 deletions src/gen_worker/models/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,10 @@ def _civitai_select_files(
) -> list[dict[str, Any]]:
"""Downloadable weight files of a model version, primary first.

Safetensors files win when present (unchanged behavior). GGUF-only
versions (th#611: klein/qwen fine-tunes published only as quants)
Safetensors files win when present. Civitai may publish alternative
precisions under the same filename; keep the primary/first alternative
once so a later variant cannot overwrite it on disk. GGUF-only versions
(th#611: klein/qwen fine-tunes published only as quants)
select exactly ONE gguf — civitai reuses a single filename across
quantType variants, so downloading several would collide on disk:
``gguf_quant`` picks it explicitly, else the preference order applies.
Expand All @@ -809,7 +811,10 @@ def _civitai_select_files(
gg.append(entry)
if st:
st.sort(key=lambda f: (0 if f["primary"] else 1, f["id"], f["name"]))
return st
unique: dict[str, dict[str, Any]] = {}
for f in st:
unique.setdefault(f["name"], f)
return list(unique.values())
if not gg:
return []
gg.sort(key=lambda f: (f["id"], f["name"]))
Expand Down
12 changes: 12 additions & 0 deletions tests/convert/test_civitai_gguf_select.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ def test_safetensors_win_over_gguf():
assert [f["name"] for f in files] == ["model.safetensors"]


def test_safetensors_same_name_keeps_primary_without_dropping_distinct_files():
files = _civitai_select_files({"files": [
_f("model.safetensors", id=2),
_f("text_encoder.safetensors", id=3),
_f("model.safetensors", id=1, primary=True),
]})
assert [(f["id"], f["name"]) for f in files] == [
(1, "model.safetensors"),
(3, "text_encoder.safetensors"),
]


def test_gguf_only_picks_one_by_preference():
files = _civitai_select_files({"files": [
_f("m.gguf", id=1, quant="Q5_K_M"),
Expand Down
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading