change package structure.

Author: be-hase

examples/flask-echo/app.py

@@ -4,8 +4,13 @@
 from flask import Flask, request, abort
 
 from line_bot import (
-    LineBotApi, MessageEvent, TextMessage, TextSendMessage,
-    WebhookParser, InvalidSignatureError
+    LineBotApi, WebhookParser
+)
+from line_bot.exceptions import (
+    InvalidSignatureError
+)
+from line_bot.models import (
+    MessageEvent, TextMessage, TextSendMessage,
 )
 
 app = Flask(__name__)

examples/flask-echo/app_with_handler.py

@@ -4,8 +4,13 @@
 from flask import Flask, request, abort
 
 from line_bot import (
-    LineBotApi, MessageEvent, TextMessage, TextSendMessage,
-    WebhookHandler, InvalidSignatureError
+    LineBotApi, WebhookHandler
+)
+from line_bot.exceptions import (
+    InvalidSignatureError
+)
+from line_bot.models import (
+    MessageEvent, TextMessage, TextSendMessage,
 )
 
 app = Flask(__name__)

examples/flask-kitchensink/app.py

@@ -8,16 +8,20 @@
 from flask import Flask, request, abort
 
 from line_bot import (
-    LineBotApi, MessageEvent, TextMessage, TextSendMessage,
-    WebhookHandler,
+    LineBotApi, WebhookHandler
+)
+from line_bot.exceptions import (
+    InvalidSignatureError
+)
+from line_bot.models import (
+    MessageEvent, TextMessage, TextSendMessage,
     SourceUser, SourceGroup, SourceRoom,
     TemplateSendMessage, ConfirmTemplate, MessageTemplateAction,
     ButtonsTemplate, URITemplateAction, PostbackTemplateAction,
     CarouselTemplate, CarouselColumn, PostbackEvent,
     StickerMessage, StickerSendMessage, LocationMessage, LocationSendMessage,
     ImageMessage, VideoMessage, AudioMessage,
-    UnfollowEvent, FollowEvent, JoinEvent, LeaveEvent, BeaconEvent,
-    InvalidSignatureError
+    UnfollowEvent, FollowEvent, JoinEvent, LeaveEvent, BeaconEvent
 )
 
 app = Flask(__name__)

examples/simple-server-echo/app.py

@@ -5,8 +5,13 @@
 from argparse import ArgumentParser
 
 from line_bot import (
-    LineBotApi, MessageEvent, TextMessage,
-    TextSendMessage, WebhookParser, InvalidSignatureError
+    LineBotApi, WebhookParser
+)
+from line_bot.exceptions import (
+    InvalidSignatureError
+)
+from line_bot.models import (
+    MessageEvent, TextMessage, TextSendMessage
 )
 
 # get from os env

line_bot/__init__.py

@@ -1,53 +1,19 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
 from .__about__ import (
     __version__
 )
 from .api import (
-    LineBotApi
-)
-from .exceptions import (
-    BaseError, LineBotApiError, InvalidSignatureError
+    LineBotApi,
 )
 from .http_client import (
-    HttpClient, RequestsHttpClient, HttpResponse
-)
-from .models.base import (
-    Base
-)
-from .models.error import (
-    Error, ErrorDetail
-)
-from .models.events import (
-    Event, MessageEvent, FollowEvent, UnfollowEvent,
-    JoinEvent, LeaveEvent, PostbackEvent, BeaconEvent,
-    Postback, Beacon
-)
-from .models.imagemap import (
-    ImagemapSendMessage, BaseSize, ImagemapAction,
-    URIImagemapAction, MessageImagemapAction, ImagemapArea
-)
-from .models.messages import (
-    Message, TextMessage, ImageMessage, VideoMessage,
-    AudioMessage, LocationMessage, StickerMessage
-)
-from .models.profile import (
-    Profile
-)
-from .models.send_messages import (
-    SendMessage, TextSendMessage, ImageSendMessage,
-    VideoSendMessage, AudioSendMessage, LocationSendMessage,
-    StickerSendMessage
-)
-from .models.sources import (
-    Source, SourceUser, SourceGroup, SourceRoom
-)
-from .models.template import (
-    TemplateSendMessage, Template, ButtonsTemplate,
-    ConfirmTemplate, CarouselTemplate, CarouselColumn,
-    TemplateAction, PostbackTemplateAction, MessageTemplateAction,
-    URITemplateAction
+    HttpClient,
+    RequestsHttpClient,
+    HttpResponse,
 )
 from .webhook import (
-    SignatureValidator, WebhookParser, WebhookHandler
+    SignatureValidator,
+    WebhookParser,
+    WebhookHandler,
 )

