feat: comprehensive test infrastructure improvements
- Fix unit test imports: add env setup in conftest.py before module imports - Add 24 new auth router tests (RBAC, preferences, password validation) - Add 16 new tests for litellm and chat_summary routers - Apply black formatting and ruff linting across codebase - Add pre-commit hooks configuration (black, ruff, file checks) - Increase CI coverage threshold from 40% to 50% Test Results: - 206 tests passing (91 unit + 115 integration) - Coverage: 58.79% on core modules - auth.py: 57% → 85%, litellm.py: 23% → 87%, chat_summary.py: 41% → 100% - auth_service: 96.51%, config: 100%, rbac: 93.48%
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
"""
|
||||
OPC Task Management Router
|
||||
"""
|
||||
from fastapi import APIRouter, Depends, Query, HTTPException, Request
|
||||
from typing import Optional, List
|
||||
from pydantic import BaseModel
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import APIRouter, HTTPException, Query, Request
|
||||
from pydantic import BaseModel
|
||||
|
||||
from db import opc_db
|
||||
from rbac import require_page, User
|
||||
from rbac import User
|
||||
from routers import opc_ws
|
||||
|
||||
router = APIRouter()
|
||||
@@ -14,27 +16,27 @@ router = APIRouter()
|
||||
|
||||
class TaskCreate(BaseModel):
|
||||
title: str
|
||||
description: Optional[str] = None
|
||||
description: str | None = None
|
||||
status: str = "parking_lot"
|
||||
priority: str = "medium"
|
||||
project_id: Optional[int] = None
|
||||
assigned_to: Optional[str] = None
|
||||
project_id: int | None = None
|
||||
assigned_to: str | None = None
|
||||
assigned_type: str = "human"
|
||||
tags: Optional[List[str]] = None
|
||||
due_date: Optional[datetime] = None
|
||||
tags: list[str] | None = None
|
||||
due_date: datetime | None = None
|
||||
|
||||
|
||||
class TaskUpdate(BaseModel):
|
||||
title: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
status: Optional[str] = None
|
||||
priority: Optional[str] = None
|
||||
project_id: Optional[int] = None
|
||||
assigned_to: Optional[str] = None
|
||||
assigned_type: Optional[str] = None
|
||||
tags: Optional[List[str]] = None
|
||||
due_date: Optional[datetime] = None
|
||||
completed_at: Optional[datetime] = None
|
||||
title: str | None = None
|
||||
description: str | None = None
|
||||
status: str | None = None
|
||||
priority: str | None = None
|
||||
project_id: int | None = None
|
||||
assigned_to: str | None = None
|
||||
assigned_type: str | None = None
|
||||
tags: list[str] | None = None
|
||||
due_date: datetime | None = None
|
||||
completed_at: datetime | None = None
|
||||
|
||||
|
||||
class TaskMove(BaseModel):
|
||||
@@ -49,11 +51,11 @@ class TaskAssign(BaseModel):
|
||||
@router.get("/tasks")
|
||||
async def list_tasks(
|
||||
request: Request,
|
||||
status: Optional[str] = Query(None),
|
||||
assigned_to: Optional[str] = Query(None),
|
||||
project_id: Optional[int] = Query(None),
|
||||
priority: Optional[str] = Query(None),
|
||||
tags: Optional[str] = Query(None),
|
||||
status: str | None = Query(None),
|
||||
assigned_to: str | None = Query(None),
|
||||
project_id: int | None = Query(None),
|
||||
priority: str | None = Query(None),
|
||||
tags: str | None = Query(None),
|
||||
limit: int = Query(50, le=100),
|
||||
offset: int = Query(0, ge=0),
|
||||
):
|
||||
@@ -67,7 +69,7 @@ async def list_tasks(
|
||||
priority=priority,
|
||||
tags=tag_list,
|
||||
limit=limit,
|
||||
offset=offset
|
||||
offset=offset,
|
||||
)
|
||||
return {"items": tasks, "total": len(tasks)}
|
||||
|
||||
@@ -91,16 +93,12 @@ async def create_task(
|
||||
assigned_type=task.assigned_type,
|
||||
tags=task.tags,
|
||||
due_date=due_date,
|
||||
actor=user.username
|
||||
actor=user.username,
|
||||
)
|
||||
|
||||
# Start automatic timer if status is in_progress
|
||||
if task.status == "in_progress":
|
||||
await opc_db.start_time_entry(
|
||||
task_id=created_task["id"],
|
||||
project_id=task.project_id,
|
||||
actor=user.username
|
||||
)
|
||||
await opc_db.start_time_entry(task_id=created_task["id"], project_id=task.project_id, actor=user.username)
|
||||
|
||||
# Broadcast WebSocket update
|
||||
await opc_ws.broadcast_task_update(created_task["id"], "created", created_task)
|
||||
@@ -144,11 +142,7 @@ async def update_task(
|
||||
|
||||
# Start timer when moving to in_progress
|
||||
if old_status != "in_progress" and new_status == "in_progress":
|
||||
await opc_db.start_time_entry(
|
||||
task_id=task_id,
|
||||
project_id=current_task.get("project_id"),
|
||||
actor=user.username
|
||||
)
|
||||
await opc_db.start_time_entry(task_id=task_id, project_id=current_task.get("project_id"), actor=user.username)
|
||||
|
||||
# Stop timer when moving away from in_progress
|
||||
if old_status == "in_progress" and new_status != "in_progress":
|
||||
@@ -164,11 +158,7 @@ async def update_task(
|
||||
if "completed_at" in updates and updates["completed_at"] is not None:
|
||||
updates["completed_at"] = updates["completed_at"].replace(tzinfo=None)
|
||||
|
||||
updated_task = await opc_db.update_task(
|
||||
task_id=task_id,
|
||||
updates=updates,
|
||||
actor=user.username
|
||||
)
|
||||
updated_task = await opc_db.update_task(task_id=task_id, updates=updates, actor=user.username)
|
||||
|
||||
# Broadcast WebSocket update
|
||||
await opc_ws.broadcast_task_update(task_id, "updated", updated_task)
|
||||
@@ -209,16 +199,14 @@ async def move_task(
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
|
||||
old_status = current_task["status"]
|
||||
print(f"[Move] Task {task_id}: old_status={old_status}, new_status={move.status}, assigned_to={current_task.get('assigned_to')}")
|
||||
print(
|
||||
f"[Move] Task {task_id}: old_status={old_status}, new_status={move.status}, assigned_to={current_task.get('assigned_to')}"
|
||||
)
|
||||
|
||||
# Handle automatic time tracking
|
||||
if old_status != "in_progress" and move.status == "in_progress":
|
||||
print(f"[Move] Task {task_id} moving to in_progress, old_status={old_status}")
|
||||
await opc_db.start_time_entry(
|
||||
task_id=task_id,
|
||||
project_id=current_task.get("project_id"),
|
||||
actor=user.username
|
||||
)
|
||||
await opc_db.start_time_entry(task_id=task_id, project_id=current_task.get("project_id"), actor=user.username)
|
||||
|
||||
# Auto-assign to default agent (PM) if not already assigned
|
||||
if not current_task.get("assigned_to"):
|
||||
@@ -232,18 +220,12 @@ async def move_task(
|
||||
print(f"[Move] Task {task_id} assigned to agent {agent_id}, checking for existing execution")
|
||||
|
||||
# Check if there's already a pending execution
|
||||
existing_executions = await opc_db.get_agent_executions(
|
||||
task_id=task_id,
|
||||
status="pending",
|
||||
limit=1
|
||||
)
|
||||
existing_executions = await opc_db.get_agent_executions(task_id=task_id, status="pending", limit=1)
|
||||
|
||||
if not existing_executions:
|
||||
print(f"[Move] No pending execution found, creating one for agent {agent_id}")
|
||||
execution_id = await opc_db.create_agent_execution(
|
||||
task_id=task_id,
|
||||
agent_id=agent_id,
|
||||
actor=user.username
|
||||
task_id=task_id, agent_id=agent_id, actor=user.username
|
||||
)
|
||||
print(f"[Move] Created agent execution {execution_id} for task {task_id}")
|
||||
else:
|
||||
@@ -255,11 +237,7 @@ async def move_task(
|
||||
if move.status == "done":
|
||||
updates["completed_at"] = datetime.utcnow().replace(tzinfo=None)
|
||||
|
||||
updated_task = await opc_db.update_task(
|
||||
task_id=task_id,
|
||||
updates=updates,
|
||||
actor=user.username
|
||||
)
|
||||
updated_task = await opc_db.update_task(task_id=task_id, updates=updates, actor=user.username)
|
||||
return updated_task
|
||||
|
||||
|
||||
@@ -271,24 +249,13 @@ async def assign_task(
|
||||
):
|
||||
"""Assign task to human or agent"""
|
||||
user: User = request.state.user
|
||||
updates = {
|
||||
"assigned_to": assign.assigned_to,
|
||||
"assigned_type": assign.assigned_type
|
||||
}
|
||||
updates = {"assigned_to": assign.assigned_to, "assigned_type": assign.assigned_type}
|
||||
|
||||
updated_task = await opc_db.update_task(
|
||||
task_id=task_id,
|
||||
updates=updates,
|
||||
actor=user.username
|
||||
)
|
||||
updated_task = await opc_db.update_task(task_id=task_id, updates=updates, actor=user.username)
|
||||
|
||||
# If assigning to agent, create execution record
|
||||
if assign.assigned_type == "agent":
|
||||
await opc_db.create_agent_execution(
|
||||
task_id=task_id,
|
||||
agent_id=assign.assigned_to,
|
||||
actor=user.username
|
||||
)
|
||||
await opc_db.create_agent_execution(task_id=task_id, agent_id=assign.assigned_to, actor=user.username)
|
||||
|
||||
return updated_task
|
||||
|
||||
@@ -313,8 +280,4 @@ async def get_task_time(
|
||||
user: User = request.state.user
|
||||
entries = await opc_db.get_time_entries(task_id=task_id)
|
||||
total_minutes = sum(e["duration_minutes"] for e in entries)
|
||||
return {
|
||||
"entries": entries,
|
||||
"total_minutes": total_minutes,
|
||||
"total_hours": round(total_minutes / 60, 2)
|
||||
}
|
||||
return {"entries": entries, "total_minutes": total_minutes, "total_hours": round(total_minutes / 60, 2)}
|
||||
|
||||
Reference in New Issue
Block a user