mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-08-07 22:40:14 -03:00
feat(autocomplete): search loras within active filters of LoRA Manager page
Add /af and /noaf toggle commands (plus /activefilters aliases) to the
loras autocomplete widget. When enabled (default off), suggestions are
matched within the active filters (folder, base model, tags, auto-tags,
license, tag logic) persisted by the LoRA Manager page in localStorage,
keeping the match pool consistent with the list endpoint, including the
global show_only_sfw setting.
Backend: /lm/{prefix}/relative-paths accepts the filter query params and
pre-filters the scanner cache with ModelFilterSet. The presence of the
recursive param signals the filter pipeline to run even without concrete
filters so global settings stay in parity with the list endpoint.
This commit is contained in:
Will Miao
@@ -1666,4 +1666,374 @@ describe('AutoComplete widget interactions', () => {
|
||||
// Entire phrase should be replaced with selected tag
|
||||
expect(input.value).toBe('looking_to_the_side,');
|
||||
});
|
||||
|
||||
it('shows /af command for loras when active-filters autocomplete is off (default)', async () => {
|
||||
const input = document.createElement('textarea');
|
||||
input.value = '/';
|
||||
input.selectionStart = input.value.length;
|
||||
document.body.append(input);
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('/');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
const autoComplete = new AutoComplete(input, 'loras', { showPreview: false, minChars: 1 });
|
||||
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
const commandNames = autoComplete.items.map((item) => item.command);
|
||||
expect(commandNames).toContain('/af');
|
||||
expect(commandNames).not.toContain('/noaf');
|
||||
expect(commandNames).toContain('/activefilters');
|
||||
expect(commandNames).not.toContain('/noactivefilters');
|
||||
});
|
||||
|
||||
it('does not trigger preview for command items when selecting the loras command list', async () => {
|
||||
// Regression: with showPreview enabled (the default for loras widgets), the
|
||||
// auto-selected first command item was passed to showPreviewForItem() as a
|
||||
// relative path, crashing on relativePath.split.
|
||||
const input = document.createElement('textarea');
|
||||
input.value = '/';
|
||||
input.selectionStart = input.value.length;
|
||||
document.body.append(input);
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('/');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
const autoComplete = new AutoComplete(input, 'loras', { showPreview: true, minChars: 1 });
|
||||
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
// Allow the async preview tooltip import to resolve
|
||||
await Promise.resolve();
|
||||
await Promise.resolve();
|
||||
|
||||
const commandNames = autoComplete.items.map((item) => item.command);
|
||||
expect(commandNames).toContain('/af');
|
||||
expect(previewTooltipMock.show).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('shows /noaf command for loras when active-filters autocomplete is on', async () => {
|
||||
settingGetMock.mockImplementation((key) => {
|
||||
if (key === 'loramanager.lora_active_filters_autocomplete') {
|
||||
return true;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
input.value = '/';
|
||||
input.selectionStart = input.value.length;
|
||||
document.body.append(input);
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('/');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
const autoComplete = new AutoComplete(input, 'loras', { showPreview: false, minChars: 1 });
|
||||
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
const commandNames = autoComplete.items.map((item) => item.command);
|
||||
expect(commandNames).toContain('/noaf');
|
||||
expect(commandNames).not.toContain('/af');
|
||||
expect(commandNames).toContain('/noactivefilters');
|
||||
expect(commandNames).not.toContain('/activefilters');
|
||||
});
|
||||
|
||||
it('toggles the active-filters setting when /activefilters alias is used', async () => {
|
||||
const input = document.createElement('textarea');
|
||||
input.value = '/activefilters';
|
||||
input.selectionStart = input.value.length;
|
||||
input.focus = vi.fn();
|
||||
input.setSelectionRange = vi.fn();
|
||||
document.body.append(input);
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('/activefilters');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
const autoComplete = new AutoComplete(input, 'loras', { showPreview: false, minChars: 1 });
|
||||
|
||||
const commandResult = autoComplete._parseCommandInput('/activefilters');
|
||||
expect(commandResult.command).toBeDefined();
|
||||
expect(commandResult.command.type).toBe('toggle_setting');
|
||||
expect(commandResult.command.value).toBe(true);
|
||||
|
||||
await autoComplete._handleToggleSettingCommand(commandResult.command);
|
||||
|
||||
expect(settingSetMock).toHaveBeenCalledWith('loramanager.lora_active_filters_autocomplete', true);
|
||||
});
|
||||
|
||||
it('toggles the active-filters setting when /af is accepted', async () => {
|
||||
const input = document.createElement('textarea');
|
||||
input.value = '/';
|
||||
input.selectionStart = input.value.length;
|
||||
input.focus = vi.fn();
|
||||
input.setSelectionRange = vi.fn();
|
||||
document.body.append(input);
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('/');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
const autoComplete = new AutoComplete(input, 'loras', { showPreview: false, minChars: 1 });
|
||||
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
const afItem = autoComplete.items.find((item) => item.command === '/af');
|
||||
expect(afItem).toBeDefined();
|
||||
|
||||
// Simulate the input being cleared after the command is accepted so the
|
||||
// cleared-token input event does not re-trigger command parsing.
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('');
|
||||
await autoComplete._handleToggleSettingCommand(afItem);
|
||||
|
||||
expect(settingSetMock).toHaveBeenCalledWith('loramanager.lora_active_filters_autocomplete', true);
|
||||
});
|
||||
|
||||
it('appends active filter params to loras autocomplete requests when enabled', async () => {
|
||||
vi.useFakeTimers();
|
||||
|
||||
settingGetMock.mockImplementation((key) => {
|
||||
if (key === 'loramanager.lora_active_filters_autocomplete') {
|
||||
return true;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
|
||||
localStorage.setItem('lora_manager_loras_filters', JSON.stringify({
|
||||
baseModel: ['SD 1.5'],
|
||||
tags: { anime: 'include', nsfw: 'exclude', __no_tags__: 'exclude' },
|
||||
autoTags: { I2V: 'include' },
|
||||
modelTypes: ['standard'],
|
||||
tagLogic: 'all',
|
||||
license: { noCredit: 'include', allowSelling: 'exclude' },
|
||||
}));
|
||||
localStorage.setItem('lora_manager_loras_activeFolder', 'MyLoras');
|
||||
localStorage.setItem('lora_manager_loras_recursiveSearch', 'true');
|
||||
|
||||
fetchApiMock.mockResolvedValue({
|
||||
json: () => Promise.resolve({ success: true, relative_paths: ['models/example.safetensors'] }),
|
||||
});
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('example');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
document.body.append(input);
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
new AutoComplete(input, 'loras', { debounceDelay: 0, showPreview: false, minChars: 1 });
|
||||
|
||||
input.value = 'example';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
await vi.runAllTimersAsync();
|
||||
await Promise.resolve();
|
||||
|
||||
const calledUrl = fetchApiMock.mock.calls[0][0];
|
||||
expect(calledUrl).toContain('/lm/loras/relative-paths?search=example&limit=100');
|
||||
expect(calledUrl).toContain('folder=MyLoras');
|
||||
expect(calledUrl).toContain('recursive=true');
|
||||
expect(calledUrl).toContain('tag_include=anime');
|
||||
expect(calledUrl).toContain('tag_exclude=nsfw');
|
||||
expect(calledUrl).toContain('tag_exclude=__no_tags__');
|
||||
expect(calledUrl).toContain('auto_tag_include=I2V');
|
||||
expect(calledUrl).toContain('tag_logic=all');
|
||||
expect(calledUrl).toContain('credit_required=false');
|
||||
expect(calledUrl).toContain('allow_selling_generated_content=false');
|
||||
const parsed = new URL(calledUrl, 'https://example.com');
|
||||
expect(parsed.searchParams.get('base_model')).toBe('SD 1.5');
|
||||
expect(parsed.searchParams.get('model_type')).toBe('standard');
|
||||
});
|
||||
|
||||
it('keeps the default loras autocomplete URL when active-filters mode is off', async () => {
|
||||
vi.useFakeTimers();
|
||||
|
||||
fetchApiMock.mockResolvedValue({
|
||||
json: () => Promise.resolve({ success: true, relative_paths: ['models/example.safetensors'] }),
|
||||
});
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('example');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
document.body.append(input);
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
new AutoComplete(input, 'loras', { debounceDelay: 0, showPreview: false, minChars: 1 });
|
||||
|
||||
input.value = 'example';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
await vi.runAllTimersAsync();
|
||||
await Promise.resolve();
|
||||
|
||||
expect(fetchApiMock).toHaveBeenCalledWith('/lm/loras/relative-paths?search=example&limit=100');
|
||||
});
|
||||
|
||||
it('sends the filter-pipeline signal even when no filters are stored', async () => {
|
||||
// Regression: with filter mode on but no folder/filters stored, the request
|
||||
// carried no params, so the backend skipped the filter pipeline and global
|
||||
// settings like show_only_sfw diverged from the list endpoint.
|
||||
vi.useFakeTimers();
|
||||
|
||||
settingGetMock.mockImplementation((key) => {
|
||||
if (key === 'loramanager.lora_active_filters_autocomplete') {
|
||||
return true;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
|
||||
localStorage.removeItem('lora_manager_loras_filters');
|
||||
localStorage.removeItem('lora_manager_loras_activeFolder');
|
||||
localStorage.removeItem('lora_manager_loras_recursiveSearch');
|
||||
|
||||
fetchApiMock.mockResolvedValue({
|
||||
json: () => Promise.resolve({ success: true, relative_paths: ['models/example.safetensors'] }),
|
||||
});
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('example');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
document.body.append(input);
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
new AutoComplete(input, 'loras', { debounceDelay: 0, showPreview: false, minChars: 1 });
|
||||
|
||||
input.value = 'example';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
await vi.runAllTimersAsync();
|
||||
await Promise.resolve();
|
||||
|
||||
const calledUrl = fetchApiMock.mock.calls[0][0];
|
||||
expect(calledUrl).toContain('recursive=true');
|
||||
});
|
||||
|
||||
it('omits folder param when active folder is root and recursion is enabled', async () => {
|
||||
vi.useFakeTimers();
|
||||
|
||||
settingGetMock.mockImplementation((key) => {
|
||||
if (key === 'loramanager.lora_active_filters_autocomplete') {
|
||||
return true;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
|
||||
localStorage.setItem('lora_manager_loras_filters', JSON.stringify({
|
||||
baseModel: ['SD 1.5'],
|
||||
tags: { anime: 'include' },
|
||||
}));
|
||||
localStorage.setItem('lora_manager_loras_activeFolder', '');
|
||||
localStorage.removeItem('lora_manager_loras_recursiveSearch');
|
||||
|
||||
fetchApiMock.mockResolvedValue({
|
||||
json: () => Promise.resolve({ success: true, relative_paths: ['models/example.safetensors'] }),
|
||||
});
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('example');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
document.body.append(input);
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
new AutoComplete(input, 'loras', { debounceDelay: 0, showPreview: false, minChars: 1 });
|
||||
|
||||
input.value = 'example';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
await vi.runAllTimersAsync();
|
||||
await Promise.resolve();
|
||||
|
||||
const calledUrl = fetchApiMock.mock.calls[0][0];
|
||||
expect(calledUrl).not.toContain('folder=');
|
||||
expect(calledUrl).toContain('recursive=true');
|
||||
});
|
||||
|
||||
it('sends an empty folder param for root with recursion disabled, mirroring the page list', async () => {
|
||||
vi.useFakeTimers();
|
||||
|
||||
settingGetMock.mockImplementation((key) => {
|
||||
if (key === 'loramanager.lora_active_filters_autocomplete') {
|
||||
return true;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
|
||||
localStorage.setItem('lora_manager_loras_filters', JSON.stringify({
|
||||
baseModel: ['SD 1.5'],
|
||||
tags: { anime: 'include' },
|
||||
}));
|
||||
localStorage.setItem('lora_manager_loras_activeFolder', '');
|
||||
localStorage.setItem('lora_manager_loras_recursiveSearch', 'false');
|
||||
|
||||
fetchApiMock.mockResolvedValue({
|
||||
json: () => Promise.resolve({ success: true, relative_paths: ['models/example.safetensors'] }),
|
||||
});
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('example');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
document.body.append(input);
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
new AutoComplete(input, 'loras', { debounceDelay: 0, showPreview: false, minChars: 1 });
|
||||
|
||||
input.value = 'example';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
await vi.runAllTimersAsync();
|
||||
await Promise.resolve();
|
||||
|
||||
const calledUrl = fetchApiMock.mock.calls[0][0];
|
||||
expect(calledUrl).toContain('folder=');
|
||||
expect(calledUrl).toContain('recursive=false');
|
||||
const parsed = new URL(calledUrl, 'https://example.com');
|
||||
expect(parsed.searchParams.get('folder')).toBe('');
|
||||
});
|
||||
|
||||
it('applies the active folder even when no filter-panel filters are set', async () => {
|
||||
// Regression: folder was skipped when lora_manager_loras_filters was
|
||||
// missing because the filters key gate returned early.
|
||||
vi.useFakeTimers();
|
||||
|
||||
settingGetMock.mockImplementation((key) => {
|
||||
if (key === 'loramanager.lora_active_filters_autocomplete') {
|
||||
return true;
|
||||
}
|
||||
return undefined;
|
||||
});
|
||||
|
||||
localStorage.removeItem('lora_manager_loras_filters');
|
||||
localStorage.setItem('lora_manager_loras_activeFolder', 'Flux.1 D/style');
|
||||
|
||||
fetchApiMock.mockResolvedValue({
|
||||
json: () => Promise.resolve({ success: true, relative_paths: ['Flux.1 D/style/3D_Fairytales.safetensors'] }),
|
||||
});
|
||||
|
||||
caretHelperInstance.getBeforeCursor.mockReturnValue('3D');
|
||||
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
|
||||
|
||||
const input = document.createElement('textarea');
|
||||
document.body.append(input);
|
||||
|
||||
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
|
||||
new AutoComplete(input, 'loras', { debounceDelay: 0, showPreview: false, minChars: 1 });
|
||||
|
||||
input.value = '3D';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
await vi.runAllTimersAsync();
|
||||
await Promise.resolve();
|
||||
|
||||
const calledUrl = fetchApiMock.mock.calls[0][0];
|
||||
expect(calledUrl).toContain('folder=Flux.1+D%2Fstyle');
|
||||
expect(calledUrl).toContain('recursive=true');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -27,6 +27,13 @@ class FakeScanner:
|
||||
return list(self._roots)
|
||||
|
||||
|
||||
class StubSettings:
|
||||
"""Settings stub that returns defaults, avoiding the real settings singleton."""
|
||||
|
||||
def get(self, key, default=None):
|
||||
return default
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_supports_multiple_tokens():
|
||||
scanner = FakeScanner(
|
||||
@@ -101,3 +108,274 @@ async def test_search_safe_does_not_match_all_files():
|
||||
matching = await service.search_relative_paths("safe")
|
||||
|
||||
assert len(matching) == 0
|
||||
|
||||
|
||||
class SfwStubSettings(StubSettings):
|
||||
"""Settings stub with the global SFW filter enabled."""
|
||||
|
||||
def get(self, key, default=None):
|
||||
if key == "show_only_sfw":
|
||||
return True
|
||||
return default
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_respects_global_sfw_setting():
|
||||
"""Filtered search applies show_only_sfw like the list endpoint (parity)."""
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/sfw-model.safetensors", "preview_nsfw_level": 0},
|
||||
{"file_path": "/models/nsfw-model.safetensors", "preview_nsfw_level": 4},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=SfwStubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("model", apply_filters=True)
|
||||
|
||||
assert matching == ["sfw-model.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_sfw_only_applied_when_filter_mode_is_on():
|
||||
"""Global settings (show_only_sfw) apply only when the filter pipeline runs."""
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/sfw-model.safetensors", "preview_nsfw_level": 0},
|
||||
{"file_path": "/models/nsfw-model.safetensors", "preview_nsfw_level": 4},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=SfwStubSettings()
|
||||
)
|
||||
|
||||
default_matching = await service.search_relative_paths("model")
|
||||
|
||||
assert default_matching == [
|
||||
"sfw-model.safetensors",
|
||||
"nsfw-model.safetensors",
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_folder_filter_recursive():
|
||||
"""folder filter with recursive=True (default) matches subfolders."""
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/anime/model-a.safetensors", "folder": "anime"},
|
||||
{
|
||||
"file_path": "/models/anime/nsfw/model-b.safetensors",
|
||||
"folder": "anime/nsfw",
|
||||
},
|
||||
{"file_path": "/models/realistic/model-c.safetensors", "folder": "realistic"},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("model", folder="anime")
|
||||
|
||||
assert matching == [
|
||||
f"anime{os.sep}model-a.safetensors",
|
||||
f"anime{os.sep}nsfw{os.sep}model-b.safetensors",
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_folder_filter_exact():
|
||||
"""folder filter with recursive=False matches only the exact folder."""
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/anime/model-a.safetensors", "folder": "anime"},
|
||||
{
|
||||
"file_path": "/models/anime/nsfw/model-b.safetensors",
|
||||
"folder": "anime/nsfw",
|
||||
},
|
||||
{"file_path": "/models/realistic/model-c.safetensors", "folder": "realistic"},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths(
|
||||
"model", folder="anime", recursive=False
|
||||
)
|
||||
|
||||
assert matching == [f"anime{os.sep}model-a.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_base_model_filter():
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/model-a.safetensors", "base_model": "SD 1.5"},
|
||||
{"file_path": "/models/model-b.safetensors", "base_model": "SDXL"},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("model", base_models=["SD 1.5"])
|
||||
|
||||
assert matching == ["model-a.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_tag_include():
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/model-a.safetensors", "tags": ["anime"]},
|
||||
{"file_path": "/models/model-b.safetensors", "tags": ["realistic"]},
|
||||
{"file_path": "/models/model-c.safetensors", "tags": ["anime", "realistic"]},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("model", tags={"anime": "include"})
|
||||
|
||||
assert set(matching) == {"model-a.safetensors", "model-c.safetensors"}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_tag_exclude():
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/model-a.safetensors", "tags": ["anime"]},
|
||||
{"file_path": "/models/model-b.safetensors", "tags": ["realistic"]},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("model", tags={"anime": "exclude"})
|
||||
|
||||
assert matching == ["model-b.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_auto_tag_include():
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{
|
||||
"file_path": "/models/model-i2v.safetensors",
|
||||
"file_name": "model-i2v.safetensors",
|
||||
},
|
||||
{
|
||||
"file_path": "/models/model-t2v.safetensors",
|
||||
"file_name": "model-t2v.safetensors",
|
||||
},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths(
|
||||
"model", auto_tags={"I2V": "include"}
|
||||
)
|
||||
|
||||
assert matching == ["model-i2v.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_tag_logic_all():
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/model-a.safetensors", "tags": ["anime", "style"]},
|
||||
{"file_path": "/models/model-b.safetensors", "tags": ["anime"]},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths(
|
||||
"model", tags={"anime": "include", "style": "include"}, tag_logic="all"
|
||||
)
|
||||
|
||||
assert matching == ["model-a.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_credit_required_filter():
|
||||
# license_flags bit0: 1 = no credit required, 0 = credit required
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/model-a.safetensors", "license_flags": 127},
|
||||
{"file_path": "/models/model-b.safetensors", "license_flags": 0},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("model", credit_required=True)
|
||||
assert matching == ["model-b.safetensors"]
|
||||
|
||||
matching = await service.search_relative_paths("model", credit_required=False)
|
||||
assert matching == ["model-a.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_allow_selling_filter():
|
||||
# license_flags bit1: 1 = commercial image use allowed, 0 = not allowed
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/model-a.safetensors", "license_flags": 2},
|
||||
{"file_path": "/models/model-b.safetensors", "license_flags": 1},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths(
|
||||
"model", allow_selling_generated_content=True
|
||||
)
|
||||
assert matching == ["model-a.safetensors"]
|
||||
|
||||
matching = await service.search_relative_paths(
|
||||
"model", allow_selling_generated_content=False
|
||||
)
|
||||
assert matching == ["model-b.safetensors"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_search_relative_paths_no_filters_regression():
|
||||
"""No filter kwargs -> behavior is byte-identical to plain token matching."""
|
||||
scanner = FakeScanner(
|
||||
[
|
||||
{"file_path": "/models/flux/detail-model.safetensors"},
|
||||
{"file_path": "/models/flux/only-flux.safetensors"},
|
||||
],
|
||||
["/models"],
|
||||
)
|
||||
service = DummyService(
|
||||
"stub", scanner, BaseModelMetadata, settings_provider=StubSettings()
|
||||
)
|
||||
|
||||
matching = await service.search_relative_paths("flux")
|
||||
|
||||
assert matching == [
|
||||
f"flux{os.sep}only-flux.safetensors",
|
||||
f"flux{os.sep}detail-model.safetensors",
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user