chuk-tool-processor 0.6.15__tar.gz → 0.6.18__tar.gz

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chuk-tool-processor
-Version: 0.6.15
+Version: 0.6.18
 Summary: Async-native framework for registering, discovering, and executing tools referenced in LLM responses
 Author-email: CHUK Team <chrishayuk@somejunkmailbox.com>
 Maintainer-email: CHUK Team <chrishayuk@somejunkmailbox.com>
@@ -20,7 +20,7 @@ Classifier: Framework :: AsyncIO
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: chuk-mcp>=0.5.2
+Requires-Dist: chuk-mcp>=0.5.4
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pydantic>=2.11.3

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "chuk-tool-processor"
-version = "0.6.15"
+version = "0.6.18"
 description = "Async-native framework for registering, discovering, and executing tools referenced in LLM responses"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -41,7 +41,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "chuk-mcp>=0.5.2",
+    "chuk-mcp>=0.5.4",
     "dotenv>=0.9.9",
     "psutil>=7.0.0",
     "pydantic>=2.11.3",

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor/core/processor.py

@@ -370,7 +370,7 @@ class ToolProcessor:
         def _args_digest(args: dict[str, Any]) -> str:
             """Return a stable hash for any JSON-serialisable payload."""
             blob = json.dumps(args, sort_keys=True, default=str)
-            return hashlib.md5(blob.encode()).hexdigest()
+            return hashlib.md5(blob.encode(), usedforsecurity=False).hexdigest()  # nosec B324
 
         unique_calls: dict[str, ToolCall] = {}
         for call in all_calls:

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor/execution/strategies/subprocess_strategy.py

