fractal-server 2.7.0a3__py3-none-any.whl → 2.7.0a4__py3-none-any.whl

fractal_server/tasks/v2/endpoint_operations.py

@@ -1,148 +1,14 @@
-import json
-from pathlib import Path
-from typing import Literal
-from typing import Optional
-from typing import Union
-from zipfile import ZipFile
-
 from fastapi import HTTPException
 from fastapi import status
 from httpx import AsyncClient
 from httpx import TimeoutException
 
-from ._TaskCollectPip import _TaskCollectPip
-from .utils import _parse_wheel_filename
-from .utils import get_python_interpreter_v2
-from fractal_server.app.schemas.v2 import ManifestV2
-from fractal_server.config import get_settings
-from fractal_server.logger import get_logger
 from fractal_server.logger import set_logger
-from fractal_server.syringe import Inject
-from fractal_server.utils import execute_command
 
 
-FRACTAL_PUBLIC_TASK_SUBDIR = ".fractal"
 logger = set_logger(__name__)
 
 
-async def download_package(
-    *,
-    task_pkg: _TaskCollectPip,
-    dest: Union[str, Path],
-) -> Path:
-    """
-    Download package to destination and return wheel-file path.
-    """
-    interpreter = get_python_interpreter_v2(
-        python_version=task_pkg.python_version
-    )
-    pip = f"{interpreter} -m pip"
-    if task_pkg.package_version is None:
-        package_and_version = f"{task_pkg.package_name}"
-    else:
-        package_and_version = (
-            f"{task_pkg.package_name}=={task_pkg.package_version}"
-        )
-    cmd = f"{pip} download --no-deps {package_and_version} -d {dest}"
-    stdout = await execute_command(command=cmd, cwd=Path("."))
-    pkg_file = next(
-        line.split()[-1] for line in stdout.split("\n") if "Saved" in line
-    )
-    return Path(pkg_file)
-
-
-def _load_manifest_from_wheel(
-    path: Path, wheel: ZipFile, logger_name: Optional[str] = None
-) -> ManifestV2:
-    logger = get_logger(logger_name)
-    namelist = wheel.namelist()
-    try:
-        manifest = next(
-            name for name in namelist if "__FRACTAL_MANIFEST__.json" in name
-        )
-    except StopIteration:
-        msg = f"{path.as_posix()} does not include __FRACTAL_MANIFEST__.json"
-        logger.error(msg)
-        raise ValueError(msg)
-    with wheel.open(manifest) as manifest_fd:
-        manifest_dict = json.load(manifest_fd)
-    manifest_version = str(manifest_dict["manifest_version"])
-    if manifest_version == "2":
-        pkg_manifest = ManifestV2(**manifest_dict)
-        return pkg_manifest
-    else:
-        msg = f"Manifest version {manifest_version=} not supported"
-        logger.error(msg)
-        raise ValueError(msg)
-
-
-def inspect_package(
-    path: Path, logger_name: Optional[str] = None
-) -> dict[Literal["pkg_version", "pkg_manifest"], str]:
-    """
-    Inspect task package to extract version and manifest
-
-    Note that this only works with wheel files, which have a well-defined
-    dist-info section. If we need to generalize to to tar.gz archives, we would
-    need to go and look for `PKG-INFO`.
-
-    Args:
-        path: Path of the package wheel file.
-        logger_name:
-
-    Returns:
-        A dictionary with keys `pkg_version` and `pkg_manifest`.
-    """
-
-    logger = get_logger(logger_name)
-
-    if not path.as_posix().endswith(".whl"):
-        raise ValueError(
-            "Only wheel packages are supported in Fractal "
-            f"(given {path.name})."
-        )
-
-    # Extract package name and version from wheel filename
-    _info = _parse_wheel_filename(wheel_filename=path.name)
-    pkg_version = _info["version"]
-
-    # Read and validate task manifest
-    logger.debug(f"Now reading manifest for {path.as_posix()}")
-    with ZipFile(path) as wheel:
-        pkg_manifest = _load_manifest_from_wheel(
-            path, wheel, logger_name=logger_name
-        )
-    logger.debug("Manifest read correctly.")
-
-    info = dict(
-        pkg_version=pkg_version,
-        pkg_manifest=pkg_manifest,
-    )
-    return info
-
-
-def create_package_dir_pip(
-    *,
-    task_pkg: _TaskCollectPip,
-    create: bool = True,
-) -> Path:
-    """
-    Create venv folder for a task package and return corresponding Path object
-    """
-    settings = Inject(get_settings)
-    user = FRACTAL_PUBLIC_TASK_SUBDIR
-    if task_pkg.package_version is None:
-        raise ValueError(
-            f"Cannot create venv folder for package `{task_pkg.package}` "
-            "with `version=None`."
-        )
-    package_dir = f"{task_pkg.package_name}{task_pkg.package_version}"
-    venv_path = settings.FRACTAL_TASKS_DIR / user / package_dir
-    if create:
-        venv_path.mkdir(exist_ok=False, parents=True)
-    return venv_path
-
-
 async def get_package_version_from_pypi(name: str) -> str:
     """
     Make a GET call to PyPI JSON API and get latest package version.

fractal_server/tasks/v2/templates/_1_create_venv.sh

@@ -7,16 +7,20 @@ write_log(){
 
 
 # Variables to be filled within fractal-server
+TASK_GROUP_DIR=__TASK_GROUP_DIR__
 PACKAGE_ENV_DIR=__PACKAGE_ENV_DIR__
 PYTHON=__PYTHON__
 
 TIME_START=$(date +%s)
 
-# Check that package folder does not exist
-if [ -d "$PACKAGE_ENV_DIR" ]; then
-    write_log "ERROR: Folder $PACKAGE_ENV_DIR already exists. Exit."
-    exit 1
-fi
+# Check that task-group and venv folders do not exist
+for DIR_TO_BE_CHECKED in "$TASK_GROUP_DIR" "$PACKAGE_ENV_DIR";
+do
+    if [ -d "$DIR_TO_BE_CHECKED" ]; then
+        write_log "ERROR: Folder $DIR_TO_BE_CHECKED already exists. Exit."
+        exit 1
+    fi
+done
 
 write_log "START mkdir -p $PACKAGE_ENV_DIR"
 mkdir -p $PACKAGE_ENV_DIR

fractal_server/tasks/v2/utils.py

@@ -45,6 +45,11 @@ def _parse_wheel_filename(wheel_filename: str) -> dict[str, str]:
     Note that we transform exceptions in `ValueError`s, since this function is
     also used within Pydantic validators.
     """
