diff --git a/app/app/v1alpha/app_public_service_pb2.py b/app/app/v1alpha/app_public_service_pb2.py
index a03f014..4475de2 100644
--- a/app/app/v1alpha/app_public_service_pb2.py
+++ b/app/app/v1alpha/app_public_service_pb2.py
@@ -18,7 +18,7 @@
 from protoc_gen_openapiv2.options import annotations_pb2 as protoc__gen__openapiv2_dot_options_dot_annotations__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(app/app/v1alpha/app_public_service.proto\x12\x0f\x61pp.app.v1alpha\x1a\x19\x61pp/app/v1alpha/app.proto\x1a\"app/app/v1alpha/conversation.proto\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/api/visibility.proto\x1a.protoc-gen-openapiv2/options/annotations.proto2\xd1\x1b\n\x10\x41ppPublicService\x12\x93\x01\n\x08Liveness\x12 .app.app.v1alpha.LivenessRequest\x1a!.app.app.v1alpha.LivenessResponse\"B\xfa\xd2\xe4\x93\x02\n\x12\x08INTERNAL\x82\xd3\xe4\x93\x02,\x12\x13/v1alpha/__livenessZ\x15\x12\x13/v1alpha/health/app\x12\x96\x01\n\tReadiness\x12!.app.app.v1alpha.ReadinessRequest\x1a\".app.app.v1alpha.ReadinessResponse\"B\xfa\xd2\xe4\x93\x02\n\x12\x08INTERNAL\x82\xd3\xe4\x93\x02,\x12\x14/v1alpha/__readinessZ\x14\x12\x12/v1alpha/ready/app\x12\x8e\x01\n\tCreateApp\x12!.app.app.v1alpha.CreateAppRequest\x1a\".app.app.v1alpha.CreateAppResponse\":\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02,\"\'/v1alpha/namespaces/{namespace_id}/apps:\x01*\x12\x88\x01\n\x08ListApps\x12 .app.app.v1alpha.ListAppsRequest\x1a!.app.app.v1alpha.ListAppsResponse\"7\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02)\x12\'/v1alpha/namespaces/{namespace_id}/apps\x12\x97\x01\n\tUpdateApp\x12!.app.app.v1alpha.UpdateAppRequest\x1a\".app.app.v1alpha.UpdateAppResponse\"C\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02\x35\x1a\x30/v1alpha/namespaces/{namespace_id}/apps/{app_id}:\x01*\x12\x94\x01\n\tDeleteApp\x12!.app.app.v1alpha.DeleteAppRequest\x1a\".app.app.v1alpha.DeleteAppResponse\"@\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02\x32*0/v1alpha/namespaces/{namespace_id}/apps/{app_id}\x12\xc9\x01\n\x12\x43reateConversation\x12*.app.app.v1alpha.CreateConversationRequest\x1a+.app.app.v1alpha.CreateConversationResponse\"Z\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02\x43\">/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations:\x01*\x12\xc3\x01\n\x11ListConversations\x12).app.app.v1alpha.ListConversationsRequest\x1a*.app.app.v1alpha.ListConversationsResponse\"W\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02@\x12>/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations\x12\xdb\x01\n\x12UpdateConversation\x12*.app.app.v1alpha.UpdateConversationRequest\x1a+.app.app.v1alpha.UpdateConversationResponse\"l\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02U\x1aP/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}:\x01*\x12\xd8\x01\n\x12\x44\x65leteConversation\x12*.app.app.v1alpha.DeleteConversationRequest\x1a+.app.app.v1alpha.DeleteConversationResponse\"i\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02R*P/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}\x12\xd0\x01\n\rCreateMessage\x12%.app.app.v1alpha.CreateMessageRequest\x1a&.app.app.v1alpha.CreateMessageResponse\"p\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02^\"Y/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages:\x01*\x12\xca\x01\n\x0cListMessages\x12$.app.app.v1alpha.ListMessagesRequest\x1a%.app.app.v1alpha.ListMessagesResponse\"m\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02[\x12Y/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages\x12\xde\x01\n\rUpdateMessage\x12%.app.app.v1alpha.UpdateMessageRequest\x1a&.app.app.v1alpha.UpdateMessageResponse\"~\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02l\x1ag/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages/{message_uid}:\x01*\x12\xdb\x01\n\rDeleteMessage\x12%.app.app.v1alpha.DeleteMessageRequest\x1a&.app.app.v1alpha.DeleteMessageResponse\"{\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02i*g/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages/{message_uid}\x12\xf5\x01\n\x1eUpdateAIAssistantAppPlayground\x12\x36.app.app.v1alpha.UpdateAIAssistantAppPlaygroundRequest\x1a\x37.app.app.v1alpha.UpdateAIAssistantAppPlaygroundResponse\"b\x92\x41\x0c\n\nPlayground\x82\xd3\xe4\x93\x02M\x1aH/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground:\x01*\x12\xf0\x01\n\x19GetPlaygroundConversation\x12\x31.app.app.v1alpha.GetPlaygroundConversationRequest\x1a\x32.app.app.v1alpha.GetPlaygroundConversationResponse\"l\x92\x41\x0c\n\nPlayground\x82\xd3\xe4\x93\x02W\x12U/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground/conversation\x12\xf7\x01\n\x1dRestartPlaygroundConversation\x12\x35.app.app.v1alpha.RestartPlaygroundConversationRequest\x1a\x36.app.app.v1alpha.RestartPlaygroundConversationResponse\"g\x92\x41\x0c\n\nPlayground\x82\xd3\xe4\x93\x02R\"P/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground/restart\x12\x96\x01\n\x04\x43hat\x12\x1c.app.app.v1alpha.ChatRequest\x1a\x1d.app.app.v1alpha.ChatResponse\"O\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02\x41\"</v1alpha/namespaces/{namespace_id}/apps/{app_id}/chat-stream:\x01*0\x01\x1a\x19\x92\x41\x16\x12\x14Public App endpointsB\xc8\x01\n\x13\x63om.app.app.v1alphaB\x15\x41ppPublicServiceProtoP\x01Z<github.com/instill-ai/protogen-go/app/app/v1alpha;appv1alpha\xa2\x02\x03\x41\x41X\xaa\x02\x0f\x41pp.App.V1alpha\xca\x02\x0f\x41pp\\App\\V1alpha\xe2\x02\x1b\x41pp\\App\\V1alpha\\GPBMetadata\xea\x02\x11\x41pp::App::V1alphab\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(app/app/v1alpha/app_public_service.proto\x12\x0f\x61pp.app.v1alpha\x1a\x19\x61pp/app/v1alpha/app.proto\x1a\"app/app/v1alpha/conversation.proto\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/api/visibility.proto\x1a.protoc-gen-openapiv2/options/annotations.proto2\xc8\x1b\n\x10\x41ppPublicService\x12\x93\x01\n\x08Liveness\x12 .app.app.v1alpha.LivenessRequest\x1a!.app.app.v1alpha.LivenessResponse\"B\xfa\xd2\xe4\x93\x02\n\x12\x08INTERNAL\x82\xd3\xe4\x93\x02,\x12\x13/v1alpha/__livenessZ\x15\x12\x13/v1alpha/health/app\x12\x96\x01\n\tReadiness\x12!.app.app.v1alpha.ReadinessRequest\x1a\".app.app.v1alpha.ReadinessResponse\"B\xfa\xd2\xe4\x93\x02\n\x12\x08INTERNAL\x82\xd3\xe4\x93\x02,\x12\x14/v1alpha/__readinessZ\x14\x12\x12/v1alpha/ready/app\x12\x8e\x01\n\tCreateApp\x12!.app.app.v1alpha.CreateAppRequest\x1a\".app.app.v1alpha.CreateAppResponse\":\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02,\"\'/v1alpha/namespaces/{namespace_id}/apps:\x01*\x12\x88\x01\n\x08ListApps\x12 .app.app.v1alpha.ListAppsRequest\x1a!.app.app.v1alpha.ListAppsResponse\"7\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02)\x12\'/v1alpha/namespaces/{namespace_id}/apps\x12\x97\x01\n\tUpdateApp\x12!.app.app.v1alpha.UpdateAppRequest\x1a\".app.app.v1alpha.UpdateAppResponse\"C\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02\x35\x1a\x30/v1alpha/namespaces/{namespace_id}/apps/{app_id}:\x01*\x12\x94\x01\n\tDeleteApp\x12!.app.app.v1alpha.DeleteAppRequest\x1a\".app.app.v1alpha.DeleteAppResponse\"@\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02\x32*0/v1alpha/namespaces/{namespace_id}/apps/{app_id}\x12\xc9\x01\n\x12\x43reateConversation\x12*.app.app.v1alpha.CreateConversationRequest\x1a+.app.app.v1alpha.CreateConversationResponse\"Z\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02\x43\">/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations:\x01*\x12\xc3\x01\n\x11ListConversations\x12).app.app.v1alpha.ListConversationsRequest\x1a*.app.app.v1alpha.ListConversationsResponse\"W\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02@\x12>/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations\x12\xdb\x01\n\x12UpdateConversation\x12*.app.app.v1alpha.UpdateConversationRequest\x1a+.app.app.v1alpha.UpdateConversationResponse\"l\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02U\x1aP/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}:\x01*\x12\xd8\x01\n\x12\x44\x65leteConversation\x12*.app.app.v1alpha.DeleteConversationRequest\x1a+.app.app.v1alpha.DeleteConversationResponse\"i\x92\x41\x0e\n\x0c\x43onversation\x82\xd3\xe4\x93\x02R*P/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}\x12\xd0\x01\n\rCreateMessage\x12%.app.app.v1alpha.CreateMessageRequest\x1a&.app.app.v1alpha.CreateMessageResponse\"p\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02^\"Y/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages:\x01*\x12\xca\x01\n\x0cListMessages\x12$.app.app.v1alpha.ListMessagesRequest\x1a%.app.app.v1alpha.ListMessagesResponse\"m\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02[\x12Y/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages\x12\xde\x01\n\rUpdateMessage\x12%.app.app.v1alpha.UpdateMessageRequest\x1a&.app.app.v1alpha.UpdateMessageResponse\"~\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02l\x1ag/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages/{message_uid}:\x01*\x12\xdb\x01\n\rDeleteMessage\x12%.app.app.v1alpha.DeleteMessageRequest\x1a&.app.app.v1alpha.DeleteMessageResponse\"{\x92\x41\t\n\x07Message\x82\xd3\xe4\x93\x02i*g/v1alpha/namespaces/{namespace_id}/apps/{app_id}/conversations/{conversation_id}/messages/{message_uid}\x12\xf5\x01\n\x1eUpdateAIAssistantAppPlayground\x12\x36.app.app.v1alpha.UpdateAIAssistantAppPlaygroundRequest\x1a\x37.app.app.v1alpha.UpdateAIAssistantAppPlaygroundResponse\"b\x92\x41\x0c\n\nPlayground\x82\xd3\xe4\x93\x02M\x1aH/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground:\x01*\x12\xf0\x01\n\x19GetPlaygroundConversation\x12\x31.app.app.v1alpha.GetPlaygroundConversationRequest\x1a\x32.app.app.v1alpha.GetPlaygroundConversationResponse\"l\x92\x41\x0c\n\nPlayground\x82\xd3\xe4\x93\x02W\x12U/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground/conversation\x12\xf7\x01\n\x1dRestartPlaygroundConversation\x12\x35.app.app.v1alpha.RestartPlaygroundConversationRequest\x1a\x36.app.app.v1alpha.RestartPlaygroundConversationResponse\"g\x92\x41\x0c\n\nPlayground\x82\xd3\xe4\x93\x02R\"P/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground/restart\x12\x8d\x01\n\x04\x43hat\x12\x1c.app.app.v1alpha.ChatRequest\x1a\x1d.app.app.v1alpha.ChatResponse\"H\x92\x41\x05\n\x03\x41pp\x82\xd3\xe4\x93\x02:\"5/v1alpha/namespaces/{namespace_id}/apps/{app_id}/chat:\x01*\x1a\x19\x92\x41\x16\x12\x14Public App endpointsB\xc8\x01\n\x13\x63om.app.app.v1alphaB\x15\x41ppPublicServiceProtoP\x01Z<github.com/instill-ai/protogen-go/app/app/v1alpha;appv1alpha\xa2\x02\x03\x41\x41X\xaa\x02\x0f\x41pp.App.V1alpha\xca\x02\x0f\x41pp\\App\\V1alpha\xe2\x02\x1b\x41pp\\App\\V1alpha\\GPBMetadata\xea\x02\x11\x41pp::App::V1alphab\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -64,7 +64,7 @@
   _APPPUBLICSERVICE.methods_by_name['RestartPlaygroundConversation']._options = None
   _APPPUBLICSERVICE.methods_by_name['RestartPlaygroundConversation']._serialized_options = b'\222A\014\n\nPlayground\202\323\344\223\002R\"P/v1alpha/namespaces/{namespace_id}/apps/{app_id}/ai_assistant_playground/restart'
   _APPPUBLICSERVICE.methods_by_name['Chat']._options = None
-  _APPPUBLICSERVICE.methods_by_name['Chat']._serialized_options = b'\222A\005\n\003App\202\323\344\223\002A\"</v1alpha/namespaces/{namespace_id}/apps/{app_id}/chat-stream:\001*'
+  _APPPUBLICSERVICE.methods_by_name['Chat']._serialized_options = b'\222A\005\n\003App\202\323\344\223\002:\"5/v1alpha/namespaces/{namespace_id}/apps/{app_id}/chat:\001*'
   _globals['_APPPUBLICSERVICE']._serialized_start=232
-  _globals['_APPPUBLICSERVICE']._serialized_end=3769
+  _globals['_APPPUBLICSERVICE']._serialized_end=3760
 # @@protoc_insertion_point(module_scope)
diff --git a/app/app/v1alpha/app_public_service_pb2_grpc.py b/app/app/v1alpha/app_public_service_pb2_grpc.py
index 3ebb512..f9943fa 100644
--- a/app/app/v1alpha/app_public_service_pb2_grpc.py
+++ b/app/app/v1alpha/app_public_service_pb2_grpc.py
@@ -102,7 +102,7 @@ def __init__(self, channel):
                 request_serializer=app_dot_app_dot_v1alpha_dot_app__pb2.RestartPlaygroundConversationRequest.SerializeToString,
                 response_deserializer=app_dot_app_dot_v1alpha_dot_app__pb2.RestartPlaygroundConversationResponse.FromString,
                 )
