mirror of
https://github.com/Novartis/cellxgene-gateway.git
synced 2026-10-08 13:18:12 +08:00
Applied "Formatting and new enumeration for Cellxgene-gateway" patch
This commit is contained in:
Alok Saldanha
@@ -6,17 +6,25 @@
|
||||
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
|
||||
# OR CONDITIONS OF ANY KIND, either express or implied. See the License for
|
||||
# the specific language governing permissions and limitations under the License.
|
||||
import psutil
|
||||
import logging
|
||||
import datetime
|
||||
import logging
|
||||
|
||||
from flask import make_response, request, render_template
|
||||
import psutil
|
||||
from enum import Enum
|
||||
from flask import make_response, render_template, request
|
||||
from requests import get, post, put
|
||||
|
||||
from cellxgene_gateway import env
|
||||
from cellxgene_gateway.cellxgene_exception import CellxgeneException
|
||||
from cellxgene_gateway.util import current_time_stamp
|
||||
from cellxgene_gateway.flask_util import querystring
|
||||
from cellxgene_gateway.util import current_time_stamp
|
||||
|
||||
|
||||
class CacheEntryStatus(Enum):
|
||||
loaded = "loaded"
|
||||
loading = "loading"
|
||||
error = "error"
|
||||
terminated = "terminated"
|
||||
|
||||
class CacheEntry:
|
||||
def __init__(
|
||||
@@ -26,7 +34,7 @@ class CacheEntry:
|
||||
port,
|
||||
launchtime,
|
||||
timestamp,
|
||||
status,
|
||||
status: CacheEntryStatus,
|
||||
message,
|
||||
all_output,
|
||||
stderr,
|
||||
@@ -52,7 +60,7 @@ class CacheEntry:
|
||||
port,
|
||||
current_time_stamp(),
|
||||
current_time_stamp(),
|
||||
"loading",
|
||||
CacheEntryStatus.loading,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
@@ -61,13 +69,13 @@ class CacheEntry:
|
||||
|
||||
def set_loaded(self, pid):
|
||||
self.pid = pid
|
||||
self.status = "loaded"
|
||||
self.status = CacheEntryStatus.loaded
|
||||
|
||||
def set_error(self, message, stderr, http_status):
|
||||
self.message = message
|
||||
self.stderr = stderr
|
||||
self.http_status = http_status
|
||||
self.status = "error"
|
||||
self.status = CacheEntryStatus.error
|
||||
|
||||
def append_output(self, output):
|
||||
if self.all_output == None:
|
||||
@@ -77,10 +85,12 @@ class CacheEntry:
|
||||
|
||||
def terminate(self):
|
||||
pid = self.pid
|
||||
if pid != None and self.status != "terminated":
|
||||
if pid != None and self.status != CacheEntryStatus.terminated:
|
||||
terminated = []
|
||||
|
||||
def on_terminate(p):
|
||||
terminated.append(p.pid)
|
||||
|
||||
p = psutil.Process(pid)
|
||||
children = p.children()
|
||||
for child in children:
|
||||
@@ -89,44 +99,46 @@ class CacheEntry:
|
||||
terminated.append(p.pid)
|
||||
p.terminate()
|
||||
psutil.wait_procs([p], callback=on_terminate)
|
||||
logging.getLogger("cellxgene_gateway").info(f"terminated {terminated}")
|
||||
self.status = "terminated"
|
||||
logging.getLogger("cellxgene_gateway").info(
|
||||
f"terminated {terminated}"
|
||||
)
|
||||
self.status = CacheEntryStatus.terminated
|
||||
|
||||
def serve_content(self, path):
|
||||
gateway_basepath = (
|
||||
f"{env.external_protocol}://{env.external_host}/view/{self.key.pathpart}/"
|
||||
)
|
||||
gateway_basepath = f"{env.external_protocol}://{env.external_host}/view/{self.key.pathpart}/"
|
||||
subpath = path[len(self.key.pathpart) :] # noqa: E203
|
||||
|
||||
|
||||
if len(subpath) == 0:
|
||||
r = make_response(f"Redirect to {gateway_basepath}\n", 301)
|
||||
r.headers["location"] = gateway_basepath+querystring()
|
||||
r.headers["location"] = gateway_basepath + querystring()
|
||||
return r
|
||||
elif self.status == "loading":
|
||||
elif self.status == CacheEntryStatus.loading:
|
||||
launch_time = datetime.datetime.fromtimestamp(self.launchtime)
|
||||
return render_template(
|
||||
"loading.html", launchtime=launch_time, all_output=self.all_output
|
||||
"loading.html",
|
||||
launchtime=launch_time,
|
||||
all_output=self.all_output,
|
||||
)
|
||||
|
||||
port = self.port
|
||||
cellxgene_basepath = f"http://127.0.0.1:{port}"
|
||||
headers = {}
|
||||
copy_headers = [
|
||||
'accept',
|
||||
'accept-encoding',
|
||||
'accept-language',
|
||||
'cache-control',
|
||||
'connection',
|
||||
'content-length',
|
||||
'content-type',
|
||||
'cookie',
|
||||
'host',
|
||||
'origin',
|
||||
'pragma',
|
||||
'referer',
|
||||
'sec-fetch-mode',
|
||||
'sec-fetch-site',
|
||||
'user-agent'
|
||||
"accept",
|
||||
"accept-encoding",
|
||||
"accept-language",
|
||||
"cache-control",
|
||||
"connection",
|
||||
"content-length",
|
||||
"content-type",
|
||||
"cookie",
|
||||
"host",
|
||||
"origin",
|
||||
"pragma",
|
||||
"referer",
|
||||
"sec-fetch-mode",
|
||||
"sec-fetch-site",
|
||||
"user-agent",
|
||||
]
|
||||
for h in copy_headers:
|
||||
if h in request.headers:
|
||||
@@ -135,20 +147,14 @@ class CacheEntry:
|
||||
full_path = cellxgene_basepath + subpath + querystring()
|
||||
|
||||
if request.method in ["GET", "HEAD", "OPTIONS"]:
|
||||
cellxgene_response = get(
|
||||
full_path, headers=headers
|
||||
)
|
||||
cellxgene_response = get(full_path, headers=headers)
|
||||
elif request.method == "PUT":
|
||||
cellxgene_response = put(
|
||||
full_path,
|
||||
headers=headers,
|
||||
data=request.data,
|
||||
full_path, headers=headers, data=request.data,
|
||||
)
|
||||
elif request.method == "POST":
|
||||
cellxgene_response = post(
|
||||
full_path,
|
||||
headers=headers,
|
||||
data=request.data,
|
||||
full_path, headers=headers, data=request.data,
|
||||
)
|
||||
else:
|
||||
raise CellxgeneException(
|
||||
@@ -169,9 +175,7 @@ class CacheEntry:
|
||||
resp_headers[h] = cellxgene_response.headers[h]
|
||||
|
||||
gateway_response = make_response(
|
||||
gateway_content,
|
||||
cellxgene_response.status_code,
|
||||
resp_headers,
|
||||
gateway_content, cellxgene_response.status_code, resp_headers,
|
||||
)
|
||||
|
||||
return gateway_response
|
||||
|
||||
Reference in New Issue
Block a user