langroid 0.50.8__py3-none-any.whl → 0.50.10__py3-none-any.whl

langroid/language_models/base.py

@@ -733,16 +733,37 @@ class LanguageModel(ABC):
         history = collate_chat_history(chat_history)
 
         prompt = f"""
-        Given the CHAT HISTORY below, and a follow-up QUESTION or SEARCH PHRASE,
-        rephrase the follow-up question/phrase as a STANDALONE QUESTION that
-        can be understood without the context of the chat history.
+        You are an expert at understanding a CHAT HISTORY between an AI Assistant
+        and a User, and you are highly skilled in rephrasing the User's FOLLOW-UP 
+        QUESTION/REQUEST as a STANDALONE QUESTION/REQUEST that can be understood 
+        WITHOUT the context of the chat history.
         
-        Chat history: {history}
+        Below is the CHAT HISTORY. When the User asks you to rephrase a 
+        FOLLOW-UP QUESTION/REQUEST, your ONLY task is to simply return the 
+        question REPHRASED as a STANDALONE QUESTION/REQUEST, without any additional 
+        text or context.
         
-        Follow-up question: {question} 
+        <CHAT_HISTORY>
+        {history}
+        </CHAT_HISTORY>        
         """.strip()
+
+        follow_up_question = f"""
+        Please rephrase this as a stand-alone question or request:
+        <FOLLOW-UP-QUESTION-OR-REQUEST>
+        {question}
+        </FOLLOW-UP-QUESTION-OR-REQUEST>
+        """.strip()
+
         show_if_debug(prompt, "FOLLOWUP->STANDALONE-PROMPT= ")
-        standalone = self.generate(prompt=prompt, max_tokens=1024).message.strip()
+        standalone = self.chat(
+            messages=[
+                LLMMessage(role=Role.SYSTEM, content=prompt),
+                LLMMessage(role=Role.USER, content=follow_up_question),
+            ],
+            max_tokens=1024,
+        ).message.strip()
+
         show_if_debug(prompt, "FOLLOWUP->STANDALONE-RESPONSE= ")
         return standalone
 

langroid/language_models/utils.py

@@ -59,6 +59,18 @@ def retry_with_exponential_backoff(
 
             # Retry on specified errors
             except errors as e:
+
+                # For certain types of errors that slip through here
+                # (e.g. when using proxies like LiteLLM, do not retry)
+                if any(
+                    err in str(e)
+                    for err in [
+                        "BadRequestError",
+                        "ConnectionError",
+                    ]
+                ):
+                    logger.error(f"OpenAI API request failed with error: {e}.")
+                    raise e
                 # Increment retries
                 num_retries += 1
 

{langroid-0.50.8.dist-info → langroid-0.50.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langroid
-Version: 0.50.8
+Version: 0.50.10
 Summary: Harness LLMs with Multi-Agent Programming
 Author-email: Prasad Chalasani <pchalasani@gmail.com>
 License: MIT

{langroid-0.50.8.dist-info → langroid-0.50.10.dist-info}/RECORD

@@ -69,12 +69,12 @@ langroid/embedding_models/protoc/embeddings_pb2.pyi,sha256=UkNy7BrNsmQm0vLb3NtGX
 langroid/embedding_models/protoc/embeddings_pb2_grpc.py,sha256=9dYQqkW3JPyBpSEjeGXTNpSqAkC-6FPtBHyteVob2Y8,2452
 langroid/language_models/__init__.py,sha256=3aD2qC1lz8v12HX4B-dilv27gNxYdGdeu1QvDlkqqHs,1095
 langroid/language_models/azure_openai.py,sha256=SW0Fp_y6HpERr9l6TtF6CYsKgKwjUf_hSL_2mhTV4wI,5034
-langroid/language_models/base.py,sha256=A9A83SJOGh_elRScKNIDAcVT4mw9vKCou7txsPMVSv4,27023
+langroid/language_models/base.py,sha256=sCDC02hqIgjY73KnCvc-YGxZJm_LAs4Z1VVQpIFWLyQ,27754
 langroid/language_models/config.py,sha256=9Q8wk5a7RQr8LGMT_0WkpjY8S4ywK06SalVRjXlfCiI,378
 langroid/language_models/mock_lm.py,sha256=5BgHKDVRWFbUwDT_PFgTZXz9-k8wJSA2e3PZmyDgQ1k,4022
 langroid/language_models/model_info.py,sha256=tfBBxL0iUf2mVN6CjcvqflzFUVg2oZqOJZexZ8jHTYA,12216
 langroid/language_models/openai_gpt.py,sha256=t5oFJFxfm0ZwbD5kS73TY8Hal6aCFUWX7O7dBZc-7fw,84480
-langroid/language_models/utils.py,sha256=L4_CbihDMTGcsg0TOG1Yd5JFEto46--h7CX_14m89sQ,5016
+langroid/language_models/utils.py,sha256=hC5p61P_Qlrowkm5wMap1A1b5ZUCwK_XhPIzAQk1T1s,5483
 langroid/language_models/prompt_formatter/__init__.py,sha256=2-5cdE24XoFDhifOLl8yiscohil1ogbP1ECkYdBlBsk,372
 langroid/language_models/prompt_formatter/base.py,sha256=eDS1sgRNZVnoajwV_ZIha6cba5Dt8xjgzdRbPITwx3Q,1221
 langroid/language_models/prompt_formatter/hf_formatter.py,sha256=PVJppmjRvD-2DF-XNC6mE05vTZ9wbu37SmXwZBQhad0,5055
@@ -129,7 +129,7 @@ langroid/vector_store/pineconedb.py,sha256=otxXZNaBKb9f_H75HTaU3lMHiaR2NUp5MqwLZ
 langroid/vector_store/postgres.py,sha256=wHPtIi2qM4fhO4pMQr95pz1ZCe7dTb2hxl4VYspGZoA,16104
 langroid/vector_store/qdrantdb.py,sha256=O6dSBoDZ0jzfeVBd7LLvsXu083xs2fxXtPa9gGX3JX4,18443
 langroid/vector_store/weaviatedb.py,sha256=Yn8pg139gOy3zkaPfoTbMXEEBCiLiYa1MU5d_3UA1K4,11847
-langroid-0.50.8.dist-info/METADATA,sha256=cv2tgYtCXrsYqYuNrBjdYEib3tGOYjxf3z7ACrUnU1U,63641
-langroid-0.50.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.50.8.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.50.8.dist-info/RECORD,,
+langroid-0.50.10.dist-info/METADATA,sha256=XAXiPJuTaCrL_WyihMNOfVxm1BZxk_aAxxg_OCQSQqQ,63642
+langroid-0.50.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.50.10.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.50.10.dist-info/RECORD,,