-        self.Chat = channel.unary_stream(
+        self.Chat = channel.unary_unary(
                 '/app.app.v1alpha.AppPublicService/Chat',
                 request_serializer=app_dot_app_dot_v1alpha_dot_conversation__pb2.ChatRequest.SerializeToString,
                 response_deserializer=app_dot_app_dot_v1alpha_dot_conversation__pb2.ChatResponse.FromString,
@@ -341,7 +341,7 @@ def add_AppPublicServiceServicer_to_server(servicer, server):
                     request_deserializer=app_dot_app_dot_v1alpha_dot_app__pb2.RestartPlaygroundConversationRequest.FromString,
                     response_serializer=app_dot_app_dot_v1alpha_dot_app__pb2.RestartPlaygroundConversationResponse.SerializeToString,
             ),
-            'Chat': grpc.unary_stream_rpc_method_handler(
+            'Chat': grpc.unary_unary_rpc_method_handler(
                     servicer.Chat,
                     request_deserializer=app_dot_app_dot_v1alpha_dot_conversation__pb2.ChatRequest.FromString,
                     response_serializer=app_dot_app_dot_v1alpha_dot_conversation__pb2.ChatResponse.SerializeToString,
@@ -658,7 +658,7 @@ def Chat(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_stream(request, target, '/app.app.v1alpha.AppPublicService/Chat',
+        return grpc.experimental.unary_unary(request, target, '/app.app.v1alpha.AppPublicService/Chat',
             app_dot_app_dot_v1alpha_dot_conversation__pb2.ChatRequest.SerializeToString,
             app_dot_app_dot_v1alpha_dot_conversation__pb2.ChatResponse.FromString,
             options, channel_credentials,
diff --git a/app/app/v1alpha/app_public_service_pb2_grpc.pyi b/app/app/v1alpha/app_public_service_pb2_grpc.pyi
index bb13bfd..1d12d76 100644
--- a/app/app/v1alpha/app_public_service_pb2_grpc.pyi
+++ b/app/app/v1alpha/app_public_service_pb2_grpc.pyi
@@ -122,7 +122,7 @@ class AppPublicServiceStub:
     create a new conversation and use the auth user uid as creator uid and auto
     generate a new conversation id on the behalf of auth user.
     """
-    Chat: grpc.UnaryStreamMultiCallable[
+    Chat: grpc.UnaryUnaryMultiCallable[
         app.app.v1alpha.conversation_pb2.ChatRequest,
         app.app.v1alpha.conversation_pb2.ChatResponse,
     ]
@@ -236,7 +236,7 @@ class AppPublicServiceAsyncStub:
     create a new conversation and use the auth user uid as creator uid and auto
     generate a new conversation id on the behalf of auth user.
     """
-    Chat: grpc.aio.UnaryStreamMultiCallable[
+    Chat: grpc.aio.UnaryUnaryMultiCallable[
         app.app.v1alpha.conversation_pb2.ChatRequest,
         app.app.v1alpha.conversation_pb2.ChatResponse,
     ]
@@ -389,7 +389,7 @@ class AppPublicServiceServicer(metaclass=abc.ABCMeta):
         self,
         request: app.app.v1alpha.conversation_pb2.ChatRequest,
         context: _ServicerContext,
-    ) -> typing.Union[collections.abc.Iterator[app.app.v1alpha.conversation_pb2.ChatResponse], collections.abc.AsyncIterator[app.app.v1alpha.conversation_pb2.ChatResponse]]:
+    ) -> typing.Union[app.app.v1alpha.conversation_pb2.ChatResponse, collections.abc.Awaitable[app.app.v1alpha.conversation_pb2.ChatResponse]]:
         """Chat
 
         Chat sends a message asynchronously and streams back the response.