fractal-server 1.4.2a5__py3-none-any.whl → 1.4.3a1__py3-none-any.whl

fractal_server/app/routes/api/v1/project.py

@@ -1,4 +1,3 @@
-import json
 from typing import Optional
 
 from fastapi import APIRouter
@@ -15,7 +14,7 @@ from .....logger import close_logger
 from .....logger import set_logger
 from .....syringe import Inject
 from ....db import AsyncSession
-from ....db import get_db
+from ....db import get_async_db
 from ....models import ApplyWorkflow
 from ....models import Dataset
 from ....models import LinkUserProject
@@ -34,9 +33,9 @@ from ....security import current_active_user
 from ....security import current_active_verified_user
 from ....security import User
 from ._aux_functions import _check_project_exists
-from ._aux_functions import _get_active_jobs_statement
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_project_check_owner
+from ._aux_functions import _get_submitted_jobs_statement
 from ._aux_functions import _get_workflow_check_owner
 
 
@@ -46,7 +45,7 @@ router = APIRouter()
 @router.get("/", response_model=list[ProjectRead])
 async def get_list_project(
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> list[Project]:
     """
     Return list of projects user is member of
@@ -66,7 +65,7 @@ async def get_list_project(
 async def create_project(
     project: ProjectCreate,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ProjectRead]:
     """
     Create new poject
@@ -101,7 +100,7 @@ async def create_project(
 async def read_project(
     project_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ProjectRead]:
     """
     Return info on an existing project
@@ -118,7 +117,7 @@ async def update_project(
     project_id: int,
     project_update: ProjectUpdate,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ):
     project = await _get_project_check_owner(
         project_id=project_id, user_id=user.id, db=db
@@ -143,7 +142,7 @@ async def update_project(
 async def delete_project(
     project_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
     Delete project
@@ -152,9 +151,9 @@ async def delete_project(
         project_id=project_id, user_id=user.id, db=db
     )
 
-    # Fail if there exist jobs that are active (that is, pending or running)
-    # and in relation with the current project.
-    stm = _get_active_jobs_statement().where(
+    # Fail if there exist jobs that are submitted and in relation with the
+    # current project.
+    stm = _get_submitted_jobs_statement().where(
         ApplyWorkflow.project_id == project_id
     )
     res = await db.execute(stm)
@@ -246,7 +245,7 @@ async def apply_workflow(
     input_dataset_id: int,
     output_dataset_id: int,
     user: User = Depends(current_active_verified_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ApplyWorkflowRead]:
 
     output = await _get_dataset_check_owner(
@@ -353,16 +352,11 @@ async def apply_workflow(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(e)
         )
 
-    # Check that no other job with the same output_dataset_id is either
-    # SUBMITTED or RUNNING
+    # Check that no other job with the same output_dataset_id is SUBMITTED
     stm = (
         select(ApplyWorkflow)
         .where(ApplyWorkflow.output_dataset_id == output_dataset_id)
-        .where(
-            ApplyWorkflow.status.in_(
-                [JobStatusType.SUBMITTED, JobStatusType.RUNNING]
-            )
-        )
+        .where(ApplyWorkflow.status == JobStatusType.SUBMITTED)
     )
     res = await db.execute(stm)
     if res.scalars().all():
@@ -370,7 +364,7 @@ async def apply_workflow(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=(
                 f"Output dataset {output_dataset_id} is already in use "
-                "in pending/running job(s)."
+                "in submitted job(s)."
             ),
         )
 
@@ -395,31 +389,40 @@ async def apply_workflow(
         workflow_id=workflow_id,
         user_email=user.email,
         input_dataset_dump=dict(
-            input_dataset.model_dump(exclude={"resource_list"}),
+            **input_dataset.model_dump(
+                exclude={"resource_list", "timestamp_created"}
+            ),
+            timestamp_created=str(input_dataset.timestamp_created),
             resource_list=[
                 resource.model_dump()
                 for resource in input_dataset.resource_list
             ],
         ),
         output_dataset_dump=dict(
-            output_dataset.model_dump(exclude={"resource_list"}),
+            **output_dataset.model_dump(
+                exclude={"resource_list", "timestamp_created"}
+            ),
+            timestamp_created=str(output_dataset.timestamp_created),
             resource_list=[
                 resource.model_dump()
                 for resource in output_dataset.resource_list
             ],
         ),
         workflow_dump=dict(
-            workflow.model_dump(exclude={"task_list"}),
+            **workflow.model_dump(exclude={"task_list", "timestamp_created"}),
+            timestamp_created=str(workflow.timestamp_created),
             task_list=[
                 dict(
-                    wf_task.model_dump(exclude={"task"}),
+                    **wf_task.model_dump(exclude={"task"}),
                     task=wf_task.task.model_dump(),
                 )
                 for wf_task in workflow.task_list
             ],
         ),
-        # we use (project.json + json.loads) to serialize datetime
-        project_dump=json.loads(project.json(exclude={"user_list"})),
+        project_dump=dict(
+            **project.model_dump(exclude={"user_list", "timestamp_created"}),
+            timestamp_created=str(project.timestamp_created),
+        ),
         **apply_workflow.dict(),
     )
     db.add(job)

fractal_server/app/routes/api/v1/task.py

@@ -10,7 +10,7 @@ from sqlmodel import select
 
 from .....logger import set_logger
 from ....db import AsyncSession
-from ....db import get_db
+from ....db import get_async_db
 from ....models import Task
 from ....models import WorkflowTask
 from ....schemas import TaskCreate
@@ -29,7 +29,7 @@ logger = set_logger(__name__)
 @router.get("/", response_model=list[TaskRead])
 async def get_list_task(
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskRead]:
     """
     Get list of available tasks
@@ -45,7 +45,7 @@ async def get_list_task(
 async def get_task(
     task_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> TaskRead:
     """
     Get info on a specific task
@@ -64,7 +64,7 @@ async def patch_task(
     task_id: int,
     task_update: TaskUpdate,
     user: User = Depends(current_active_verified_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[TaskRead]:
     """
     Edit a specific task (restricted to superusers and task owner)
@@ -108,7 +108,7 @@ async def patch_task(
 async def create_task(
     task: TaskCreate,
     user: User = Depends(current_active_verified_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[TaskRead]:
     """
     Create a new task
@@ -154,7 +154,7 @@ async def create_task(
 async def delete_task(
     task_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
     Delete a task

fractal_server/app/routes/api/v1/task_collection.py

@@ -1,7 +1,5 @@
-import json
 from pathlib import Path
 from shutil import copy as shell_copy
-from shutil import rmtree as shell_rmtree
 from tempfile import TemporaryDirectory
 
 from fastapi import APIRouter
@@ -17,27 +15,21 @@ from .....config import get_settings
 from .....logger import close_logger
 from .....logger import set_logger
 from .....syringe import Inject
-from .....tasks.collection import _TaskCollectPip
-from .....tasks.collection import create_package_dir_pip
-from .....tasks.collection import create_package_environment_pip
-from .....tasks.collection import download_package
-from .....tasks.collection import get_collection_data
-from .....tasks.collection import get_collection_log
-from .....tasks.collection import get_collection_path
-from .....tasks.collection import get_log_path
-from .....tasks.collection import inspect_package
-from .....tasks.collection import slugify_task_name
+from .....tasks._TaskCollectPip import _TaskCollectPip
+from .....tasks.background_operations import background_collect_pip
+from .....tasks.endpoint_operations import create_package_dir_pip
+from .....tasks.endpoint_operations import download_package
+from .....tasks.endpoint_operations import get_collection_data
+from .....tasks.endpoint_operations import inspect_package
+from .....tasks.utils import get_collection_log
+from .....tasks.utils import slugify_task_name
 from ....db import AsyncSession
-from ....db import DBSyncSession
-from ....db import get_db
-from ....db import get_sync_db
+from ....db import get_async_db
 from ....models import State
 from ....models import Task
 from ....schemas import StateRead
 from ....schemas import TaskCollectPip
 from ....schemas import TaskCollectStatus
-from ....schemas import TaskCreate
-from ....schemas import TaskRead
 from ....security import current_active_user
 from ....security import current_active_verified_user
 from ....security import User
@@ -47,112 +39,6 @@ router = APIRouter()
 logger = set_logger(__name__)
 
 
-async def _background_collect_pip(
-    state_id: int,
-    venv_path: Path,
-    task_pkg: _TaskCollectPip,
-) -> None:
-    """
-    Install package and collect tasks
-
-    Install a python package and collect the tasks it provides according to
-    the manifest.
-
-    In case of error, copy the log into the state and delete the package
-    directory.
-    """
-    logger_name = task_pkg.package.replace("/", "_")
-    logger = set_logger(
-        logger_name=logger_name,
-        log_file_path=get_log_path(venv_path),
-    )
-    logger.debug("Start background task collection")
-    for key, value in task_pkg.dict(exclude={"package_manifest"}).items():
-        logger.debug(f"{key}: {value}")
-
-    with next(get_sync_db()) as db:
-        state: State = db.get(State, state_id)
-        data = TaskCollectStatus(**state.data)
-        data.info = None
-
-        try:
-            # install
-            logger.debug("Task-collection status: installing")
-            data.status = "installing"
-
-            state.data = data.sanitised_dict()
-            db.merge(state)
-            db.commit()
-            task_list = await create_package_environment_pip(
-                venv_path=venv_path,
-                task_pkg=task_pkg,
-                logger_name=logger_name,
-            )
-
-            # collect
-            logger.debug("Task-collection status: collecting")
-            data.status = "collecting"
-            state.data = data.sanitised_dict()
-            db.merge(state)
-            db.commit()
-            tasks = await _insert_tasks(task_list=task_list, db=db)
-
-            # finalise
-            logger.debug("Task-collection status: finalising")
-            collection_path = get_collection_path(venv_path)
-            data.task_list = [TaskRead(**task.model_dump()) for task in tasks]
-            with collection_path.open("w") as f:
-                json.dump(data.sanitised_dict(), f)
-
-            # Update DB
-            data.status = "OK"
-            data.log = get_collection_log(venv_path)
-            state.data = data.sanitised_dict()
-            db.add(state)
-            db.merge(state)
-            db.commit()
-
-            # Write last logs to file
-            logger.debug("Task-collection status: OK")
-            logger.info("Background task collection completed successfully")
-            close_logger(logger)
-            db.close()
-
-        except Exception as e:
-            # Write last logs to file
-            logger.debug("Task-collection status: fail")
-            logger.info(f"Background collection failed. Original error: {e}")
-            close_logger(logger)
-
-            # Update db
-            data.status = "fail"
-            data.info = f"Original error: {e}"
-            data.log = get_collection_log(venv_path)
-            state.data = data.sanitised_dict()
-            db.merge(state)
-            db.commit()
-            db.close()
-
-            # Delete corrupted package dir
-            shell_rmtree(venv_path)
-
-
-async def _insert_tasks(
-    task_list: list[TaskCreate],
-    db: DBSyncSession,
-) -> list[Task]:
-    """
-    Insert tasks into database
-    """
-    task_db_list = [Task(**t.dict()) for t in task_list]
-    db.add_all(task_db_list)
-    db.commit()
-    for t in task_db_list:
-        db.refresh(t)
-    db.close()
-    return task_db_list
-
-
 @router.post(
     "/collect/pip/",
     response_model=StateRead,
@@ -175,7 +61,7 @@ async def collect_tasks_pip(
     background_tasks: BackgroundTasks,
     response: Response,
     user: User = Depends(current_active_verified_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> StateRead:  # State[TaskCollectStatus]
     """
     Task collection endpoint
@@ -289,7 +175,7 @@ async def collect_tasks_pip(
     await db.refresh(state)
 
     background_tasks.add_task(
-        _background_collect_pip,
+        background_collect_pip,
         state_id=state.id,
         venv_path=venv_path,
         task_pkg=task_pkg,
@@ -314,7 +200,7 @@ async def check_collection_status(
     state_id: int,
     user: User = Depends(current_active_user),
     verbose: bool = False,
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> StateRead:  # State[TaskCollectStatus]
     """
     Check status of background task collection

fractal_server/app/routes/api/v1/workflow.py

@@ -22,7 +22,7 @@ from sqlmodel import select
 from .....logger import close_logger
 from .....logger import set_logger
 from ....db import AsyncSession
-from ....db import get_db
+from ....db import get_async_db
 from ....models import ApplyWorkflow
 from ....models import Project
 from ....models import Task
@@ -36,9 +36,10 @@ from ....schemas import WorkflowUpdate
 from ....security import current_active_user
 from ....security import User
 from ._aux_functions import _check_workflow_exists
-from ._aux_functions import _get_active_jobs_statement
 from ._aux_functions import _get_project_check_owner
+from ._aux_functions import _get_submitted_jobs_statement
 from ._aux_functions import _get_workflow_check_owner
+from ._aux_functions import _workflow_insert_task
 
 
 router = APIRouter()
@@ -51,7 +52,7 @@ router = APIRouter()
 async def get_workflow_list(
     project_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[list[WorkflowRead]]:
     """
     Get workflow list for given project
@@ -78,7 +79,7 @@ async def create_workflow(
     project_id: int,
     workflow: WorkflowCreate,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowRead]:
     """
     Create a workflow, associate to a project
@@ -108,7 +109,7 @@ async def read_workflow(
     project_id: int,
     workflow_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowRead]:
     """
     Get info on an existing workflow
@@ -130,7 +131,7 @@ async def update_workflow(
     workflow_id: int,
     patch: WorkflowUpdate,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowRead]:
     """
     Edit a workflow
@@ -181,7 +182,7 @@ async def delete_workflow(
     project_id: int,
     workflow_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
     Delete a workflow
@@ -191,9 +192,9 @@ async def delete_workflow(
         project_id=project_id, workflow_id=workflow_id, user_id=user.id, db=db
     )
 
-    # Fail if there exist jobs that are active (that is, pending or running)
-    # and in relation with the current workflow.
-    stm = _get_active_jobs_statement().where(
+    # Fail if there exist jobs that are submitted and in relation with the
+    # current workflow.
+    stm = _get_submitted_jobs_statement().where(
         ApplyWorkflow.workflow_id == workflow.id
     )
     res = await db.execute(stm)
@@ -233,7 +234,7 @@ async def export_worfklow(
     project_id: int,
     workflow_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowExport]:
     """
     Export an existing workflow, after stripping all IDs
@@ -266,7 +267,7 @@ async def import_workflow(
     project_id: int,
     workflow: WorkflowImport,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowRead]:
     """
     Import an existing workflow into a project
@@ -323,8 +324,9 @@ async def import_workflow(
                 **wf_task.dict(exclude_none=True),
             )
             # Insert task
-            await db_workflow.insert_task(
+            await _workflow_insert_task(
                 **new_wf_task.dict(),
+                workflow_id=db_workflow.id,
                 task_id=task_id,
                 db=db,
             )
@@ -336,7 +338,7 @@ async def import_workflow(
 @router.get("/workflow/", response_model=list[WorkflowRead])
 async def get_user_workflows(
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowRead]:
     """
     Returns all the workflows of the current user

fractal_server/app/routes/api/v1/workflowtask.py

@@ -21,7 +21,7 @@ from fastapi import Response
 from fastapi import status
 
 from ....db import AsyncSession
-from ....db import get_db
+from ....db import get_async_db
 from ....models import Task
 from ....schemas import WorkflowTaskCreate
 from ....schemas import WorkflowTaskRead
@@ -30,6 +30,7 @@ from ....security import current_active_user
 from ....security import User
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
+from ._aux_functions import _workflow_insert_task
 
 router = APIRouter()
 
@@ -45,7 +46,7 @@ async def create_workflowtask(
     task_id: int,
     new_task: WorkflowTaskCreate,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowTaskRead]:
     """
     Add a WorkflowTask to a Workflow
@@ -64,8 +65,9 @@ async def create_workflowtask(
         )
 
     async with db:
-        workflow_task = await workflow.insert_task(
+        workflow_task = await _workflow_insert_task(
             **new_task.dict(),
+            workflow_id=workflow.id,
             task_id=task_id,
             db=db,
         )
@@ -83,7 +85,7 @@ async def read_workflowtask(
     workflow_id: int,
     workflow_task_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ):
     workflow_task, _ = await _get_workflow_task_check_owner(
         project_id=project_id,
@@ -105,7 +107,7 @@ async def update_workflowtask(
     workflow_task_id: int,
     workflow_task_update: WorkflowTaskUpdate,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowTaskRead]:
     """
     Edit a WorkflowTask of a Workflow
@@ -160,7 +162,7 @@ async def delete_workflowtask(
     workflow_id: int,
     workflow_task_id: int,
     user: User = Depends(current_active_user),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
     Delete a WorkflowTask of a Workflow

fractal_server/app/routes/auth.py

@@ -13,7 +13,7 @@ from sqlmodel import select
 
 from ...config import get_settings
 from ...syringe import Inject
-from ..db import get_db
+from ..db import get_async_db
 from ..models.security import UserOAuth as User
 from ..schemas.user import UserCreate
 from ..schemas.user import UserRead
@@ -97,7 +97,7 @@ async def get_current_user(user: User = Depends(current_active_user)):
 @router_auth.get("/users/", response_model=list[UserRead])
 async def list_users(
     user: User = Depends(current_active_superuser),
-    db: AsyncSession = Depends(get_db),
+    db: AsyncSession = Depends(get_async_db),
 ):
     """
     Return list of all users

fractal_server/app/runner/__init__.py

@@ -184,7 +184,6 @@ async def submit_workflow(
         # Update db
         job.working_dir = WORKFLOW_DIR.as_posix()
         job.working_dir_user = WORKFLOW_DIR_USER.as_posix()
-        job.status = JobStatusType.RUNNING
         db_sync.merge(job)
         db_sync.commit()
 

fractal_server/app/schemas/__init__.py

@@ -26,6 +26,7 @@ from .task import TaskUpdate  # noqa: F401
 from .task_collection import TaskCollectPip  # noqa: F401
 from .task_collection import TaskCollectStatus  # noqa: F401
 from .user import UserCreate  # noqa: F401
+from .user import UserRead  # noqa: F401
 from .user import UserUpdate  # noqa: F401
 from .user import UserUpdateStrict  # noqa: F401
 from .workflow import WorkflowCreate  # noqa: F401

fractal_server/app/schemas/applyworkflow.py

@@ -25,21 +25,17 @@ class JobStatusType(str, Enum):
 
     Attributes:
         SUBMITTED:
-            The workflow has been applied but not yet scheduled with an
-            executor. In this phase, due diligence takes place, such as
-            creating working directory, assemblying arguments, etc.
-        RUNNING:
-            The workflow was scheduled with an executor. Note that it might not
-            yet be running within the executor, e.g., jobs could still be
-            pending within a SLURM executor.
+            The job was created. This does not guarantee that it was also
+            submitted to an executor (e.g. other errors could have prevented
+            this), nor that it is actually running (e.g. SLURM jobs could be
+            still in the queue).
         DONE:
-            The workflow was applied successfully
+            The job successfully reached its end.
         FAILED:
             The workflow terminated with an error.
     """
 
     SUBMITTED = "submitted"
-    RUNNING = "running"
     DONE = "done"
     FAILED = "failed"
 
@@ -135,15 +131,15 @@ class ApplyWorkflowRead(_ApplyWorkflowBase):
 
     id: int
     project_id: Optional[int]
-    project_dump: Optional[ProjectDump]
+    project_dump: ProjectDump
     user_email: str
     slurm_account: Optional[str]
     workflow_id: Optional[int]
-    workflow_dump: Optional[WorkflowDump]
+    workflow_dump: WorkflowDump
     input_dataset_id: Optional[int]
-    input_dataset_dump: Optional[DatasetDump]
+    input_dataset_dump: DatasetDump
     output_dataset_id: Optional[int]
-    output_dataset_dump: Optional[DatasetDump]
+    output_dataset_dump: DatasetDump
     start_timestamp: datetime
     end_timestamp: Optional[datetime]
     status: str

fractal_server/app/schemas/dataset.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Any
 from typing import Optional
 
@@ -147,6 +148,7 @@ class DatasetRead(_DatasetBase):
     project_id: int
     read_only: bool
     project: ProjectRead
+    timestamp_created: datetime
 
 
 class DatasetStatusRead(BaseModel):

fractal_server/app/schemas/dumps.py

@@ -46,6 +46,7 @@ class WorkflowDump(BaseModel):
     name: str
     project_id: int
     task_list: list[WorkflowTaskDump]
+    timestamp_created: str
 
 
 class ResourceDump(BaseModel):
@@ -61,3 +62,4 @@ class DatasetDump(BaseModel):
     read_only: bool
     resource_list: list[ResourceDump]
     project_id: int
+    timestamp_created: str