Emit FlowFailedEvent and finalise batch via added event listener

lib/crewai-tools/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "pytube~=15.0.0",
     "requests~=2.32.5",
     "docker~=7.1.0",
-    "crewai==1.7.2",
+    "crewai==1.7.1",
     "lancedb~=0.5.4",
     "tiktoken~=0.8.0",
     "beautifulsoup4~=4.13.4",

lib/crewai-tools/src/crewai_tools/__init__.py

@@ -291,4 +291,4 @@ __all__ = [
     "ZapierActionTools",
 ]
 
-__version__ = "1.7.2"
+__version__ = "1.7.1"

lib/crewai-tools/src/crewai_tools/tools/crewai_platform_tools/crewai_platform_action_tool.py

@@ -1,5 +1,5 @@
 """Crewai Enterprise Tools."""
-import os
+
 import json
 import re
 from typing import Any, Optional, Union, cast, get_origin
@@ -432,11 +432,7 @@ class CrewAIPlatformActionTool(BaseTool):
             payload = cleaned_kwargs
 
             response = requests.post(
-                url=api_url,
-                headers=headers,
-                json=payload,
-                timeout=60,
-                verify=os.environ.get("CREWAI_FACTORY", "false").lower() != "true",
+                url=api_url, headers=headers, json=payload, timeout=60
             )
 
             data = response.json()

lib/crewai-tools/src/crewai_tools/tools/crewai_platform_tools/crewai_platform_tool_builder.py

@@ -1,5 +1,5 @@
 from typing import Any
-import os
+
 from crewai.tools import BaseTool
 import requests
 
@@ -37,7 +37,6 @@ class CrewaiPlatformToolBuilder:
                 headers=headers,
                 timeout=30,
                 params={"apps": ",".join(self._apps)},
-                verify=os.environ.get("CREWAI_FACTORY", "false").lower() != "true",
             )
             response.raise_for_status()
         except Exception:

lib/crewai-tools/tests/tools/crewai_platform_tools/test_crewai_platform_action_tool.py

@@ -1,6 +1,4 @@
 from typing import Union, get_args, get_origin
-from unittest.mock import patch, Mock
-import os
 
 from crewai_tools.tools.crewai_platform_tools.crewai_platform_action_tool import (
     CrewAIPlatformActionTool,
@@ -251,109 +249,3 @@ class TestSchemaProcessing:
         result_type = tool._process_schema_type(test_schema, "TestFieldAllOfMixed")
 
         assert result_type is str
-
-class TestCrewAIPlatformActionToolVerify:
-    """Test suite for SSL verification behavior based on CREWAI_FACTORY environment variable"""
-
-    def setup_method(self):
-        self.action_schema = {
-            "function": {
-                "name": "test_action",
-                "parameters": {
-                    "properties": {
-                        "test_param": {
-                            "type": "string",
-                            "description": "Test parameter"
-                        }
-                    },
-                    "required": []
-                }
-            }
-        }
-
-    def create_test_tool(self):
-        return CrewAIPlatformActionTool(
-            description="Test action tool",
-            action_name="test_action",
-            action_schema=self.action_schema
-        )
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token"}, clear=True)
-    @patch("crewai_tools.tools.crewai_platform_tools.crewai_platform_action_tool.requests.post")
-    def test_run_with_ssl_verification_default(self, mock_post):
-        """Test that _run uses SSL verification by default when CREWAI_FACTORY is not set"""
-        mock_response = Mock()
-        mock_response.ok = True
-        mock_response.json.return_value = {"result": "success"}
-        mock_post.return_value = mock_response
-
-        tool = self.create_test_tool()
-        tool._run(test_param="test_value")
-
-        mock_post.assert_called_once()
-        call_args = mock_post.call_args
-        assert call_args.kwargs["verify"] is True
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "false"}, clear=True)
-    @patch("crewai_tools.tools.crewai_platform_tools.crewai_platform_action_tool.requests.post")
-    def test_run_with_ssl_verification_factory_false(self, mock_post):
-        """Test that _run uses SSL verification when CREWAI_FACTORY is 'false'"""
-        mock_response = Mock()
-        mock_response.ok = True
-        mock_response.json.return_value = {"result": "success"}
-        mock_post.return_value = mock_response
-
-        tool = self.create_test_tool()
-        tool._run(test_param="test_value")
-
-        mock_post.assert_called_once()
-        call_args = mock_post.call_args
-        assert call_args.kwargs["verify"] is True
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "FALSE"}, clear=True)
-    @patch("crewai_tools.tools.crewai_platform_tools.crewai_platform_action_tool.requests.post")
-    def test_run_with_ssl_verification_factory_false_uppercase(self, mock_post):
-        """Test that _run uses SSL verification when CREWAI_FACTORY is 'FALSE' (case-insensitive)"""
-        mock_response = Mock()
-        mock_response.ok = True
-        mock_response.json.return_value = {"result": "success"}
-        mock_post.return_value = mock_response
-
-        tool = self.create_test_tool()
-        tool._run(test_param="test_value")
-
-        mock_post.assert_called_once()
-        call_args = mock_post.call_args
-        assert call_args.kwargs["verify"] is True
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "true"}, clear=True)
-    @patch("crewai_tools.tools.crewai_platform_tools.crewai_platform_action_tool.requests.post")
-    def test_run_without_ssl_verification_factory_true(self, mock_post):
-        """Test that _run disables SSL verification when CREWAI_FACTORY is 'true'"""
-        mock_response = Mock()
-        mock_response.ok = True
-        mock_response.json.return_value = {"result": "success"}
-        mock_post.return_value = mock_response
-
-        tool = self.create_test_tool()
-        tool._run(test_param="test_value")
-
-        mock_post.assert_called_once()
-        call_args = mock_post.call_args
-        assert call_args.kwargs["verify"] is False
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "TRUE"}, clear=True)
-    @patch("crewai_tools.tools.crewai_platform_tools.crewai_platform_action_tool.requests.post")
-    def test_run_without_ssl_verification_factory_true_uppercase(self, mock_post):
-        """Test that _run disables SSL verification when CREWAI_FACTORY is 'TRUE' (case-insensitive)"""
-        mock_response = Mock()
-        mock_response.ok = True
-        mock_response.json.return_value = {"result": "success"}
-        mock_post.return_value = mock_response
-
-        tool = self.create_test_tool()
-        tool._run(test_param="test_value")
-
-        mock_post.assert_called_once()
-        call_args = mock_post.call_args
-        assert call_args.kwargs["verify"] is False

