nvidia-nat-langchain 1.3.0rc4__py3-none-any.whl → 1.3.0rc6__py3-none-any.whl

nat/plugins/langchain/llm.py

@@ -65,32 +65,22 @@ def _patch_llm_based_on_config(client: ModelType, llm_config: LLMBaseConfig) ->
             Raises:
                 ValueError: If the messages are not a valid type for LanguageModelInput.
             """
-            system_message = SystemMessage(content=self.system_prompt)
-            if isinstance(messages, BaseMessage):
-                # Attempt to inject the system prompt into the first system message
-                if isinstance(messages, SystemMessage):
-                    messages.content = f"{self.system_prompt}\n\n{messages.content}"
-                    return FunctionArgumentWrapper(messages, *args, **kwargs)
-                # If no system message found, prepend a new one
-                new_messages = [system_message, messages]
-                return FunctionArgumentWrapper(new_messages, *args, **kwargs)
-            elif isinstance(messages, PromptValue):
-                new_messages = [system_message, *messages.to_messages()]
-                return FunctionArgumentWrapper(new_messages, *args, **kwargs)
+            if isinstance(messages, PromptValue):
+                messages = messages.to_messages()
             elif isinstance(messages, str):
-                new_messages = [system_message, HumanMessage(content=messages)]
-                return FunctionArgumentWrapper(new_messages, *args, **kwargs)
-            elif isinstance(messages, Sequence):
-                if all(isinstance(m, BaseMessage) for m in messages):
+                messages = [HumanMessage(content=messages)]
+
+            if isinstance(messages, Sequence) and all(isinstance(m, BaseMessage) for m in messages):
+                for i, message in enumerate(messages):
+                    if isinstance(message, SystemMessage):
+                        if self.system_prompt not in str(message.content):
+                            messages = list(messages)
+                            messages[i] = SystemMessage(content=f"{message.content}\n{self.system_prompt}")
+                        break
+                else:
                     messages = list(messages)
-                    # Attempt to inject the system prompt into the first system message
-                    for message in messages:
-                        if isinstance(message, SystemMessage):
-                            message.content = f"{self.system_prompt}\n\n{message.content}"
-                            return FunctionArgumentWrapper(messages, *args, **kwargs)
-                    # If no system message found, prepend a new one
-                    new_messages = [system_message, *messages]
-                    return FunctionArgumentWrapper(new_messages, *args, **kwargs)
+                    messages.insert(0, SystemMessage(content=self.system_prompt))
+                return FunctionArgumentWrapper(messages, *args, **kwargs)
             raise ValueError(f"Unsupported message type: {type(messages)}")
 
     if isinstance(llm_config, RetryMixin):

{nvidia_nat_langchain-1.3.0rc4.dist-info → nvidia_nat_langchain-1.3.0rc6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-langchain
-Version: 1.3.0rc4
+Version: 1.3.0rc6
 Summary: Subpackage for LangChain/LangGraph integration in NeMo Agent toolkit
 Author: NVIDIA Corporation
 Maintainer: NVIDIA Corporation
@@ -16,7 +16,7 @@ Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE-3rd-party.txt
 License-File: LICENSE.md
-Requires-Dist: nvidia-nat==v1.3.0-rc4
+Requires-Dist: nvidia-nat==v1.3.0-rc6
 Requires-Dist: langchain-aws~=0.2.31
 Requires-Dist: langchain-core~=0.3.75
 Requires-Dist: langchain-litellm~=0.2.3

{nvidia_nat_langchain-1.3.0rc4.dist-info → nvidia_nat_langchain-1.3.0rc6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 nat/meta/pypi.md,sha256=T_KFtTXVxhFM8Y6K3OlNByA5sTXLQuqqUpHgNOCvZBU,1120
 nat/plugins/langchain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/plugins/langchain/embedder.py,sha256=ZSESaazyz7y3F0GSSsWRe_xfvxOe0Mwd45wEAkQ2jJk,3339
-nat/plugins/langchain/llm.py,sha256=MhkcqlINcNuGppLLr8vN9DN2meKCjbAzcO_cXxy9GK8,7958
+nat/plugins/langchain/llm.py,sha256=KFE59qGeYxTSScaPgid5CDcx_acTcAJylmDVAmQtYmk,7089
 nat/plugins/langchain/register.py,sha256=jgq6wSJoGQIZFJhS8RbUs25cLgNJjCkFu4M6qaWJS_4,906
 nat/plugins/langchain/retriever.py,sha256=SWbXXOezEUuPACnmSSU497NAmEVEMj2SrFJGodkRg34,2644
 nat/plugins/langchain/tool_wrapper.py,sha256=Zgb2_XB4bEhjPPeqS-ZH_OJT_pcQmteX7u03N_qCLfc,2121
@@ -10,10 +10,10 @@ nat/plugins/langchain/tools/code_generation_tool.py,sha256=f5pna0WMOx3QOS4WnaMFK
 nat/plugins/langchain/tools/register.py,sha256=uemxqLxcNk1bGX4crV52oMphLTZWonStzkXwTZeG2Rw,889
 nat/plugins/langchain/tools/tavily_internet_search.py,sha256=UFMP1xh_kC3fydMQBeV-oDZ-M7jnLcs5OkMSzgm7mng,2653
 nat/plugins/langchain/tools/wikipedia_search.py,sha256=431YwLsjoC_mdvMZ_gY0Q37Uqaue2ASnAHpwr4jWCaU,2197
-nvidia_nat_langchain-1.3.0rc4.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
-nvidia_nat_langchain-1.3.0rc4.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat_langchain-1.3.0rc4.dist-info/METADATA,sha256=B_4DICNI625tSbo57-PLqkRP5uVqt2IqkbdS4JTad9g,2219
-nvidia_nat_langchain-1.3.0rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat_langchain-1.3.0rc4.dist-info/entry_points.txt,sha256=4deXsMn97I012HhDw0UjoqcZ8eEoZ7BnqaRx5QmzebY,123
-nvidia_nat_langchain-1.3.0rc4.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
-nvidia_nat_langchain-1.3.0rc4.dist-info/RECORD,,
+nvidia_nat_langchain-1.3.0rc6.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat_langchain-1.3.0rc6.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat_langchain-1.3.0rc6.dist-info/METADATA,sha256=MoVc-Gjx2mTvpRBrsiBHaTX2XJ6lO2fs3bNQ3csHAnk,2219
+nvidia_nat_langchain-1.3.0rc6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_langchain-1.3.0rc6.dist-info/entry_points.txt,sha256=4deXsMn97I012HhDw0UjoqcZ8eEoZ7BnqaRx5QmzebY,123
+nvidia_nat_langchain-1.3.0rc6.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_langchain-1.3.0rc6.dist-info/RECORD,,