fractal-server 2.3.0a1__tar.gz → 2.3.0a2__tar.gz

{fractal_server-2.3.0a1 → fractal_server-2.3.0a2}/PKG-INFO

@@ -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.0a2/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.3.0a2"

{fractal_server-2.3.0a1 → fractal_server-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-2.3.0a1 → fractal_server-2.3.0a2}/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 → fractal_server-2.3.0a2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.3.0a1"
+version = "2.3.0a2"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -91,7 +91,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.3.0a1"
+current_version = "2.3.0a2"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.3.0a1/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.3.0a1"