move validation to external function

Author: ychiucco

fractal_server/app/routes/api/v2/task_collection_pixi.py

@@ -8,8 +8,6 @@
 from fastapi import Response
 from fastapi import status
 from fastapi import UploadFile
-from packaging.version import InvalidVersion
-from packaging.version import parse
 
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
@@ -26,9 +24,29 @@
 logger = set_logger(__name__)
 
 
+def get_pkgname_and_version(filename: str) -> tuple[str, str]:
+    if not filename.endswith(".tar.gz"):
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=f"{filename=} does not end with '.tar.gz'.",
+        )
+    filename_splitted = filename.split("-")
+    if len(filename_splitted) < 2:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                f"{filename=} does not contain a '-' to separate "
+                "'pkg_name' from 'version'."
+            ),
+        )
+    pkg_name = filename_splitted[0]
+    version = filename.removeprefix(f"{pkg_name}-").removesuffix(".tar.gz")
+    return pkg_name, version
+
+
 @router.post(
     "/collect/pixi/",
-    status_code=201,
+    status_code=202,
     # response_model=TaskGroupActivityV2Read,
 )
 async def collect_task_pixi(
@@ -42,20 +60,4 @@ async def collect_task_pixi(
     user: UserOAuth = Depends(current_active_verified_user),
     db: AsyncSession = Depends(get_async_db),
 ):  # -> TaskGroupActivityV2Read:
-    filename = file.filename
-    if not filename.endswith(".tar.gz"):
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=f"{filename=} does not end with '.tar.gz'.",
-        )
-    pkg_name = filename.split("-")[0]
-    version = filename.removeprefix(f"{pkg_name}-").removesuffix(".tar.gz")
-    try:
-        parse(version)
-    except InvalidVersion:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=(
-                f"Detected {pkg_name=} and {version=}, but version is invalid."
-            ),
-        )
+    pkg_name, version = get_pkgname_and_version(file.filename)

tests/v2/test_06_tasks_lifecycle/test_api_task_collection_pixi.py

@@ -28,18 +28,20 @@ def empty_tar_gz(filename) -> dict:
             data={"pixi_version": "1.2.3"},
             files=empty_tar_gz("mypackage-0.1.2-a345"),
         )
-        assert res.status_code == 201
+        assert res.status_code == 202
 
         res = await client.post(
             "api/v2/task/collect/pixi/",
             data={"pixi_version": "1.2.3"},
             files=empty_tar_gz("my-package-0.1.2-a345"),
         )
-        assert res.status_code == 422
+        # pkg_name == my
+        # version == package-0.1.2-a345
+        assert res.status_code == 202
 
         res = await client.post(
             "api/v2/task/collect/pixi/",
             data={"pixi_version": "1.2.3"},
-            files=empty_tar_gz("mypackage-a.b.c"),
+            files=empty_tar_gz("mypackage0.1.2a345"),
         )
         assert res.status_code == 422