Skip to content

handle invalid directory in save_corpus #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukavdplas wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

handle invalid directory in save_corpus #2047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d5a4f4
handle invalid directory in save_corpus
lukavdplas Mar 26, 2026
53eef78
fix empty data_directory import
lukavdplas Mar 26, 2026
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
21 changes: 20 additions & 1 deletion backend/addcorpus/python_corpora/save_corpus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import warnings
import sys
from elastic_transport import ConnectionError
from django.core.exceptions import ValidationError

from es.client import elasticsearch
from es.search import total_hits, get_index
Expand All @@ -13,6 +14,7 @@
load_all_corpus_definitions, corpus_dir, load_corpus_definition
)
from addcorpus.utils import normalize_date_to_year, clear_corpus_image
from addcorpus.validation.creation import validate_source_data_directory

def _save_corpus_configuration(corpus: Corpus, corpus_definition: CorpusDefinition):
'''
Expand All @@ -35,6 +37,7 @@ def _save_corpus_configuration(corpus: Corpus, corpus_definition: CorpusDefiniti
pk = corpus.configuration_obj.pk if corpus.configuration_obj else None
configuration = CorpusConfiguration(pk=pk, corpus=corpus)
_copy_corpus_attributes(corpus_definition, configuration)
_import_corpus_data_directory(corpus_definition, configuration)
_import_corpus_date_range(corpus_definition, configuration)
configuration.save()
configuration.full_clean()
Expand Down Expand Up @@ -68,7 +71,6 @@ def _copy_corpus_attributes(corpus_definition: CorpusDefinition, configuration:
'word_models_present',
'default_sort',
'language_field',
'data_directory',
]

try:
Expand All @@ -79,6 +81,23 @@ def _copy_corpus_attributes(corpus_definition: CorpusDefinition, configuration:
for attr, value in defined.items():
configuration.__setattr__(attr, value)


def _import_corpus_data_directory(definition: CorpusDefinition, configuration: CorpusConfiguration):
'''
Set the data directory, but if it does not exist, show a warning and leave blank.
'''

if definition.data_directory:
try:
validate_source_data_directory(definition.data_directory)
except ValidationError as e:
message = f'Invalid directory for corpus {configuration.corpus.name}: {e.message}'
warnings.warn(message)
return

configuration.data_directory = definition.data_directory


def _import_corpus_date_range(definition: CorpusDefinition, configuration: CorpusConfiguration):
'''
Sets the `min_year` and `max_year` attributes on a CorpusConfiguration based on
Expand Down
Loading