Skip to content

DRY'd up default indexes default location #432

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.

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

Merged
merged 1 commit into from
Sep 18, 2024
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
3 changes: 1 addition & 2 deletions paperqa/agents/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

from paperqa.docs import Docs
from paperqa.types import Answer
from paperqa.utils import pqa_directory

from .env import PaperQAEnvironment
from .helpers import litellm_get_search_query, table_formatter
Expand Down Expand Up @@ -289,7 +288,7 @@ async def index_search(
search_index = SearchIndex(
fields=fields,
index_name=index_name,
index_directory=index_directory or pqa_directory("indexes"),
index_directory=index_directory,
storage=(
SearchDocumentStorage.JSON_MODEL_DUMP
if index_name == "answers"
Expand Down
4 changes: 2 additions & 2 deletions paperqa/agents/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from paperqa.docs import Docs
from paperqa.settings import MaybeSettings, Settings, get_settings
from paperqa.types import DocDetails
from paperqa.utils import ImpossibleParsingError, hexdigest, pqa_directory
from paperqa.utils import ImpossibleParsingError, hexdigest

from .models import SupportsPickle

Expand Down Expand Up @@ -105,7 +105,7 @@ def __init__(
f"{self.REQUIRED_FIELDS} must be included in search index fields."
)
if index_directory is None:
index_directory = pqa_directory("indexes")
index_directory = Settings.model_fields["index_directory"].default
self.index_name = index_name
self._index_directory = index_directory
self._schema = None
Expand Down