Merge pull request #236 from lsst-sqre/tickets/DM-47986

DM-47986: Convert to Wobby and the new Safir UWS library
lsst-sqre · Dec 12, 2024 · 97843f0 · 97843f0
2 parents 97f5116 + 6a7bbaa
commit 97843f0
Show file tree

Hide file tree

Showing 24 changed files with 349 additions and 863 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -52,16 +52,6 @@ RUN useradd --create-home appuser
 # Copy the virtualenv
 COPY --from=install-image /opt/venv /opt/venv
 
-# Copy the Alembic configuration and migrations, and set that path as the
-# working directory so that Alembic can be run with a simple entry command
-# and no extra configuration.
-COPY --from=install-image /workdir/alembic.ini /app/alembic.ini
-COPY --from=install-image /workdir/alembic /app/alembic
-WORKDIR /app
-
-# Copy the startup script
-COPY scripts/start-frontend.sh /start-frontend.sh
-
 # Make sure we use the virtualenv
 ENV PATH="/opt/venv/bin:$PATH"
 
@@ -72,4 +62,4 @@ USER appuser
 EXPOSE 8080
 
 # Run the application.
-CMD ["/start-frontend.sh"]
+CMD ["uvicorn", "vocutouts.main:app", "--host", "0.0.0.0", "--port", "8080"]
diff --git a/alembic.ini b/alembic.ini
diff --git a/alembic/README.md b/alembic/README.md
diff --git a/alembic/docker-compose.yaml b/alembic/docker-compose.yaml
diff --git a/alembic/env.py b/alembic/env.py
diff --git a/alembic/script.py.mako b/alembic/script.py.mako
diff --git a/alembic/versions/20240912_1902_5ab72a20365b_initial_uws_schema.py b/alembic/versions/20240912_1902_5ab72a20365b_initial_uws_schema.py
diff --git a/changelog.d/20241021_232057_steliosvoutsinas_DM_47027.md b/changelog.d/20241021_232057_steliosvoutsinas_DM_47027.md
diff --git a/changelog.d/20241210_140315_rra_DM_47986.md b/changelog.d/20241210_140315_rra_DM_47986.md
@@ -0,0 +1,11 @@
+### Backwards-incompatible changes
+
+- Switch to Wobbly for job storage. All previous job history will be lost unless the vo-cutouts database is converted into Wobbly's storage format and inserted into Wobbly's database.
+
+### Bug fixes
+
+- Append a colon after the error code when reporting UWS errors.
+
+### Other changes
+
+- Render all UWS XML output except for error VOTables using vo-models rather than hand-written XML templates.
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,26 +21,17 @@ classifiers = [
 # be able to install vo-cutouts there so that we can use supporting code.
 requires-python = ">=3.11"
 dependencies = [
-    # FastAPI including some optional features
-    "fastapi",
-    "python-multipart",
-    "uvicorn[standard]",
-    # Other dependencies.
-    "alembic[tz]",
     "astropy",
     "click",
+    "fastapi",
     "pydantic>2",
     "pydantic-settings",
-    "safir[db,uws] @ git+https://github.com/lsst-sqre/safir@main#subdirectory=safir",
+    "safir[uws]>=9.0.1",
     "structlog",
+    "uvicorn[standard]",
 ]
-
-
 dynamic = ["version"]
 
-[project.scripts]
-vo-cutouts = "vocutouts.cli:main"
-
 [project.urls]
 Homepage = "https://github.com/lsst-sqre/vo-cutouts"
 Source = "https://github.com/lsst-sqre/vo-cutouts"
@@ -79,10 +70,7 @@ disallow_untyped_defs = true
 disallow_incomplete_defs = true
 ignore_missing_imports = true
 local_partial_types = true
-plugins = [
-    "pydantic.mypy",
-    "sqlalchemy.ext.mypy.plugin",
-]
+plugins = ["pydantic.mypy"]
 no_implicit_reexport = true
 show_error_codes = true
 strict_equality = true

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -144,7 +144,7 @@ click-log==0.4.0 \
     --hash=sha256:3970f8570ac54491237bcdb3d8ab5e3eef6c057df29f8c3d1151a51a9c23b975 \
     --hash=sha256:a43e394b528d52112af599f2fc9e4b7cf3c15f94e53581f74fa6867e68c91756
     # via scriv
-colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows' \
+colorama==0.4.6 ; platform_system == 'Windows' or sys_platform == 'win32' \
     --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
     --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
     # via