fractal-server 2.3.0a1__py3-none-any.whl → 2.3.0a2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.3.0a1"
+__VERSION__ = "2.3.0a2"

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

@@ -49,15 +49,33 @@ async def collect_task_custom(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                 detail="Cannot infer 'package_root' with 'slurm_ssh' backend.",
             )
+        package_name_underscore = task_collect.package_name.replace("-", "_")
+        # Note that python_command is then used as part of a subprocess.run
+        # statement: be careful with mixing `'` and `"`.
+        python_command = (
+            "import importlib.util; "
+            "from pathlib import Path; "
+            "init_path=importlib.util.find_spec"
+            f'("{package_name_underscore}").origin; '
+            "print(Path(init_path).parent.as_posix())"
+        )
+        logger.debug(
+            f"Now running {python_command=} through "
+            "{task_collect.python_interpreter}."
+        )
         res = subprocess.run(  # nosec
             shlex.split(
-                f"{task_collect.python_interpreter} "
-                f"-m pip show {task_collect.package_name}"
+                f"{task_collect.python_interpreter} -c '{python_command}'"
             ),
             capture_output=True,
             encoding="utf8",
         )
-        if res.returncode != 0:
+
+        if (
+            res.returncode != 0
+            or res.stdout is None
+            or ("\n" in res.stdout.strip("\n"))
+        ):
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                 detail=(
@@ -66,23 +84,7 @@ async def collect_task_custom(
                     f"Original error: {res.stderr}"
                 ),
             )
-        try:
-            package_root_dir = next(
-                it.split()[1]
-                for it in res.stdout.split("\n")
-                if it.startswith("Location")
-            )
-        except Exception as e:
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                detail=(
-                    "Command 'pip show' gave an unexpected response:\n"
-                    "the output should contain 'Location /path/to/package', "
-                    f"instead returned: {res.stdout}.\n"
-                    f"Original error: {str(e)}"
-                ),
-            )
-        package_root = Path(package_root_dir) / task_collect.package_name
+        package_root = Path(res.stdout.strip("\n"))
     else:
         package_root = Path(task_collect.package_root)
 
@@ -113,23 +115,25 @@ async def collect_task_custom(
     res = db.execute(stm)
     overlapping_sources_v2 = res.scalars().all()
     if overlapping_sources_v2:
+        overlapping_tasks_v2_source_and_id = [
+            f"TaskV2 with ID {task.id} already has source='{task.source}'"
+            for task in overlapping_sources_v2
+        ]
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=(
-                "Some sources already used by some TaskV2: "
-                f"{overlapping_sources_v2}"
-            ),
+            detail="\n".join(overlapping_tasks_v2_source_and_id),
         )
     stm = select(TaskV1).where(TaskV1.source.in_(sources))
     res = db.execute(stm)
     overlapping_sources_v1 = res.scalars().all()
     if overlapping_sources_v1:
+        overlapping_tasks_v1_source_and_id = [
+            f"TaskV1 with ID {task.id} already has source='{task.source}'\n"
+            for task in overlapping_sources_v1
+        ]
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=(
-                "Some sources already used by some TaskV1: "
-                f"{overlapping_sources_v1}"
-            ),
+            detail="\n".join(overlapping_tasks_v1_source_and_id),
         )
 
     task_list_db: list[TaskV2] = _insert_tasks(

fractal_server/app/schemas/v2/task_collection.py

@@ -56,15 +56,16 @@ class TaskCollectPipV2(BaseModel):
     python_version: Optional[Literal["3.9", "3.10", "3.11", "3.12"]] = None
     pinned_package_versions: Optional[dict[str, str]] = None
 
+    _package = validator("package", allow_reuse=True)(valstr("package"))
+    _package_version = validator("package_version", allow_reuse=True)(
+        valstr("package_version")
+    )
     _pinned_package_versions = validator(
         "pinned_package_versions", allow_reuse=True
     )(valdictkeys("pinned_package_versions"))
     _package_extras = validator("package_extras", allow_reuse=True)(
         valstr("package_extras")
     )
-    _python_version = validator("python_version", allow_reuse=True)(
-        valstr("python_version")
-    )
 
     @validator("package")
     def package_validator(cls, value):
@@ -114,6 +115,21 @@ class TaskCollectCustomV2(BaseModel):
     package_name: Optional[str]
     version: Optional[str]
 
+    # Valstr
+    _python_interpreter = validator("python_interpreter", allow_reuse=True)(
+        valstr("python_interpreter")
+    )
+    _source = validator("source", allow_reuse=True)(valstr("source"))
+    _package_root = validator("package_root", allow_reuse=True)(
+        valstr("package_root", accept_none=True)
+    )
+    _package_name = validator("package_name", allow_reuse=True)(
+        valstr("package_name", accept_none=True)
+    )
+    _version = validator("version", allow_reuse=True)(
+        valstr("version", accept_none=True)
+    )
+
     @root_validator(pre=True)
     def one_of_package_root_or_name(cls, values):
         package_root = values.get("package_root")
@@ -154,21 +170,6 @@ class TaskCollectCustomV2(BaseModel):
             )
         return value
 
