Fixed typing and formatting problems

paperqa/chains.py

@@ -9,7 +9,7 @@
 from langchain.chains import LLMChain
 from langchain.chat_models import ChatOpenAI
 from langchain.memory.chat_memory import BaseChatMemory
-from langchain.prompts import BasePromptTemplate, PromptTemplate, StringPromptTemplate
+from langchain.prompts import PromptTemplate, StringPromptTemplate
 from langchain.prompts.chat import ChatPromptTemplate, HumanMessagePromptTemplate
 from langchain.schema import LLMResult, SystemMessage
 
@@ -45,7 +45,7 @@ async def agenerate(
 
 
 class ExtendedHumanMessagePromptTemplate(HumanMessagePromptTemplate):
-    prompt: BasePromptTemplate
+    prompt: StringPromptTemplate
 
 
 def make_chain(

paperqa/docs.py

@@ -23,6 +23,7 @@
 from .types import Answer, CallbackFactory, Context, Doc, DocKey, PromptCollection, Text
 from .utils import (
     gather_with_concurrency,
+    get_llm_name,
     guess_is_4xx,
     maybe_is_html,
     maybe_is_pdf,
@@ -316,7 +317,7 @@ async def adoc_match(
         try:
             if (
                 rerank is None
-                and cast(BaseLanguageModel, self.llm).model_name.startswith("gpt-4")
+                and get_llm_name(cast(BaseLanguageModel, self.llm)).startswith("gpt-4")
                 or rerank is True
             ):
                 chain = make_chain(
@@ -538,7 +539,7 @@ async def process(match):
         context_str = "\n\n".join(
             [
                 f"{c.text.name}: {c.context}"
-                + (f" Based on {c.text.doc.citation}" if detailed_citations else "")
+                + (f"\n\n Based on {c.text.doc.citation}" if detailed_citations else "")
                 for c in answer.contexts
             ]
         )

paperqa/utils.py

@@ -5,6 +5,7 @@
 from typing import BinaryIO, List
 
 import pypdf
+from langchain.base_language import BaseLanguageModel
 
 from .types import StrPath
 
@@ -89,3 +90,10 @@ def guess_is_4xx(msg: str) -> bool:
     if re.search(r"4\d\d", msg):
         return True
     return False
+
+
+def get_llm_name(llm: BaseLanguageModel) -> str:
+    try:
+        return llm.model_name  # type: ignore
+    except AttributeError:
+        return llm.model  # type: ignore

paperqa/version.py

@@ -1 +1 @@
-__version__ = "3.9.0"
+__version__ = "3.9.1"