add sqlite support (#10)

* update service apis
* add sqlite support

Author: haobibo

.github/workflows/pip.yml

@@ -30,11 +30,12 @@ jobs:
 
       - name: pip-install-test
         run: |
-          sudo pip install -UI pip && sudo pip install -UI setuptools wheel twine
+          sudo pip3 install -UI pip && sudo pip3 install -UI setuptools wheel twine pyOpenSSL
           cd src
-          sudo python setup.py sdist bdist_wheel
-          pip install ./dist/*.tar.gz
+          sudo python3 setup.py sdist bdist_wheel
+          pip3 install ./dist/*.tar.gz
           aloha info -v
+          pip3 list | sort
 
       - name: pypi-publish
         env:
@@ -44,8 +45,8 @@ jobs:
           TWINE_PASSWORD_TEST: ${{ secrets.TWINE_PASSWORD_TEST }}
         run: |
           env | sort -f && cd src && ls -alh
-          sudo python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
-          sudo python setup.py sdist bdist_wheel
+          sudo python3 -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
+          sudo python3 setup.py sdist bdist_wheel
           ls -alh ./dist
           if [ "${GITHUB_REPOSITORY}" = "QPod/aloha" ] && [ "${GITHUB_REF_NAME}" = "main" ] ; then
             twine upload dist/* --verbose -u "${TWINE_USERNAME}" -p "${TWINE_PASSWORD}" ;

src/aloha/db/mysql.py

@@ -39,3 +39,7 @@ def execute_query(self, sql, *args, **kwargs):
         with self.db.connect() as conn:
             cur = conn.execute(text(sql), *args, **kwargs)
             return cur
+
+    @property
+    def connection_str(self) -> str:
+        return 'mysql://{user}:{password}@{host}:{port}/{dbname}'.format(**self._config)

src/aloha/db/postgres.py

@@ -43,3 +43,7 @@ def execute_query(self, sql, *args, **kwargs):
         with self.engine.connect() as conn:
             cur = conn.execute(text(sql), *args, **kwargs)
             return cur
+
+    @property
+    def connection_str(self) -> str:
+        return "postgresql://{user}:{password}@{host}:{port}/{dbname}".format(**self._config)

src/aloha/db/sqlite.py

@@ -0,0 +1,53 @@
+__all__ = ('SqliteOperator',)
+
+import sqlite3
+
+from sqlalchemy import create_engine
+from sqlalchemy.sql import text
+
+from .base import PasswordVault
+from ..logger import LOG
+
+
+class SqliteOperator:
+    def __init__(self, db_config, **kwargs):
+        self._connection_pattern = "sqlite://{dbname}"
+        dbname = db_config.get('dbname', '')
+        if len(dbname) > 0:
+            dbname = '/%s' % dbname
+        self._config = {'dbname': dbname}
+
+        if 'password' in db_config:
+            try:
+                import sqlcipher3
+            except ImportError:
+                raise RuntimeError('Python package required for encrypted sqlite3: sqlcipher3-binary')
+            LOG.debug('Version of sqlcipher3 = %s' % sqlcipher3.sqlite_version)
+            password_vault = PasswordVault.get_vault(db_config.get('vault_type'), db_config.get('vault_config'))
+            password = password_vault.get_password(db_config.get('password', None))
+            self._config['password'] = password
+            self._connection_pattern = "sqlite+pysqlcipher://:{password}@/{dbname}"
+        else:
+            LOG.debug('Version of sqlite = %s' % sqlite3.sqlite_version)
+
+        try:
+            self.db = create_engine(
+                self._connection_pattern.format(**self._config), **kwargs
+            )
+            LOG.debug("Sqlite connected: %s" % self.connection_str)
+        except Exception as e:
+            LOG.exception(e)
+            raise RuntimeError('Failed to connect to sqlite')
+
+    @property
+    def connection(self):
+        return self.db
+
+    def execute_query(self, sql, *args, **kwargs):
+        with self.db.connect() as conn:
+            cur = conn.execute(text(sql), *args, **kwargs)
+            return cur
+
+    @property
+    def connection_str(self) -> str:
+        return self._connection_pattern.format(**self._config)

src/aloha/service/web.py

@@ -1,5 +1,6 @@
 import logging
 import os
+
 from tornado import web, httpserver
 from tornado.routing import HostMatches
 
@@ -40,8 +41,12 @@ def init_handlers(config: dict):
         for m in modules:
             _handlers = _load_handlers(m)
             for h in _handlers:
+                (url, class_handler) = h
                 handlers.append(h)
-                LOG.debug('Loaded module %s handler for API:\t%s' % h[::-1])
+                s_log_msg = 'Loaded API module %-50s' % url
+                if LOG.level < logging.INFO:  # more verbose information
+                    s_log_msg += '\t from class %s' % str(class_handler)
+                LOG.info(s_log_msg)
 
         return [
             (HostMatches('(.*)'), handlers)

src/aloha/util/sys_info.py

@@ -7,7 +7,7 @@
 
 from ..logger import LOG
 
-LOG.info('Using psutil == %s' % psutil.__version__)
+LOG.debug('Using psutil == %s' % psutil.__version__)
 
 
 def get_size(bytes, suffix="B"):