lib/crewai-tools/tests/tools/crewai_platform_tools/test_crewai_platform_tool_builder.py

@@ -258,98 +258,3 @@ class TestCrewaiPlatformToolBuilder(unittest.TestCase):
         assert "simple_string" in description_text
         assert "nested_object" in description_text
         assert "array_prop" in description_text
-
-
-
-class TestCrewaiPlatformToolBuilderVerify(unittest.TestCase):
-    """Test suite for SSL verification behavior in CrewaiPlatformToolBuilder"""
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token"}, clear=True)
-    @patch(
-        "crewai_tools.tools.crewai_platform_tools.crewai_platform_tool_builder.requests.get"
-    )
-    def test_fetch_actions_with_ssl_verification_default(self, mock_get):
-        """Test that _fetch_actions uses SSL verification by default when CREWAI_FACTORY is not set"""
-        mock_response = Mock()
-        mock_response.raise_for_status.return_value = None
-        mock_response.json.return_value = {"actions": {}}
-        mock_get.return_value = mock_response
-
-        builder = CrewaiPlatformToolBuilder(apps=["github"])
-        builder._fetch_actions()
-
-        mock_get.assert_called_once()
-        call_args = mock_get.call_args
-        assert call_args.kwargs["verify"] is True
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "false"}, clear=True)
-    @patch(
-        "crewai_tools.tools.crewai_platform_tools.crewai_platform_tool_builder.requests.get"
-    )
-    def test_fetch_actions_with_ssl_verification_factory_false(self, mock_get):
-        """Test that _fetch_actions uses SSL verification when CREWAI_FACTORY is 'false'"""
-        mock_response = Mock()
-        mock_response.raise_for_status.return_value = None
-        mock_response.json.return_value = {"actions": {}}
-        mock_get.return_value = mock_response
-
-        builder = CrewaiPlatformToolBuilder(apps=["github"])
-        builder._fetch_actions()
-
-        mock_get.assert_called_once()
-        call_args = mock_get.call_args
-        assert call_args.kwargs["verify"] is True
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "FALSE"}, clear=True)
-    @patch(
-        "crewai_tools.tools.crewai_platform_tools.crewai_platform_tool_builder.requests.get"
-    )
-    def test_fetch_actions_with_ssl_verification_factory_false_uppercase(self, mock_get):
-        """Test that _fetch_actions uses SSL verification when CREWAI_FACTORY is 'FALSE' (case-insensitive)"""
-        mock_response = Mock()
-        mock_response.raise_for_status.return_value = None
-        mock_response.json.return_value = {"actions": {}}
-        mock_get.return_value = mock_response
-
-        builder = CrewaiPlatformToolBuilder(apps=["github"])
-        builder._fetch_actions()
-
-        mock_get.assert_called_once()
-        call_args = mock_get.call_args
-        assert call_args.kwargs["verify"] is True
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "true"}, clear=True)
-    @patch(
-        "crewai_tools.tools.crewai_platform_tools.crewai_platform_tool_builder.requests.get"
-    )
-    def test_fetch_actions_without_ssl_verification_factory_true(self, mock_get):
-        """Test that _fetch_actions disables SSL verification when CREWAI_FACTORY is 'true'"""
-        mock_response = Mock()
-        mock_response.raise_for_status.return_value = None
-        mock_response.json.return_value = {"actions": {}}
-        mock_get.return_value = mock_response
-
-        builder = CrewaiPlatformToolBuilder(apps=["github"])
-        builder._fetch_actions()
-
-        mock_get.assert_called_once()
-        call_args = mock_get.call_args
-        assert call_args.kwargs["verify"] is False
-
-    @patch.dict("os.environ", {"CREWAI_PLATFORM_INTEGRATION_TOKEN": "test_token", "CREWAI_FACTORY": "TRUE"}, clear=True)
-    @patch(
-        "crewai_tools.tools.crewai_platform_tools.crewai_platform_tool_builder.requests.get"
-    )
-    def test_fetch_actions_without_ssl_verification_factory_true_uppercase(self, mock_get):
-        """Test that _fetch_actions disables SSL verification when CREWAI_FACTORY is 'TRUE' (case-insensitive)"""
-        mock_response = Mock()
-        mock_response.raise_for_status.return_value = None
-        mock_response.json.return_value = {"actions": {}}
-        mock_get.return_value = mock_response
-
-        builder = CrewaiPlatformToolBuilder(apps=["github"])
-        builder._fetch_actions()
-
-        mock_get.assert_called_once()
-        call_args = mock_get.call_args
-        assert call_args.kwargs["verify"] is False

