Use unified client in examples

Author: habara-k

examples/aiohttp-echo/app.py

@@ -24,12 +24,10 @@
 from aiohttp.web_runner import TCPSite
 
 from linebot.v3 import (
-    WebhookParser
+    WebhookParser,
+    AsyncLineBotClient,
 )
 from linebot.v3.messaging import (
-    Configuration,
-    AsyncApiClient,
-    AsyncMessagingApi,
     TextMessage,
     ReplyMessageRequest
 )
@@ -52,13 +50,8 @@
     print('Specify LINE_CHANNEL_ACCESS_TOKEN as environment variable.')
     sys.exit(1)
 
-configuration = Configuration(
-    access_token=channel_access_token
-)
-
-
 class Handler:
-    def __init__(self, line_bot_api: AsyncMessagingApi, parser: WebhookParser):
+    def __init__(self, line_bot_api: AsyncLineBotClient, parser: WebhookParser):
         self.line_bot_api = line_bot_api
         self.parser = parser
 
@@ -87,8 +80,7 @@ async def echo(self, request):
 
 
 async def main(port=8000):
-    async_api_client = AsyncApiClient(configuration)
-    line_bot_api = AsyncMessagingApi(async_api_client)
+    line_bot_api = AsyncLineBotClient(channel_access_token=channel_access_token)
     parser = WebhookParser(channel_secret)
 
     handler = Handler(line_bot_api, parser)

examples/fastapi-echo/main.py

@@ -17,11 +17,8 @@
 
 from fastapi import Request, FastAPI, HTTPException
 
-from linebot.v3.webhook import WebhookParser
+from linebot.v3 import WebhookParser, AsyncLineBotClient
 from linebot.v3.messaging import (
-    AsyncApiClient,
-    AsyncMessagingApi,
-    Configuration,
     ReplyMessageRequest,
     TextMessage
 )
@@ -44,13 +41,8 @@
     print('Specify LINE_CHANNEL_ACCESS_TOKEN as environment variable.')
     sys.exit(1)
 
-configuration = Configuration(
-    access_token=channel_access_token
-)
-
 app = FastAPI()
-async_api_client = AsyncApiClient(configuration)
-line_bot_api = AsyncMessagingApi(async_api_client)
+line_bot_api = AsyncLineBotClient(channel_access_token=channel_access_token)
 parser = WebhookParser(channel_secret)
 
 

examples/flask-echo/app.py

@@ -18,8 +18,9 @@
 from argparse import ArgumentParser
 
 from flask import Flask, request, abort
-from linebot import (
-    WebhookParser
+from linebot.v3 import (
+    WebhookParser,
+    LineBotClient,
 )
 from linebot.v3.exceptions import (
     InvalidSignatureError
@@ -29,9 +30,6 @@
     TextMessageContent,
 )
 from linebot.v3.messaging import (
-    Configuration,
-    ApiClient,
-    MessagingApi,
     ReplyMessageRequest,
     TextMessage
 )
@@ -49,10 +47,7 @@
     sys.exit(1)
 
 parser = WebhookParser(channel_secret)
-
-configuration = Configuration(
-    access_token=channel_access_token
-)
+line_bot_api = LineBotClient(channel_access_token=channel_access_token)
 
 
 @app.route("/callback", methods=['POST'])
@@ -75,14 +70,12 @@ def callback():
             continue
         if not isinstance(event.message, TextMessageContent):
             continue
-        with ApiClient(configuration) as api_client:
-            line_bot_api = MessagingApi(api_client)
-            line_bot_api.reply_message_with_http_info(
-                ReplyMessageRequest(
-                    reply_token=event.reply_token,
-                    messages=[TextMessage(text=event.message.text)]
-                )
+        line_bot_api.reply_message_with_http_info(
+            ReplyMessageRequest(
+                reply_token=event.reply_token,
+                messages=[TextMessage(text=event.message.text)]
             )
+        )
 
     return 'OK'
 

examples/flask-echo/app_with_handler.py

@@ -18,7 +18,8 @@
 
 from flask import Flask, request, abort
 from linebot.v3 import (
-     WebhookHandler
+    WebhookHandler,
+    LineBotClient,
 )
 from linebot.v3.exceptions import (
     InvalidSignatureError
@@ -28,9 +29,6 @@
     TextMessageContent,
 )
 from linebot.v3.messaging import (
-    Configuration,
-    ApiClient,
-    MessagingApi,
     ReplyMessageRequest,
     TextMessage
 )
@@ -48,10 +46,7 @@
     sys.exit(1)
 
 handler = WebhookHandler(channel_secret)
-
-configuration = Configuration(
-    access_token=channel_access_token
-)
+line_bot_api = LineBotClient(channel_access_token=channel_access_token)
 
 
 @app.route("/callback", methods=['POST'])
@@ -74,14 +69,12 @@ def callback():
 
 @handler.add(MessageEvent, message=TextMessageContent)
 def message_text(event):
-    with ApiClient(configuration) as api_client:
-        line_bot_api = MessagingApi(api_client)
-        line_bot_api.reply_message_with_http_info(
-            ReplyMessageRequest(
-                reply_token=event.reply_token,
-                messages=[TextMessage(text=event.message.text)]
-            )
+    line_bot_api.reply_message_with_http_info(
+        ReplyMessageRequest(
+            reply_token=event.reply_token,
+            messages=[TextMessage(text=event.message.text)]
         )
+    )
 
 
 if __name__ == "__main__":