langroid 0.59.8__py3-none-any.whl → 0.59.10__py3-none-any.whl

langroid/agent/special/relevance_extractor_agent.py

@@ -14,7 +14,6 @@ from langroid.agent.chat_document import ChatDocument
 from langroid.agent.tools.segment_extract_tool import SegmentExtractTool
 from langroid.language_models.base import LLMConfig
 from langroid.language_models.openai_gpt import OpenAIGPTConfig
-from langroid.mytypes import Entity
 from langroid.parsing.utils import extract_numbered_segments, number_segments
 from langroid.utils.constants import DONE, NO_ANSWER
 
@@ -26,12 +25,19 @@ class RelevanceExtractorAgentConfig(ChatAgentConfig):
     llm: LLMConfig | None = OpenAIGPTConfig()
     segment_length: int = 1  # number of sentences per segment
     query: str = ""  # query for relevance extraction
+    handle_llm_no_tool: str = """
+    You FORGOT to use the `extract_segments` tool!
+    Remember that your response MUST be a JSON-formatted string
+    starting with `{"request": "extract_segments", ...}`
+    """
     system_message: str = """
     The user will give you a PASSAGE containing segments numbered as  
     <#1#>, <#2#>, <#3#>, etc.,
     followed by a QUERY. Extract ONLY the segment-numbers from 
     the PASSAGE that are RELEVANT to the QUERY.
     Present the extracted segment-numbers using the `extract_segments` tool/function.
+    Note that your response MUST be a JSON-formatted string 
+    starting with `{"request": "extract_segments", ...}`
     """
 
 
@@ -63,13 +69,22 @@ class RelevanceExtractorAgent(ChatAgent):
         self.numbered_passage = number_segments(message_str, self.config.segment_length)
         # compose prompt
         prompt = f"""
+        <Instructions>
+        Given the PASSAGE below with NUMBERED segments, and the QUERY,
+        extract ONLY the segment-numbers that are RELEVANT to the QUERY,
+        and present them using the `extract_segments` tool/function,
+        i.e. your response MUST be a JSON-formatted string starting with
+        `{{"request": "extract_segments", ...}}`
+        </Instructions>
+        
         PASSAGE:
         {self.numbered_passage}
         
         QUERY: {self.config.query}
         """
         # send to LLM
-        return super().llm_response(prompt)
+        response = super().llm_response(prompt)
+        return response
 
     @no_type_check
     async def llm_response_async(
@@ -99,7 +114,8 @@ class RelevanceExtractorAgent(ChatAgent):
         QUERY: {self.config.query}
         """
         # send to LLM
-        return await super().llm_response_async(prompt)
+        response = await super().llm_response_async(prompt)
+        return response
 
     def extract_segments(self, msg: SegmentExtractTool) -> str:
         """Method to handle a segmentExtractTool message from LLM"""
@@ -116,12 +132,3 @@ class RelevanceExtractorAgent(ChatAgent):
             return DONE + " " + NO_ANSWER
         # this response ends the task by saying DONE
         return DONE + " " + extracts
-
-    def handle_message_fallback(
-        self, msg: str | ChatDocument
-    ) -> str | ChatDocument | None:
-        """Handle case where LLM forgets to use SegmentExtractTool"""
-        if isinstance(msg, ChatDocument) and msg.metadata.sender == Entity.LLM:
-            return DONE + " " + NO_ANSWER
-        else:
-            return None

langroid/embedding_models/models.py

@@ -463,12 +463,12 @@ class LlamaCppServerEmbeddings(EmbeddingModel):
         response = requests.post(self.embedding_url, json=data)
 
         if response.status_code == 200:
-            embeddings = response.json()["embedding"]
+            embeddings = self._extract_embedding(response.json())
             if not (
                 isinstance(embeddings, list) and isinstance(embeddings[0], (int, float))
             ):
                 raise ValueError(
-                    """Embedding endpoint has not returned the correct format. 
+                    """Embedding endpoint has not returned the correct format.
                    Is the URL correct?
                 """
                 )
@@ -480,6 +480,71 @@ class LlamaCppServerEmbeddings(EmbeddingModel):
                 "Failed to connect to embedding provider",
             )
 
