Replace another crud call with get_job_or_404

Author: niole

automl-service/app/api/utils.py

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core.job_file_cache import download_mlflow_artifact
-from app.db import crud
+from app.services.job_service import get_job_or_404
 
 
 def resolve_request_project_id(request: Optional[Request]) -> Optional[str]:
@@ -34,7 +34,7 @@ async def get_job_paths(
     Raises HTTPException(400) if model_path not available.
     Raises HTTPException(500) if model_path is not an MLflow URI or download fails.
     """
-    job = await crud.get_job(db, job_id)
+    job = await get_job_or_404(db, job_id)
     if not job:
         raise HTTPException(status_code=404, detail=f"Job not found: {job_id}")
 

automl-service/tests/conftest.py

@@ -80,6 +80,14 @@ def pytest_configure(config):
     config.option.htmlpath = str(report_dir / filename)
 
 
+@pytest.fixture(autouse=True)
+def _use_local_mlflow_tracking_uri(monkeypatch):
+    """Keep tests on the repo-local MLflow store instead of inherited remote URIs."""
+    tracking_uri = Path(__file__).resolve().parent.parent / "mlruns"
+    tracking_uri.mkdir(exist_ok=True)
+    monkeypatch.setenv("MLFLOW_TRACKING_URI", str(tracking_uri))
+
+
 # ---------------------------------------------------------------------------
 # Auto-skip markers when optional packages are absent
 # ---------------------------------------------------------------------------

automl-service/tests/test_api_deployment.py

@@ -33,11 +33,12 @@ def _make_success_response(model_id: str, model_version: int = 3):
 
 
 @pytest.mark.asyncio
-async def test_deploy_from_job_happy_path(app_client):
+async def test_deploy_from_job_happy_path(app_client, monkeypatch):
     """
     Verifies that the helper that reaches out to domino to get jobs is called and that the domino api
     for creating model apis is called
     """
+    monkeypatch.setenv("DOMINO_ENVIRONMENT_ID", "fakeenvid")
     set_request_auth_header("Bearer test-token")
     job_id = "8771df7b-5550-4b6e-bea9-838f9fad040b"
     project_id = "69c66e4d729d187bd89d71f4"
@@ -54,4 +55,5 @@ async def test_deploy_from_job_happy_path(app_client):
         set_request_auth_header(None)
     body = response.json()
 
+    assert body['success'], f"Body was not successful, {body}"
     assert response.status_code == 200

automl-service/tests/test_deployment_service.py

@@ -106,7 +106,7 @@ async def test_job_not_found_raises_404(self):
         db.execute = AsyncMock()
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=None)):
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=None)):
             with pytest.raises(HTTPException) as exc_info:
                 await deploy_from_job("nonexistent-job-id")
             assert exc_info.value.status_code == 404
@@ -117,7 +117,7 @@ async def test_job_not_completed_raises_400(self):
         session_cm, _ = _make_db_session(job)
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)):
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)):
             with pytest.raises(HTTPException) as exc_info:
                 await deploy_from_job("job-id")
             assert exc_info.value.status_code == 400
@@ -129,7 +129,7 @@ async def test_job_not_registered_raises_400(self):
         session_cm, _ = _make_db_session(job)
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)):
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)):
             with pytest.raises(HTTPException) as exc_info:
                 await deploy_from_job("job-id")
             assert exc_info.value.status_code == 400
@@ -141,7 +141,7 @@ async def test_missing_registered_model_name_raises_400(self):
         session_cm, _ = _make_db_session(job)
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)):
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)):
             with pytest.raises(HTTPException) as exc_info:
                 await deploy_from_job("job-id")
             assert exc_info.value.status_code == 400
@@ -156,7 +156,7 @@ async def test_api_error_raises_400(self):
         )
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)), \
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)), \
              patch("app.services.deployment_service.get_domino_model_api", return_value=mock_api), \
              patch.dict("os.environ", {"DOMINO_ENVIRONMENT_ID": "env-123"}):
             with pytest.raises(HTTPException) as exc_info:
@@ -174,7 +174,7 @@ async def test_happy_path_returns_model_api_id(self):
         )
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)), \
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)), \
              patch("app.services.deployment_service.get_domino_model_api", return_value=mock_api), \
              patch.dict("os.environ", {"DOMINO_ENVIRONMENT_ID": "env-123"}):
             result = await deploy_from_job("job-id", model_name="my-api", replicas=2)
@@ -201,7 +201,7 @@ async def test_model_name_defaults_to_job_name(self):
         )
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)), \
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)), \
              patch("app.services.deployment_service.get_domino_model_api", return_value=mock_api), \
              patch.dict("os.environ", {"DOMINO_ENVIRONMENT_ID": "env-123"}):
             await deploy_from_job("job-id")
@@ -219,7 +219,7 @@ async def test_uses_domino_environment_id(self):
         )
 
         with patch("app.services.deployment_service.get_db_session", session_cm), \
-             patch("app.services.deployment_service.crud.get_job", AsyncMock(return_value=job)), \
+             patch("app.services.deployment_service.get_job_or_404", new=AsyncMock(return_value=job)), \
              patch("app.services.deployment_service.get_domino_model_api", return_value=mock_api), \
              patch.dict("os.environ", {"DOMINO_ENVIRONMENT_ID": "my-env-id"}):
             await deploy_from_job("job-id")