langroid 0.33.11__tar.gz → 0.33.13__tar.gz

{langroid-0.33.11 → langroid-0.33.13}/PKG-INFO

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

{langroid-0.33.11 → langroid-0.33.13}/langroid/agent/callbacks/chainlit.py

@@ -20,6 +20,7 @@ from chainlit.logger import logger
 
 import langroid as lr
 import langroid.language_models as lm
+from langroid.language_models import StreamEventType
 from langroid.utils.configuration import settings
 from langroid.utils.constants import NO_ANSWER
 
@@ -276,7 +277,7 @@ class ChainlitAgentCallbacks:
     def get_last_step(self) -> Optional[cl.Step]:
         return self.last_step
 
-    def start_llm_stream(self) -> Callable[[str], None]:
+    def start_llm_stream(self) -> Callable[[str, StreamEventType], None]:
         """Returns a streaming fn that can be passed to the LLM class"""
         self.stream = cl.Message(
             content="",
@@ -295,14 +296,14 @@ class ChainlitAgentCallbacks:
         """
         )
 
-        def stream_token(t: str) -> None:
+        def stream_token(t: str, e: StreamEventType) -> None:
             if self.stream is None:
                 raise ValueError("Stream not initialized")
             run_sync(self.stream.stream_token(t))
 
         return stream_token
 
-    async def start_llm_stream_async(self) -> Callable[[str], None]:
+    async def start_llm_stream_async(self) -> Callable[[str, StreamEventType], None]:
         """Returns a streaming fn that can be passed to the LLM class"""
         self.stream = cl.Message(
             content="",
@@ -321,7 +322,7 @@ class ChainlitAgentCallbacks:
             """
         )
 
-        async def stream_token(t: str) -> None:
+        async def stream_token(t: str, e: StreamEventType) -> None:
             if self.stream is None:
                 raise ValueError("Stream not initialized")
             await self.stream.stream_token(t)

{langroid-0.33.11 → langroid-0.33.13}/langroid/agent/special/doc_chat_agent.py

@@ -1143,20 +1143,22 @@ class DocChatAgent(ChatAgent):
         id2_rank_semantic = {d.id(): i for i, (d, _) in enumerate(docs_and_scores)}
         id2doc = {d.id(): d for d, _ in docs_and_scores}
         # make sure we get unique docs
-        passages = [id2doc[id] for id, _ in id2_rank_semantic.items()]
+        passages = [id2doc[id] for id in id2_rank_semantic.keys()]
 
         id2_rank_bm25 = {}
         if self.config.use_bm25_search:
             # TODO: Add score threshold in config
             docs_scores = self.get_similar_chunks_bm25(query, retrieval_multiple)
+            id2doc.update({d.id(): d for d, _ in docs_scores})
             if self.config.cross_encoder_reranking_model == "":
                 # only if we're not re-ranking with a cross-encoder,
                 # we collect these ranks for Reciprocal Rank Fusion down below.
                 docs_scores = sorted(docs_scores, key=lambda x: x[1], reverse=True)
                 id2_rank_bm25 = {d.id(): i for i, (d, _) in enumerate(docs_scores)}
-                id2doc.update({d.id(): d for d, _ in docs_scores})
             else:
                 passages += [d for (d, _) in docs_scores]
+                # eliminate duplicate ids
+                passages = [id2doc[id] for id in id2doc.keys()]
 
         id2_rank_fuzzy = {}
         if self.config.use_fuzzy_match:
@@ -1174,6 +1176,8 @@ class DocChatAgent(ChatAgent):
                 id2doc.update({d.id(): d for d, _ in fuzzy_match_doc_scores})
             else:
                 passages += [d for (d, _) in fuzzy_match_doc_scores]
