media-agent-mcp 2.6.13__py3-none-any.whl → 2.6.14__py3-none-any.whl

media_agent_mcp/async_server.py

@@ -163,15 +163,15 @@ class SessionManager:
         """Get session object by ID."""
         return self._sessions.get(session_id)
     
-    def remove_session(self, session_id: str):
+    def remove_session(self, session_id: str, remove_route_mapping: bool = True):
         """Remove a session."""
         if session_id in self._sessions:
             del self._sessions[session_id]
-        if session_id in self._session_routes:
+        if remove_route_mapping and session_id in self._session_routes:
             del self._session_routes[session_id]
         if session_id in self._session_timestamps:
             del self._session_timestamps[session_id]
-        logger.info(f"Removed session: {session_id}")
+        logger.info(f"Removed session: {session_id} (route_mapping_removed: {remove_route_mapping})")
     
     def cleanup_expired_sessions(self, max_age_seconds: int = 3600):
         """Clean up sessions older than max_age_seconds."""
@@ -209,70 +209,25 @@ class SessionManager:
 # Global session manager
 session_manager = SessionManager()
 
-class SessionErrorHandlingMiddleware(BaseHTTPMiddleware):
-    """Middleware to handle ClosedResourceError and auto-regenerate sessions."""
+def _extract_session_id_from_url(url: str) -> Optional[str]:
+    """Extract session_id from URL."""
+    import re
+    from urllib.parse import urlparse, parse_qs
     
-    async def dispatch(self, request: Request, call_next):
-        try:
-            response = await call_next(request)
-            return response
-        except anyio.ClosedResourceError as e:
-            logger.warning(f"ClosedResourceError detected: {e}")
-            
-            # Extract session_id from request
-            session_id = self._extract_session_id(request)
-            if session_id:
-                # Generate new session ID
-                new_session_id = session_manager.generate_session_id()
-                
-                # Add route mapping
-                session_manager.add_route_mapping(session_id, new_session_id)
-                
-                # Remove old session
-                session_manager.remove_session(session_id)
-                
-                logger.info(f"Auto-generated new session {new_session_id} to replace expired session {session_id}")
-                
-                # Create a JSON response with new session information
-                new_url = str(request.url).replace(f"session_id={session_id}", f"session_id={new_session_id}")
-                
-                from starlette.responses import JSONResponse
-                return JSONResponse(
-                    status_code=410,  # Gone - indicates the resource is no longer available
-                    content={
-                        "error": "session_expired",
-                        "message": "Session expired, please use the new session ID",
-                        "old_session_id": session_id,
-                        "new_session_id": new_session_id,
-                        "redirect_url": new_url
-                    }
-                )
-            
-            # If no session_id found, re-raise the error
-            raise e
-        except Exception as e:
-            logger.error(f"Unexpected error in middleware: {e}")
-            raise e
-    
-    def _extract_session_id(self, request: Request) -> Optional[str]:
-        """Extract session_id from request URL or headers."""
-        # Try to get from query parameters
-        session_id = request.query_params.get('session_id')
-        if session_id:
-            return session_id
-        
-        # Try to get from path parameters
-        if hasattr(request, 'path_params') and 'session_id' in request.path_params:
-            return request.path_params['session_id']
-        
-        # Try to extract from URL path
-        import re
-        path = str(request.url.path)
-        match = re.search(r'session_id=([a-f0-9]+)', str(request.url))
-        if match:
-            return match.group(1)
-        
-        return None
+    # Parse the URL
+    parsed = urlparse(url)
+    
+    # Try to get from query parameters
+    query_params = parse_qs(parsed.query)
+    if 'session_id' in query_params:
+        return query_params['session_id'][0]
+    
+    # Try to extract from URL path using regex
+    match = re.search(r'session_id=([a-f0-9]+)', url)
+    if match:
+        return match.group(1)
+    
+    return None
 
 # Global exception handler for ClosedResourceError
 async def handle_closed_resource_error(request, exc):
