Merge pull request #137 from JoshYuJump/main

Tested bali 3.2.1

CHANGELOG

@@ -5,9 +5,10 @@
 
 ## [3.3.0] UNRELEASED
 
-## [3.2.1] UNRELEASED
+## [3.2.1] 2022-07-05
 ### Added
 - Event handler support class style
+- Added bali.Environments
 
 ### Changed
 - Removed dependency python-jose[cryptography]==3.2.0

bali/__init__.py

@@ -5,7 +5,7 @@
 from bali.decorators import event_handler, init_handler
 from bali.resources import Resource, ModelResource
 
-__version__ = '3.2.2'
+__version__ = '3.2.1'
 
 
 class Schema(BaseModel):

bali/application.py

@@ -143,11 +143,13 @@ def serve():
 
     def _launch_event(self):
         from .events import handle
-        from bali import init_handler
+        from bali import init_handler, __version__
+
         event_handler = self.kwargs.get('event_handler')
         if not event_handler:
             raise Exception('event_handler not provided')
         init_handler(event_handler)
+        logger.info('Bali v%s Event started.', __version__)
         while True:
             handle()
 

examples/legacy/config.py

@@ -5,7 +5,7 @@
 
 
 class Settings(BaseSettings):
-    SERVER_NAME: str = 'bali-test'
+    SERVER_NAME: str = 'legacy'
 
     DATABASE_SERVER: str = '127.0.0.1'
     DATABASE_USER: str = 'root'
@@ -25,6 +25,15 @@ def assemble_db_connection(cls, v: Optional[str], values: Dict[str, Any]) -> Any
     CACHE_ADDRESS: str = '127.0.0.1'
     CACHE_PASSWORD: str = '123456'
 
+    AMQP_SERVER_ADDRESS: str = 'amqp://127.0.0.1:5672'
+
+    AMQP_CONFIGS = {
+        'default': {
+            'AMQP_SERVER_ADDRESS': AMQP_SERVER_ADDRESS,
+            'EXCHANGE_TYPE': 'fanout',
+        }
+    }
+
 
 settings = Settings()
 

examples/legacy/event_handler.py

@@ -1,6 +1,16 @@
 from bali.decorators import event_handler
 
 
-@event_handler('hello')
-def hello_handle(event):
-    pass
+class EventHandler:
+    @event_handler('HelloSaid')
+    def handle_hello_said(self, event):
+        self.prepare(event)
+        print('handle event: ', event)
+
+    @event_handler('HiSaid')
+    def handle_hi_said(self, event):
+        self.prepare(event)
+        print('handle event: ', event)
+
+    def prepare(self, event):
+        print('prepare event: ', event)

examples/legacy/event_trigger.py

@@ -0,0 +1,41 @@
+import os
+
+from bali.core import _settings
+from bali.events import Event, dispatch
+
+amqp_uri = os.getenv('AMQP_SERVER_ADDRESS', default='amqp://127.0.0.1:5672')
+
+
+_settings.AMQP_CONFIGS = {
+    'default': {
+        'AMQP_SERVER_ADDRESS': amqp_uri,
+        'EXCHANGE_NAME': 'ms.events',
+        'EXCHANGE_TYPE': 'fanout',
+    }
+}
+
+
+class HelloSaidEvent(Event):
+    """Hello said event"""
+    type: str = 'HelloSaid'
+    name: str = ''
+
+
+class HiSaidEvent(Event):
+    """Hi said event"""
+    type: str = 'HiSaid'
+    name: str = ''
+
+
+def run():
+    event = HelloSaidEvent(name='Jack')
+    dispatch(event)
+    print('Dispatched event: ', event)
+
+    event = HiSaidEvent(name='Jerry')
+    dispatch(event)
+    print('Dispatched event: ', event)
+
+
+if __name__ == '__main__':
+    run()

examples/legacy/main.py

@@ -1,12 +1,9 @@
 # noinspection PyUnresolvedReferences
 import config
-# import grpc_server
 import grpc_server_async
 from bali.core import Bali
-import event_handler
+from event_handler import EventHandler
 from v1.app import router
-from fastapi_pagination import LimitOffsetPage, add_pagination, paginate
-
 
 app = Bali(
     base_settings=None,
@@ -16,9 +13,9 @@
     }],
     backend_cors_origins=['http://127.0.0.1'],
     rpc_service=grpc_server_async,
-    event_handler=event_handler
+    event_handler=EventHandler
 )
-app.settings(title='Bali Example')
+app.settings(title='legacy')
 
 if __name__ == "__main__":
     app.start()

examples/legacy/resources/async_greeter.py

@@ -4,7 +4,7 @@
 from bali.decorators import action
 from bali.resources import Resource
 from bali.schemas import GetRequest, ListRequest
-from ..permissions import IsAuthenticated
+from permissions import IsAuthenticated
 
 GREETERS = [{'id': i, 'content': 'Hi, number %s' % i} for i in range(10)]
 

examples/legacy/resources/greeter.py

@@ -4,7 +4,7 @@
 from bali.decorators import action
 from bali.resources import Resource
 from bali.schemas import GetRequest, ListRequest
-from ..permissions import IsAuthenticated
+from permissions import IsAuthenticated
 
 GREETERS = [{'id': i, 'content': 'Hi, number %s' % i} for i in range(10)]
 

examples/legacy/resources/item.py

@@ -9,14 +9,13 @@
 from bali.decorators import action
 from bali.resources import Resource
 from bali.schemas import ListRequest
-from ..models import Item
-from ..permissions import IsAuthenticated
-from ..schemas import ItemModel
+from models import Item
+from permissions import IsAuthenticated
+from schemas import ItemModel
 
 from sqlalchemy.future import select
 
 
-
 class QFilter(BaseModel):
     name: str
 
@@ -38,7 +37,9 @@ def get(self, pk=None):
     @action()
     def list(self, schema_in: ListRequest = None):
         time.sleep(2)
-        return Item.query().filter(*get_filters_expr(Item, **schema_in.filters))
+        return Item.query().filter(
+            *get_filters_expr(Item, **schema_in.filters)
+        )
 
     @action()
     async def list_async(self, schema_in: ListRequest = None):

examples/legacy/resources/item_model_resource.py

@@ -3,9 +3,9 @@
 from pydantic import BaseModel
 
 from bali.resources import ModelResource
-from ..models import Item
-from ..permissions import IsAuthenticated
-from ..schemas import ItemModel
+from models import Item
+from permissions import IsAuthenticated
+from schemas import ItemModel
 
 
 class QFilter(BaseModel):

examples/legacy/v1/app.py

@@ -1,14 +1,14 @@
 from fastapi_pagination import LimitOffsetPage, paginate
 
 from bali.core import APIRouter, cache_memoize
-from ..models import Item
-from ..resources import (
+from models import Item
+from resources import (
     GreeterResource,
     AsyncGreeterResource,
     ItemResource,
     ItemModelResource,
 )
-from ..schemas import ItemModel
+from schemas import ItemModel
 
 router = APIRouter()