#4 filter rewrite

examples/example2/bot_stuff2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from flask import Flask
 
-from teleflask.server.extras import PollingTeleflask
+from teleflask.server.extras.flask import PollingTeleflask
 
 from somewhere import API_KEY
 
@@ -33,4 +33,4 @@ def test2(update):
 # end def
 
 
-app.run(HOST, PORT, debug=True)
+app.run(HOST, PORT, debug=True)

examples/example2/sync_poll_bot_example.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+from luckydonaldUtils.logger import logging
+from teleflask.server.extras.polling.sync import Telepoll
+
+from somewhere import API_KEY
+
+__author__ = 'luckydonald'
+
+logger = logging.getLogger(__name__)
+if __name__ == '__main__':
+    logging.add_colored_handler(level=logging.DEBUG)
+# end if
+
+
+bot = Telepoll(api_key=API_KEY)
+
+
+@bot.command("test")
+def test(update, text):
+    return "You tested with {arg!r}".format(arg=text)
+# end def
+
+
+@bot.on_message()
+def test32(update):
+    bot.bot.forward_message(10717954, update.message.chat.id, update.message.message_id)
+
+
+@bot.on_update()
+def test2(update):
+    pass
+# end def
+
+
+bot.run_forever()

setup.py

@@ -7,20 +7,31 @@
 
 long_description = """A Python module that connects to the Telegram bot api, allowing to interact with Telegram users or groups."""
 
+
+SYNC_REQUIREMENTS = [
+    'pytgbot[sync]',
+    'requests', "requests[security]",  # connect with the internet in general
+]
+ASYNC_REQUIREMENTS = [
+    'pytgbot[async]',
+    'httpx',  # connect with the internet in general
+]
+
+
 setup(
-    name='teleflask', version="2.0.0.dev21",
-    description='Easily create Telegram bots with pytgbot and flask. Webhooks made easy.',
+    name='teleflask', version="3.0.0.dev1",
+    description='Easily create Telegram bots with decorators functions, running a webserver of your choice. Webhooks made easy, but you don\'t even have to use \'em.',
     long_description=long_description,
     # The project's main homepage.
     url='https://github.com/luckydonald/teleflask',
     # Author details
     author='luckydonald',
-    author_email='[email protected]',
+    author_email='teleflask+[email protected]',
     # Choose your license
     license='GPLv3+',
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha', # 2 - Pre-Alpha, 3 - Alpha, 4 - Beta, 5 - Production/Stable
+        'Development Status :: 4 - Beta', # 2 - Pre-Alpha, 3 - Alpha, 4 - Beta, 5 - Production/Stable
         # Indicate who your project is intended for
         'Intended Audience :: Developers',
         'Topic :: Communications',
@@ -36,16 +47,18 @@
         # that you indicate whether you support Python 2, Python 3 or both.
         # 'Programming Language :: Python :: 2',
         # 'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
+        # 'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         # 'Programming Language :: Python :: 3.2',
         # 'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.7',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Unix',
     ],
     # What does your project relate to?
-    keywords='pytgbot flask webhook telegram bot api python message send receive python secure fast answer reply image voice picture location contacts typing multi messanger inline quick reply gif image video mp4 mpeg4',
+    keywords='pytgbot flask webhook telegram bot api python message send receive python secure fast answer reply image voice picture location contacts typing multi messanger inline quick reply gif image video mp4 mpeg4 webserver decorators',
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
     packages=['teleflask', 'teleflask.server'],
@@ -55,20 +68,27 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
-        "flask",  # have flask
-        "pytgbot>=4.0",  # connect to telegram
+        'pprint',
         "DictObject", "luckydonald-utils>=0.70",  # general utils
         "python-magic", "backoff>=1.4.1",  # messages messages
         # backoff >=1.4.1 because of a bug with the flask development server
         # see https://github.com/litl/backoff/issues/30
-        "requests", "requests[security]",  # connect with the internet in general
+        'pytgbot>=4.0" # connect to telegram'
     ],
     # List additional groups of dependencies here (e.g. development dependencies).
     # You can install these using the following syntax, for example:
     # $ pip install -e .[dev,test]
     extras_require = {
-      'dev': ['bump2version'],
-    # 'test': ['coverage'],
+        'dev': ['bump2version'],
+        'sync': SYNC_REQUIREMENTS,
+        'async': ASYNC_REQUIREMENTS,
+        'flask': [
+            'flask',
+        ] + SYNC_REQUIREMENTS,
+        'quart': [
+            'quart',
+        ] + ASYNC_REQUIREMENTS,
+        # 'test': ['coverage'],
     },
     # If there are data files included in your packages that need to be
     # installed, specify them here. If using Python 2.6 or less, then these

teleflask/__init__.py

@@ -1,9 +1,47 @@
 # -*- coding: utf-8 -*-
 __author__ = 'luckydonald'
 
+import sys as _sys
+
 VERSION = "2.0.0.dev21"
 __version__ = VERSION
 
-from .server import Teleflask
+__all__ = [
+    'VERSION', '__version__',
+    # the ones we provide for easy toplevel access:
+    'Teleprocessor', 'Teleserver',
+    'TBlueprint', 'abort_processing',
+    # special modules:
+    'Teleflask',
+    # submodules:
+   'server', 'exceptions', 'messages', 'new_messages', 'proxy',
+]
+
+from .server.core import Teleprocessor, Teleserver
+
+if _sys.version_info.major >= 3 and _sys.version_info.minor >= 6:
+    IMPORTS = {'Teleflask': '.server.extras.flask', 'SyncTelepoll': '.server.extras.polling.sync'}
+    try:
+        # we try to serve them as lazy imports
+        import importlib as _importlib
+
+        _module = _importlib.import_module('.sever', __name__)
+
+        def __getattr__(name):
+            if name not in IMPORTS:
+                raise AttributeError(f'module {_module.__spec__.parent!r} has no attribute {name!r} ({IMPORTS[name]!r}')
+            # end if
+            imported = _importlib.import_module(IMPORTS[name], _module.__spec__.parent)
+            return imported
+        # end def
+    except Exception:
+        # for some reason it failed, go back to importing it directly
+        from .server.extras.flask import Teleflask
+    # end if
+else:
+    # older python, go back to importing it directly
+    from .server.extras.flask import Teleflask
+# end if
+
 from .server.blueprints import TBlueprint
 from .server.utilities import abort_processing

teleflask/server/__init__.py

@@ -1,5 +1,2 @@
 # -*- coding: utf-8 -*-
-from .extras import Teleflask
-
 __author__ = 'luckydonald'
-

teleflask/server/abstact.py

@@ -19,12 +19,17 @@ def on_update(self, *required_keywords):
     # end def
 
     @abstractmethod
-    def add_update_listener(self, function, required_keywords=None):
+    def register_handler(self, handler):
         pass
     # end def
 
     @abstractmethod
-    def remove_update_listener(self, func):
+    def remove_handler(self, handler):
+        pass
+    # end def
+
+    @abstractmethod
+    def remove_handled_func(self, func):
         pass
     # end def
 # end class