Merge branch 'main' into fix_delete

.github/workflows/build.yml

@@ -28,10 +28,11 @@ jobs:
         pip install .
       env:
         OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
     - name: Build a binary wheel and a source tarball
       run: |
         python -m build --sdist --wheel --outdir dist/ .
     - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/tests.yml

@@ -33,5 +33,6 @@ jobs:
     - name: Run Test
       env:
         OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
       run: |
          pytest tests

.pre-commit-config.yaml

@@ -20,11 +20,11 @@ repos:
       - id: black
         language_version: python3
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.3.0"
+    rev: v1.8.0
     hooks:
       - id: mypy
         args: [--pretty, --ignore-missing-imports]
-        additional_dependencies: [types-requests]
+        additional_dependencies: [types-requests, types-setuptools]
   - repo: https://github.com/PyCQA/isort
     rev: "5.12.0"
     hooks:

.ruff.toml

@@ -1,2 +1,2 @@
-# Allow lines to be as long as 120 characters.
-line-length = 120
+# Allow lines to be as longer.
+line-length = 180

dev-requirements.txt

@@ -5,5 +5,10 @@ pyzotero
 python-dotenv
 pymupdf
 build
+types-setuptools
 types-requests
-numpy
+langchain_openai
+langchain_community
+faiss-cpu
+sentence_transformers
+anthropic

paperqa/__init__.py

@@ -1,4 +1,39 @@
-from .docs import Answer, Docs, PromptCollection, Doc, Text
+from .docs import Answer, Docs, PromptCollection, Doc, Text, Context, print_callback
 from .version import __version__
+from .llms import (
+    LLMModel,
+    EmbeddingModel,
+    LangchainEmbeddingModel,
+    OpenAIEmbeddingModel,
+    LangchainLLMModel,
+    OpenAILLMModel,
+    AnthropicLLMModel,
+    LlamaEmbeddingModel,
+    NumpyVectorStore,
+    LangchainVectorStore,
+    SentenceTransformerEmbeddingModel,
+    LLMResult,
+)
 
-__all__ = ["Docs", "Answer", "PromptCollection", "__version__", "Doc", "Text"]
+__all__ = [
+    "Docs",
+    "Answer",
+    "PromptCollection",
+    "__version__",
+    "Doc",
+    "Text",
+    "Context",
+    "LLMModel",
+    "EmbeddingModel",
+    "OpenAIEmbeddingModel",
+    "OpenAILLMModel",
+    "AnthropicLLMModel",
+    "LangchainLLMModel",
+    "LlamaEmbeddingModel",
+    "SentenceTransformerEmbeddingModel",
+    "LangchainEmbeddingModel",
+    "NumpyVectorStore",
+    "LangchainVectorStore",
+    "print_callback",
+    "LLMResult",
+]

paperqa/contrib/zotero.py

@@ -11,8 +11,7 @@
 except ImportError:
     raise ImportError("Please install pyzotero: `pip install pyzotero`")
 from ..paths import PAPERQA_DIR
-from ..types import StrPath
-from ..utils import count_pdf_pages
+from ..utils import StrPath, count_pdf_pages
 
 
 class ZoteroPaper(BaseModel):
@@ -129,7 +128,7 @@ def get_pdf(self, item: dict) -> Union[Path, None]:
         if pdf_key is None:
             return None
 
-        pdf_path: Path = Path(self.storage / (pdf_key + ".pdf"))  # type: ignore
+        pdf_path: Path = Path(self.storage / (pdf_key + ".pdf"))  # type: ignore[operator]
 
         if not pdf_path.exists():
             pdf_path.parent.mkdir(parents=True, exist_ok=True)