Merge branch 'main' into fix/local-model-vllm

Author: deep1401

api/transformerlab/routers/experiment/task.py

@@ -34,7 +34,6 @@
 )
 from transformerlab.routers.auth import get_user_and_team
 from transformerlab.shared.models.user_model import get_async_session
-from lab.task_template import TaskTemplate
 from transformerlab.schemas.task import (
     ExportTaskToTeamGalleryRequest,
     ImportTaskFromGalleryRequest,
@@ -245,20 +244,15 @@ async def task_list_files(experimentId: str, task_id: str) -> TaskFilesResponse:
     "/{task_id}/file/{file_path:path}",
     summary="Serve a file from a task's local workspace directory for preview",
 )
-async def task_get_file(task_id: str, file_path: str):
+async def task_get_file(experimentId: str, task_id: str, file_path: str):
     """
     Serve a file from the per-task workspace directory (used for upload-from-directory tasks).
 
     This mirrors the behavior of the jobs get_job_file endpoint but is scoped to
-    workspace/task/{task_id}. It is primarily intended for lightweight previews in
-    the UI and supports both text and binary content.
+    the task's experiment-scoped directory. It is primarily intended for lightweight
+    previews in the UI and supports both text and binary content.
     """
-    workspace_dir = await get_workspace_dir()
-    if not workspace_dir:
-        raise HTTPException(status_code=500, detail="Workspace directory is not configured")
-
-    # Files for upload-from-directory tasks are materialized under workspace/task/{task_id}
-    task_dir = storage.join(workspace_dir, "task", str(task_id))
+    task_dir = await task_service.get_task_dir(task_id, experiment_id=experimentId)
     safe_rel = posixpath.normpath(file_path).lstrip("/")
     if safe_rel.startswith("..") or "/.." in safe_rel:
         raise HTTPException(status_code=400, detail="Invalid file path")
