Skip to content

Commit

Permalink
to more files
Browse files Browse the repository at this point in the history
  • Loading branch information
StpMax committed Nov 24, 2022
1 parent 21f96e7 commit 7c6f4d5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 27 deletions.
1 change: 0 additions & 1 deletion .flake8
Expand Up @@ -89,6 +89,5 @@ exclude =
mindsdb/integrations/handlers/byom_handler/byom_handler.py
mindsdb/integrations/handlers/byom_handler/proc_wrapper.py
mindsdb/integrations/handlers/*
mindsdb/integrations/handlers_wrapper

max-complexity = 18
31 changes: 16 additions & 15 deletions mindsdb/integrations/handlers_wrapper/db_handler_wrapper.py
Expand Up @@ -29,6 +29,7 @@
from mindsdb.integrations.libs.handler_helpers import define_handler
from mindsdb.utilities import log


class BaseDBWrapper:
"""Base abstract class contains some general methods."""

Expand Down Expand Up @@ -58,7 +59,7 @@ class DBHandlerWrapper(BaseDBWrapper):
General meaning: DBHandlerWrapper(DBHandler) = DBHandler + REST API
DBHandler which capable communicate with the caller via REST
"""
def __init__(self, **kwargs):
def __init__(self, **kwargs):
""" Wrapper Init.
Args:
connection_data: dict contains all required connection info to a specific database
Expand All @@ -68,41 +69,41 @@ def __init__(self, **kwargs):
super().__init__(**kwargs)

# CONVERT METHODS TO FLASK API ENDPOINTS
connect_route = self.app.route("/connect", methods = ["GET", ])
connect_route = self.app.route("/connect", methods=["GET", ])
self.connect = connect_route(self.connect)

check_connection_route = self.app.route("/check_connection", methods = ["GET", ])
check_connection_route = self.app.route("/check_connection", methods=["GET", ])
self.check_connection = check_connection_route(self.check_connection)

get_tables_route = self.app.route("/get_tables", methods = ["GET", ])
get_tables_route = self.app.route("/get_tables", methods=["GET", ])
self.get_tables = get_tables_route(self.get_tables)

get_columns_route = self.app.route("/get_columns", methods = ["GET", ])
get_columns_route = self.app.route("/get_columns", methods=["GET", ])
self.get_columns = get_columns_route(self.get_columns)

native_query_route = self.app.route("/native_query", methods = ["POST", "PUT"])
native_query_route = self.app.route("/native_query", methods=["POST", "PUT"])
self.native_query = native_query_route(self.native_query)

query_route = self.app.route("/query", methods = ["GET", ])
query_route = self.app.route("/query", methods=["GET", ])
self.query = query_route(self.query)
log.logger.info("%s: additional params and routes have been initialized", self.__class__.__name__)

def connect(self):
try:
self.handler.connect()
return {"status": "OK"}, 200
except Exception as e:
except Exception:
msg = traceback.format_exc()
log.logger.error(msg)
return {"status": "FAIL" ,"error": msg}, 500
return {"status": "FAIL", "error": msg}, 500

def check_connection(self):
"""Check connection to the database server."""
log.logger.info("%s: calling 'check_connection'", self.__class__.__name__)
try:
result = self.handler.check_connection()
result = self.handler.check_connection()
return result.to_json(), 200
except Exception as e:
except Exception:
msg = traceback.format_exc()
log.logger.error(msg)
result = StatusResponse(success=False,
Expand All @@ -116,7 +117,7 @@ def native_query(self):
try:
result = self.handler.native_query(query)
return result.to_json(), 200
except Exception as e:
except Exception:
msg = traceback.format_exc()
log.logger.error(msg)
result = Response(resp_type=RESPONSE_TYPE.ERROR,
Expand All @@ -132,7 +133,7 @@ def query(self):
try:
result = self.handler.query(query)
return result.to_json(), 200
except Exception as e:
except Exception:
msg = traceback.format_exc()
log.logger.error(msg)
result = Response(resp_type=RESPONSE_TYPE.ERROR,
Expand All @@ -145,7 +146,7 @@ def get_tables(self):
try:
result = self.handler.get_tables()
return result.to_json(), 200
except Exception as e:
except Exception:
msg = traceback.format_exc()
log.logger.error(msg)
result = Response(resp_type=RESPONSE_TYPE.ERROR,
Expand All @@ -159,7 +160,7 @@ def get_columns(self):
log.logger.info("%s: calling 'get_columns' for table - %s", self.__class__.__name__, table)
result = self.handler.get_columns(table)
return result.to_json(), 200
except Exception as e:
except Exception:
msg = traceback.format_exc()
log.logger.error(msg)
result = Response(resp_type=RESPONSE_TYPE.ERROR,
Expand Down
17 changes: 6 additions & 11 deletions mindsdb/integrations/handlers_wrapper/ml_handler_wrapper.py
Expand Up @@ -9,8 +9,8 @@
"""
import traceback
import pickle
import json

from pandas import read_json
from flask import Flask, request

Expand All @@ -19,12 +19,9 @@
HandlerResponse as Response,
RESPONSE_TYPE
)
from mindsdb.integrations.libs.const import PREDICTOR_STATUS

from mindsdb.utilities.config import Config
from mindsdb.interfaces.storage.fs import ModelStorage, HandlerStorage

from mindsdb.integrations.libs.handler_helpers import define_ml_handler
from mindsdb.utilities.config import Config
from mindsdb.utilities.log import get_log

log = get_log()
Expand Down Expand Up @@ -59,21 +56,21 @@ def run(self, **kwargs):


class MLHandlerWrapper(BaseMLWrapper):
def __init__(self, name):
def __init__(self, name):
""" Wrapper Init.
Args:
name: name of the service
"""
super().__init__(name)

# CONVERT METHODS TO FLASK API ENDPOINTS
check_connect_route = self.app.route("/check_connection", methods = ["GET", ])
check_connect_route = self.app.route("/check_connection", methods=["GET", ])
self.check_connection = check_connect_route(self.check_connection)

predict_route = self.app.route("/predict", methods = ["GET", ])
predict_route = self.app.route("/predict", methods=["GET", ])
self.predict = predict_route(self.predict)

query_create = self.app.route("/create", methods = ["POST", ])
query_create = self.app.route("/create", methods=["POST", ])
self.create = query_create(self.create)

def _get_handler_general_data(self) -> dict:
Expand Down Expand Up @@ -139,7 +136,6 @@ def check_connection(self):
error_message=None)
return result.to_json(), 200


def create(self):
"""See 'create' method in MLHandler"""
try:
Expand Down Expand Up @@ -172,4 +168,3 @@ def predict(self):
error_code=1,
error_message=msg)
return result.to_json(), 500

0 comments on commit 7c6f4d5

Please sign in to comment.