Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion querybook/server/app/auth/oauth_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import requests


from flask import Markup, request, session as flask_session, redirect
from markupsafe import Markup
from flask import request, session as flask_session, redirect
import flask_login
from requests_oauthlib import OAuth2Session

Expand Down
3 changes: 2 additions & 1 deletion querybook/server/app/auth/okta_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from app.auth.oauth_auth import OAuthLoginManager, OAUTH_CALLBACK_PATH
from app.db import with_session, DBSession
from env import QuerybookSettings, get_env_config
from flask import Markup, request, session as flask_session, redirect
from markupsafe import Markup
from flask import request, session as flask_session, redirect
from lib.logger import get_logger
from lib.utils.decorators import in_mem_memoized
from logic.user import (
Expand Down
12 changes: 11 additions & 1 deletion querybook/server/app/flask_app.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import json
import os
import sys
from datetime import timedelta

from celery import Celery
from flask import Flask, Blueprint, json as flask_json, has_request_context
from flask.json.provider import DefaultJSONProvider
from flask_socketio import SocketIO
from flask_limiter import Limiter
from flask_limiter.util import get_remote_address
Expand All @@ -15,6 +17,14 @@
from lib.utils.json import JSONEncoder


class JSONProvider(DefaultJSONProvider):
def dumps(self, obj, **kwargs):
kwargs.setdefault("cls", JSONEncoder)
kwargs.setdefault("ensure_ascii", self.ensure_ascii)
kwargs.setdefault("sort_keys", self.sort_keys)
return json.dumps(obj, **kwargs)


def validate_db():
# We need to make sure db connection is valid
# before proceeding to other things such as
Expand All @@ -34,7 +44,7 @@ def validate_db():

def make_flask_app():
app = Flask(__name__, static_folder=STATIC_PATH)
app.json_encoder = JSONEncoder
app.json = JSONProvider(app)
app.secret_key = QuerybookSettings.FLASK_SECRET_KEY

if QuerybookSettings.PRODUCTION:
Expand Down
3 changes: 1 addition & 2 deletions querybook/server/lib/utils/json.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from datetime import datetime, date
import json

from flask import json as flask_json
from sqlalchemy.engine.row import Row

from lib.utils.utils import DATE_TO_UTC, DATETIME_TO_UTC


class JSONEncoder(flask_json.JSONEncoder):
class JSONEncoder(json.JSONEncoder):
def __init__(self, *args, **kwargs):
self.date_formatter = kwargs.pop("date_formatter", DATE_TO_UTC)
self.datetime_formatter = kwargs.pop("datetime_formatter", DATETIME_TO_UTC)
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

# Server requirements
Werkzeug==2.2.3
flask==2.2.2
Werkzeug==3.1.9
flask==3.1.3
Flask-Caching==1.10.1
Flask-Compress==1.10.1
Flask-Login==0.6.2
Flask-Login==0.6.3
Flask-Limiter==2.2.0
python-memcached==1.59
redis==4.3.6
Expand Down