+    def _extract_embedding(
+        self, response_json: dict[str, Any] | list[Any]
+    ) -> List[int | float]:
+        """
+        Extract embedding vector from llama.cpp response.
+
+        Handles multiple response formats:
+        1. Native /embedding: {"embedding": [floats]}
+        2. Array format: [{"embedding": [floats]}]
+        3. Double-nested: [{"embedding": [[floats]]}]
+        4. OpenAI /v1/embeddings: {"data": [{"embedding": [floats]}]}
+        5. Nested in dict: {"embedding": [[floats]]}
+
+        Args:
+            response_json: The JSON response from llama.cpp server
+
+        Returns:
+            List of floats representing the embedding vector
+
+        Raises:
+            ValueError: If response format is not recognized
+        """
+        import json
+
+        # Try native format first: {"embedding": [floats]}
+        if isinstance(response_json, dict) and "embedding" in response_json:
+            embeddings = response_json["embedding"]
+            # Check if it's [floats]
+            if isinstance(embeddings, list) and len(embeddings) > 0:
+                if isinstance(embeddings[0], (int, float)):
+                    return embeddings
+                # Might be nested: {"embedding": [[floats]]}
+                if isinstance(embeddings[0], list) and len(embeddings[0]) > 0:
+                    if isinstance(embeddings[0][0], (int, float)):
+                        return embeddings[0]
+
+        # Try OpenAI format: {"data": [{"embedding": [floats]}]}
+        if isinstance(response_json, dict) and "data" in response_json:
+            data = response_json["data"]
+            if isinstance(data, list) and len(data) > 0:
+                if isinstance(data[0], dict) and "embedding" in data[0]:
+                    embeddings = data[0]["embedding"]
+                    if isinstance(embeddings, list) and len(embeddings) > 0:
+                        if isinstance(embeddings[0], (int, float)):
+                            return embeddings
+
+        # Try array format: [{"embedding": [floats]}] or [{"embedding": [[floats]]}]
+        if isinstance(response_json, list) and len(response_json) > 0:
+            first_item = response_json[0]
+            if isinstance(first_item, dict) and "embedding" in first_item:
+                embeddings = first_item["embedding"]
+                # Check if it's [floats]
+                if isinstance(embeddings, list) and len(embeddings) > 0:
+                    if isinstance(embeddings[0], (int, float)):
+                        return embeddings
+                    # Check if it's [[floats]]
+                    if isinstance(embeddings[0], list) and len(embeddings[0]) > 0:
+                        if isinstance(embeddings[0][0], (int, float)):
+                            return embeddings[0]
+
+        raise ValueError(
+            f"Unsupported embedding response format from {self.embedding_url}. "
+            f"Response: {json.dumps(response_json)[:500]}"
+        )
+
     def embedding_fn(self) -> Callable[[List[str]], Embeddings]:
         return EmbeddingFunctionCallable(self, self.config.batch_size)
 

langroid/parsing/parse_json.py

@@ -142,8 +142,14 @@ def top_level_json_field(s: str, f: str) -> Any:
         return ""
     for j in jsons:
         json_data = json.loads(j)
-        if f in json_data:
-            return json_data[f]
+        if isinstance(json_data, dict):
+            if f in json_data:
+                return json_data[f]
+        elif isinstance(json_data, list):
+            # Some responses wrap candidate JSON objects in a list; scan them.
+            for item in json_data:
+                if isinstance(item, dict) and f in item:
+                    return item[f]
 
     return ""
 

{langroid-0.59.8.dist-info → langroid-0.59.10.dist-info}/METADATA

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

{langroid-0.59.8.dist-info → langroid-0.59.10.dist-info}/RECORD

@@ -19,7 +19,7 @@ langroid/agent/special/doc_chat_agent.py,sha256=tUr4qex3OjqF32zeyvTOnNgUP1wdpe5h
 langroid/agent/special/doc_chat_task.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/agent/special/lance_doc_chat_agent.py,sha256=6pIqi2DF-MvYYN3-blsdUgulYnOBTl7I21T7wPAt1zM,10413
 langroid/agent/special/lance_tools.py,sha256=3j7Hsyf3-H9ccTXjyNOcnMnpJ7r1lXnqDLSMQgFa7ZI,2114