@@ -95,7 +95,8 @@ def _serialized_tool_worker(
 
     try:
         # Deserialize the complete tool
-        tool = pickle.loads(serialized_tool_data)
+        # This is safe as the data comes from the parent process, not untrusted external sources
+        tool = pickle.loads(serialized_tool_data)  # nosec B301
 
         # Multiple fallbacks to ensure tool_name is available
 

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor/execution/wrappers/caching.py

@@ -362,11 +362,11 @@ class CachingToolExecutor:
         """
         try:
             blob = json.dumps(arguments, sort_keys=True, default=str)
-            return hashlib.md5(blob.encode()).hexdigest()
+            return hashlib.md5(blob.encode(), usedforsecurity=False).hexdigest()  # nosec B324
         except Exception as e:
             logger.warning(f"Error hashing arguments: {e}")
             # Fallback to a string representation
-            return hashlib.md5(str(arguments).encode()).hexdigest()
+            return hashlib.md5(str(arguments).encode(), usedforsecurity=False).hexdigest()  # nosec B324
 
     def _is_cacheable(self, tool: str) -> bool:
         """
@@ -565,7 +565,9 @@ def invalidate_cache(tool: str, arguments: dict[str, Any] | None = None):
 
     async def _invalidate(cache: CacheInterface):
         if arguments is not None:
-            h = hashlib.md5(json.dumps(arguments, sort_keys=True, default=str).encode()).hexdigest()
+            h = hashlib.md5(
+                json.dumps(arguments, sort_keys=True, default=str).encode(), usedforsecurity=False
+            ).hexdigest()  # nosec B324
             await cache.invalidate(tool, h)
             logger.debug(f"Invalidated cache entry for {tool} with specific arguments")
         else:

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor/mcp/transport/http_streamable_transport.py

@@ -16,10 +16,12 @@ from chuk_mcp.protocol.messages import (  # type: ignore[import-untyped]
     send_tools_call,
     send_tools_list,
 )
+from chuk_mcp.transports.http.parameters import StreamableHTTPParameters  # type: ignore[import-untyped]
 
 # Import chuk-mcp HTTP transport components
-from chuk_mcp.transports.http import http_client  # type: ignore[import-untyped]
-from chuk_mcp.transports.http.parameters import StreamableHTTPParameters  # type: ignore[import-untyped]
+from chuk_mcp.transports.http.transport import (
+    StreamableHTTPTransport as ChukHTTPTransport,  # type: ignore[import-untyped]
+)
 
 from .base_transport import MCPBaseTransport
 
@@ -78,7 +80,7 @@ class HTTPStreamableTransport(MCPBaseTransport):
             logger.debug("Session ID configured: %s", self.session_id)
 
         # State tracking (enhanced like SSE)
-        self._http_context = None
+        self._http_transport = None
         self._read_stream = None
         self._write_stream = None
         self._initialized = False
@@ -115,8 +117,9 @@ class HTTPStreamableTransport(MCPBaseTransport):
         if self.configured_headers:
             headers.update(self.configured_headers)
 
-        # Add API key as Bearer token if provided
-        if self.api_key:
+        # Add API key as Bearer token if provided and no Authorization header exists
+        # This prevents clobbering OAuth tokens from configured_headers
+        if self.api_key and "Authorization" not in headers:
             headers["Authorization"] = f"Bearer {self.api_key}"
 
         # Add session ID if provided
@@ -159,33 +162,38 @@ class HTTPStreamableTransport(MCPBaseTransport):
             headers = self._get_headers()
             logger.debug("Using headers: %s", list(headers.keys()))
 
-            # Create StreamableHTTPParameters with proper configuration
+            # Create StreamableHTTPParameters with minimal configuration
+            # NOTE: Keep params minimal - extra params can break message routing
             http_params = StreamableHTTPParameters(
                 url=self.url,
                 timeout=self.default_timeout,
                 headers=headers,
-                bearer_token=None,  # Don't duplicate auth - it's in headers
-                session_id=self.session_id,
                 enable_streaming=True,
-                max_concurrent_requests=5,
-                max_retries=2,
-                retry_delay=1.0,
-                user_agent="chuk-tool-processor/1.0.0",
             )
 
-            # Create and enter the HTTP context
-            self._http_context = http_client(http_params)
+            # Create and store transport (will be managed via async with in parent scope)
+            self._http_transport = ChukHTTPTransport(http_params)
 
+            # IMPORTANT: Must use async with for proper stream setup
             logger.debug("Establishing HTTP connection...")
-            self._read_stream, self._write_stream = await asyncio.wait_for(
-                self._http_context.__aenter__(), timeout=self.connection_timeout
+            self._http_context_entered = await asyncio.wait_for(
+                self._http_transport.__aenter__(), timeout=self.connection_timeout
             )
 
+            # Get streams after context entered
+            self._read_stream, self._write_stream = await self._http_transport.get_streams()
+
+            # Give the transport's message handler task time to start
+            await asyncio.sleep(0.1)
+
             # Enhanced MCP initialize sequence
             logger.debug("Sending MCP initialize request...")
             init_start = time.time()
 
-            await asyncio.wait_for(send_initialize(self._read_stream, self._write_stream), timeout=self.default_timeout)
+            await asyncio.wait_for(
+                send_initialize(self._read_stream, self._write_stream, timeout=self.default_timeout),
+                timeout=self.default_timeout,
+            )
 
             init_time = time.time() - init_start
             logger.debug("MCP initialize completed in %.3fs", init_time)
@@ -193,9 +201,11 @@ class HTTPStreamableTransport(MCPBaseTransport):
             # Verify connection with ping (enhanced like SSE)
             logger.debug("Verifying connection with ping...")
             ping_start = time.time()
+            # Use longer timeout for initial ping - some servers (like Notion) are slow
+            ping_timeout = max(self.default_timeout, 15.0)
             ping_success = await asyncio.wait_for(
-                send_ping(self._read_stream, self._write_stream),
-                timeout=10.0,  # Longer timeout for initial ping
+                send_ping(self._read_stream, self._write_stream, timeout=ping_timeout),
+                timeout=ping_timeout,
             )
             ping_time = time.time() - ping_start
 
@@ -273,8 +283,8 @@ class HTTPStreamableTransport(MCPBaseTransport):
             )
 
         try:
-            if self._http_context is not None:
-                await self._http_context.__aexit__(None, None, None)
+            if self._http_transport is not None:
+                await self._http_transport.__aexit__(None, None, None)
                 logger.debug("HTTP Streamable context closed")
 
         except Exception as e:
@@ -284,7 +294,7 @@ class HTTPStreamableTransport(MCPBaseTransport):
 
     async def _cleanup(self) -> None:
         """Enhanced cleanup with state reset."""
-        self._http_context = None
+        self._http_transport = None
         self._read_stream = None
         self._write_stream = None
         self._initialized = False
@@ -298,7 +308,8 @@ class HTTPStreamableTransport(MCPBaseTransport):
         start_time = time.time()
         try:
             result = await asyncio.wait_for(
-                send_ping(self._read_stream, self._write_stream), timeout=self.default_timeout
+                send_ping(self._read_stream, self._write_stream, timeout=self.default_timeout),
+                timeout=self.default_timeout,
             )
 
             success = bool(result)
@@ -347,7 +358,8 @@ class HTTPStreamableTransport(MCPBaseTransport):
         start_time = time.time()
         try:
             tools_response = await asyncio.wait_for(
-                send_tools_list(self._read_stream, self._write_stream), timeout=self.default_timeout
+                send_tools_list(self._read_stream, self._write_stream, timeout=self.default_timeout),
+                timeout=self.default_timeout,
             )
 
             # Normalize response

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor/mcp/transport/sse_transport.py

@@ -110,8 +110,9 @@ class SSETransport(MCPBaseTransport):
         if self.configured_headers:
             headers.update(self.configured_headers)
 
-        # Add API key as Bearer token if provided
-        if self.api_key:
+        # Add API key as Bearer token if provided and no Authorization header exists
+        # This prevents clobbering OAuth tokens from configured_headers
+        if self.api_key and "Authorization" not in headers:
             headers["Authorization"] = f"Bearer {self.api_key}"
 
         return headers
@@ -269,12 +270,30 @@ class SSETransport(MCPBaseTransport):
                         # Extract session ID from URL if present
                         if "session_id=" in data_part:
                             self.session_id = data_part.split("session_id=")[1].split("&")[0]
+                        elif "sessionId=" in data_part:
+                            self.session_id = data_part.split("sessionId=")[1].split("&")[0]
                         else:
                             self.session_id = str(uuid.uuid4())
 
                         logger.debug("Session endpoint discovered via event format: %s", self.message_url)
                         continue
 
+                    # RELATIVE PATH FORMAT: event: endpoint + data: /sse/message?sessionId=...
+                    elif current_event == "endpoint" and data_part.startswith("/"):
+                        endpoint_path = data_part
+                        self.message_url = f"{self.url}{endpoint_path}"
+
+                        # Extract session ID if present
+                        if "session_id=" in endpoint_path:
+                            self.session_id = endpoint_path.split("session_id=")[1].split("&")[0]
+                        elif "sessionId=" in endpoint_path:
+                            self.session_id = endpoint_path.split("sessionId=")[1].split("&")[0]
+                        else:
+                            self.session_id = str(uuid.uuid4())
+
+                        logger.debug("Session endpoint discovered via relative path: %s", self.message_url)
+                        continue
+
                     # OLD FORMAT: data: /messages/... (backwards compatibility)
                     elif "/messages/" in data_part:
                         endpoint_path = data_part

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chuk-tool-processor
-Version: 0.6.15
+Version: 0.6.18
 Summary: Async-native framework for registering, discovering, and executing tools referenced in LLM responses
 Author-email: CHUK Team <chrishayuk@somejunkmailbox.com>
 Maintainer-email: CHUK Team <chrishayuk@somejunkmailbox.com>
@@ -20,7 +20,7 @@ Classifier: Framework :: AsyncIO
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: chuk-mcp>=0.5.2
+Requires-Dist: chuk-mcp>=0.5.4
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pydantic>=2.11.3

{chuk_tool_processor-0.6.15 → chuk_tool_processor-0.6.18}/src/chuk_tool_processor.egg-info/requires.txt

@@ -1,4 +1,4 @@
-chuk-mcp>=0.5.2
+chuk-mcp>=0.5.4
 dotenv>=0.9.9
 psutil>=7.0.0
 pydantic>=2.11.3