Merge pull request #110 from dakotablair/dependency_upgrades

celiafish · web-flow · commit 949d458b82bc · 2025-05-13T12:32:56.000-04:00
Remove eventlet in favor of gevent.
diff --git a/frontend/v1/package-lock.json b/frontend/v1/package-lock.json
diff --git a/frontend/v1/package.json b/frontend/v1/package.json
@@ -30,7 +30,7 @@
     "@material-ui/icons": "^4.2.1",
     "@material-ui/lab": "^4.0.0-alpha.29",
     "@material-ui/styles": "^4.3.3",
-    "axios": "^1.6.0",
+    "axios": "^1.8.4",
     "chart.js": "^2.9.4",
     "chartjs-plugin-streaming": "1.8.0",
     "chartjs-plugin-zoom": "^0.7.7",
@@ -50,6 +50,7 @@
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "socket.io": "^4.8.1",
+    "socket.io-adapter": "^2.5.5",
     "socket.io-client": "^4.8.1"
   }
 }
diff --git a/manager.py b/manager.py
@@ -1,9 +1,22 @@
+# needed for using redis in this configuration
+from gevent import monkey
+monkey.patch_all()
+
+import types
 import subprocess
 import sys
 import os
 
-import eventlet
-eventlet.monkey_patch()
+# monkey patch flask to support old version of flask_script
+import flask
+
+module_name = 'flask._compat'
+my_submodule = types.ModuleType(module_name)
+_compat = types.ModuleType(module_name)
+_compat.text_type = str
+sys.modules[module_name] = _compat
+setattr(flask, '_compat', _compat)
+flask._request_ctx_stack = None
 
 from flask_script import Manager, Command, Server as _Server, Option
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,24 +1,25 @@
 amqp==5.3.1
 async-timeout==4.0.2
 billiard==3.6.4.0
+blinker==1.8.2
 celery==5.2.2
 certifi==2024.7.4
 cffi==1.15.1
 charset-normalizer==3.3.0
 click==8.1.7
 Cython==3.0.4
 dnspython==2.6.1
-eventlet==0.35.2
-Flask==1.1.2
+flask==3.0.3
 Flask-Script==2.0.6
 Flask-SocketIO==2.9.6
 Flask-SQLAlchemy==2.5.1
 flit_core==3.9.0
-gevent==23.7.0
+gevent==24.2.1
 greenlet==2.0.2
 idna==3.7
-itsdangerous==2.0.1
-Jinja2==3.0.3
+importlib-metadata==8.5.0
+itsdangerous==2.2.0
+Jinja2==3.1.6
 kombu==5.4.2
 MarkupSafe==2.1.5
 pkgconfig==1.5.5
@@ -34,6 +35,7 @@ six==1.16.0
 SQLAlchemy==1.4.45
 urllib3==1.26.19
 vine==5.1.0
-werkzeug==0.16.0
+werkzeug==3.0.6
+zipp==3.20
 zope.event==4.6
 zope.interface==5.4.0
diff --git a/run_server.py b/run_server.py
@@ -1,6 +1,8 @@
+# needed for using redis in this configuration
+from gevent import monkey
+monkey.patch_all()
+
 import sys
-import eventlet
-eventlet.monkey_patch()
 
 from server import create_app, socketio
 
diff --git a/server/__init__.py b/server/__init__.py
@@ -9,7 +9,7 @@
 
 # Flask extensions
 db = SQLAlchemy()
-socketio = SocketIO()
+socketio = SocketIO(async_mode='gevent', engineio_logger=True)
 dm = DataModel()
 pdb = ProvDB(pdb_path=os.environ.get('PROVENANCE_DB', ''),
              pdb_sharded_num=int(os.environ.get('SHARDED_NUM', 0)),
diff --git a/server/api/anomalystats.py b/server/api/anomalystats.py
@@ -5,7 +5,6 @@
 from ..models import AnomalyStat, AnomalyData, FuncStat, AnomalyStatQuery
 from . import api
 from ..tasks import make_async
-from ..utils import timestamp, url_for
 from requests import post
 from ..events import push_data
 
diff --git a/server/server.py b/server/server.py
@@ -1,20 +1,18 @@
-from flask import Blueprint, jsonify, render_template, Response, json
-# render_template, json, request, current_app
+from flask import (
+    Blueprint,
+    Response,
+    current_app,
+    jsonify,
+    render_template,
+)
 
 from . import stats as req_stats
 from . import socketio, celery as mycelery
 from . import pdb
-from .utils import url_for
 
 main = Blueprint('main', __name__)
 
 
-@main.before_app_first_request
-def before_first_request():
-    # for future usages
-    pass
-
-
 @main.before_app_request
 def before_request():
     """Update requests per second stats."""
@@ -27,7 +25,7 @@ def stop():
 
     def get_inspect():
         from requests import get
-        resp = get(url_for('tasks.get_info', _external=True))
+        resp = get(current_app.url_for('tasks.get_info', _external=True))
         info = resp.json()
         return info
 
diff --git a/server/static/js/bundle.js b/server/static/js/bundle.js
diff --git a/server/tasks.py b/server/tasks.py
@@ -4,12 +4,11 @@
 except ImportError:  # pragma:  no cover
     from cStringIO import StringIO as BytesIO
 
-from flask import Blueprint, abort, g, request
+from flask import Blueprint, abort, current_app, g, request
 from werkzeug.exceptions import InternalServerError
 from celery import states
 
 from . import celery
-from .utils import url_for
 
 text_types = (str, bytes)
 try:
@@ -81,7 +80,14 @@ def wrapped(*args, **kwargs):
         # to obtain task status
         if t.state == states.PENDING or t.state == states.RECEIVED or \
                 t.state == states.STARTED:
-            return '', 202, {'Location': url_for('tasks.get_status', id=t.id)}
+            app = Flask(__name__)
+            app.register_blueprint(tasks_bp)
+            with app.app_context() as actx:
+                url = current_app.url_for('tasks.get_status', id=t.id)
+                output = (
+                    '', 202, {'Location': url}
+                )
+            return output
 
         # If the task already finished, return its return value as response
         # if isinstance(t.info, list):
diff --git a/server/utils.py b/server/utils.py
@@ -1,23 +1,6 @@
 import time
-from flask import url_for as _url_for, current_app, _request_ctx_stack
 
 
 def timestamp():
     """Return the current timestamp in milli-second as an integer"""
     return int(round(time.time() * 1000))
-
-
-def url_for(*args, **kwargs):
-    """
-    url_for replacement that works even when there is no request context.
-    """
-    if '_external' not in kwargs:
-        kwargs['_external'] = False
-    reqctx = _request_ctx_stack.top
-    if reqctx is None:
-        if kwargs['_external']:
-            raise RuntimeError('Cannot generate external URLs without a '
-                               'request context.')
-        with current_app.test_request_context():
-            return _url_for(*args, **kwargs)
-    return _url_for(*args, **kwargs)
