Skip to content

Commit

Permalink
make create_nowait default create and introduce run endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
nerdai committed Oct 9, 2024
1 parent e74adfe commit d103f19
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
8 changes: 4 additions & 4 deletions llama_deploy/apiserver/routers/deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ async def read_deployment(deployment_name: str) -> JSONResponse:
)


@deployments_router.post("/{deployment_name}/tasks/create")
@deployments_router.post("/{deployment_name}/tasks/run")
async def create_deployment_task(
deployment_name: str, task_definition: TaskDefinition
) -> JSONResponse:
"""Create a task for the deployment."""
"""Create a task for the deployment, wait for result and delete associated session."""
deployment = manager.get_deployment(deployment_name)
if deployment is None:
raise HTTPException(status_code=404, detail="Deployment not found")
Expand All @@ -63,11 +63,11 @@ async def create_deployment_task(
return JSONResponse(result)


@deployments_router.post("/{deployment_name}/tasks/create_nowait")
@deployments_router.post("/{deployment_name}/tasks/create")
async def create_deployment_task_nowait(
deployment_name: str, task_definition: TaskDefinition
) -> JSONResponse:
"""Create a task for the deployment and don't wait for result."""
"""Create a task for the deployment but don't wait for result."""
deployment = manager.get_deployment(deployment_name)
if deployment is None:
raise HTTPException(status_code=404, detail="Deployment not found")
Expand Down
10 changes: 4 additions & 6 deletions tests/apiserver/routers/test_deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def test_create_deployment_task_missing_service(
)


def test_create_deployment_task(http_client: TestClient, data_path: Path) -> None:
def test_run_deployment_task(http_client: TestClient, data_path: Path) -> None:
with mock.patch(
"llama_deploy.apiserver.routers.deployments.manager"
) as mocked_manager:
Expand All @@ -95,16 +95,14 @@ def test_create_deployment_task(http_client: TestClient, data_path: Path) -> Non
session.session_id = "42"
mocked_manager.get_deployment.return_value = deployment
response = http_client.post(
"/deployments/test-deployment/tasks/create/",
"/deployments/test-deployment/tasks/run/",
json={"input": "{}"},
)
assert response.status_code == 200
deployment.client.delete_session.assert_called_with("42")


def test_create_deployment_task_nowait(
http_client: TestClient, data_path: Path
) -> None:
def test_create_deployment_task(http_client: TestClient, data_path: Path) -> None:
with mock.patch(
"llama_deploy.apiserver.routers.deployments.manager"
) as mocked_manager:
Expand All @@ -116,7 +114,7 @@ def test_create_deployment_task_nowait(
session.run_nowait.return_value = "test_task_id"
mocked_manager.get_deployment.return_value = deployment
response = http_client.post(
"/deployments/test-deployment/tasks/create_nowait/",
"/deployments/test-deployment/tasks/create/",
json={"input": "{}"},
)
assert response.status_code == 200
Expand Down

0 comments on commit d103f19

Please sign in to comment.