@@ -835,19 +835,17 @@ def __next__(self: "Stream") -> "RawMessageStreamEvent":
835835 except StopIteration :
836836 exc_info = sys .exc_info ()
837837 with capture_internal_exceptions ():
838- if not hasattr (self , "_span" ):
839- raise
840-
841- _finish_streaming_span (
842- self ._span ,
843- self ._integration ,
844- self ._model ,
845- self ._usage ,
846- self ._content_blocks ,
847- self ._response_id ,
848- self ._finish_reason ,
849- )
850- del self ._span
838+ if hasattr (self , "_span" ):
839+ _finish_streaming_span (
840+ self ._span ,
841+ self ._integration ,
842+ self ._model ,
843+ self ._usage ,
844+ self ._content_blocks ,
845+ self ._response_id ,
846+ self ._finish_reason ,
847+ )
848+ del self ._span
851849 reraise (* exc_info )
852850
853851 _accumulate_event_data (self , event )
@@ -870,6 +868,7 @@ def close(self: "Stream") -> None:
870868
871869 if not hasattr (self , "_model" ):
872870 self ._span .__exit__ (None , None , None )
871+ del self ._span
873872 return f (self )
874873
875874 _finish_streaming_span (
@@ -1041,19 +1040,17 @@ def __next__(self: "MessageStream") -> "MessageStreamEvent":
10411040 except StopIteration :
10421041 exc_info = sys .exc_info ()
10431042 with capture_internal_exceptions ():
1044- if not hasattr (self , "_span" ):
1045- raise
1046-
1047- _finish_streaming_span (
1048- self ._span ,
1049- self ._integration ,
1050- self ._model ,
1051- self ._usage ,
1052- self ._content_blocks ,
1053- self ._response_id ,
1054- self ._finish_reason ,
1055- )
1056- del self ._span
1043+ if hasattr (self , "_span" ):
1044+ _finish_streaming_span (
1045+ self ._span ,
1046+ self ._integration ,
1047+ self ._model ,
1048+ self ._usage ,
1049+ self ._content_blocks ,
1050+ self ._response_id ,
1051+ self ._finish_reason ,
1052+ )
1053+ del self ._span
10571054 reraise (* exc_info )
10581055
10591056 _accumulate_event_data (self , event )
@@ -1076,6 +1073,7 @@ def close(self: "MessageStream") -> None:
10761073
10771074 if not hasattr (self , "_model" ):
10781075 self ._span .__exit__ (None , None , None )
1076+ del self ._span
10791077 return f (self )
10801078
10811079 _finish_streaming_span (
0 commit comments