line_bot/models/__init__.py

@@ -1,38 +1,68 @@
 # -*- coding: utf-8 -*-
 
 from .base import (
-    Base
+    Base,
 )
 from .error import (
-    Error, ErrorDetail
+    Error,
+    ErrorDetail,
 )
 from .events import (
-    Event, MessageEvent, FollowEvent, UnfollowEvent,
-    JoinEvent, LeaveEvent, PostbackEvent, BeaconEvent,
-    Postback, Beacon
+    Event,
+    MessageEvent,
+    FollowEvent,
+    UnfollowEvent,
+    JoinEvent,
+    LeaveEvent,
+    PostbackEvent,
+    BeaconEvent,
+    Postback,
+    Beacon,
 )
 from .imagemap import (
-    ImagemapSendMessage, BaseSize, ImagemapAction,
-    URIImagemapAction, MessageImagemapAction, ImagemapArea
+    ImagemapSendMessage,
+    BaseSize,
+    ImagemapAction,
+    URIImagemapAction,
+    MessageImagemapAction,
+    ImagemapArea,
 )
 from .messages import (
-    Message, TextMessage, ImageMessage, VideoMessage,
-    AudioMessage, LocationMessage, StickerMessage
+    Message,
+    TextMessage,
+    ImageMessage,
+    VideoMessage,
+    AudioMessage,
+    LocationMessage,
+    StickerMessage,
 )
 from .profile import (
-    Profile
+    Profile,
 )
 from .send_messages import (
-    SendMessage, TextSendMessage, ImageSendMessage,
-    VideoSendMessage, AudioSendMessage, LocationSendMessage,
-    StickerSendMessage
+    SendMessage,
+    TextSendMessage,
+    ImageSendMessage,
+    VideoSendMessage,
+    AudioSendMessage,
+    LocationSendMessage,
+    StickerSendMessage,
 )
 from .sources import (
-    Source, SourceUser, SourceGroup, SourceRoom
+    Source,
+    SourceUser,
+    SourceGroup,
+    SourceRoom,
 )
 from .template import (
-    TemplateSendMessage, Template, ButtonsTemplate,
-    ConfirmTemplate, CarouselTemplate, CarouselColumn,
-    TemplateAction, PostbackTemplateAction, MessageTemplateAction,
-    URITemplateAction
+    TemplateSendMessage,
+    Template,
+    ButtonsTemplate,
+    ConfirmTemplate,
+    CarouselTemplate,
+    CarouselColumn,
+    TemplateAction,
+    PostbackTemplateAction,
+    MessageTemplateAction,
+    URITemplateAction,
 )

setup.py

@@ -24,14 +24,14 @@ def _requirements_test():
 
 
 setup(
-    name="line-bot-sdk-python",
+    name="line-bot-sdk",
     version=__version__,
     author="Ryosuke Hasebe",
     author_email="ryosuke.hasebe@linecorp.com",
     url="https://github.com/line/line-bot-sdk-python",
     description="LINE Messaging API SDK for Python",
     packages=[
-        "line_bot"
+        "line_bot", "line_bot.models"
     ],
     install_requires=_requirements(),
     tests_require=_requirements_test(),

tests/api/test_error_handle.py

@@ -1,11 +1,18 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, absolute_import
 
-import responses
 import unittest
 
+import responses
+
 from line_bot import (
-    LineBotApi, LineBotApiError, TextSendMessage
+    LineBotApi
+)
+from line_bot.exceptions import (
+    LineBotApiError
+)
+from line_bot.models import (
+    TextSendMessage
 )
 
 

tests/api/test_get_profile.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, absolute_import
 
-import responses
 import unittest
 
+import responses
+
 from line_bot import (
     LineBotApi
 )

tests/api/test_leave.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals, absolute_import
 
-import responses
 import unittest
 
+import responses
+
 from line_bot import (
     LineBotApi
 )