lib/crewai/pyproject.toml

@@ -49,7 +49,7 @@ Repository = "https://github.com/crewAIInc/crewAI"
 
 [project.optional-dependencies]
 tools = [
-    "crewai-tools==1.7.2",
+    "crewai-tools==1.7.1",
 ]
 embeddings = [
     "tiktoken~=0.8.0"

lib/crewai/src/crewai/__init__.py

@@ -40,7 +40,7 @@ def _suppress_pydantic_deprecation_warnings() -> None:
 
 _suppress_pydantic_deprecation_warnings()
 
-__version__ = "1.7.2"
+__version__ = "1.7.1"
 _telemetry_submitted = False
 
 

lib/crewai/src/crewai/agent/core.py

@@ -44,8 +44,6 @@ from crewai.events.types.memory_events import (
     MemoryRetrievalCompletedEvent,
     MemoryRetrievalStartedEvent,
 )
-from crewai.events.types.task_events import TaskFailedEvent
-from crewai.hooks import LLMCallBlockedError
 from crewai.knowledge.knowledge import Knowledge
 from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
 from crewai.lite_agent import LiteAgent
@@ -411,15 +409,6 @@ class Agent(BaseAgent):
                     ),
                 )
                 raise e
-            if isinstance(e, LLMCallBlockedError):
-                crewai_event_bus.emit(
-                    self,
-                    event=TaskFailedEvent(  # type: ignore[no-untyped-call]
-                        task=task,
-                        error=str(e),
-                    ),
-                )
-                raise e
             self._times_executed += 1
             if self._times_executed > self.max_retry_limit:
                 crewai_event_bus.emit(
@@ -626,15 +615,6 @@ class Agent(BaseAgent):
                     ),
                 )
                 raise e
-            if isinstance(e, LLMCallBlockedError):
-                crewai_event_bus.emit(
-                    self,
-                    event=TaskFailedEvent(  # type: ignore[no-untyped-call]
-                        task=task,
-                        error=str(e),
-                    ),
-                )
-                raise e
             self._times_executed += 1
             if self._times_executed > self.max_retry_limit:
                 crewai_event_bus.emit(

lib/crewai/src/crewai/agents/crew_agent_executor.py

@@ -34,7 +34,6 @@ from crewai.utilities.agent_utils import (
     get_llm_response,
     handle_agent_action_core,
     handle_context_length,
-    handle_llm_call_blocked_error,
     handle_max_iterations_exceeded,
     handle_output_parser_exception,
     handle_unknown_error,
@@ -285,6 +284,7 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
                     log_error_after=self.log_error_after,
                     printer=self._printer,
                 )
+
             except Exception as e:
                 if e.__class__.__module__.startswith("litellm"):
                     # Do not retry on litellm errors

lib/crewai/src/crewai/cli/authentication/main.py

@@ -149,9 +149,7 @@ class AuthenticationCommand:
                 return
 
             if token_data["error"] not in ("authorization_pending", "slow_down"):
-                raise requests.HTTPError(
-                    token_data.get("error_description") or token_data.get("error")
-                )
+                raise requests.HTTPError(token_data["error_description"])
 
             time.sleep(device_code_data["interval"])
             attempts += 1

lib/crewai/src/crewai/cli/plus_api.py

@@ -1,6 +1,6 @@
 from typing import Any
 from urllib.parse import urljoin
-import os
+
 import requests
 
 from crewai.cli.config import Settings
@@ -33,7 +33,9 @@ class PlusAPI:
         if settings.org_uuid:
             self.headers["X-Crewai-Organization-Id"] = settings.org_uuid
 
-        self.base_url = os.getenv("CREWAI_PLUS_URL") or str(settings.enterprise_base_url) or DEFAULT_CREWAI_ENTERPRISE_URL
+        self.base_url = (
+            str(settings.enterprise_base_url) or DEFAULT_CREWAI_ENTERPRISE_URL
+        )
 
     def _make_request(
         self, method: str, endpoint: str, **kwargs: Any

lib/crewai/src/crewai/cli/templates/crew/pyproject.toml

@@ -5,7 +5,7 @@ description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "crewai[tools]==1.7.2"
+    "crewai[tools]==1.7.1"
 ]
 
 [project.scripts]

lib/crewai/src/crewai/cli/templates/flow/pyproject.toml

@@ -5,7 +5,7 @@ description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "crewai[tools]==1.7.2"
+    "crewai[tools]==1.7.1"
 ]
 
 [project.scripts]