@@ -288,7 +243,7 @@ async def handle_closed_resource_error(request, exc):
         # Generate new session ID
         new_session_id = session_manager.generate_session_id()
         session_manager.add_route_mapping(session_id, new_session_id)
-        session_manager.remove_session(session_id)
+        session_manager.remove_session(session_id, remove_route_mapping=False)
         
         logger.info(f"Global handler: Generated new session {new_session_id} to replace {session_id}")
         
@@ -834,16 +789,13 @@ def main():
             mcp.settings.host = args.host
             mcp.settings.port = args.port
             
-            # Get the SSE app and add session error handling middleware
+            # Get the SSE app and add global exception handler
             sse_app = mcp.sse_app()
             
-            # Add session error handling middleware
-            sse_app.add_middleware(SessionErrorHandlingMiddleware)
-            
             # Add global exception handler for ClosedResourceError
             sse_app.add_exception_handler(anyio.ClosedResourceError, handle_closed_resource_error)
             
-            logger.info("Added SessionErrorHandlingMiddleware and global ClosedResourceError handler for automatic session recovery")
+            logger.info("Added global ClosedResourceError handler for automatic session recovery")
             
             # Use uvicorn to run SSE app with extended keep-alive timeout (5 minutes)
             uvicorn.run(

{media_agent_mcp-2.6.13.dist-info → media_agent_mcp-2.6.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-agent-mcp
-Version: 2.6.13
+Version: 2.6.14
 Summary: A Model Context Protocol server for media processing with AI tools
 Author-email: Media Agent Team <team@mediaagent.com>
 Keywords: mcp,ai,media,video,image,processing

{media_agent_mcp-2.6.13.dist-info → media_agent_mcp-2.6.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 media_agent_mcp/__init__.py,sha256=4GfH0flV1CGHefl-eNXt-Gidk7aDXA6Jlh2uVDOXGSo,312
-media_agent_mcp/async_server.py,sha256=eNw2sC7WT5AOjb_KIvfQobVYZ_h68vg_3en9zSfenrM,33332
+media_agent_mcp/async_server.py,sha256=3y1Xse4lavfzuNKUD9AU-REzhlAc3Po42GNn2el6Pn8,31091
 media_agent_mcp/async_wrapper.py,sha256=hiiBhhz9WeVDfSBWVh6ovhf5jeP5ZbsieBbz9P-KPn0,15351
 media_agent_mcp/ai_models/__init__.py,sha256=2kHzTYwjQw89U4QGDq0e2WqJScqDkDNlDaWHGak5JeY,553
 media_agent_mcp/ai_models/omni_human.py,sha256=s_Ja4gEmHG_bgii1x4SoeV73lz0Zg_3iBRvu36goxVA,4643
@@ -43,8 +43,8 @@ media_agent_mcp/video/__init__.py,sha256=tfz22XEeFSeuKa3AggYCE0vCDt4IwXRCKW6avof
 media_agent_mcp/video/processor.py,sha256=twfqmN5DbVryjDawZUcqTUcnglcBJYpUbAnApqHgD0c,12787
 media_agent_mcp/video/stack.py,sha256=pyoJiJ9NhU1tjy2l3kARI9sWFoC00Fj97psxYOBi2NU,1736
 media_agent_mcp/video/subtitle.py,sha256=TlrWVhWJqYTUJpnVz7eccwMAn8ixfrRzRxS6ETMY-DM,16323
-media_agent_mcp-2.6.13.dist-info/METADATA,sha256=3Qo4BxxgAXZppQmTEZQpBazbpCUmYt6ssbnZeHMb5oU,11306
-media_agent_mcp-2.6.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_agent_mcp-2.6.13.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
-media_agent_mcp-2.6.13.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
-media_agent_mcp-2.6.13.dist-info/RECORD,,
+media_agent_mcp-2.6.14.dist-info/METADATA,sha256=OrIMFu2iuILwbJ2sjRQp15v4Qm0_MnutbD7ocHDf5CU,11306
+media_agent_mcp-2.6.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+media_agent_mcp-2.6.14.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
+media_agent_mcp-2.6.14.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
+media_agent_mcp-2.6.14.dist-info/RECORD,,