@@ -365,11 +359,7 @@ async def task_update_file(experimentId: str, task_id: str, file_path: str, requ
     if not task:
         raise HTTPException(status_code=404, detail="Task not found")
 
-    workspace_dir = await get_workspace_dir()
-    if not workspace_dir:
-        raise HTTPException(status_code=500, detail="Workspace directory is not configured")
-
-    task_dir = storage.join(workspace_dir, "task", str(task_id))
+    task_dir = await task_service.get_task_dir(task_id, experiment_id=experimentId)
     safe_rel = posixpath.normpath(file_path).lstrip("/")
     if safe_rel.startswith("..") or "/.." in safe_rel:
         raise HTTPException(status_code=400, detail="Invalid file path")
@@ -401,11 +391,7 @@ async def task_delete_file(experimentId: str, task_id: str, file_path: str):
     if not task:
         raise HTTPException(status_code=404, detail="Task not found")
 
-    workspace_dir = await get_workspace_dir()
-    if not workspace_dir:
-        raise HTTPException(status_code=500, detail="Workspace directory is not configured")
-
-    task_dir = storage.join(workspace_dir, "task", str(task_id))
+    task_dir = await task_service.get_task_dir(task_id, experiment_id=experimentId)
     safe_rel = posixpath.normpath(file_path).lstrip("/")
     if safe_rel.startswith("..") or "/.." in safe_rel:
         raise HTTPException(status_code=400, detail="Invalid file path")
@@ -436,11 +422,7 @@ async def task_upload_file(
     if not task:
         raise HTTPException(status_code=404, detail="Task not found")
 
-    workspace_dir = await get_workspace_dir()
-    if not workspace_dir:
-        raise HTTPException(status_code=500, detail="Workspace directory is not configured")
-
-    task_dir = storage.join(workspace_dir, "task", str(task_id))
+    task_dir = await task_service.get_task_dir(task_id, experiment_id=experimentId)
     await storage.makedirs(task_dir, exist_ok=True)
 
     saved_files: list[str] = []
@@ -1151,21 +1133,17 @@ async def import_task_from_gallery(
         # Invalidate cached task lists for this experiment (best-effort).
         await cache.invalidate(f"tasks:{experimentId}")
 
-        # Store task.yaml in the task directory for GitHub-sourced interactive tasks
+        # Store task.yaml in the task directory for GitHub-sourced interactive tasks.
+        # Use task_service.write_task_yaml so the file lands in the experiment-scoped
+        # path that task_list_files reads from (workspace/experiments/{exp_id}/tasks/{id}).
         if github_repo_url and source_yaml_data:
-            task_template = TaskTemplate(secure_filename(str(task_id)))
-            task_dir_path = await task_template.get_dir()
-            await storage.makedirs(task_dir_path, exist_ok=True)
-            yaml_path = storage.join(task_dir_path, "task.yaml")
-            async with await storage.open(yaml_path, "w", encoding="utf-8") as f:
-                await f.write(task_yaml_content)
+            await task_service.write_task_yaml(task_id, task_yaml_content, experiment_id=experimentId)
 
         # Copy local_task_dir files into the task directory (inside a subdirectory
         # matching the source directory name, mirroring what github_repo_dir does
         # at clone time) and mark file_mounts so the runner copies them at launch.
         if local_task_dir and os.path.isdir(local_task_dir):
-            task_template = TaskTemplate(secure_filename(str(task_id)))
-            task_dir_path = await task_template.get_dir()
+            task_dir_path = await task_service.get_task_dir(task_id, experiment_id=experimentId)
             await storage.makedirs(task_dir_path, exist_ok=True)
             dest_subdir = storage.join(task_dir_path, os.path.basename(local_task_dir.rstrip("/")))
             await storage.copy_dir(local_task_dir, dest_subdir)
@@ -1267,13 +1245,8 @@ async def import_task_from_gallery(
     # Create the task with all fields stored directly (flat structure)
     task_id = await task_service.add_task(task_data)
 
-    # Store task.yaml in task directory
-    task = TaskTemplate(secure_filename(str(task_id)))
-    task_dir = await task.get_dir()
-    await storage.makedirs(task_dir, exist_ok=True)
-    yaml_path = storage.join(task_dir, "task.yaml")
-    async with await storage.open(yaml_path, "w", encoding="utf-8") as f:
-        await f.write(task_yaml_content)
+    # Store task.yaml in the experiment-scoped task directory
+    await task_service.write_task_yaml(task_id, task_yaml_content, experiment_id=experimentId)
 
     # Invalidate cached task lists for this experiment (best-effort).
     await cache.invalidate(f"tasks:{experimentId}")
@@ -1550,11 +1523,10 @@ async def import_task_from_team_gallery(
 
         # Create task + copy full directory into the task workspace dir
         task_id = await task_service.add_task(task_data)
-        task = TaskTemplate(secure_filename(str(task_id)))
-        task_dir = await task.get_dir()
+        task_dir = await task_service.get_task_dir(task_id, experiment_id=experimentId)
         await storage.makedirs(task_dir, exist_ok=True)
 
-        # Copy the entire directory contents (task.yaml + attachments) into workspace/task/{task_id}
+        # Copy the entire directory contents (task.yaml + attachments) into the experiment-scoped task dir
         try:
             await storage.copy_dir(str(local_task_dir), task_dir)
         except Exception as e:
@@ -1630,10 +1602,7 @@ async def import_task_from_team_gallery(
             _clear_interactive_launch_provider(task_data)
         task_id = await task_service.add_task(task_data)
 
-        # Write a task.yaml into the task directory so the editor works
-        task = TaskTemplate(secure_filename(str(task_id)))
-        task_dir = await task.get_dir()
-        await storage.makedirs(task_dir, exist_ok=True)
+        # Write a task.yaml into the experiment-scoped task directory so the editor works
         yaml_obj = {
             "name": task_data["name"],
             "setup": task_data.get("setup"),
@@ -1651,9 +1620,9 @@ async def import_task_from_team_gallery(
         # Remove empty values so YAML stays tidy
         yaml_obj["resources"] = {k: v for k, v in (yaml_obj.get("resources") or {}).items() if v is not None}
         yaml_obj = {k: v for k, v in yaml_obj.items() if v not in (None, {}, [])}
-        yaml_path = storage.join(task_dir, "task.yaml")
-        async with await storage.open(yaml_path, "w", encoding="utf-8") as f:
-            await f.write(yaml.safe_dump(yaml_obj, sort_keys=False))
+        await task_service.write_task_yaml(
+            task_id, yaml.safe_dump(yaml_obj, sort_keys=False), experiment_id=experimentId
+        )
 
         await cache.invalidate(f"tasks:{experimentId}")
         return {
@@ -1730,13 +1699,8 @@ async def import_task_from_team_gallery(
     # Create the task with all fields stored directly (flat structure)
     task_id = await task_service.add_task(task_data)
 
-    # Store task.yaml in task directory
-    task = TaskTemplate(secure_filename(str(task_id)))
-    task_dir = await task.get_dir()
-    await storage.makedirs(task_dir, exist_ok=True)
-    yaml_path = storage.join(task_dir, "task.yaml")
-    async with await storage.open(yaml_path, "w", encoding="utf-8") as f:
-        await f.write(task_yaml_content)
+    # Store task.yaml in the experiment-scoped task directory
+    await task_service.write_task_yaml(task_id, task_yaml_content, experiment_id=experimentId)
 
     # Invalidate cached task lists for this experiment (best-effort).
     await cache.invalidate(f"tasks:{experimentId}")
@@ -1827,9 +1791,8 @@ async def export_task_to_team_gallery(
             short_id = secure_filename(str(request.task_id))[:12]
             dest_dir = storage.join(export_root, f"{safe_title}-{short_id}")
 
-            # Copy from the task's workspace dir (workspace/task/{task_id})
-            src_task = TaskTemplate(secure_filename(str(request.task_id)))
-            src_dir = await src_task.get_dir()
+            # Copy from the task's experiment-scoped workspace directory
+            src_dir = await task_service.get_task_dir(request.task_id, experiment_id=experimentId)
             if await storage.exists(src_dir):
                 # Ensure destination is clean
                 if await storage.exists(dest_dir):