Skip to content
Open
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
8 changes: 8 additions & 0 deletions pyrit/datasets/seed_datasets/local/local_dataset_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ async def fetch_dataset_async(self, *, cache: bool = True) -> SeedDataset:
dataset = await asyncio.to_thread(SeedDataset.from_yaml_file, self.file_path)
if not dataset.dataset_name:
dataset.dataset_name = self.dataset_name
# A filename-only YAML leaves the top-level dataset name unset, so `_build_seeds`
# could not merge it into the seeds. Carry the resolved provider name onto every
# seed that has no name of its own before the dataset is returned for persistence;
# otherwise the persisted rows stay unnamed and named queries/listing miss them.
# Explicit per-seed names are kept as-is (#3740).
for seed in dataset.seeds:
if not seed.dataset_name:
seed.dataset_name = self.dataset_name
return dataset
except Exception as e:
logger.error(f"Failed to load local dataset from {self.file_path}: {e}")
Expand Down
63 changes: 63 additions & 0 deletions tests/unit/datasets/test_local_dataset_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import pytest

from pyrit.datasets.seed_datasets.local.local_dataset_loader import _LocalDatasetLoader
from pyrit.memory import MemoryInterface
from pyrit.models import SeedDataset, SeedOrigin, SeedPrompt


Expand Down Expand Up @@ -121,3 +122,65 @@ async def test_fetch_dataset_file_not_found(self):
loader = _LocalDatasetLoader(file_path=Path("non_existent.yaml"))
with pytest.raises(Exception):
await loader.fetch_dataset_async()


@pytest.mark.usefixtures("patch_central_database")
class TestLocalDatasetFilenameFallback:
"""A filename-derived dataset name must reach the seeds before they are persisted (#3740)."""

filename_only_yaml = """
source: http://example.com
seeds:
- value: filename fallback prompt
data_type: text
origin: local
- value: per seed named prompt
data_type: text
origin: local
dataset_name: per_seed_dataset
"""

explicitly_named_yaml = """
dataset_name: explicit_dataset
source: http://example.com
seeds:
- value: explicitly named prompt
data_type: text
origin: local
"""

async def test_filename_fallback_is_assigned_to_seeds_and_queryable_async(
self, tmp_path: Path, sqlite_instance: MemoryInterface
) -> None:
file_path = tmp_path / "filename_only.yaml"
file_path.write_text(self.filename_only_yaml, encoding="utf-8")

dataset = await _LocalDatasetLoader(file_path=file_path).fetch_dataset_async()

assert dataset.dataset_name == "filename_only"
assert dataset.seeds[0].dataset_name == "filename_only"
assert dataset.seeds[1].dataset_name == "per_seed_dataset"

await sqlite_instance.add_seed_datasets_to_memory_async(datasets=[dataset], added_by="test")

stored = await sqlite_instance.get_seeds_async(dataset_name="filename_only")
assert [seed.value for seed in stored] == ["filename fallback prompt"]
assert set(await sqlite_instance.get_seed_dataset_names_async()) == {
"filename_only",
"per_seed_dataset",
}

async def test_explicit_dataset_name_is_unchanged_async(
self, tmp_path: Path, sqlite_instance: MemoryInterface
) -> None:
file_path = tmp_path / "explicit.yaml"
file_path.write_text(self.explicitly_named_yaml, encoding="utf-8")

dataset = await _LocalDatasetLoader(file_path=file_path).fetch_dataset_async()

assert dataset.dataset_name == "explicit_dataset"
assert dataset.seeds[0].dataset_name == "explicit_dataset"

await sqlite_instance.add_seed_datasets_to_memory_async(datasets=[dataset], added_by="test")
assert len(await sqlite_instance.get_seeds_async(dataset_name="explicit_dataset")) == 1
assert "explicit_dataset" in await sqlite_instance.get_seed_dataset_names_async()
Loading