+    if "/" in wheel_filename:
+        raise ValueError(
+            "[_parse_wheel_filename] Input must be a filename, not a full "
+            f"path (given: {wheel_filename})."
+        )
     try:
         parts = wheel_filename.split("-")
         return dict(distribution=parts[0], version=parts[1])

fractal_server/utils.py

@@ -32,8 +32,8 @@ def get_timestamp() -> datetime:
 
 async def execute_command(
     *,
-    cwd: Path,
     command: str,
+    cwd: Optional[Path] = None,
     logger_name: Optional[str] = None,
 ) -> str:
     """
@@ -60,12 +60,13 @@ async def execute_command(
     cmd, *args = command_split
 
     logger = get_logger(logger_name)
+    cwd_kwarg = dict() if cwd is None else dict(cwd=cwd)
     proc = await asyncio.create_subprocess_exec(
         cmd,
         *args,
         stdout=asyncio.subprocess.PIPE,
         stderr=asyncio.subprocess.PIPE,
-        cwd=cwd,
+        **cwd_kwarg,
     )
     stdout, stderr = await proc.communicate()
     logger.debug(f"Subprocess call to: {command}")

{fractal_server-2.7.0a3.dist-info → fractal_server-2.7.0a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.7.0a3
+Version: 2.7.0a4
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.7.0a3.dist-info → fractal_server-2.7.0a4.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fractal_server/__init__.py,sha256=8F5In7R-H4qg5Yf7sXXB43RixMlW4SOmaCR83lziaso,24
-fractal_server/__main__.py,sha256=KqGiemsvIhrBeUlFDzIQsMEjOJW2BsH4qo_a_ldRQok,6362
+fractal_server/__init__.py,sha256=9_YO3JbGhl33GlqFo7oPg2NBzR2h2okm4r0G4hr4TvI,24
+fractal_server/__main__.py,sha256=dEkCfzLLQrIlxsGC-HBfoR-RBMWnJDgNrxYTyzmE9c0,6146
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/db/__init__.py,sha256=81rK9w1__Z6PJ5cEcChPVc-wI9YOK4fN--_5Opry0MQ,4119
@@ -16,11 +16,11 @@ fractal_server/app/models/v1/state.py,sha256=m9gMZqqnm3oDpJNJp-Lht4kM7oO7pcEI7sL
 fractal_server/app/models/v1/task.py,sha256=uFXam7eu3Ye1Yt7_g7llCzY8BetmDRilsq5hR2C1Zbg,2640
 fractal_server/app/models/v1/workflow.py,sha256=dnY5eMaOe3oZv8arn00RNX9qVkBtTLG-vYdWXcQuyo4,3950
 fractal_server/app/models/v2/__init__.py,sha256=yvIE6kuqYEoF_kuCjl1AIjpMRi0VuTDWRJaaEzs9RQ8,522
-fractal_server/app/models/v2/collection_state.py,sha256=nxb042i8tt8rCpmgbFJoBCYWU-34m0HdUfO9YurTp8k,588
+fractal_server/app/models/v2/collection_state.py,sha256=Yx18ZbywjraOdlHFyRVlb3VP101jBkOKkuOBIVD16fY,660
 fractal_server/app/models/v2/dataset.py,sha256=-7sxHEw4IIAvF_uSan7tA3o8hvoakBkQ0SRvqS2iOQU,1455
 fractal_server/app/models/v2/job.py,sha256=ypJmN-qspkKBGhBG7Mt-HypSQqcQ2EmB4Bzzb2-y550,1535
 fractal_server/app/models/v2/project.py,sha256=rAHoh5KfYwIaW7rTX0_O0jvWmxEvfo1BafvmcXuSSRk,786
-fractal_server/app/models/v2/task.py,sha256=SbTVkIUj7igL6-zhu8GigJK9oq4ddN4mXGvtlbjNbC0,2495
+fractal_server/app/models/v2/task.py,sha256=8cT_YBA5dyjBjunqCg23I-t3XZ62xJgiR-6brXISuLA,3337
 fractal_server/app/models/v2/workflow.py,sha256=YBgFGCziUgU0aJ5EM3Svu9W2c46AewZO9VBlFCHiSps,1069
 fractal_server/app/models/v2/workflowtask.py,sha256=iDuJYk8kp4PNqGmbKRtGI7y-QsbjkNd_gDsbMzL4i-g,1274
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,8 +29,8 @@ fractal_server/app/routes/admin/v1.py,sha256=GIpZlwAwwwLGDWkBqywhtmp9TGsKLhGmZAd
 fractal_server/app/routes/admin/v2/__init__.py,sha256=zkdrk3mSQWfgTJugS8Sc_Q_xCAwfmHUfdRe0DTaYT80,521
 fractal_server/app/routes/admin/v2/job.py,sha256=JmNmF5MeHtcDQzGadCJWwFNDQvB5G8SwVABaL11S1Vc,8268
 fractal_server/app/routes/admin/v2/project.py,sha256=luy-yiGX1JYTdPm1hpIdDUUqPm8xHuipLy9k2X6zu74,1223
-fractal_server/app/routes/admin/v2/task.py,sha256=T0DNtc8d4jZYS0gGKBcz6pwoeh30WSgkMuIUEw_yBjo,4406
-fractal_server/app/routes/admin/v2/task_group.py,sha256=aJhizy-EhM0Iupxq19w0lam7Prs_xTnGxyLFaL8I_AE,4545
+fractal_server/app/routes/admin/v2/task.py,sha256=5gUz3NSedFZN1d5pGhGQAuXxyHEaRlymqqXNKbuWX3c,4096
+fractal_server/app/routes/admin/v2/task_group.py,sha256=loxjJe9C2BBsG8gWkhHgrn6ReeE4mnipQ21PMP3MrKI,5398
 fractal_server/app/routes/api/__init__.py,sha256=2IDheFi0OFdsUg7nbUiyahqybvpgXqeHUXIL2QtWrQQ,641
 fractal_server/app/routes/api/v1/__init__.py,sha256=Y2HQdG197J0a7DyQEE2jn53IfxD0EHGhzK1I2JZuEck,958
 fractal_server/app/routes/api/v1/_aux_functions.py,sha256=P9Q48thGH95w0h5cacYoibxqgiiLW4oqZ8rNJ2LIISY,13219
@@ -38,28 +38,28 @@ fractal_server/app/routes/api/v1/dataset.py,sha256=KVfKdp-bT8eB14kCjTSmpji4a2IPI
 fractal_server/app/routes/api/v1/job.py,sha256=0jGxvu0xNQnWuov2qnoo9yE7Oat37XbcVn4Ute-UsiE,5370
 fractal_server/app/routes/api/v1/project.py,sha256=V-oeLiLs3vhD6STKiI2_mOyeB7FDUAcEXevHZbCWQ10,15956
 fractal_server/app/routes/api/v1/task.py,sha256=eW89nMCjpD4G6tHXDo2qGBKqWaPirjH6M3hpdJQhfa0,6528
-fractal_server/app/routes/api/v1/task_collection.py,sha256=VYxhtd_idBppgJM7-FCHikI2OKMAIz05fhV_TsJpWI8,9060
+fractal_server/app/routes/api/v1/task_collection.py,sha256=EPkuqnPtUpjpW6uQ1T9zAmtDhyNzhnyx0oJpr7mxYQ8,9066
 fractal_server/app/routes/api/v1/workflow.py,sha256=2T93DuEnSshaDCue-JPmjuvGCtbk6lt9pFMuPt783t8,11217
 fractal_server/app/routes/api/v1/workflowtask.py,sha256=OYYConwJbmNULDw5I3T-UbSJKrbbBiAHbbBeVcpoFKQ,5785
 fractal_server/app/routes/api/v2/__init__.py,sha256=_2Yce3aFT-t2FF_Yk_KbNgmG4FJKXlY3QTqib64yhIs,1807
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=ayRA66dnsaVGGhCsFJ4sbaseQSXo5bGbnwjOs4oCdKI,11893
-fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=1s_zuQUd4lPL2jqb7nPRP3ZcII6A4EmvX1Gi8xxxWHo,5713
+fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=rgBi9KrbewTVwsd2aUAFZ4VZpAZml2q6-ekmIkK_vY0,7969
 fractal_server/app/routes/api/v2/dataset.py,sha256=Eilf_BAGjicIhqUiVwI86jlW45ineA5sVzxXW4b2GoQ,8329
 fractal_server/app/routes/api/v2/images.py,sha256=JR1rR6qEs81nacjriOXAOBQjAbCXF4Ew7M7mkWdxBU0,7920
 fractal_server/app/routes/api/v2/job.py,sha256=Bga2Kz1OjvDIdxZObWaaXVhNIhC_5JKhKRjEH2_ayEE,5157
 fractal_server/app/routes/api/v2/project.py,sha256=eWYFJ7F2ZYQcpi-_n-rhPF-Q4gJhzYBsVGYFhHZZXAE,6653
 fractal_server/app/routes/api/v2/status.py,sha256=6N9DSZ4iFqbZImorWfEAPoyoFUgEruo4Hweqo0x0xXU,6435
 fractal_server/app/routes/api/v2/submit.py,sha256=h7mjmea_VNCriGiA4HRuyxLHlvd9aGfTAFXK3bSsvzc,9422
-fractal_server/app/routes/api/v2/task.py,sha256=FRYHJTvr_tl62HvwKgHSayLrT0gCNeGwU9k9bsiSqws,8302
-fractal_server/app/routes/api/v2/task_collection.py,sha256=9trKrJDuaKKgdn-mG06VuFpyObhbcCD8AstaxN4lAOM,13507
-fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=CIJ4ZYPRtKvC6JVkagQPVFm6A53mOeDIPD8-y1lPJLc,7433
-fractal_server/app/routes/api/v2/task_group.py,sha256=yRUCMZtXH9KdfD2pfdCKPBGf_eVn-S5CXFHCUyXAoJk,4078
-fractal_server/app/routes/api/v2/workflow.py,sha256=aG5hs7oj-em2EpydgBPE4xPKrlKxD6NXuLhKkfdG79c,12116
+fractal_server/app/routes/api/v2/task.py,sha256=R_1bCinQvNrkEh6uAguNNfimduz1uJzgN_iTDwjnVF4,7209
+fractal_server/app/routes/api/v2/task_collection.py,sha256=ncFSYv9VtBrWR8lEW6ZxpDUmk6h0NLuGxJFKlhjhXHM,11456
+fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=9T0U_4gqrQbJCy6uFDCMSZ-b1sfNIzyz_qm4P41W2Gs,6133
+fractal_server/app/routes/api/v2/task_group.py,sha256=1uvhO7-Zgr6so5Ovn2PDiFKbqvbeGv6RrguZym8yZr0,5131
+fractal_server/app/routes/api/v2/workflow.py,sha256=jxBgxjKjrtO8T9Y-IOZb1az9NeuhUY4Ma5wd-1uvvoE,10575
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=TIOePM13uK3GKVhtGK2wBB341ZFheBYQKTfXuPfdymE,6999
 fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
-fractal_server/app/routes/auth/_aux_auth.py,sha256=6GERRDXK4P-2OA81bjxJZEw6hN4QCk5x7MqDNtN7VG4,4746
+fractal_server/app/routes/auth/_aux_auth.py,sha256=ifkNocTYatBSMYGwiR14qohmvR9SfMldceiEj6uJBrU,4783
 fractal_server/app/routes/auth/current_user.py,sha256=v767HGi8k076ZHoErlU4Vv0_c8HQqYmi8ncjzZZDaDE,4455
-fractal_server/app/routes/auth/group.py,sha256=eT-1c0Ow8KbYkKEMQ5ebhEAeRixwJs2kQW45UIutH5w,5833
+fractal_server/app/routes/auth/group.py,sha256=riav97YGJHqAwcbjbZcSYPfx8kEnyUnYe37155dMAmU,6548
 fractal_server/app/routes/auth/login.py,sha256=tSu6OBLOieoBtMZB4JkBAdEgH2Y8KqPGSbwy7NIypIo,566
 fractal_server/app/routes/auth/oauth.py,sha256=AnFHbjqL2AgBX3eksI931xD6RTtmbciHBEuGf9YJLjU,1895
 fractal_server/app/routes/auth/register.py,sha256=DlHq79iOvGd_gt2v9uwtsqIKeO6i_GKaW59VIkllPqY,587
@@ -127,7 +127,7 @@ fractal_server/app/runner/v2/merge_outputs.py,sha256=IHuHqbKmk97K35BFvTrKVBs60z3
 fractal_server/app/runner/v2/runner.py,sha256=nw9oYt3cFItHWVoevJyMI63K0kWHCTAriAQ_KINo_F8,13039
 fractal_server/app/runner/v2/runner_functions.py,sha256=BLREIcQaE6FSc2AEJyZuiYk6rGazEz_9gprUqUZDljs,9488
 fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=1fWvQ6YZUUnDhO_mipXC5hnaT-zK-GHxg8ayoxZX82k,3648
-fractal_server/app/runner/v2/task_interface.py,sha256=myS-kT0DsJ8xIJZBVEzgD8g54VbiwL6i7Im3e1zcVHQ,1866
+fractal_server/app/runner/v2/task_interface.py,sha256=hT3p-bRGsLNAR_dNv_PYFoqzIF_EQtSsGwl38j1haYA,1824
 fractal_server/app/runner/versions.py,sha256=dSaPRWqmFPHjg20kTCHmi_dmGNcCETflDtDLronNanU,852
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
 fractal_server/app/schemas/_validators.py,sha256=XKEGEHxp3H6YSJewtFWXe_2Nh7SDdNtAXmlEmJO6Vb0,3606
@@ -145,33 +145,34 @@ fractal_server/app/schemas/v1/task.py,sha256=7BxOZ_qoRQ8n3YbQpDvB7VMcxB5fSYQmR5R
 fractal_server/app/schemas/v1/task_collection.py,sha256=uvq9bcMaGD_qHsh7YtcpoSAkVAbw12eY4DocIO3MKOg,3057
 fractal_server/app/schemas/v1/workflow.py,sha256=tuOs5E5Q_ozA8if7YPZ07cQjzqB_QMkBS4u92qo4Ro0,4618
 fractal_server/app/schemas/v2/__init__.py,sha256=BHbRPSBLjGaCpmjd8OJSycKhBLfZY5b1lj0z9sLR17o,2273
-fractal_server/app/schemas/v2/dataset.py,sha256=dLT52tV4dSf2HrFNak4vdQEn8PT_04IUrGnd2z-AXIU,2599
-fractal_server/app/schemas/v2/dumps.py,sha256=ZrJCHTv9oU2QMNjPUSBO3DIPRO3qDvbxpAGpernpf-Q,1720
-fractal_server/app/schemas/v2/job.py,sha256=zfF9K3v4jWUJ7M482ta2CkqUJ4tVT4XfVt60p9IRhP0,3250
+fractal_server/app/schemas/v2/dataset.py,sha256=865ia13E9mWu1DaYyppKW2csNYglaInrScrprdVYX7A,2552
+fractal_server/app/schemas/v2/dumps.py,sha256=xh5P_tJEhJ2VfGsMbBNOwosDT7Ee8lnxPSTAlF1ZR98,1737
+fractal_server/app/schemas/v2/job.py,sha256=oYSLYkQ0HL83QyjEGIaggtZ117FndzFlONMKWd9sTXM,3270
 fractal_server/app/schemas/v2/manifest.py,sha256=eHfDjth8cSDiuYeDMfBOte8sMHOI74DC0VlhebhUXvY,6545
-fractal_server/app/schemas/v2/project.py,sha256=u7S4B-bote1oGjzAGiZ-DuQIyeRAGqJsI71Tc1EtYE0,736
+fractal_server/app/schemas/v2/project.py,sha256=UXEA0UUUe0bFFOVLLmVtvDFLBO5vmD1JVI7EeTIcwDo,756
 fractal_server/app/schemas/v2/status.py,sha256=SQaUpQkjFq5c5k5J4rOjNhuQaDOEg8lksPhkKmPU5VU,332
-fractal_server/app/schemas/v2/task.py,sha256=8iuugQR_ol-bP9nFkANt2JjjBtEzzTifrBmTWpV4QF4,6557
-fractal_server/app/schemas/v2/task_collection.py,sha256=_utBv7_kcRJCbPdWezasU8GrikI_QFPKeIl4vyAgDd4,6155
-fractal_server/app/schemas/v2/task_group.py,sha256=LRW_sggWUqnXVkmicmwxMbxRRYbSJmzg0Np-Dm0uBDU,1217
-fractal_server/app/schemas/v2/workflow.py,sha256=7jqZhGn6plFSU8EkQsvvnDMh5N8m7GouRt1DIXmweIA,1986
-fractal_server/app/schemas/v2/workflowtask.py,sha256=t29n7TM2Z_bcFC8RKor694dcU_cGaasUSuX4Q9oQikY,5758
+fractal_server/app/schemas/v2/task.py,sha256=bm0qG_Zt6ClJHh6uSSb-vWxiKmh0x1gAQgMmtQayCk8,6648
+fractal_server/app/schemas/v2/task_collection.py,sha256=Ddw_7QaQ93kdEIwWQvzLQDu03gho_OHdhah3n0ioK3M,6296
+fractal_server/app/schemas/v2/task_group.py,sha256=F40u64z-wXHNPFjx9RHozzl_SySTHfKFc-sBFyn_e0I,2352
+fractal_server/app/schemas/v2/workflow.py,sha256=HSNQSrBRdoBzh8Igr76FUWCAWvVzykrqmUv1vGv-8og,2026
+fractal_server/app/schemas/v2/workflowtask.py,sha256=2T5LcourImZwlZa3PNsF_JM-I0fEAzWMhx1Y8KY0Ak8,5798
 fractal_server/app/security/__init__.py,sha256=V1NOWlmaFZHMR6SrkMl62jyAuqYONyo8lyGvR6UZesM,12312
 fractal_server/app/user_settings.py,sha256=aZgQ3i0JkHfgwLGW1ee6Gzr1ae3IioFfJKKSsSS8Svk,1312
 fractal_server/config.py,sha256=gX0aYwDwbC5y7JNorifON84YMveubb7XTb4sH14N3KM,23667
-fractal_server/data_migrations/2_7_0.py,sha256=ReB664szR2w9_mblfEilYYkVzs8Wi61O1_9G1gDtoQQ,9405
+fractal_server/data_migrations/2_7_0.py,sha256=HWReCLmfz_abEzKEAbDflNjH5kQEgTpzjiKCWexNaTk,9133
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
 fractal_server/images/__init__.py,sha256=xO6jTLE4EZKO6cTDdJsBmK9cdeh9hFTaSbSuWgQg7y4,196
-fractal_server/images/models.py,sha256=9ipU5h4N6ogBChoB-2vHoqtL0TXOHCv6kRR-fER3mkM,4167
+fractal_server/images/models.py,sha256=UlWazUOFQtpS3pZuROjcJXviG_Ai453jqUDHdzuvD5w,4170
 fractal_server/images/tools.py,sha256=gxeniYy4Z-cp_ToK2LHPJUTVVUUrdpogYdcBUvBuLiY,2209
 fractal_server/logger.py,sha256=56wfka6fHaa3Rx5qO009nEs_y8gx5wZ2NUNZZ1I-uvc,5130
-fractal_server/main.py,sha256=68rVybnviF28yFgRhfHZXwnf6LyzkcmeYYZZppboU4M,4925
+fractal_server/main.py,sha256=gStLT9Du5QMpc9SyvRvtKU21EKwp-dG4HL3zGHzE06A,4908
 fractal_server/migrations/README,sha256=4rQvyDfqodGhpJw74VYijRmgFP49ji5chyEemWGHsuw,59
 fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
 fractal_server/migrations/script.py.mako,sha256=oMXw9LC3zRbinWWPPDgeZ4z9FJrV2zhRWiYdS5YgNbI,526
+fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=vrPhC8hfFu1c4HmLHNZyCuqEfecFD8-bWc49bXMNes0,6199
 fractal_server/migrations/versions/091b01f51f88_add_usergroup_and_linkusergroup_table.py,sha256=-BSS9AFTPcu3gYC-sYbawSy4MWQQx8TfMb5BW5EBKmQ,1450
 fractal_server/migrations/versions/4c308bcaea2b_add_task_args_schema_and_task_args_.py,sha256=-wHe-fOffmYeAm0JXVl_lxZ7hhDkaEVqxgxpHkb_uL8,954
 fractal_server/migrations/versions/4cedeb448a53_workflowtask_foreign_keys_not_nullables.py,sha256=Mob8McGYAcmgvrseyyYOa54E6Gsgr-4SiGdC-r9O4_A,1157
@@ -180,8 +181,6 @@ fractal_server/migrations/versions/50a13d6138fd_initial_schema.py,sha256=zwXegXs
 fractal_server/migrations/versions/5bf02391cfef_v2.py,sha256=axhNkr_H6R4rRbY7oGYazNbFvPXeSyBDWFVbKNmiqs8,8433
 fractal_server/migrations/versions/70e77f1c38b0_add_applyworkflow_first_task_index_and_.py,sha256=Q-DsMzG3IcUV2Ol1dhJWosDvKERamBE6QvA2zzS5zpQ,1632
 fractal_server/migrations/versions/71eefd1dd202_add_slurm_accounts.py,sha256=mbWuCkTpRAdGbRhW7lhXs_e5S6O37UAcCN6JfoY5H8A,1353
-fractal_server/migrations/versions/742b74e1cc6e_revamp_taskv2_and_taskgroupv2.py,sha256=CHihUE7dfHfVwweH_ijdGw_l7XGM0UfXDqXwAG9FKBg,3002
-fractal_server/migrations/versions/7cf1baae8fb4_task_group_v2.py,sha256=793xuEk8Pr28q1Hfe9_qNWWtU6ysXYdOFVRUPO_MB1o,1996
 fractal_server/migrations/versions/84bf0fffde30_add_dumps_to_applyworkflow.py,sha256=NSCuhANChsg76vBkShBl-9tQ4VEHubOjtAv1etHhlvY,2684
 fractal_server/migrations/versions/8f79bd162e35_add_docs_info_and_docs_link_to_task_.py,sha256=6pgODDtyAxevZvAJBj9IJ41inhV1RpwbpZr_qfPPu1A,1115
 fractal_server/migrations/versions/94a47ea2d3ff_remove_cache_dir_slurm_user_and_slurm_.py,sha256=yL3-Hvzw5jBLKj4LFP1z5ofZE9L9W3tLwYtPNW7z4ko,1508
@@ -192,41 +191,39 @@ fractal_server/migrations/versions/9fd26a2b0de4_add_workflow_timestamp_created.p
 fractal_server/migrations/versions/a7f4d6137b53_add_workflow_dump_to_applyworkflow.py,sha256=ekDUML7ILpmdoqEclKbEUdyLi4uw9HSG_sTjG2hp_JE,867
 fractal_server/migrations/versions/d4fe3708d309_make_applyworkflow_workflow_dump_non_.py,sha256=6cHEZFuTXiQg9yu32Y3RH1XAl71av141WQ6UMbiITIg,949
 fractal_server/migrations/versions/da2cb2ac4255_user_group_viewer_paths.py,sha256=yGWSA2HIHUybcVy66xBITk08opV2DFYSCIIrulaUZhI,901
-fractal_server/migrations/versions/df7cc3501bf7_linkusergroup_timestamp_created.py,sha256=pkF9ocXKYCsIeVXf8kDRK4hmIgv7UHCytJu2U-X1n7w,1134
 fractal_server/migrations/versions/e75cac726012_make_applyworkflow_start_timestamp_not_.py,sha256=lOggSvzGWqQvnxxFuSM6W50Ui49R918A-uBuiZJ0pNM,963
 fractal_server/migrations/versions/efa89c30e0a4_add_project_timestamp_created.py,sha256=jilQW3QIqYQ4Q6hCnUiG7UtNMpA41ujqrB3tPFiPM1Q,1221
 fractal_server/migrations/versions/f384e1c0cf5d_drop_task_default_args_columns.py,sha256=9BwqUS9Gf7UW_KjrzHbtViC880qhD452KAytkHWWZyk,746
 fractal_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/ssh/__init__.py,sha256=sVUmzxf7_DuXG1xoLQ1_00fo5NPhi2LJipSmU5EAkPs,124
 fractal_server/ssh/_fabric.py,sha256=Fw6NZl8YnlShYTL-jmuPpbJ_Kn2pDRAIRY3bbDcnMA8,16214
-fractal_server/string_tools.py,sha256=bEcGNzlZJ3fj4IjRBXM34Klt25Amfx5AbeTHqPwnAqM,2264
+fractal_server/string_tools.py,sha256=Z4qcleqXSG6RCG4hqS1emm0U-Bvv0sgTm_T87ZdYn7M,2395
 fractal_server/syringe.py,sha256=3qSMW3YaMKKnLdgnooAINOPxnCOxP7y2jeAQYB21Gdo,2786
 fractal_server/tasks/__init__.py,sha256=kadmVUoIghl8s190_Tt-8f-WBqMi8u8oU4Pvw39NHE8,23
 fractal_server/tasks/utils.py,sha256=wucz57I7G0Vd8hvtmvonlryACx9zIVlqfxG5I87MJ80,1820
-fractal_server/tasks/v1/_TaskCollectPip.py,sha256=16Gn8lVYHBuwNLBHdcdx0X8s9QXXsbfPwSzcCcM6fRg,3775
+fractal_server/tasks/v1/_TaskCollectPip.py,sha256=ARq5AoHYXH0hziEsb-nFAqbsLA-VIddXOdXL38O6_zA,3746
 fractal_server/tasks/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/tasks/v1/background_operations.py,sha256=6EGnZ0kG_N-LUcmUmWNztobmjwMIrO1Al9fMOnCK7Vo,11766
+fractal_server/tasks/v1/background_operations.py,sha256=OlRMFY4i6J5EQ_ofDUjAPYDhTDF3QHT7hqXRc06EBio,11772
 fractal_server/tasks/v1/endpoint_operations.py,sha256=YyMU1Y3Xt7D9WOKqaMLuwEoIaAqQP2Klz3I-ypAgOLI,5077
 fractal_server/tasks/v1/get_collection_data.py,sha256=bi9tuApLgoKZNMIG1kR4GoKI9S6Y040gFfNQapw4ikM,502
 fractal_server/tasks/v1/utils.py,sha256=J9oKys-82OehBxOon5wWl3CxjVBgYWeVEEyWGVFnreI,1759
-fractal_server/tasks/v2/_TaskCollectPip.py,sha256=kWQNMNZ8OEddkYhmhsk3E6ArcaD7qe4vsjYYx9vbrUg,4900
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/tasks/v2/_venv_pip.py,sha256=6NCItfeWgO9BDnlfhoCfiUG5UCGGz_SJz4Mfn4Jg_nk,6489
-fractal_server/tasks/v2/background_operations.py,sha256=CcaIzhQTqtw4wnlN3A-vLLSm6qOJvzrfG-12Jg0iC1I,11604
-fractal_server/tasks/v2/background_operations_ssh.py,sha256=9mj4t3cNJ8a268ykoj7lukXSojXi2dme7od1Uf_lVq4,14917
-fractal_server/tasks/v2/database_operations.py,sha256=_55kLUMWuOYQANuN0QDtDt-GWby4hDKPJp5NOB4ZoxA,1396
-fractal_server/tasks/v2/endpoint_operations.py,sha256=v1p3lFa3nuQ0ydv2T-cUQF42mZodz62C4tuiOKsA858,5637
-fractal_server/tasks/v2/templates/_1_create_venv.sh,sha256=5uW0ETYxl5xiQEXP107zgq8V_-vf3k5NzMMj1hSLjas,1015
+fractal_server/tasks/v2/_venv_pip.py,sha256=FOD20yKfTsW7sim3h7CsB6pgp85JBhELyYvbkpaiDKA,6390
+fractal_server/tasks/v2/background_operations.py,sha256=B_Djcd0LKQuYk_6bgg4keEXkCH5kEwMlpHap9tk5QzY,15399
+fractal_server/tasks/v2/background_operations_ssh.py,sha256=RcMshcrj04r70hnyCB9aANk-8x8gr55AeP3v0gS7-Ts,13410
+fractal_server/tasks/v2/database_operations.py,sha256=6r56yyFPnEBrXl6ncmO6D76znzISQCFZqCYcD-Ummd4,1213
+fractal_server/tasks/v2/endpoint_operations.py,sha256=3bMLnwncAbOb_l9jW_94oNpmU7AMJDXM36bpQNk-tzU,1413
+fractal_server/tasks/v2/templates/_1_create_venv.sh,sha256=7tt-B6n8KRN-pannZ0enE6XSxyq-hKRYRGY63CvtINI,1151
 fractal_server/tasks/v2/templates/_2_upgrade_pip.sh,sha256=ca5Yng6JgJYu-a4QrsIsatwUmrLdRWBKw7_VJrY7WLY,555
 fractal_server/tasks/v2/templates/_3_pip_install.sh,sha256=T9sabeB9iQzVZpLfuLkKGz9EpfHkUrJHKWO4HNij6yM,595
 fractal_server/tasks/v2/templates/_4_pip_freeze.sh,sha256=qHdDKu1svXi1VQKGePciEJK4_uEKuwAvwaDCcGxSvNk,274
 fractal_server/tasks/v2/templates/_5_pip_show.sh,sha256=GrJ19uHYQxANEy9JaeNJZVTquY9c8Ww9eCdnC7eLVr0,1754
-fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kqXRM,1657
+fractal_server/tasks/v2/utils.py,sha256=MnY6MhcxDRo4rPuXo2tQ252eWEPZF3OlCGe-p5MrG9U,1846
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
-fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
+fractal_server/utils.py,sha256=jrlCBPmC7F0ptBVcDac-EbZNsdYTLbHfX9oxkXthS5Q,2193
 fractal_server/zip_tools.py,sha256=xYpzBshysD2nmxkD5WLYqMzPYUcCRM3kYy-7n9bJL-U,4426
-fractal_server-2.7.0a3.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.7.0a3.dist-info/METADATA,sha256=rovIICs2nBroN4xAIpjuVgTPhmY985uWMIuWQDPjl3g,4630
-fractal_server-2.7.0a3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.7.0a3.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.7.0a3.dist-info/RECORD,,
+fractal_server-2.7.0a4.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.7.0a4.dist-info/METADATA,sha256=Qr2jnRh7ETsVojqsgBF9_O3PKPdyABXi0KMstyhSTr8,4630
+fractal_server-2.7.0a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.7.0a4.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.7.0a4.dist-info/RECORD,,

fractal_server/migrations/versions/742b74e1cc6e_revamp_taskv2_and_taskgroupv2.py

@@ -1,101 +0,0 @@
-"""Revamp TaskV2 and TaskGroupV2
-
-Revision ID: 742b74e1cc6e
-Revises: df7cc3501bf7
-Create Date: 2024-10-07 16:56:37.399878
-
-"""
-import sqlalchemy as sa
-import sqlmodel
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision = "742b74e1cc6e"
-down_revision = "df7cc3501bf7"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "origin", sqlmodel.sql.sqltypes.AutoString(), nullable=False
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "pkg_name", sqlmodel.sql.sqltypes.AutoString(), nullable=False
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "version", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "python_version",
-                sqlmodel.sql.sqltypes.AutoString(),
-                nullable=True,
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "path", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "venv_path", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "pip_extras", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-
-    with op.batch_alter_table("taskv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "category", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "modality", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "authors", sqlmodel.sql.sqltypes.AutoString(), nullable=True
-            )
-        )
-        batch_op.add_column(
-            sa.Column("tags", sa.JSON(), server_default="[]", nullable=False)
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("taskv2", schema=None) as batch_op:
-        batch_op.drop_column("tags")
-        batch_op.drop_column("authors")
-        batch_op.drop_column("modality")
-        batch_op.drop_column("category")
-
-    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
-        batch_op.drop_column("pip_extras")
-        batch_op.drop_column("venv_path")
-        batch_op.drop_column("path")
-        batch_op.drop_column("python_version")
-        batch_op.drop_column("version")
-        batch_op.drop_column("pkg_name")
-        batch_op.drop_column("origin")
-
-    # ### end Alembic commands ###

fractal_server/migrations/versions/7cf1baae8fb4_task_group_v2.py

@@ -1,66 +0,0 @@
-"""task group v2
-
-Revision ID: 7cf1baae8fb4
-Revises: da2cb2ac4255
-Create Date: 2024-10-01 12:31:46.792037
-
-"""
-import sqlalchemy as sa
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision = "7cf1baae8fb4"
-down_revision = "da2cb2ac4255"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "taskgroupv2",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("user_group_id", sa.Integer(), nullable=True),
-        sa.Column("active", sa.Boolean(), nullable=False),
-        sa.Column(
-            "timestamp_created", sa.DateTime(timezone=True), nullable=False
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_group_id"],
-            ["usergroup.id"],
-            name=op.f("fk_taskgroupv2_user_group_id_usergroup"),
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_id"],
-            ["user_oauth.id"],
-            name=op.f("fk_taskgroupv2_user_id_user_oauth"),
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_taskgroupv2")),
-    )
-    with op.batch_alter_table("taskv2", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column("taskgroupv2_id", sa.Integer(), nullable=True)
-        )
-        batch_op.create_foreign_key(
-            batch_op.f("fk_taskv2_taskgroupv2_id_taskgroupv2"),
-            "taskgroupv2",
-            ["taskgroupv2_id"],
-            ["id"],
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("taskv2", schema=None) as batch_op:
-        batch_op.drop_constraint(
-            batch_op.f("fk_taskv2_taskgroupv2_id_taskgroupv2"),
-            type_="foreignkey",
-        )
-        batch_op.drop_column("taskgroupv2_id")
-
-    op.drop_table("taskgroupv2")
-    # ### end Alembic commands ###

fractal_server/migrations/versions/df7cc3501bf7_linkusergroup_timestamp_created.py

@@ -1,42 +0,0 @@
-"""LinkUserGroup.timestamp_created
-
-Revision ID: df7cc3501bf7
-Revises: 7cf1baae8fb4
-Create Date: 2024-10-03 13:55:53.272269
-
-"""
-from datetime import datetime
-from datetime import timezone
-
-import sqlalchemy as sa
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision = "df7cc3501bf7"
-down_revision = "7cf1baae8fb4"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("linkusergroup", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "timestamp_created",
-                sa.DateTime(timezone=True),
-                nullable=False,
-                server_default=str(datetime(2000, 1, 1, tzinfo=timezone.utc)),
-            )
-        )
-
-    with op.batch_alter_table("project", schema=None) as batch_op:
-        batch_op.alter_column("timestamp_created", server_default=None)
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("linkusergroup", schema=None) as batch_op:
-        batch_op.drop_column("timestamp_created")
-
-    # ### end Alembic commands ###