lib/crewai/src/crewai/cli/tools/main.py

@@ -12,7 +12,6 @@ from rich.console import Console
 from crewai.cli import git
 from crewai.cli.command import BaseCommand, PlusAPIMixin
 from crewai.cli.config import Settings
-from crewai.cli.constants import DEFAULT_CREWAI_ENTERPRISE_URL
 from crewai.cli.utils import (
     build_env_with_tool_repository_credentials,
     extract_available_exports,
@@ -132,13 +131,10 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
         self._validate_response(publish_response)
 
         published_handle = publish_response.json()["handle"]
-        settings = Settings()
-        base_url = settings.enterprise_base_url or DEFAULT_CREWAI_ENTERPRISE_URL
-
         console.print(
             f"Successfully published `{published_handle}` ({project_version}).\n\n"
             + "⚠️ Security checks are running in the background. Your tool will be available once these are complete.\n"
-            + f"You can monitor the status or access your tool here:\n{base_url}/crewai_plus/tools/{published_handle}",
+            + f"You can monitor the status or access your tool here:\nhttps://app.crewai.com/crewai_plus/tools/{published_handle}",
             style="bold green",
         )
 

lib/crewai/src/crewai/events/listeners/tracing/trace_batch_manager.py

@@ -9,8 +9,6 @@ from rich.console import Console
 from rich.panel import Panel
 
 from crewai.cli.authentication.token import AuthError, get_auth_token
-from crewai.cli.config import Settings
-from crewai.cli.constants import DEFAULT_CREWAI_ENTERPRISE_URL
 from crewai.cli.plus_api import PlusAPI
 from crewai.cli.version import get_crewai_version
 from crewai.events.listeners.tracing.types import TraceEvent
@@ -18,6 +16,7 @@ from crewai.events.listeners.tracing.utils import (
     is_tracing_enabled_in_context,
     should_auto_collect_first_time_traces,
 )
+from crewai.utilities.constants import CREWAI_BASE_URL
 
 
 logger = getLogger(__name__)
@@ -327,12 +326,10 @@ class TraceBatchManager:
             if response.status_code == 200:
                 access_code = response.json().get("access_code", None)
                 console = Console()
-                settings = Settings()
-                base_url = settings.enterprise_base_url or DEFAULT_CREWAI_ENTERPRISE_URL
                 return_link = (
-                    f"{base_url}/crewai_plus/trace_batches/{self.trace_batch_id}"
+                    f"{CREWAI_BASE_URL}/crewai_plus/trace_batches/{self.trace_batch_id}"
                     if not self.is_current_batch_ephemeral and access_code is None
-                    else f"{base_url}/crewai_plus/ephemeral_trace_batches/{self.trace_batch_id}?access_code={access_code}"
+                    else f"{CREWAI_BASE_URL}/crewai_plus/ephemeral_trace_batches/{self.trace_batch_id}?access_code={access_code}"
                 )
 
                 if self.is_current_batch_ephemeral:

lib/crewai/src/crewai/events/listeners/tracing/trace_listener.py

@@ -33,6 +33,7 @@ from crewai.events.types.crew_events import (
 )
 from crewai.events.types.flow_events import (
     FlowCreatedEvent,
+    FlowFailedEvent,
     FlowFinishedEvent,
     FlowPlotEvent,
     FlowStartedEvent,
@@ -194,6 +195,22 @@ class TraceCollectionListener(BaseEventListener):
         @event_bus.on(FlowFinishedEvent)
         def on_flow_finished(source: Any, event: FlowFinishedEvent) -> None:
             self._handle_trace_event("flow_finished", source, event)
+            if self.batch_manager.batch_owner_type == "flow":
+                if self.first_time_handler.is_first_time:
+                    self.first_time_handler.mark_events_collected()
+                    self.first_time_handler.handle_execution_completion()
+                else:
+                    self.batch_manager.finalize_batch()
+
+        @event_bus.on(FlowFailedEvent)
+        def on_flow_failed(source: Any, event: FlowFailedEvent) -> None:
+            self._handle_trace_event("flow_failed", source, event)
+            if self.batch_manager.batch_owner_type == "flow":
+                if self.first_time_handler.is_first_time:
+                    self.first_time_handler.mark_events_collected()
+                    self.first_time_handler.handle_execution_completion()
+                else:
+                    self.batch_manager.finalize_batch()
 
         @event_bus.on(FlowPlotEvent)
         def on_flow_plot(source: Any, event: FlowPlotEvent) -> None:

lib/crewai/src/crewai/events/types/flow_events.py

@@ -67,6 +67,16 @@ class FlowFinishedEvent(FlowEvent):
     state: dict[str, Any] | BaseModel
 
 
+class FlowFailedEvent(FlowEvent):
+    """Event emitted when a flow fails execution"""
+
+    flow_name: str
+    error: Exception
+    type: str = "flow_failed"
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+
 class FlowPlotEvent(FlowEvent):
     """Event emitted when a flow plot is created"""
 

lib/crewai/src/crewai/flow/flow.py

@@ -40,6 +40,7 @@ from crewai.events.listeners.tracing.utils import (
 )
 from crewai.events.types.flow_events import (
     FlowCreatedEvent,
+    FlowFailedEvent,
     FlowFinishedEvent,
     FlowPlotEvent,
     FlowStartedEvent,
@@ -977,7 +978,6 @@ class Flow(Generic[T], metaclass=FlowMeta):
             future = crewai_event_bus.emit(
                 self,
                 FlowStartedEvent(
-                    type="flow_started",
                     flow_name=self.name or self.__class__.__name__,
                     inputs=inputs,
                 ),
@@ -1005,7 +1005,6 @@ class Flow(Generic[T], metaclass=FlowMeta):
             future = crewai_event_bus.emit(
                 self,
                 FlowFinishedEvent(
-                    type="flow_finished",
                     flow_name=self.name or self.__class__.__name__,
                     result=final_output,
                     state=self._copy_and_serialize_state(),
@@ -1020,15 +1019,18 @@ class Flow(Generic[T], metaclass=FlowMeta):
                 )
                 self._event_futures.clear()
 
-            trace_listener = TraceCollectionListener()
-            if trace_listener.batch_manager.batch_owner_type == "flow":
-                if trace_listener.first_time_handler.is_first_time:
-                    trace_listener.first_time_handler.mark_events_collected()
-                    trace_listener.first_time_handler.handle_execution_completion()
-                else:
-                    trace_listener.batch_manager.finalize_batch()
-
             return final_output
+        except Exception as e:
+            future = crewai_event_bus.emit(
+                self,
+                FlowFailedEvent(
+                    flow_name=self.name or self.__class__.__name__,
+                    error=e,
+                ),
+            )
+            if future:
+                self._event_futures.append(future)
+            raise e
         finally:
             detach(flow_token)
 

lib/crewai/src/crewai/hooks/__init__.py

@@ -7,7 +7,6 @@ from crewai.hooks.decorators import (
     before_tool_call,
 )
 from crewai.hooks.llm_hooks import (
-    LLMCallBlockedError,
     LLMCallHookContext,
     clear_after_llm_call_hooks,
     clear_all_llm_call_hooks,
@@ -75,8 +74,6 @@ def clear_all_global_hooks() -> dict[str, tuple[int, int]]:
 
 
 __all__ = [
-    # Exceptions
-    "LLMCallBlockedError",
     # Context classes
     "LLMCallHookContext",
     "ToolCallHookContext",

lib/crewai/src/crewai/hooks/llm_hooks.py

@@ -14,14 +14,6 @@ if TYPE_CHECKING:
     from crewai.utilities.types import LLMMessage
 
 
-class LLMCallBlockedError(Exception):
-    """Raised when a before_llm_call hook blocks the LLM call.
-
-    This exception is intentionally NOT retried by the agent,
-    as it represents an intentional block by the hook.
-    """
-
-
 class LLMCallHookContext:
     """Context object passed to LLM call hooks.
 
@@ -139,7 +131,6 @@ class LLMCallHookContext:
             ...         if response.lower() == "no":
             ...             print("LLM call skipped by user")
         """
-        # from crewai.events.event_listener import event_listener
 
         printer = Printer()
         event_listener.formatter.pause_live_updates()

lib/crewai/src/crewai/llm.py

@@ -1645,7 +1645,8 @@ class LLM(BaseLLM):
                     msg_role: Literal["assistant"] = "assistant"
                     message["role"] = msg_role
 
-        self._invoke_before_llm_call_hooks(messages, from_agent)
+        if not self._invoke_before_llm_call_hooks(messages, from_agent):
+            raise ValueError("LLM call blocked by before_llm_call hook")
 
         # --- 5) Set up callbacks if provided
         with suppress_warnings():

lib/crewai/src/crewai/llms/base_llm.py

@@ -591,7 +591,7 @@ class BaseLLM(ABC):
         self,
         messages: list[LLMMessage],
         from_agent: Agent | None = None,
-    ) -> None:
+    ) -> bool:
         """Invoke before_llm_call hooks for direct LLM calls (no agent context).
 
         This method should be called by native provider implementations before
@@ -601,19 +601,20 @@ class BaseLLM(ABC):
             messages: The messages being sent to the LLM
             from_agent: The agent making the call (None for direct calls)
 
-        Raises:
-            LLMCallBlockedError: If any hook returns False to block the LLM call.
+        Returns:
+            True if LLM call should proceed, False if blocked by hook
 
         Example:
             >>> # In a native provider's call() method:
-            >>> if from_agent is None:
-            ...     self._invoke_before_llm_call_hooks(messages, from_agent)
+            >>> if from_agent is None and not self._invoke_before_llm_call_hooks(
+            ...     messages, from_agent
+            ... ):
+            ...     raise ValueError("LLM call blocked by hook")
         """
         # Only invoke hooks for direct calls (no agent context)
         if from_agent is not None:
-            return
+            return True
 
-        from crewai.hooks import LLMCallBlockedError
         from crewai.hooks.llm_hooks import (
             LLMCallHookContext,
             get_before_llm_call_hooks,
@@ -622,7 +623,7 @@ class BaseLLM(ABC):
 
         before_hooks = get_before_llm_call_hooks()
         if not before_hooks:
-            return
+            return True
 
         hook_context = LLMCallHookContext(
             executor=None,
@@ -642,17 +643,15 @@ class BaseLLM(ABC):
                         content="LLM call blocked by before_llm_call hook",
                         color="yellow",
                     )
-                    raise LLMCallBlockedError(
-                        "LLM call blocked by before_llm_call hook"
-                    )
-        except LLMCallBlockedError:
-            raise
+                    return False
         except Exception as e:
             printer.print(
                 content=f"Error in before_llm_call hook: {e}",
                 color="yellow",
             )
 
+        return True
+
     def _invoke_after_llm_call_hooks(
         self,
         messages: list[LLMMessage],

lib/crewai/src/crewai/llms/providers/anthropic/completion.py

@@ -5,6 +5,7 @@ import logging
 import os
 from typing import TYPE_CHECKING, Any, Literal, cast
 
+from anthropic.types import ThinkingBlock
 from pydantic import BaseModel
 
 from crewai.events.types.llm_events import LLMCallType
@@ -196,7 +197,8 @@ class AnthropicCompletion(BaseLLM):
                 messages
             )
 
-            self._invoke_before_llm_call_hooks(formatted_messages, from_agent)
+            if not self._invoke_before_llm_call_hooks(formatted_messages, from_agent):
+                raise ValueError("LLM call blocked by before_llm_call hook")
 
             # Prepare completion parameters
             completion_params = self._prepare_completion_params(

lib/crewai/src/crewai/llms/providers/azure/completion.py

@@ -302,7 +302,8 @@ class AzureCompletion(BaseLLM):
             # Format messages for Azure
             formatted_messages = self._format_messages_for_azure(messages)
 
-            self._invoke_before_llm_call_hooks(formatted_messages, from_agent)
+            if not self._invoke_before_llm_call_hooks(formatted_messages, from_agent):
+                raise ValueError("LLM call blocked by before_llm_call hook")
 
             # Prepare completion parameters
             completion_params = self._prepare_completion_params(

lib/crewai/src/crewai/llms/providers/bedrock/completion.py

@@ -315,9 +315,10 @@ class BedrockCompletion(BaseLLM):
                 messages
             )
 
-            self._invoke_before_llm_call_hooks(
+            if not self._invoke_before_llm_call_hooks(
                 cast(list[LLMMessage], formatted_messages), from_agent
-            )
+            ):
+                raise ValueError("LLM call blocked by before_llm_call hook")
 
             # Prepare request body
             body: BedrockConverseRequestBody = {

lib/crewai/src/crewai/llms/providers/gemini/completion.py

@@ -250,7 +250,8 @@ class GeminiCompletion(BaseLLM):
 
             messages_for_hooks = self._convert_contents_to_dict(formatted_content)
 
-            self._invoke_before_llm_call_hooks(messages_for_hooks, from_agent)
+            if not self._invoke_before_llm_call_hooks(messages_for_hooks, from_agent):
+                raise ValueError("LLM call blocked by before_llm_call hook")
 
             config = self._prepare_generation_config(
                 system_instruction, tools, response_model

lib/crewai/src/crewai/llms/providers/openai/completion.py

@@ -190,7 +190,8 @@ class OpenAICompletion(BaseLLM):
 
             formatted_messages = self._format_messages(messages)
 
-            self._invoke_before_llm_call_hooks(formatted_messages, from_agent)
+            if not self._invoke_before_llm_call_hooks(formatted_messages, from_agent):
+                raise ValueError("LLM call blocked by before_llm_call hook")
 
             completion_params = self._prepare_completion_params(
                 messages=formatted_messages, tools=tools

lib/crewai/src/crewai/utilities/agent_utils.py

@@ -16,7 +16,6 @@ from crewai.agents.parser import (
     parse,
 )
 from crewai.cli.config import Settings
-from crewai.hooks import LLMCallBlockedError
 from crewai.llms.base_llm import BaseLLM
 from crewai.tools import BaseTool as CrewAITool
 from crewai.tools.base_tool import BaseTool
@@ -261,7 +260,8 @@ def get_llm_response(
     """
 
     if executor_context is not None:
-        _setup_before_llm_call_hooks(executor_context, printer)  # Raises if blocked
+        if not _setup_before_llm_call_hooks(executor_context, printer):
+            raise ValueError("LLM call blocked by before_llm_call hook")
         messages = executor_context.messages
 
     try:
@@ -314,7 +314,8 @@ async def aget_llm_response(
         ValueError: If the response is None or empty.
     """
     if executor_context is not None:
-        _setup_before_llm_call_hooks(executor_context, printer)  # Raises if blocked
+        if not _setup_before_llm_call_hooks(executor_context, printer):
+            raise ValueError("LLM call blocked by before_llm_call hook")
         messages = executor_context.messages
 
     try:
@@ -460,18 +461,6 @@ def handle_output_parser_exception(
     return formatted_answer
 
 
-def handle_llm_call_blocked_error(
-    e: LLMCallBlockedError,
-    messages: list[LLMMessage],
-) -> AgentFinish:
-    messages.append({"role": "user", "content": str(e)})
-    return AgentFinish(
-        thought="",
-        output=str(e),
-        text=str(e),
-    )
-
-
 def is_context_length_exceeded(exception: Exception) -> bool:
     """Check if the exception is due to context length exceeding.
 
@@ -739,15 +728,15 @@ def load_agent_from_repository(from_repository: str) -> dict[str, Any]:
 
 def _setup_before_llm_call_hooks(
     executor_context: CrewAgentExecutor | LiteAgent | None, printer: Printer
-) -> None:
+) -> bool:
     """Setup and invoke before_llm_call hooks for the executor context.
 
     Args:
         executor_context: The executor context to setup the hooks for.
         printer: Printer instance for error logging.
 
-    Raises:
-        LLMCallBlockedError: If any hook returns False to block the LLM call.
+    Returns:
+        True if LLM execution should proceed, False if blocked by a hook.
     """
     if executor_context and executor_context.before_llm_call_hooks:
         from crewai.hooks.llm_hooks import LLMCallHookContext
@@ -763,11 +752,7 @@ def _setup_before_llm_call_hooks(
                         content="LLM call blocked by before_llm_call hook",
                         color="yellow",
                     )
-                    raise LLMCallBlockedError(
-                        "LLM call blocked by before_llm_call hook"
-                    )
-        except LLMCallBlockedError:
-            raise
+                    return False
         except Exception as e:
             printer.print(
                 content=f"Error in before_llm_call hook: {e}",
@@ -788,6 +773,8 @@ def _setup_before_llm_call_hooks(
             else:
                 executor_context.messages = []
 
+    return True
+
 
 def _setup_after_llm_call_hooks(
     executor_context: CrewAgentExecutor | LiteAgent | None,

lib/crewai/src/crewai/utilities/constants.py

@@ -30,3 +30,4 @@ NOT_SPECIFIED: Final[
         "allows us to distinguish between 'not passed at all' and 'explicitly passed None' or '[]'.",
     ]
 ] = _NotSpecified()
+CREWAI_BASE_URL: Final[str] = "https://app.crewai.com"

lib/crewai/tests/cli/test_plus_api.py

@@ -1,7 +1,7 @@
-import os
 import unittest
 from unittest.mock import ANY, MagicMock, patch
 
+from crewai.cli.constants import DEFAULT_CREWAI_ENTERPRISE_URL
 from crewai.cli.plus_api import PlusAPI
 
 
@@ -35,7 +35,7 @@ class TestPlusAPI(unittest.TestCase):
     ):
         mock_make_request.assert_called_once_with(
             method,
-            f"{os.getenv('CREWAI_PLUS_URL')}{endpoint}",
+            f"{DEFAULT_CREWAI_ENTERPRISE_URL}{endpoint}",
             headers={
                 "Authorization": ANY,
                 "Content-Type": ANY,
@@ -53,7 +53,7 @@ class TestPlusAPI(unittest.TestCase):
     ):
         mock_settings = MagicMock()
         mock_settings.org_uuid = self.org_uuid
-        mock_settings.enterprise_base_url = os.getenv('CREWAI_PLUS_URL')
+        mock_settings.enterprise_base_url = DEFAULT_CREWAI_ENTERPRISE_URL
         mock_settings_class.return_value = mock_settings
         # re-initialize Client
         self.api = PlusAPI(self.api_key)
@@ -84,7 +84,7 @@ class TestPlusAPI(unittest.TestCase):
     def test_get_agent_with_org_uuid(self, mock_make_request, mock_settings_class):
         mock_settings = MagicMock()
         mock_settings.org_uuid = self.org_uuid
-        mock_settings.enterprise_base_url = os.getenv('CREWAI_PLUS_URL')
+        mock_settings.enterprise_base_url = DEFAULT_CREWAI_ENTERPRISE_URL
         mock_settings_class.return_value = mock_settings
         # re-initialize Client
         self.api = PlusAPI(self.api_key)
@@ -115,7 +115,7 @@ class TestPlusAPI(unittest.TestCase):
     def test_get_tool_with_org_uuid(self, mock_make_request, mock_settings_class):
         mock_settings = MagicMock()
         mock_settings.org_uuid = self.org_uuid
-        mock_settings.enterprise_base_url = os.getenv('CREWAI_PLUS_URL')
+        mock_settings.enterprise_base_url = DEFAULT_CREWAI_ENTERPRISE_URL
         mock_settings_class.return_value = mock_settings
         # re-initialize Client
         self.api = PlusAPI(self.api_key)
@@ -163,7 +163,7 @@ class TestPlusAPI(unittest.TestCase):
     def test_publish_tool_with_org_uuid(self, mock_make_request, mock_settings_class):
         mock_settings = MagicMock()
         mock_settings.org_uuid = self.org_uuid
-        mock_settings.enterprise_base_url = os.getenv('CREWAI_PLUS_URL')
+        mock_settings.enterprise_base_url = DEFAULT_CREWAI_ENTERPRISE_URL
         mock_settings_class.return_value = mock_settings
         # re-initialize Client
         self.api = PlusAPI(self.api_key)
@@ -320,7 +320,6 @@ class TestPlusAPI(unittest.TestCase):
         )
 
     @patch("crewai.cli.plus_api.Settings")
-    @patch.dict(os.environ, {"CREWAI_PLUS_URL": ""})
     def test_custom_base_url(self, mock_settings_class):
         mock_settings = MagicMock()
         mock_settings.enterprise_base_url = "https://custom-url.com/api"
@@ -330,11 +329,3 @@ class TestPlusAPI(unittest.TestCase):
             custom_api.base_url,
             "https://custom-url.com/api",
         )
-
-    @patch.dict(os.environ, {"CREWAI_PLUS_URL": "https://custom-url-from-env.com"})
-    def test_custom_base_url_from_env(self):
-        custom_api = PlusAPI("test_key")
-        self.assertEqual(
-            custom_api.base_url,
-            "https://custom-url-from-env.com",
-        )

lib/crewai/tests/hooks/test_llm_hooks.py

@@ -4,12 +4,7 @@ from __future__ import annotations
 
 from unittest.mock import Mock
 
-from crewai.hooks import (
-    LLMCallBlockedError,
-    clear_all_llm_call_hooks,
-    unregister_after_llm_call_hook,
-    unregister_before_llm_call_hook,
-)
+from crewai.hooks import clear_all_llm_call_hooks, unregister_after_llm_call_hook, unregister_before_llm_call_hook
 import pytest
 
 from crewai.hooks.llm_hooks import (
@@ -92,86 +87,6 @@ class TestLLMCallHookContext:
         assert new_message in mock_executor.messages
         assert len(mock_executor.messages) == 2
 
-    def test_before_hook_returning_false_gracefully_finishes(self) -> None:
-        """Test that when before_llm_call hook returns False, agent gracefully finishes."""
-        from crewai import Agent, Crew, Task
-
-        hook_called = {"before": False}
-
-        def blocking_hook(context: LLMCallHookContext) -> bool:
-            """Hook that blocks all LLM calls."""
-            hook_called["before"] = True
-            return False
-
-        register_before_llm_call_hook(blocking_hook)
-
-        try:
-            agent = Agent(
-                role="Test Agent",
-                goal="Answer questions",
-                backstory="You are a test agent",
-                verbose=True,
-            )
-
-            task = Task(
-                description="Say hello",
-                expected_output="A greeting",
-                agent=agent,
-            )
-
-            with pytest.raises(LLMCallBlockedError):
-                crew = Crew(agents=[agent], tasks=[task], verbose=True)
-                crew.kickoff()
-        finally:
-            unregister_before_llm_call_hook(blocking_hook)
-
-    def test_direct_llm_call_raises_blocked_error_when_hook_returns_false(self) -> None:
-        """Test that direct LLM.call() raises LLMCallBlockedError when hook returns False."""
-        from crewai.hooks import LLMCallBlockedError
-        from crewai.llm import LLM
-
-
-        hook_called = {"before": False}
-
-        def blocking_hook(context: LLMCallHookContext) -> bool:
-            """Hook that blocks all LLM calls."""
-            hook_called["before"] = True
-            return False
-
-        register_before_llm_call_hook(blocking_hook)
-
-        try:
-            llm = LLM(model="gpt-4o-mini")
-
-            with pytest.raises(LLMCallBlockedError) as exc_info:
-                llm.call([{"role": "user", "content": "Say hello"}])
-
-            assert hook_called["before"] is True, "Before hook should have been called"
-
-            assert "blocked" in str(exc_info.value).lower()
-
-        finally:
-            unregister_before_llm_call_hook(blocking_hook)
-
-    def test_raises_with_llm_call_blocked_exception(self) -> None:
-        """Test that the LLM call raises an exception when the hook raises an exception."""
-        from crewai.hooks import LLMCallBlockedError
-        from crewai.llm import LLM
-
-        def blocking_hook(context: LLMCallHookContext) -> bool:
-            raise LLMCallBlockedError("llm call blocked")
-        register_before_llm_call_hook(blocking_hook)
-
-        try:
-            llm = LLM(model="gpt-4o-mini")
-            with pytest.raises(LLMCallBlockedError) as exc_info:
-                llm.call([{"role": "user", "content": "Say hello"}])
-            assert "blocked" in str(exc_info.value).lower()
-        finally:
-            unregister_before_llm_call_hook(blocking_hook)
-
-
-
 
 class TestBeforeLLMCallHooks:
     """Test before_llm_call hook registration and execution."""

lib/devtools/src/crewai_devtools/__init__.py

@@ -1,3 +1,3 @@
 """CrewAI development tools."""
 
-__version__ = "1.7.2"
+__version__ = "1.7.1"