-langroid/agent/special/relevance_extractor_agent.py,sha256=Wa65UReGaNIB5MkXugzc4X9ci3c21-PwDrN7zNX-iVQ,4801
+langroid/agent/special/relevance_extractor_agent.py,sha256=EgFDgxHZmnpzwh17vrzdncoRn2yPBsiRweN9wr85czc,5206
 langroid/agent/special/retriever_agent.py,sha256=o2UfqiCGME0t85SZ6qjK041_WZYqXSuV1SeH_3KtVuc,1931
 langroid/agent/special/table_chat_agent.py,sha256=T2YMFpOnW4YV-QXvB34MbaBGXBPiWeCiqO1bVKFykbg,10943
 langroid/agent/special/arangodb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -64,7 +64,7 @@ langroid/cachedb/base.py,sha256=b104RrL1Og7K2mWFy3sWc4Er3z9zWMtY9dxQVhwnm2E,1351
 langroid/cachedb/redis_cachedb.py,sha256=7kgnbf4b5CKsCrlL97mHWKvdvlLt8zgn7lc528jEpiE,5141
 langroid/embedding_models/__init__.py,sha256=KyYxR3jDFUCfYjSuCL86qjAmrq6mXXjOT4lFNOKVj6Y,955
 langroid/embedding_models/base.py,sha256=F65Vlj3RugkcntWOoKm-0b7h4T_Les6m4e7Qto_-Otg,2564
-langroid/embedding_models/models.py,sha256=Cwlq3ZsXXRblh7v0iABJ1QDZorJ2l3Hyks-T9g4JtnE,20649
+langroid/embedding_models/models.py,sha256=SmUK23iX6ypisjD71ElzVizZpYmZxwQOlDpAcyXioK4,23613
 langroid/embedding_models/remote_embeds.py,sha256=6_kjXByVbqhY9cGwl9R83ZcYC2km-nGieNNAo1McHaY,5151
 langroid/embedding_models/protoc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 langroid/embedding_models/protoc/embeddings.proto,sha256=_O-SgFpTaylQeOTgSpxhEJ7CUw7PeCQQJLaPqpPYKJg,321
@@ -94,7 +94,7 @@ langroid/parsing/document_parser.py,sha256=cUcp4JKS_LpsjX7OqnGBhHorDHx7FG5pvKGjR
 langroid/parsing/file_attachment.py,sha256=f-MBRCI58XsCqJDH2HwTWwTQxLbYsDrOLgjrM1kw3XE,7350
 langroid/parsing/md_parser.py,sha256=8LX9RDRWV1dZSYa-uBD8-whC_L6UYco-AQUxIuviqEk,21656
 langroid/parsing/para_sentence_split.py,sha256=AJBzZojP3zpB-_IMiiHismhqcvkrVBQ3ZINoQyx_bE4,2000
-langroid/parsing/parse_json.py,sha256=aADo38bAHQhC8on4aWZZzVzSDy-dK35vRLZsFI2ewh8,4756
+langroid/parsing/parse_json.py,sha256=W_8dMD1SFohcQjbOBvRR1NrdO-F6xdhNVDmUX1nNdsY,5052
 langroid/parsing/parser.py,sha256=IcwmVLlAae5LiKZ9OFhrnVOoHxcnsV7feFSHQiFfoi4,16112
 langroid/parsing/pdf_utils.py,sha256=QogxU_B1N3WSLyZ9PEcJDaJoZShKs7CPQRVyF1V2DiE,3143
 langroid/parsing/repo_loader.py,sha256=oB0TNifWCaqvlj7C0U76C4NZT7b94BbGkVX_-mrcH_4,30220
@@ -139,7 +139,7 @@ langroid/vector_store/pineconedb.py,sha256=7V0Bkt4ZrOR3V90tdXvdFmyNGuww7SFdyPq7-
 langroid/vector_store/postgres.py,sha256=TY_VshimwFZglYgKYm7Qn1F-dCSL8GsXRTgmh7VTe9c,16110
 langroid/vector_store/qdrantdb.py,sha256=mqxMOrcLAQpl0opuL8vXhdIt6ppv2zYyAvddHZoEW0Y,19184
 langroid/vector_store/weaviatedb.py,sha256=BS95bxVKNYfQc9VPb85a1HlcgnXfAkgMzjydnjCgRHc,11853
-langroid-0.59.8.dist-info/METADATA,sha256=URy5sRVmD5E7DQdVg-TjodaingDUvId0hsgsATNQF5A,66517
-langroid-0.59.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langroid-0.59.8.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
-langroid-0.59.8.dist-info/RECORD,,
+langroid-0.59.10.dist-info/METADATA,sha256=LnA1YOq6VYfYsfnBONaSbzMPti5M_2IySKSNSBbdOIA,66518
+langroid-0.59.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langroid-0.59.10.dist-info/licenses/LICENSE,sha256=EgVbvA6VSYgUlvC3RvPKehSg7MFaxWDsFuzLOsPPfJg,1065
+langroid-0.59.10.dist-info/RECORD,,