+                # eliminate duplicate ids
+                passages = [id2doc[id] for id in id2doc.keys()]
 
         if (
             self.config.cross_encoder_reranking_model == ""

{langroid-0.33.11 → langroid-0.33.13}/langroid/language_models/__init__.py

@@ -6,6 +6,7 @@ from . import azure_openai
 from . import prompt_formatter
 
 from .base import (
+    StreamEventType,
     LLMConfig,
     LLMMessage,
     LLMFunctionCall,
@@ -33,6 +34,7 @@ __all__ = [
     "openai_gpt",
     "azure_openai",
     "prompt_formatter",
+    "StreamEventType",
     "LLMConfig",
     "LLMMessage",
     "LLMFunctionCall",

{langroid-0.33.11 → langroid-0.33.13}/langroid/language_models/base.py

@@ -42,6 +42,14 @@ ToolChoiceTypes = Literal["none", "auto", "required"]
 ToolTypes = Literal["function"]
 
 
+class StreamEventType(Enum):
+    TEXT = 1
+    FUNC_NAME = 2
+    FUNC_ARGS = 3
+    TOOL_NAME = 4
+    TOOL_ARGS = 5
+
+
 class LLMConfig(BaseSettings):
     """
     Common configuration for all language models.

{langroid-0.33.11 → langroid-0.33.13}/langroid/language_models/openai_gpt.py

@@ -43,6 +43,7 @@ from langroid.language_models.base import (
     OpenAIToolCall,
     OpenAIToolSpec,
     Role,
+    StreamEventType,
     ToolChoiceTypes,
 )
 from langroid.language_models.config import HFPromptFormatterConfig
@@ -875,19 +876,19 @@ class OpenAIGPT(LanguageModel):
             completion += event_text
             sys.stdout.write(Colors().GREEN + event_text)
             sys.stdout.flush()
-            self.config.streamer(event_text)
+            self.config.streamer(event_text, 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()
-            self.config.streamer(event_fn_name)
+            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()
-            self.config.streamer(event_args)
+            self.config.streamer(event_args, StreamEventType.FUNC_ARGS)
 
         if event_tool_deltas is not None:
             # print out streaming tool calls, if not async
@@ -898,12 +899,12 @@ class OpenAIGPT(LanguageModel):
                         Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
                     )
                     sys.stdout.flush()
-                    self.config.streamer(tool_fn_name)
+                    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()
-                    self.config.streamer(tool_fn_args)
+                    self.config.streamer(tool_fn_args, StreamEventType.TOOL_ARGS)
 
         # show this delta in the stream
         if finish_reason in [
@@ -968,21 +969,23 @@ class OpenAIGPT(LanguageModel):
             if not silent:
                 sys.stdout.write(Colors().GREEN + event_text)
                 sys.stdout.flush()
-                await self.config.streamer_async(event_text)
+                await self.config.streamer_async(event_text, 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)
+                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)
+                await self.config.streamer_async(event_args, StreamEventType.FUNC_ARGS)
 
         if event_tool_deltas is not None and not silent:
             # print out streaming tool calls, if not async
@@ -993,12 +996,16 @@ class OpenAIGPT(LanguageModel):
                         Colors().GREEN + "OAI-TOOL: " + tool_fn_name + ": "
                     )
                     sys.stdout.flush()
-                    await self.config.streamer_async(tool_fn_name)
+                    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()
-                    await self.config.streamer_async(tool_fn_args)
+                    await self.config.streamer_async(
+                        tool_fn_args, StreamEventType.TOOL_ARGS
+                    )
 
         # show this delta in the stream
         if choices[0].get("finish_reason", "") in [

{langroid-0.33.11 → langroid-0.33.13}/langroid/mytypes.py

@@ -75,6 +75,16 @@ class Document(BaseModel):
     def id(self) -> str:
         return self.metadata.id
 
+    def from_string(
+        content: str,
+        source: str = "context",
+        is_chunk: bool = True,
+    ) -> "Document":
+        return Document(
+            content=content,
+            metadata=DocMetaData(source=source, is_chunk=is_chunk),
+        )
+
     def __str__(self) -> str:
         return dedent(
             f"""

{langroid-0.33.11 → langroid-0.33.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langroid"
-version = "0.33.11"
+version = "0.33.13"
 authors = [
     {name = "Prasad Chalasani", email = "pchalasani@gmail.com"},
 ]