Added pyms as lib

Author: avara1986

config.yml

@@ -0,0 +1,7 @@
+ms:
+  DEBUG: false
+  TESTING: false
+  APP_NAME: Template
+  APPLICATION_ROOT : /template
+  SQLALCHEMY_TRACK_MODIFICATIONS: true
+  SECRET_KEY: "gjr39dkjn344_!67#"

manage.py

@@ -3,22 +3,9 @@
 
 from project import create_app
 
-app, db = create_app()
+app = create_app()
 
 manager = Manager(app)
 
-
-@manager.command
-def create_db():
-    """Creates the db tables."""
-    db.create_all()
-
-
-@manager.command
-def drop_db():
-    """Drops the db tables."""
-    db.drop_all()
-
-
 if __name__ == '__main__':
     manager.run()

project/__init__.py

@@ -1,63 +1,27 @@
-# encoding: utf-8
-
-import logging
-import os
-
-import connexion
-from flask_injector import FlaskInjector
-from injector import Injector
+from pyms.flask.app import Microservice
+from project.config import CONFIG
+from project.models.init_db import db
+from pyms.flask.app import Microservice
 
 from project.config import CONFIG
-from pyms.healthcheck import healthcheck_blueprint
-from pyms.logger import CustomJsonFormatter
-from pyms.models import db
-from pyms.tracer.main import TracerModule
+from project.models.init_db import db
 
 __author__ = "Alberto Vara"
 __email__ = "a.vara.1986@gmail.com"
-__version__ = "0.2"
+__version__ = "1.0"
 
-logger = logging.getLogger('jaeger_tracing')
-logger.setLevel(logging.DEBUG)
 
-ENVIRONMENT = os.environ.get("ENVIRONMENT", "default")
+class MyMicroservice(Microservice):
+    def init_libs(self, app):
+        db.init_app(app)
+        with app.test_request_context():
+            db.create_all()
 
 
 def create_app():
     """Initialize the Flask app, register blueprints and intialize all libraries like Swagger, database, the trace system...
     return the app and the database objects.
     :return:
     """
-    environment = os.environ.get("ENVIRONMENT", "default")
-
-    app = connexion.App(__name__, specification_dir='./swagger/')
-    # app.app.json_encoder = encoder.JSONEncoder
-
-    app.add_api('swagger.yaml',
-                arguments={'title': 'Swagger Example Project'},
-                base_path=CONFIG[environment].APPLICATION_ROOT)
-
-    application = app.app
-    application.config.from_object(CONFIG[environment])
-    db.init_app(application)
-
-    # Initialize Blueprints
-    application.register_blueprint(healthcheck_blueprint)
-
-    # Inject Modules
-    if not application.config["TESTING"] and not application.config["DEBUG"]:
-        log_handler = logging.StreamHandler()
-        formatter = CustomJsonFormatter('(timestamp) (level) (name) (module) (funcName) (lineno) (message)')
-        formatter.add_service_name(application.config["APP_NAME"])
-        tracer = TracerModule(application)
-        injector = Injector([tracer])
-        FlaskInjector(app=application, injector=injector)
-        formatter.add_trace_span(tracer.tracer)
-        log_handler.setFormatter(formatter)
-        application.logger.addHandler(log_handler)
-        application.logger.setLevel(logging.INFO)
-
-    with application.test_request_context():
-        db.create_all()
-
-    return application, db
+    ms = MyMicroservice(service="ms", path=__file__)
+    return ms.create_app()

project/models/init_db.py

@@ -0,0 +1,4 @@
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()

project/models/models.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy import Column, Integer, String, DateTime
 
-from pyms.models import db
+from project.models.init_db import db
 
 
 def dump_datetime(value: datetime) -> list:

project/tests/config-tests.yml

@@ -0,0 +1,9 @@
+ms:
+  DEBUG: false
+  TESTING: true
+  APP_NAME: Template
+  APPLICATION_ROOT : /template
+  SQLALCHEMY_TRACK_MODIFICATIONS: true
+  SECRET_KEY: "gjr39dkjn344_!67#"
+  DATABASE: db_test.sqlite3
+  SQLALCHEMY_DATABASE_URI: sqlite:///db_test.sqlite3

project/tests/test_views.py

@@ -3,36 +3,38 @@
 import unittest
 from typing import Dict, List, Union, Text
 
-from project import create_app
+from project import MyMicroservice
+from pyms.constants import CONFIGMAP_FILE_ENVIRONMENT
 
 
 def _format_response(response: Text = "") -> Union[List, Dict]:
     return json.loads(response)
 
 
 class ProjectTestCase(unittest.TestCase):
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
     def setUp(self):
-        os.environ["ENVIRONMENT"] = "test"
-        self.app, self.db = create_app()
+        os.environ[CONFIGMAP_FILE_ENVIRONMENT] = os.path.join(self.BASE_DIR, "config-tests.yml")
+        ms = MyMicroservice(service="ms", path=os.path.dirname(__file__))
+        self.app = ms.create_app()
         self.base_url = self.app.config["APPLICATION_ROOT"]
         self.client = self.app.test_client()
 
     def tearDown(self):
-        os.unlink(self.app.config['DATABASE'])
+        pass # os.unlink(self.app.config['DATABASE'])
 
     def test_home(self):
         response = self.client.get('/')
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(404, response.status_code)
 
     def test_healthcheck(self):
         response = self.client.get('/healthcheck')
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(200, response.status_code)
 
     def test_list_view(self):
         response = self.client.get('{base_url}/'.format(base_url=self.base_url))
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(_format_response(response.data), [])
+        self.assertEqual(200, response.status_code)
 
     def test_create_view(self):
         name = "blue"
@@ -41,5 +43,5 @@ def test_create_view(self):
             data=json.dumps(dict(name=name)),
             content_type='application/json'
         )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(_format_response(response.data)["name"], name)
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(name, _format_response(response.data)["name"])

project/views/views.py

@@ -1,9 +1,10 @@
 # encoding: utf-8
 from __future__ import absolute_import, print_function, unicode_literals
+
 import connexion
-from flask import request, jsonify, current_app
+from flask import jsonify, current_app
 
-from pyms.models import db
+from project.models.init_db import db
 from project.models.models import Colors
 
 
@@ -28,4 +29,4 @@ def create_view():
         db.session.commit()
 
         return jsonify(color.serialize)
-    return jsonify({})
+    return jsonify({})