langroid 0.50.9__py3-none-any.whl → 0.50.11__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/openai_gpt.py

@@ -157,7 +157,7 @@ class AccessWarning(Warning):
 def gpt_3_5_warning() -> None:
     warnings.warn(
         f"""
-        {OpenAIChatModel.GPT4o} is not available, 
+        {OpenAIChatModel.GPT4o} is not available,
         falling back to {OpenAIChatModel.GPT3_5_TURBO}.
         Examples may not work properly and unexpected behavior may occur.
         Adjustments to prompts may be necessary.
@@ -435,8 +435,8 @@ class OpenAIGPT(LanguageModel):
                     self.config.formatter = formatter
                     logging.warning(
                         f"""
-                        Using completions (not chat) endpoint with HuggingFace 
-                        chat_template for {formatter} for 
+                        Using completions (not chat) endpoint with HuggingFace
+                        chat_template for {formatter} for
                         model {self.config.chat_model}
                         """
                     )
@@ -758,12 +758,11 @@ class OpenAIGPT(LanguageModel):
         return tmp
 
     def get_stream(self) -> bool:
-        """Get streaming status. Note we disable streaming in quiet mode."""
+        """Get streaming status."""
         return (
             self.config.stream
             and settings.stream
             and self.info().allows_streaming
-            and not settings.quiet
         )
 
     @no_type_check
@@ -813,6 +812,7 @@ class OpenAIGPT(LanguageModel):
         event_args = ""
         event_fn_name = ""
         event_tool_deltas: Optional[List[Dict[str, Any]]] = None
+        silent = self.config.async_stream_quiet or settings.quiet
         # The first two events in the stream of Azure OpenAI is useless.
         # In the 1st: choices list is empty, in the 2nd: the dict delta has null content
         if chat:
@@ -852,25 +852,29 @@ class OpenAIGPT(LanguageModel):
 
         if event_text:
             completion += event_text
-            sys.stdout.write(Colors().GREEN + event_text)
-            sys.stdout.flush()
+            if not silent:
+                sys.stdout.write(Colors().GREEN + event_text)
+                sys.stdout.flush()
             self.config.streamer(event_text, StreamEventType.TEXT)
         if event_reasoning:
             reasoning += event_reasoning
-            sys.stdout.write(Colors().GREEN_DIM + event_reasoning)
-            sys.stdout.flush()
+            if not silent:
+                sys.stdout.write(Colors().GREEN_DIM + event_reasoning)
+                sys.stdout.flush()
             self.config.streamer(event_reasoning, StreamEventType.TEXT)
         if event_fn_name:
             function_name = event_fn_name
             has_function = True
-            sys.stdout.write(Colors().GREEN + "FUNC: " + event_fn_name + ": ")
-            sys.stdout.flush()
+            if not silent:
+                sys.stdout.write(Colors().GREEN + "FUNC: " + event_fn_name + ": ")
+                sys.stdout.flush()
             self.config.streamer(event_fn_name, StreamEventType.FUNC_NAME)
 
         if event_args:
             function_args += event_args
-            sys.stdout.write(Colors().GREEN + event_args)
-            sys.stdout.flush()
+            if not silent:
+                sys.stdout.write(Colors().GREEN + event_args)
+                sys.stdout.flush()
             self.config.streamer(event_args, StreamEventType.FUNC_ARGS)
 
         if event_tool_deltas is not None:
@@ -878,15 +882,17 @@ class OpenAIGPT(LanguageModel):
             for td in event_tool_deltas:
                 if td["function"]["name"] is not None:
                     tool_fn_name = td["function"]["name"]
-                    sys.stdout.write(
-                        Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
-                    )
-                    sys.stdout.flush()
+                    if not silent:
+                        sys.stdout.write(
+                            Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
+                        )
+                        sys.stdout.flush()
                     self.config.streamer(tool_fn_name, StreamEventType.TOOL_NAME)
                 if td["function"]["arguments"] != "":
                     tool_fn_args = td["function"]["arguments"]
-                    sys.stdout.write(Colors().GREEN + tool_fn_args)
-                    sys.stdout.flush()
+                    if not silent:
+                        sys.stdout.write(Colors().GREEN + tool_fn_args)
+                        sys.stdout.flush()
                     self.config.streamer(tool_fn_args, StreamEventType.TOOL_ARGS)
 
         # show this delta in the stream
@@ -953,7 +959,7 @@ class OpenAIGPT(LanguageModel):
         event_args = ""
         event_fn_name = ""
         event_tool_deltas: Optional[List[Dict[str, Any]]] = None
-        silent = self.config.async_stream_quiet
+        silent = self.config.async_stream_quiet or settings.quiet
         # The first two events in the stream of Azure OpenAI is useless.
         # In the 1st: choices list is empty, in the 2nd: the dict delta has null content
         if chat:
@@ -980,46 +986,48 @@ class OpenAIGPT(LanguageModel):
             if not silent:
                 sys.stdout.write(Colors().GREEN + event_text)
                 sys.stdout.flush()
-                await self.config.streamer_async(event_text, StreamEventType.TEXT)
+            await self.config.streamer_async(event_text, StreamEventType.TEXT)
         if event_reasoning:
             reasoning += event_reasoning
             if not silent:
                 sys.stdout.write(Colors().GREEN + event_reasoning)
                 sys.stdout.flush()
-                await self.config.streamer_async(event_reasoning, StreamEventType.TEXT)
+            await self.config.streamer_async(event_reasoning, StreamEventType.TEXT)
         if event_fn_name:
             function_name = event_fn_name
             has_function = True
             if not silent:
                 sys.stdout.write(Colors().GREEN + "FUNC: " + event_fn_name + ": ")
                 sys.stdout.flush()
-                await self.config.streamer_async(
-                    event_fn_name, StreamEventType.FUNC_NAME
-                )
+            await self.config.streamer_async(
+                event_fn_name, StreamEventType.FUNC_NAME
+            )
 
         if event_args:
             function_args += event_args
             if not silent:
                 sys.stdout.write(Colors().GREEN + event_args)
                 sys.stdout.flush()
-                await self.config.streamer_async(event_args, StreamEventType.FUNC_ARGS)
+            await self.config.streamer_async(event_args, StreamEventType.FUNC_ARGS)
 
-        if event_tool_deltas is not None and not silent:
+        if event_tool_deltas is not None:
             # print out streaming tool calls, if not async
             for td in event_tool_deltas:
                 if td["function"]["name"] is not None:
                     tool_fn_name = td["function"]["name"]
-                    sys.stdout.write(
-                        Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
-                    )
-                    sys.stdout.flush()
+                    if not silent:
+                        sys.stdout.write(
+                            Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
+                        )
+                        sys.stdout.flush()
                     await self.config.streamer_async(
                         tool_fn_name, StreamEventType.TOOL_NAME
                     )
                 if td["function"]["arguments"] != "":
                     tool_fn_args = td["function"]["arguments"]
-                    sys.stdout.write(Colors().GREEN + tool_fn_args)
-                    sys.stdout.flush()
+                    if not silent:
+                        sys.stdout.write(Colors().GREEN + tool_fn_args)
+                        sys.stdout.flush()
                     await self.config.streamer_async(
                         tool_fn_args, StreamEventType.TOOL_ARGS
                     )
@@ -1103,7 +1111,8 @@ class OpenAIGPT(LanguageModel):
         except Exception as e:
             logging.warning("Error while processing stream response: %s", str(e))
 
-        print("")
+        if not settings.quiet:
+            print("")
         # TODO- get usage info in stream mode (?)
 
         return self._create_stream_response(
@@ -1178,7 +1187,8 @@ class OpenAIGPT(LanguageModel):
         except Exception as e:
             logging.warning("Error while processing stream response: %s", str(e))
 
-        print("")
+        if not settings.quiet:
+            print("")
         # TODO- get usage info in stream mode (?)
 
         return self._create_stream_response(
@@ -1300,7 +1310,7 @@ class OpenAIGPT(LanguageModel):
             if not isinstance(dict_or_list, dict):
                 raise ValueError(
                     f"""
-                        Invalid function args: {stripped_fn_args} 
+                        Invalid function args: {stripped_fn_args}
                         parsed as {dict_or_list},
                         which is not a valid dict.
                         """

{langroid-0.50.9.dist-info → langroid-0.50.11.dist-info}/METADATA

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

{langroid-0.50.9.dist-info → langroid-0.50.11.dist-info}/RECORD

@@ -69,11 +69,11 @@ 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/openai_gpt.py,sha256=o-iOvdpSnkXtvrJyhlItJwYIcZoF8vz3blUBjzOcGS0,84843
 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
@@ -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.9.dist-info/METADATA,sha256=51zKXzdMlaWzOJAcz-8zmz78Kmqj_lXmEQ03LnMSOgc,63641
-langroid-0.50.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.50.9.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.50.9.dist-info/RECORD,,
+langroid-0.50.11.dist-info/METADATA,sha256=oAh04rgGQXXGEe7tu3yAX7t1787xRBG85NqEh996F_0,63642
+langroid-0.50.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.50.11.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.50.11.dist-info/RECORD,,