feat(arkruntime): condition check

Author: liuhuiqi.7

volcenginesdkarkruntime/resources/batch_chat/completions.py

@@ -156,7 +156,7 @@ def _decrypt(
         if resp.choices is not None:
             for index, choice in enumerate(resp.choices):
                 if (
-                    choice.finish_reason != 'content_filter' and choice.message is not None
+                    choice.message is not None and choice.finish_reason != 'content_filter'
                     and choice.message.content is not None
                 ):
                     choice.message.content = aes_gcm_decrypt_base64_string(
@@ -303,7 +303,7 @@ async def _decrypt(
         if resp.choices is not None:
             for index, choice in enumerate(resp.choices):
                 if (
-                    choice.finish_reason != 'content_filter' and choice.message is not None
+                    choice.message is not None and choice.finish_reason != 'content_filter'
                     and choice.message.content is not None
                 ):
                     choice.message.content = aes_gcm_decrypt_base64_string(

volcenginesdkarkruntime/resources/chat/completions.py

@@ -108,8 +108,8 @@ def _decrypt_chunk(
             if chunk.choices is not None:
                 for index, choice in enumerate(chunk.choices):
                     if (
-                        choice.finish_reason != 'content_filter'
-                        and choice.delta is not None and choice.delta.content is not None
+                        choice.delta is not None and choice.delta.content is not None
+                        and choice.finish_reason != 'content_filter'
                     ):
                         choice.delta.content = aes_gcm_decrypt_base64_string(
                             key, nonce, choice.delta.content
@@ -127,7 +127,7 @@ def _decrypt(
             if resp.choices is not None:
                 for index, choice in enumerate(resp.choices):
                     if (
-                        choice.finish_reason != 'content_filter' and choice.message is not None
+                        choice.message is not None and choice.finish_reason != 'content_filter'
                         and choice.message.content is not None
                     ):
                         choice.message.content = aes_gcm_decrypt_base64_string(
@@ -254,8 +254,8 @@ async def _decrypt_chunk(
             if chunk.choices is not None:
                 for index, choice in enumerate(chunk.choices):
                     if (
-                        choice.finish_reason != 'content_filter'
-                        and choice.delta is not None and choice.delta.content is not None
+                        choice.delta is not None and choice.delta.content is not None
+                        and choice.finish_reason != 'content_filter'
                     ):
                         choice.delta.content = aes_gcm_decrypt_base64_string(
                             key, nonce, choice.delta.content
@@ -273,7 +273,7 @@ async def _decrypt(
             if resp.choices is not None:
                 for index, choice in enumerate(resp.choices):
                     if (
-                        choice.finish_reason != 'content_filter' and choice.message is not None
+                        choice.message is not None and choice.finish_reason != 'content_filter'
                         and choice.message.content is not None
                     ):
                         choice.message.content = aes_gcm_decrypt_base64_string(