fractal-server 2.0.1__tar.gz → 2.0.2__tar.gz

{fractal_server-2.0.1 → fractal_server-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.1
+Version: 2.0.2
 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.0.2/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.0.2"

{fractal_server-2.0.1 → fractal_server-2.0.2}/fractal_server/app/routes/api/v1/project.py

@@ -398,7 +398,7 @@ async def apply_workflow(
         user_email=user.email,
         input_dataset_dump=dict(
             **input_dataset.model_dump(
-                exclude={"resource_list", "timestamp_created"}
+                exclude={"resource_list", "history", "timestamp_created"}
             ),
             timestamp_created=_encode_as_utc(input_dataset.timestamp_created),
             resource_list=[
@@ -408,7 +408,7 @@ async def apply_workflow(
         ),
         output_dataset_dump=dict(
             **output_dataset.model_dump(
-                exclude={"resource_list", "timestamp_created"}
+                exclude={"resource_list", "history", "timestamp_created"}
             ),
             timestamp_created=_encode_as_utc(output_dataset.timestamp_created),
             resource_list=[

{fractal_server-2.0.1 → fractal_server-2.0.2}/fractal_server/app/routes/api/v2/status.py

@@ -7,6 +7,7 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
 
+from .....logger import set_logger
 from ....db import AsyncSession
 from ....db import get_async_db
 from ....models.v2 import JobV2
@@ -21,6 +22,8 @@ from fractal_server.app.runner.filenames import HISTORY_FILENAME
 
 router = APIRouter()
 
+logger = set_logger(__name__)
+
 
 @router.get(
     "/project/{project_id}/status/",
@@ -113,7 +116,22 @@ async def get_workflowtask_status(
 
         # The last workflow task that is included in the submitted job is also
         # the positional-last workflow task to be included in the response.
-        last_valid_wftask_id = workflow.task_list[end - 1]
+        try:
+            last_valid_wftask_id = workflow.task_list[end - 1].id
+        except IndexError as e:
+            logger.warning(
+                f"Handled IndexError in `get_workflowtask_status` ({str(e)})."
+            )
+            logger.warning(
+                "Additional information: "
+                f"{running_job.first_task_index=}; "
+                f"{running_job.last_task_index=}; "
+                f"{len(workflow.task_list)=}; "
+                f"{dataset_id=}; "
+                f"{workflow_id=}."
+            )
+            last_valid_wftask_id = None
+            logger.warning(f"Now setting {last_valid_wftask_id=}.")
 
         # Highest priority: Read status updates coming from the running-job
         # temporary file. Note: this file only contains information on

{fractal_server-2.0.1 → fractal_server-2.0.2}/fractal_server/app/routes/api/v2/submit.py

@@ -146,7 +146,9 @@ async def apply_workflow(
         workflow_id=workflow_id,
         user_email=user.email,
         dataset_dump=dict(
-            **dataset.model_dump(exclude={"images", "timestamp_created"}),
+            **dataset.model_dump(
+                exclude={"images", "history", "timestamp_created"}
+            ),
             timestamp_created=_encode_as_utc(dataset.timestamp_created),
         ),
         workflow_dump=dict(

{fractal_server-2.0.1 → fractal_server-2.0.2}/fractal_server/app/schemas/v2/dumps.py

@@ -70,14 +70,14 @@ class WorkflowTaskDumpV2(BaseModel):
         return values
 
 
-class WorkflowDumpV2(BaseModel):
+class WorkflowDumpV2(BaseModel, extra=Extra.forbid):
     id: int
     name: str
     project_id: int
     timestamp_created: str
 
 
-class DatasetDumpV2(BaseModel):
+class DatasetDumpV2(BaseModel, extra=Extra.forbid):
     id: int
     name: str
     project_id: int

{fractal_server-2.0.1 → fractal_server-2.0.2}/fractal_server/config.py

@@ -441,9 +441,4 @@ class Settings(BaseSettings):
 
 
 def get_settings(settings=Settings()) -> Settings:
-    logging.debug("Fractal Settings:")
-    for key, value in settings.dict().items():
-        if any(s in key.upper() for s in ["PASSWORD", "SECRET"]):
-            value = "*****"
-        logging.debug(f"{key}: {value}")
     return settings

{fractal_server-2.0.1 → fractal_server-2.0.2}/fractal_server/main.py

@@ -19,6 +19,8 @@ from fastapi import FastAPI
 
 from .app.security import _create_first_user
 from .config import get_settings
+from .logger import reset_logger_handlers
+from .logger import set_logger
 from .syringe import Inject
 
 
@@ -62,6 +64,14 @@ def check_settings() -> None:
     settings = Inject(get_settings)
     settings.check()
 
+    logger = set_logger("fractal_server_settings")
+    logger.debug("Fractal Settings:")
+    for key, value in settings.dict().items():
+        if any(s in key.upper() for s in ["PASSWORD", "SECRET"]):
+            value = "*****"
+        logger.debug(f"  {key}: {value}")
+    reset_logger_handlers(logger)
+
 
 async def __on_startup() -> None:
     """

{fractal_server-2.0.1 → fractal_server-2.0.2}/pyproject.toml

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

fractal_server-2.0.1/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.0.1"