langchain-b12 0.1.4__tar.gz → 0.1.6__tar.gz

{langchain_b12-0.1.4 → langchain_b12-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-b12
-Version: 0.1.4
+Version: 0.1.6
 Summary: A reusable collection of tools and implementations for Langchain
 Author-email: Vincent Min <vincent.min@b12-consulting.com>
 Requires-Python: >=3.11

{langchain_b12-0.1.4 → langchain_b12-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langchain-b12"
-version = "0.1.4"
+version = "0.1.6"
 description = "A reusable collection of tools and implementations for Langchain"
 readme = "README.md"
 authors = [

{langchain_b12-0.1.4 → langchain_b12-0.1.6}/src/langchain_b12/citations/citations.py

@@ -3,7 +3,6 @@ from collections.abc import Sequence
 from typing import Any, Literal, TypedDict
 from uuid import UUID
 
-from fuzzysearch import find_near_matches
 from langchain_core.callbacks import Callbacks
 from langchain_core.language_models import BaseChatModel
 from langchain_core.messages import AIMessage, BaseMessage, SystemMessage
@@ -155,6 +154,8 @@ def validate_citations(
     sentences: list[str],
 ) -> list[tuple[Citation, Match | None]]:
     """Validate the citations. Invalid citations are dropped."""
+    from fuzzysearch import find_near_matches
+
     n_sentences = len(sentences)
 
     all_text = "\n".join(
@@ -244,18 +245,25 @@ def create_citation_model(
     e.g. `<context key="abc">Today is a sunny day</context>`.
     The returned AIMessage will have the following structure:
     AIMessage(
-        content= {
-            "citations": [
-                {
-                    "cited_text": "the color of the grass is green",
-                    "generated_cited_text": "the color of the grass is green",
-                    "key": "abc",
-                    "dist": 0,
-                }
-            ],
-            "text": "The grass is green",
-            "type": "text",
-        },
+        content=[
+            {
+                "citations": [
+                    {
+                        "cited_text": "the color of the grass is green",
+                        "generated_cited_text": "the color of the grass is green",
+                        "key": "abc",
+                        "dist": 0,
+                    }
+                ],
+                "text": "The grass is green",
+                "type": "text",
+            },
+            {
+                "citations": None,
+                "text": "Is there anything else I can help you with?",
+                "type": "text",
+            }
+        ]
     )
 
     Args:

{langchain_b12-0.1.4 → langchain_b12-0.1.6}/src/langchain_b12/genai/genai.py

@@ -90,6 +90,8 @@ class ChatGenAI(BaseChatModel):
                 HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_NONE,
             }
             """  # noqa: E501
+    thinking_config: types.ThinkingConfig | None = None
+    "The thinking configuration to use for the model."
 
     model_config = ConfigDict(
         arbitrary_types_allowed=True,
@@ -208,6 +210,10 @@ class ChatGenAI(BaseChatModel):
                 candidate_count=self.n,
                 stop_sequences=stop or self.stop,
                 safety_settings=self.safety_settings,
+                thinking_config=self.thinking_config,
+                automatic_function_calling=types.AutomaticFunctionCallingConfig(
+                    disable=True,
+                ),
                 **kwargs,
             ),
         )
@@ -240,6 +246,10 @@ class ChatGenAI(BaseChatModel):
                 candidate_count=self.n,
                 stop_sequences=stop or self.stop,
                 safety_settings=self.safety_settings,
+                thinking_config=self.thinking_config,
+                automatic_function_calling=types.AutomaticFunctionCallingConfig(
+                    disable=True,
+                ),
                 **kwargs,
             ),
         )
@@ -362,6 +372,12 @@ class ChatGenAI(BaseChatModel):
                 input_tokens=usage_metadata.prompt_token_count or 0,
                 output_tokens=usage_metadata.candidates_token_count or 0,
                 total_tokens=usage_metadata.total_token_count or 0,
+                input_token_details={
+                    "cache_read": usage_metadata.cached_content_token_count or 0
+                },
+                output_token_details={
+                    "reasoning": usage_metadata.thoughts_token_count or 0
+                },
             )
 
         total_lc_usage: UsageMetadata | None = (
@@ -392,7 +408,12 @@ class ChatGenAI(BaseChatModel):
                 "finish_reason": top_candidate.finish_reason,
                 "finish_message": top_candidate.finish_message,
             }
-            message = parse_response_candidate(top_candidate)
+            try:
+                message = parse_response_candidate(top_candidate)
+            except Exception as e:
+                raise ValueError(
+                    f"Failed to parse model response: {top_candidate.finish_message}"
+                ) from e
             if lc_usage:
                 message.usage_metadata = lc_usage
             # add model name if final chunk

{langchain_b12-0.1.4 → langchain_b12-0.1.6}/tests/test_citation_mixin.py

@@ -437,20 +437,9 @@ class TestCitationMixin:
             ]
         ]
 
-        with (
-            patch.object(
-                CitationMixin.__bases__[0], "agenerate"
-            ) as mock_parent_agenerate,
-            patch(
-                "langchain_b12.citations.citations.add_citations"
-            ) as mock_add_citations,
-        ):
-
-            mock_parent_agenerate.return_value = LLMResult(
-                generations=[
-                    [ChatGeneration(message=AIMessage(content="Test response"))]
-                ]
-            )
+        with patch(
+            "langchain_b12.citations.citations.add_citations"
+        ) as mock_add_citations:
 
             # Simulate an error in citation processing
             mock_add_citations.side_effect = RuntimeError("Citation error")