nvidia-nat-crewai 1.4.0a20251015__py3-none-any.whl → 1.4.0a20251021__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

@@ -30,6 +30,7 @@ from nat.llm.utils.thinking import BaseThinkingInjector
 from nat.llm.utils.thinking import FunctionArgumentWrapper
 from nat.llm.utils.thinking import patch_with_thinking
 from nat.utils.exception_handlers.automatic_retries import patch_with_retry
+from nat.utils.responses_api import validate_no_responses_api
 from nat.utils.type_utils import override
 
 ModelType = TypeVar("ModelType")
@@ -41,8 +42,17 @@ def _patch_llm_based_on_config(client: ModelType, llm_config: LLMBaseConfig) ->
 
         @override
         def inject(self, messages: list[dict[str, str]], *args, **kwargs) -> FunctionArgumentWrapper:
-            new_messages = [{"role": "system", "content": self.system_prompt}] + messages
-            return FunctionArgumentWrapper(new_messages, *args, **kwargs)
+            # Attempt to inject the system prompt into the first system message
+            for i, message in enumerate(messages):
+                if message["role"] == "system":
+                    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,
@@ -65,6 +75,8 @@ async def azure_openai_crewai(llm_config: AzureOpenAIModelConfig, _builder: Buil
 
     from crewai import LLM
 
+    validate_no_responses_api(llm_config, LLMFrameworkEnum.CREWAI)
+
     # https://docs.crewai.com/en/concepts/llms#azure
 
     api_key = llm_config.api_key or os.environ.get("AZURE_OPENAI_API_KEY") or os.environ.get("AZURE_API_KEY")
@@ -84,13 +96,7 @@ async def azure_openai_crewai(llm_config: AzureOpenAIModelConfig, _builder: Buil
 
     client = LLM(
         **llm_config.model_dump(
-            exclude={
-                "type",
-                "api_key",
-                "azure_endpoint",
-                "azure_deployment",
-                "thinking",
-            },
+            exclude={"type", "api_key", "azure_endpoint", "azure_deployment", "thinking", "api_type"},
             by_alias=True,
             exclude_none=True,
         ),
@@ -105,6 +111,8 @@ async def nim_crewai(llm_config: NIMModelConfig, _builder: Builder):
 
     from crewai import LLM
 
+    validate_no_responses_api(llm_config, LLMFrameworkEnum.CREWAI)
+
     # Because CrewAI uses a different environment variable for the API key, we need to set it here manually
     if llm_config.api_key is None and "NVIDIA_NIM_API_KEY" not in os.environ:
         nvidia_api_key = os.getenv("NVIDIA_API_KEY")
@@ -112,7 +120,9 @@ async def nim_crewai(llm_config: NIMModelConfig, _builder: Builder):
             os.environ["NVIDIA_NIM_API_KEY"] = nvidia_api_key
 
     client = LLM(
-        **llm_config.model_dump(exclude={"type", "model_name", "thinking"}, by_alias=True, exclude_none=True),
+        **llm_config.model_dump(exclude={"type", "model_name", "thinking", "api_type"},
+                                by_alias=True,
+                                exclude_none=True),
         model=f"nvidia_nim/{llm_config.model_name}",
     )
 
@@ -124,7 +134,9 @@ async def openai_crewai(llm_config: OpenAIModelConfig, _builder: Builder):
 
     from crewai import LLM
 
-    client = LLM(**llm_config.model_dump(exclude={"type", "thinking"}, by_alias=True, exclude_none=True))
+    validate_no_responses_api(llm_config, LLMFrameworkEnum.CREWAI)
+
+    client = LLM(**llm_config.model_dump(exclude={"type", "thinking", "api_type"}, by_alias=True, exclude_none=True))
 
     yield _patch_llm_based_on_config(client, llm_config)
 
@@ -134,6 +146,8 @@ async def litellm_crewai(llm_config: LiteLlmModelConfig, _builder: Builder):
 
     from crewai import LLM
 
-    client = LLM(**llm_config.model_dump(exclude={"type", "thinking"}, by_alias=True, exclude_none=True))
+    validate_no_responses_api(llm_config, LLMFrameworkEnum.CREWAI)
+
+    client = LLM(**llm_config.model_dump(exclude={"type", "thinking", "api_type"}, by_alias=True, exclude_none=True))
 
     yield _patch_llm_based_on_config(client, llm_config)

{nvidia_nat_crewai-1.4.0a20251015.dist-info → nvidia_nat_crewai-1.4.0a20251021.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-crewai
-Version: 1.4.0a20251015
+Version: 1.4.0a20251021
 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.4.0a20251015
+Requires-Dist: nvidia-nat[litellm]==v1.4.0a20251021
 Requires-Dist: crewai~=0.193.2
 Dynamic: license-file
 

nvidia_nat_crewai-1.4.0a20251021.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=FqJZBYlOERcS2FoAZbrinNgY56TFfYPpE2Gq4txMc_M,6335
+nat/plugins/crewai/register.py,sha256=_R3bhGmz___696_NwyIcpw3koMBiWqIFoWEFJ0VAgXs,831
+nat/plugins/crewai/tool_wrapper.py,sha256=BNKEPQQCLKtXNzGDAKBLCdmGJXe9lBOVI1hObha8hoI,1569
+nvidia_nat_crewai-1.4.0a20251021.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat_crewai-1.4.0a20251021.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat_crewai-1.4.0a20251021.dist-info/METADATA,sha256=4PawAUpniHnM3ft9WTytf1lgSItqSVPpmALE3iIw8wQ,1922
+nvidia_nat_crewai-1.4.0a20251021.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_crewai-1.4.0a20251021.dist-info/entry_points.txt,sha256=YF5PUdQGr_OUDXB4TykElHJTsKT8yKkuE0bMX5n_RXs,58
+nvidia_nat_crewai-1.4.0a20251021.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_crewai-1.4.0a20251021.dist-info/RECORD,,

nvidia_nat_crewai-1.4.0a20251015.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=T57f7hZ5Aa4MUdc6PJLfU6TkF_dO87DWh2KvyAsCt7g,5493
-nat/plugins/crewai/register.py,sha256=_R3bhGmz___696_NwyIcpw3koMBiWqIFoWEFJ0VAgXs,831
-nat/plugins/crewai/tool_wrapper.py,sha256=BNKEPQQCLKtXNzGDAKBLCdmGJXe9lBOVI1hObha8hoI,1569
-nvidia_nat_crewai-1.4.0a20251015.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
-nvidia_nat_crewai-1.4.0a20251015.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat_crewai-1.4.0a20251015.dist-info/METADATA,sha256=X8fdQKjCOFYcJJ4QOG30k4CsMdB1HupTXtlAOjmJRb0,1922
-nvidia_nat_crewai-1.4.0a20251015.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat_crewai-1.4.0a20251015.dist-info/entry_points.txt,sha256=YF5PUdQGr_OUDXB4TykElHJTsKT8yKkuE0bMX5n_RXs,58
-nvidia_nat_crewai-1.4.0a20251015.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
-nvidia_nat_crewai-1.4.0a20251015.dist-info/RECORD,,