langroid 0.59.9__tar.gz → 0.59.11__tar.gz

{langroid-0.59.9 → langroid-0.59.11}/PKG-INFO

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

{langroid-0.59.9 → langroid-0.59.11}/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-0.59.9 → langroid-0.59.11}/langroid/parsing/parse_json.py

@@ -135,15 +135,32 @@ def top_level_json_field(s: str, f: str) -> Any:
     Returns:
         str: The value of the field f in the top-level JSON object, if any.
             Otherwise, return an empty string.
-    """
 
-    jsons = extract_top_level_json(s)
-    if len(jsons) == 0:
-        return ""
-    for j in jsons:
-        json_data = json.loads(j)
-        if f in json_data:
-            return json_data[f]
+    Note:
+        This function is designed to never crash. If any exception occurs during
+        JSON parsing or field extraction, it gracefully returns an empty string.
+    """
+    try:
+        jsons = extract_top_level_json(s)
+        if len(jsons) == 0:
+            return ""
+        for j in jsons:
+            try:
+                json_data = json.loads(j)
+                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]
+            except (json.JSONDecodeError, TypeError, KeyError):
+                # If this specific JSON fails to parse, continue to next candidate
+                continue
+    except Exception:
+        # Catch any unexpected errors to ensure we never crash
+        pass
 
     return ""
 

{langroid-0.59.9 → langroid-0.59.11}/pyproject.toml

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