-    # Valstr
-    _python_interpreter = validator("python_interpreter", allow_reuse=True)(
-        valstr("python_interpreter")
-    )
-    _source = validator("source", allow_reuse=True)(valstr("source"))
-    _package_root = validator("package_root", allow_reuse=True)(
-        valstr("package_root", accept_none=True)
-    )
-    _package_name = validator("package_name", allow_reuse=True)(
-        valstr("package_name", accept_none=True)
-    )
-    _version = validator("version", allow_reuse=True)(
-        valstr("version", accept_none=True)
-    )
-
 
 class CollectionStateReadV2(BaseModel):
 

{fractal_server-2.3.0a1.dist-info → fractal_server-2.3.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.0a1
+Version: 2.3.0a2
 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.3.0a1.dist-info → fractal_server-2.3.0a2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=-AWvxo9_iEn6AeN7kh3LOcvbooEszyPH4VcZe0uRR2w,24
+fractal_server/__init__.py,sha256=-7gSN0r8k13Hgml0ZA7i3bfRDaNoC2Xlx1lqiv1d1uY,24
 fractal_server/__main__.py,sha256=CocbzZooX1UtGqPi55GcHGNxnrJXFg5tUU5b3wyFCyo,4958
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,7 +45,7 @@ fractal_server/app/routes/api/v2/status.py,sha256=osLexiMOSqmYcEV-41tlrwt9ofyFbt
 fractal_server/app/routes/api/v2/submit.py,sha256=bgGDGPT57oVlUgoI0p3cBuSBim8PqCGLZw8VPEbqjZs,8732
 fractal_server/app/routes/api/v2/task.py,sha256=bRTtGgL8BBGbT7csVeRB-a54clgU2xHydi5XpcByDxg,8297
 fractal_server/app/routes/api/v2/task_collection.py,sha256=AvUb6_JVxuxtaa3Nk1qN1x7D_gb13xkfVOXhgEGLwWk,10743
-fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=eGCUN2Qr6iSTD5YMM-v_tMSXD7HpLlo5XIxULJHcJT0,4950
+fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=3DclNe_AaG01ktBaVy5X6PjnceKgBBwXvKcvHV-9P9A,5196
 fractal_server/app/routes/api/v2/task_collection_ssh.py,sha256=UJDk2ijGRbB314HbscoU5SEkb9C63gV7HME7JiBB7Qw,3809
 fractal_server/app/routes/api/v2/task_legacy.py,sha256=P_VJv9v0yzFUBuS-DQHhMVSOe20ecGJJcFBqiiFciOM,1628
 fractal_server/app/routes/api/v2/workflow.py,sha256=2GlcYNjpvCdjwC_Kn7y0UP16B3pOLSNXBvIVsVDtDKM,11863
@@ -135,7 +135,7 @@ fractal_server/app/schemas/v2/manifest.py,sha256=N37IWohcfO3_y2l8rVM0h_1nZq7m4Iz
 fractal_server/app/schemas/v2/project.py,sha256=u7S4B-bote1oGjzAGiZ-DuQIyeRAGqJsI71Tc1EtYE0,736
 fractal_server/app/schemas/v2/status.py,sha256=SQaUpQkjFq5c5k5J4rOjNhuQaDOEg8lksPhkKmPU5VU,332
 fractal_server/app/schemas/v2/task.py,sha256=7IfxiZkaVqlARy7WYE_H8m7j_IEcuQaZORUrs6b5YuY,4672
-fractal_server/app/schemas/v2/task_collection.py,sha256=TU7Bl6qZNAgAkY63PtLte0SO0WctHb6uqX3iv7ezbt8,6053
+fractal_server/app/schemas/v2/task_collection.py,sha256=8PG1bOqkfQqORMN0brWf6mHDmijt0bBW-mZsF7cSxUs,6129
 fractal_server/app/schemas/v2/workflow.py,sha256=Zzx3e-qgkH8le0FUmAx9UrV5PWd7bj14PPXUh_zgZXM,1827
 fractal_server/app/schemas/v2/workflowtask.py,sha256=atVuVN4aXsVEOmSd-vyg-8_8OnPmqx-gT75rXcn_AlQ,6552
 fractal_server/app/security/__init__.py,sha256=2-QbwuR-nsuHM_uwKS_WzYvkhnuhO5jUv8UVROetyVk,11169
@@ -192,8 +192,8 @@ fractal_server/tasks/v2/templates/_5_pip_show.sh,sha256=3onbKZ0PJkkYronP4_tdMBoA
 fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kqXRM,1657
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-2.3.0a1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.3.0a1.dist-info/METADATA,sha256=ygT18QSalCHoGqzBvEUf8I1qTl9hyXcI5pBmiao9XCQ,4427
-fractal_server-2.3.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.3.0a1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.3.0a1.dist-info/RECORD,,
+fractal_server-2.3.0a2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.3.0a2.dist-info/METADATA,sha256=hUMPCeItWLj1fcMcRSLAJmyJuO7uspL2pzgx_XyJlRQ,4427
+fractal_server-2.3.0a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.3.0a2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.3.0a2.dist-info/RECORD,,