Merge pull request #1690 from fractal-analytics-platform/1527-switch-…

…from-uvicorn-to-uvicorn-worker Switch from `uvicorn.workers` to `uvicorn-worker`
fractal-analytics-platform · Jul 31, 2024 · 3a5cd17 · 3a5cd17
2 parents 48286a1 + 3f555c8
commit 3a5cd17
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 **Note**: Numbers like (\#1234) point to closed Pull Requests on the fractal-server repository.
 
+# 2.3.8 (Unreleased)
+
+* App:
+    * `UvicornWorker` is now imported from `uvicorn-worker` (\#1690).
+
 # 2.3.7
 
 * SSH SLURM executor:
@@ -13,14 +18,15 @@
     * When creating a WorkflowTask, do not pre-populate its top-level arguments based on JSON Schema default values (\#1688).
 * Dependencies:
     * Update `sqlmodel` to `^0.0.21` (\#1674).
+    * Add `uvicorn-worker` (\#1690).
 
 # 2.3.5
 
 > WARNING: The `pre_submission_commands` SLURM configuration is included as an
 > experimental feature, since it is still not useful for its main intended
 > goal (calling `module load` before running `sbatch`).
 
-* SLURM runners
+* SLURM runners:
     * Expose `gpus` SLURM parameter (\#1678).
     * For SSH executor, add `pre_submission_commands` (\#1678).
     * Removed obsolete arguments from `get_slurm_config` function (\#1678).

diff --git a/fractal_server/gunicorn_fractal.py b/fractal_server/gunicorn_fractal.py
@@ -3,7 +3,7 @@
 import signal
 
 from gunicorn.glogging import Logger as GunicornLogger
-from uvicorn.workers import UvicornWorker
+from uvicorn_worker import UvicornWorker
 
 logger = logging.getLogger("uvicorn.error")
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -45,6 +45,7 @@ gunicorn = { version = ">=21.2,<23.0", optional = true }
 psycopg = { version = "^3.1.0", extras=["binary"], optional=true }
 psycopg2 = { version = "^2.9.5", optional = true }
 psutil = "^5.9.8"
+uvicorn-worker = "^0.2.0"
 
 [tool.poetry.extras]
 postgres = ["asyncpg", "psycopg2"]