Refactor to breakout config from rest of code #289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d invalid code via blacken-docs
jamesbraza
reviewed
Sep 5, 2024
paperqa/config.py
Outdated
| MaybeSettings = Settings | str | None | ||
|
|
||
|
|
||
| def get_settings(config_or_name: MaybeSettings = None) -> Settings: |
There was a problem hiding this comment.
Let's make this a classmethod of Settings, since that's mostly what this is
paperqa/config.py
Outdated
| raise FileNotFoundError(f"No configuration file found for {config_name}") | ||
|
|
||
|
|
||
| MaybeSettings = Settings | str | None |
There was a problem hiding this comment.
I don't really like this type alias, can we remove it?
paperqa/contrib/zotero.py
Outdated
| @@ -240,7 +240,7 @@ def iterate( # noqa: C901, PLR0912 | |||
| _pdfs = [self.get_pdf(item) for item in _items] | |||
|
|
|||
| # Filter: | |||
| for item, pdf in zip(_items, _pdfs): | |||
| for item, pdf in zip(_items, _pdfs, strict=False): | |||
There was a problem hiding this comment.
Can you add a comment why we're not strict here? To me, it seems we should be strict
jamesbraza
reviewed
Sep 5, 2024
jamesbraza
reviewed
Sep 5, 2024
| settings.agent.paper_directory = stub_data_dir | ||
| settings.agent.index_directory = agent_index_dir | ||
| settings.agent.search_count = 2 | ||
| settings.embedding = "sparse" |
There was a problem hiding this comment.
Can we configure this in the instantiation of Settings(embedding="sparse")?
There was a problem hiding this comment.
Not opposed - but why?
jamesbraza
reviewed
Sep 6, 2024
|
Ready for review - the PR is getting too sprawling to keep going. TODO list [for future PRs]
|
jamesbraza
approved these changes
Sep 8, 2024
jamesbraza
approved these changes
Sep 8, 2024
whitead
changed the title
This was referenced Sep 11, 2024
Merged
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Large refactor to bring us closer to decoupling Docs, LLMs, and Config.
doc_matchanddoc_index- these were only sometimes useful and not really part of current usage. We can add back if needed, but just complicated things.get_callbacksfactories. Now, callbacks can have a kwarg ofnameto get access to name of chain being called.contextvarsfor settinganswer_idin LLMResults so that we do not need to have so much back and forth for callbacks.Answerobjects until end of functions so that retrying is possible (except token counts)Docs, exceptLLMModelwhich will be fixed in port to litellm