aboutsummaryrefslogtreecommitdiff
path: root/wqflask/db/call.py
diff options
context:
space:
mode:
authorAlexander Kabui2021-05-10 08:46:44 +0300
committerGitHub2021-05-10 08:46:44 +0300
commitf7eeb913af479358583844164400dc8489a87d8f (patch)
tree5deb035007120eff4d691c270c2ec2937622b852 /wqflask/db/call.py
parent0b723720f7b1b9802b2f5453b747c7e48b693817 (diff)
parent1afece5464520700901cbde19599ac45222ea58f (diff)
downloadgenenetwork2-f7eeb913af479358583844164400dc8489a87d8f.tar.gz
Merge branch 'testing' into feature/integrate-correlation-api
Diffstat (limited to 'wqflask/db/call.py')
-rw-r--r--wqflask/db/call.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/wqflask/db/call.py b/wqflask/db/call.py
index 0971d2a2..1fe0772b 100644
--- a/wqflask/db/call.py
+++ b/wqflask/db/call.py
@@ -4,7 +4,9 @@ from flask import g
import string
try: # Python2 support
- import urllib.request, urllib.error, urllib.parse
+ import urllib.request
+ import urllib.error
+ import urllib.parse
except:
import urllib2
import json
@@ -12,10 +14,11 @@ from utility.tools import USE_GN_SERVER, LOG_SQL, GN_SERVER_URL
from utility.benchmark import Bench
from utility.logger import getLogger
-logger = getLogger(__name__ )
+logger = getLogger(__name__)
# from inspect import stack
+
def fetch1(query, path=None, func=None):
"""Fetch one result as a Tuple using either a SQL query or the URI
path to GN_SERVER (when USE_GN_SERVER is True). Apply func to
@@ -35,6 +38,7 @@ GN_SERVER result when set (which should return a Tuple)
else:
return fetchone(query)
+
def fetchone(query):
"""Return tuple containing one row by calling SQL directly (the
original fetchone, but with logging)
@@ -46,6 +50,7 @@ original fetchone, but with logging)
return res.fetchone()
return logger.sql(query, helper)
+
def fetchall(query):
"""Return row iterator by calling SQL directly (the
original fetchall, but with logging)
@@ -57,6 +62,7 @@ original fetchall, but with logging)
return res.fetchall()
return logger.sql(query, helper)
+
def gn_server(path):
"""Return JSON record by calling GN_SERVER
@@ -64,9 +70,9 @@ def gn_server(path):
with Bench("GN_SERVER", LOG_SQL):
res = ()
try:
- res = urllib.request.urlopen(GN_SERVER_URL+path)
+ res = urllib.request.urlopen(GN_SERVER_URL + path)
except:
- res = urllib2.urlopen(GN_SERVER_URL+path)
+ res = urllib2.urlopen(GN_SERVER_URL + path)
rest = res.read()
res2 = json.loads(rest)
logger.debug(res2)