fix: Simplify code

Author: zastrowm

src/strands/event_loop/event_loop.py

@@ -230,18 +230,15 @@ async def event_loop_cycle(
 
             tracer.end_event_loop_cycle_span(cycle_span, message)
             yield EventLoopStopEvent(stop_reason, message, agent.event_loop_metrics, invocation_state["request_state"])
-        except StructuredOutputException as e:
+        except (
+            StructuredOutputException,
+            EventLoopException,
+            ContextWindowOverflowException,
+            MaxTokensReachedException,
+        ) as e:
+            # Known exceptions bubble up directly rather than getting wrapped in an EventLoopException
             tracer.end_span_with_error(cycle_span, str(e), e)
             raise
-        except EventLoopException as e:
-            tracer.end_span_with_error(cycle_span, str(e), e)
-            # Don't yield or log the exception - we already did it when we
-            # raised the exception and we don't need that duplication.
-            raise
-        except (ContextWindowOverflowException, MaxTokensReachedException) as e:
-            # Special cased exceptions which we want to bubble up rather than get wrapped in an EventLoopException
-            tracer.end_span_with_error(cycle_span, str(e), e)
-            raise e
         except Exception as e:
             tracer.end_span_with_error(cycle_span, str(e), e)
             # Handle any other exceptions
@@ -363,11 +360,8 @@ async def _handle_model_execution(
                     model_state=agent._model_state,
                     cancel_signal=agent._cancel_signal,
                 )
-                try:
-                    async for event in streamed_events:
-                        yield event
-                finally:
-                    await streamed_events.aclose()
+                async for event in streamed_events:
+                    yield event
 
                 stop_reason, message, usage, metrics = event["stop"]
                 invocation_state.setdefault("request_state", {})