AI-1169 add link in run_job tool, update JobDetail to fit the specs

Author: Radoslav Klic

src/keboola_mcp_server/links.py

@@ -8,7 +8,8 @@
 
 
 class Link(BaseModel):
-    model_config = ConfigDict(frozen=True)  # we make the model immutable to avoid unexpected changes
+    model_config = ConfigDict(frozen=True)
+
     type: URLType = Field(..., description='The type of the URL.')
     title: str = Field(..., description='The name of the URL.')
     url: str = Field(..., description='The URL.')
@@ -85,14 +86,14 @@ def get_used_components_link(
         )
 
     def get_configuration_links(
-            self, component_id: str, configuration_id: str, configuration_name: str
-            ) -> list[Link]:
+        self, component_id: str, configuration_id: str, configuration_name: str
+    ) -> list[Link]:
         return [
-                self.get_component_config_link(
-                    component_id=component_id, configuration_id=configuration_id, configuration_name=configuration_name
-                ),
-                self.get_config_dashboard_link(component_id=component_id, component_name=component_id),
-            ]
+            self.get_component_config_link(
+                component_id=component_id, configuration_id=configuration_id, configuration_name=configuration_name
+            ),
+            self.get_config_dashboard_link(component_id=component_id, component_name=component_id),
+        ]
 
     # --- Transformations ---
     def get_transformations_dashboard_link(self) -> Link:

src/keboola_mcp_server/tools/jobs.py

@@ -94,22 +94,17 @@ class JobDetail(JobListItem):
     """Represents a detailed job with all available information."""
 
     url: str = Field(description='The URL of the job.')
-    table_id: Optional[str] = Field(
-        description='The ID of the table that the job is running on.',
-        validation_alias=AliasChoices('tableId', 'table_id', 'table-id'),
-        serialization_alias='tableId',
-        default=None,
-    )
+
     config_data: Optional[dict[str, Any]] = Field(
         description='The data of the configuration.',
         validation_alias=AliasChoices('configData', 'config_data', 'config-data'),
         serialization_alias='configData',
         default=None,
     )
-    config_row_ids: Optional[list[str]] = Field(
-        description='The row IDs of the configuration.',
-        validation_alias=AliasChoices('configRowIds', 'config_row_ids', 'config-row-ids'),
-        serialization_alias='configRowIds',
+    config_row: Optional[str] = Field(
+        description='The configuration row ID.',
+        validation_alias=AliasChoices('configRow', 'config_row', 'config-row'),
+        serialization_alias='configRow',
         default=None,
     )
     run_id: Optional[str] = Field(
@@ -118,12 +113,6 @@ class JobDetail(JobListItem):
         serialization_alias='runId',
         default=None,
     )
-    parent_run_id: Optional[str] = Field(
-        description='The ID of the parent run that the job is running on.',
-        validation_alias=AliasChoices('parentRunId', 'parent_run_id', 'parent-run-id'),
-        serialization_alias='parentRunId',
-        default=None,
-    )
     result: Optional[dict[str, Any]] = Field(
         description='The results of the job.',
         validation_alias='result',
@@ -291,7 +280,9 @@ async def run_job(
         raw_job = await client.jobs_queue_client.create_job(
             component_id=component_id, configuration_id=configuration_id
         )
-        job = JobDetail.model_validate(raw_job)
+        links_manager = await ProjectLinksManager.from_client(client)
+        links = links_manager.get_job_links(str(raw_job['id']))
+        job = JobDetail.model_validate(raw_job | {'links': links})
         LOG.info(
             f'Started a new job with id: {job.id} for component {component_id} and configuration {configuration_id}.'
         )

tests/conftest.py

@@ -19,7 +19,9 @@ def keboola_client(mocker) -> KeboolaClient:
 
     # Mock API clients
     client.storage_client = mocker.MagicMock(AsyncStorageClient)
+    client.storage_client.base_api_url = 'test://api.keboola.com'
     client.storage_client.branch_id = 'default'
+    client.storage_client.project_id.return_value = '123'
     client.jobs_queue_client = mocker.MagicMock(JobsQueueClient)
     client.ai_service_client = mocker.MagicMock(AIServiceClient)
 

tests/tools/test_jobs.py

@@ -7,6 +7,7 @@
 from pytest_mock import MockerFixture
 
 from keboola_mcp_server.client import KeboolaClient
+from keboola_mcp_server.links import Link
 from keboola_mcp_server.tools.jobs import (
     JobDetail,
     JobListItem,
@@ -60,13 +61,11 @@ def mock_job() -> dict[str, Any]:
         'endTime': '2024-01-01T00:00:02Z',
         'url': 'https://connection.keboola.com/jobs/123',
         'configData': {'source': 'file.csv'},
-        'configRowIds': ['1', '2', '3'],
+        'configRow': '1',
         'runId': '456',
-        'parentRunId': '789',
         'durationSeconds': 100,
         'result': {'import': 'successful'},
         'metrics': {'rows': 1000},
-        'links': []
     }
 
 
@@ -151,13 +150,10 @@ async def test_get_job(
     assert result.end_time.replace(tzinfo=None) == datetime.strptime(mock_job['endTime'], iso_format)
     assert result.url == mock_job['url']
     assert result.config_data == mock_job['configData']
-    assert result.config_row_ids == mock_job['configRowIds']
+    assert result.config_row == mock_job['configRow']
     assert result.run_id == mock_job['runId']
-    assert result.parent_run_id == mock_job['parentRunId']
     assert result.duration_seconds == mock_job['durationSeconds']
     assert result.result == mock_job['result']
-    # table_id is not present in the mock_job, should be None
-    assert result.table_id is None
 
     keboola_client.jobs_queue_client.get_job_detail.assert_called_once_with('123')
 
@@ -247,6 +243,10 @@ async def test_run_job(
     assert job_detail.component_id == component_id
     assert job_detail.config_id == configuration_id
     assert job_detail.result == {}
+    assert set(job_detail.links) == {
+        Link(type='ui-detail', title='Job: 123', url='test://api.keboola.com/admin/projects/123/queue/123'),
+        Link(type='ui-dashboard', title='Jobs in the project', url='test://api.keboola.com/admin/projects/123/queue'),
+    }
 
     keboola_client.jobs_queue_client.create_job.assert_called_once_with(
         component_id=component_id,
@@ -302,6 +302,7 @@ def test_job_detail_model_validate_dict_fields(
     :param mock_job: The mock job details - expecting api response.
     """
     mock_job[field_name] = input_value
+    mock_job['links'] = []
     if isinstance(expected_result, type) and issubclass(expected_result, Exception):
         with pytest.raises(expected_result):
             JobDetail.model_validate(mock_job)