Skip to content

Commit e11e179

Browse files
committed
Don't bother to authenticate a version check. Makes updating installs easier
1 parent d57cea4 commit e11e179

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

src/murfey/server/api.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from pathlib import Path
88
from typing import Dict, List
99

10-
import packaging.version
1110
import sqlalchemy
1211
from fastapi import APIRouter, Depends, Request
1312
from fastapi.responses import FileResponse, HTMLResponse
@@ -1132,23 +1131,6 @@ async def request_tomography_preprocessing(
11321131
return proc_file
11331132

11341133

1135-
@router.get("/version")
1136-
def get_version(client_version: str = ""):
1137-
result = {
1138-
"server": murfey.__version__,
1139-
"oldest-supported-client": murfey.__supported_client_version__,
1140-
}
1141-
1142-
if client_version:
1143-
client = packaging.version.parse(client_version)
1144-
server = packaging.version.parse(murfey.__version__)
1145-
minimum_version = packaging.version.parse(murfey.__supported_client_version__)
1146-
result["client-needs-update"] = minimum_version > client
1147-
result["client-needs-downgrade"] = client > server
1148-
1149-
return result
1150-
1151-
11521134
@router.post("/visits/{visit_name}/suggested_path")
11531135
def suggest_path(visit_name, params: SuggestedPathParameters):
11541136
count: int | None = None

src/murfey/server/bootstrap.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from fastapi import APIRouter, HTTPException, Request, Response
2525
from fastapi.responses import FileResponse, HTMLResponse
2626

27+
import murfey
2728
from murfey.server import get_machine_config, respond_with_template
2829

2930
tag = {
@@ -38,6 +39,7 @@
3839
pypi = APIRouter(prefix="/pypi", tags=["bootstrap"])
3940
plugins = APIRouter(prefix="/plugins", tags=["bootstrap"])
4041
cygwin = APIRouter(prefix="/cygwin", tags=["bootstrap"])
42+
version = APIRouter(prefix="/version", tags=["bootstrap"])
4143

4244
log = logging.getLogger("murfey.server.bootstrap")
4345

@@ -362,3 +364,20 @@ def parse_cygwin_request(request_path: str):
362364
media_type=cygwin_data.headers.get("Content-Type"),
363365
status_code=cygwin_data.status_code,
364366
)
367+
368+
369+
@version.get("/")
370+
def get_version(client_version: str = ""):
371+
result = {
372+
"server": murfey.__version__,
373+
"oldest-supported-client": murfey.__supported_client_version__,
374+
}
375+
376+
if client_version:
377+
client = packaging.version.parse(client_version)
378+
server = packaging.version.parse(murfey.__version__)
379+
minimum_version = packaging.version.parse(murfey.__supported_client_version__)
380+
result["client-needs-update"] = minimum_version > client
381+
result["client-needs-downgrade"] = client > server
382+
383+
return result

src/murfey/server/main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class Settings(BaseSettings):
5757
app.include_router(murfey.server.bootstrap.cygwin)
5858
app.include_router(murfey.server.bootstrap.pypi)
5959
app.include_router(murfey.server.bootstrap.plugins)
60+
app.include_router(murfey.server.bootstrap.version)
6061
app.include_router(murfey.server.clem.api.router)
6162
app.include_router(murfey.server.auth.api.router)
6263
app.include_router(murfey.server.websocket.ws)

0 commit comments

Comments
 (0)