nvidia-nat-crewai 1.3.0rc4__py3-none-any.whl → 1.3.0rc5__py3-none-any.whl

nat/plugins/crewai/crewai_callback_handler.py

@@ -154,13 +154,16 @@ class CrewAIProfilerHandler(BaseProfilerCallback):
             seconds_between_calls = int(now - self.last_call_ts)
             model_name = kwargs.get('model', "")
 
-            model_input = ""
+            model_input = []
             try:
                 for message in kwargs.get('messages', []):
-                    model_input += message.get('content', "")
+                    content = message.get('content', "")
+                    model_input.append("" if content is None else str(content))
             except Exception as e:
                 logger.exception("Error getting model input: %s", e)
 
+            model_input = "".join(model_input)
+
             # Record the start event
             input_stats = IntermediateStepPayload(
                 event_type=IntermediateStepType.LLM_START,
@@ -177,14 +180,17 @@ class CrewAIProfilerHandler(BaseProfilerCallback):
             # Call the original litellm.completion(...)
             output = original_func(*args, **kwargs)
 
-            model_output = ""
+            model_output = []
             try:
                 for choice in output.choices:
                     msg = choice.model_extra["message"]
-                    model_output += msg.get('content', "")
+                    content = msg.get('content', "")
+                    model_output.append("" if content is None else str(content))
             except Exception as e:
                 logger.exception("Error getting model output: %s", e)
 
+            model_output = "".join(model_output)
+
             now = time.time()
             # Record the end event
             output_stats = IntermediateStepPayload(

nat/plugins/crewai/llm.py

@@ -42,13 +42,16 @@ def _patch_llm_based_on_config(client: ModelType, llm_config: LLMBaseConfig) ->
         @override
         def inject(self, messages: list[dict[str, str]], *args, **kwargs) -> FunctionArgumentWrapper:
             # Attempt to inject the system prompt into the first system message
-            for message in messages:
+            for i, message in enumerate(messages):
                 if message["role"] == "system":
-                    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 = [{"role": "system", "content": self.system_prompt}] + messages
-            return FunctionArgumentWrapper(new_messages, *args, **kwargs)
+                    if self.system_prompt not in message["content"]:
+                        messages = list(messages)
+                        messages[i] = {"role": "system", "content": f"{message['content']}\n{self.system_prompt}"}
+                    break
+            else:
+                messages = list(messages)
+                messages.insert(0, {"role": "system", "content": self.system_prompt})
+            return FunctionArgumentWrapper(messages, *args, **kwargs)
 
     if isinstance(llm_config, RetryMixin):
         client = patch_with_retry(client,

{nvidia_nat_crewai-1.3.0rc4.dist-info → nvidia_nat_crewai-1.3.0rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-crewai
-Version: 1.3.0rc4
+Version: 1.3.0rc5
 Summary: Subpackage for CrewAI 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[litellm]==v1.3.0-rc4
+Requires-Dist: nvidia-nat[litellm]==v1.3.0-rc5
 Requires-Dist: crewai~=0.193.2
 Dynamic: license-file
 

nvidia_nat_crewai-1.3.0rc5.dist-info/RECORD

@@ -0,0 +1,13 @@
+nat/meta/pypi.md,sha256=T68FnThRzDGFf1LR8u-okM-r11-skSnKqSyI6HOktQY,1107
+nat/plugins/crewai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nat/plugins/crewai/crewai_callback_handler.py,sha256=il537F5tD9pFL1P9Q38ReOZasD-GgcBrm8BX_w0-xdo,8582
+nat/plugins/crewai/llm.py,sha256=sfQsdSK6WGWHscald4tG4dyXEcn6zqdhkFjE-1zAtJE,5984
+nat/plugins/crewai/register.py,sha256=_R3bhGmz___696_NwyIcpw3koMBiWqIFoWEFJ0VAgXs,831
+nat/plugins/crewai/tool_wrapper.py,sha256=BNKEPQQCLKtXNzGDAKBLCdmGJXe9lBOVI1hObha8hoI,1569
+nvidia_nat_crewai-1.3.0rc5.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat_crewai-1.3.0rc5.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat_crewai-1.3.0rc5.dist-info/METADATA,sha256=jHmtQrTwc0TvCZLwD2RwD0SpiWfulpckXuU-PdGkeYU,1911
+nvidia_nat_crewai-1.3.0rc5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_crewai-1.3.0rc5.dist-info/entry_points.txt,sha256=YF5PUdQGr_OUDXB4TykElHJTsKT8yKkuE0bMX5n_RXs,58
+nvidia_nat_crewai-1.3.0rc5.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_crewai-1.3.0rc5.dist-info/RECORD,,

nvidia_nat_crewai-1.3.0rc4.dist-info/RECORD

@@ -1,13 +0,0 @@
-nat/meta/pypi.md,sha256=T68FnThRzDGFf1LR8u-okM-r11-skSnKqSyI6HOktQY,1107
-nat/plugins/crewai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nat/plugins/crewai/crewai_callback_handler.py,sha256=m5u0RqUd94F0iIuUvknhVHn1SxYltg3lxAhN_3AogPQ,8334
-nat/plugins/crewai/llm.py,sha256=_uzGGkXvDS6RU5JNmClGx_BgV4KBBz4YU-PgO2JHGak,5885
-nat/plugins/crewai/register.py,sha256=_R3bhGmz___696_NwyIcpw3koMBiWqIFoWEFJ0VAgXs,831
-nat/plugins/crewai/tool_wrapper.py,sha256=BNKEPQQCLKtXNzGDAKBLCdmGJXe9lBOVI1hObha8hoI,1569
-nvidia_nat_crewai-1.3.0rc4.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
-nvidia_nat_crewai-1.3.0rc4.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat_crewai-1.3.0rc4.dist-info/METADATA,sha256=SjQ2ze9NrGKdVnZnpBBYhBFNUZ4ZXCwxKlpWkN_M6dE,1911
-nvidia_nat_crewai-1.3.0rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat_crewai-1.3.0rc4.dist-info/entry_points.txt,sha256=YF5PUdQGr_OUDXB4TykElHJTsKT8yKkuE0bMX5n_RXs,58
-nvidia_nat_crewai-1.3.0rc4.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
-nvidia_nat_crewai-1.3.0rc4.dist-info/RECORD,,