datarobot-genai 0.2.11__py3-none-any.whl → 0.2.19__py3-none-any.whl

datarobot_genai/drmcp/tools/clients/confluence.py

@@ -31,6 +31,14 @@ from .atlassian import get_atlassian_cloud_id
 logger = logging.getLogger(__name__)
 
 
+class ConfluenceError(Exception):
+    """Exception for Confluence API errors."""
+
+    def __init__(self, message: str, status_code: int | None = None) -> None:
+        super().__init__(message)
+        self.status_code = status_code
+
+
 class ConfluencePage(BaseModel):
     """Pydantic model for Confluence page."""
 
@@ -51,6 +59,22 @@ class ConfluencePage(BaseModel):
         }
 
 
+class ConfluenceComment(BaseModel):
+    """Pydantic model for Confluence comment."""
+
+    comment_id: str = Field(..., description="The unique comment ID")
+    page_id: str = Field(..., description="The page ID where the comment was added")
+    body: str = Field(..., description="Comment content in storage format")
+
+    def as_flat_dict(self) -> dict[str, Any]:
+        """Return a flat dictionary representation of the comment."""
+        return {
+            "comment_id": self.comment_id,
+            "page_id": self.page_id,
+            "body": self.body,
+        }
+
+
 class ConfluenceClient:
     """
     Client for interacting with Confluence API using OAuth access token.
@@ -133,7 +157,7 @@ class ConfluenceClient:
 
         Raises
         ------
-            ValueError: If page is not found
+            ConfluenceError: If page is not found
             httpx.HTTPStatusError: If the API request fails
         """
         cloud_id = await self._get_cloud_id()
@@ -142,7 +166,7 @@ class ConfluenceClient:
         response = await self._client.get(url, params={"expand": self.EXPAND_FIELDS})
 
         if response.status_code == HTTPStatus.NOT_FOUND:
-            raise ValueError(f"Page with ID '{page_id}' not found")
+            raise ConfluenceError(f"Page with ID '{page_id}' not found", status_code=404)
 
         response.raise_for_status()
         return self._parse_response(response.json())
@@ -161,7 +185,7 @@ class ConfluenceClient:
 
         Raises
         ------
-            ValueError: If the page is not found
+            ConfluenceError: If the page is not found
             httpx.HTTPStatusError: If the API request fails
         """
         cloud_id = await self._get_cloud_id()
@@ -181,10 +205,183 @@ class ConfluenceClient:
         results = data.get("results", [])
 
         if not results:
-            raise ValueError(f"Page with title '{title}' not found in space '{space_key}'")
+            raise ConfluenceError(
+                f"Page with title '{title}' not found in space '{space_key}'", status_code=404
+            )
 
         return self._parse_response(results[0])
 
+    def _extract_error_message(self, response: httpx.Response) -> str:
+        """Extract error message from Confluence API error response."""
+        try:
+            error_data = response.json()
+            # Confluence API returns errors in different formats
+            if "message" in error_data:
+                return error_data["message"]
+            if "errorMessages" in error_data and error_data["errorMessages"]:
+                return "; ".join(error_data["errorMessages"])
+            if "errors" in error_data:
+                errors = error_data["errors"]
+                if isinstance(errors, list):
+                    return "; ".join(str(e) for e in errors)
+                if isinstance(errors, dict):
+                    return "; ".join(f"{k}: {v}" for k, v in errors.items())
+        except Exception:
+            pass
+        return response.text or "Unknown error"
+
+    async def create_page(
+        self,
+        space_key: str,
+        title: str,
+        body_content: str,
+        parent_id: int | None = None,
+    ) -> ConfluencePage:
+        """
+        Create a new Confluence page in a specified space.
+
+        Args:
+            space_key: The key of the Confluence space where the page should live
+            title: The title of the new page
+            body_content: The content in Confluence Storage Format (XML) or raw text
+            parent_id: Optional ID of the parent page for creating a child page
+
+        Returns
+        -------
+            ConfluencePage with the created page data
+
+        Raises
+        ------
+            ConfluenceError: If space not found, parent page not found, duplicate title,
+                            permission denied, or invalid content
+            httpx.HTTPStatusError: If the API request fails with unexpected status
+        """
+        cloud_id = await self._get_cloud_id()
+        url = f"{ATLASSIAN_API_BASE}/ex/confluence/{cloud_id}/wiki/rest/api/content"
+
+        payload: dict[str, Any] = {
+            "type": "page",
+            "title": title,
+            "space": {"key": space_key},
+            "body": {
+                "storage": {
+                    "value": body_content,
+                    "representation": "storage",
+                }
+            },
+        }
+
+        if parent_id is not None:
+            payload["ancestors"] = [{"id": parent_id}]
+
+        response = await self._client.post(url, json=payload)
+
+        if response.status_code == HTTPStatus.NOT_FOUND:
+            error_msg = self._extract_error_message(response)
+            if parent_id is not None and "ancestor" in error_msg.lower():
+                raise ConfluenceError(
+                    f"Parent page with ID '{parent_id}' not found", status_code=404
+                )
+            raise ConfluenceError(
+                f"Space '{space_key}' not found or resource unavailable: {error_msg}",
+                status_code=404,
+            )
+
+        if response.status_code == HTTPStatus.CONFLICT:
+            raise ConfluenceError(
+                f"A page with title '{title}' already exists in space '{space_key}'",
+                status_code=409,
+            )
+
+        if response.status_code == HTTPStatus.FORBIDDEN:
+            raise ConfluenceError(
+                f"Permission denied: you don't have access to create pages in space '{space_key}'",
+                status_code=403,
+            )
+
+        if response.status_code == HTTPStatus.BAD_REQUEST:
+            error_msg = self._extract_error_message(response)
+            raise ConfluenceError(f"Invalid request: {error_msg}", status_code=400)
+
+        if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
+            raise ConfluenceError("Rate limit exceeded. Please try again later.", status_code=429)
+
+        response.raise_for_status()
+
+        return self._parse_response(response.json())
+
+    def _parse_comment_response(self, data: dict, page_id: str) -> ConfluenceComment:
+        """Parse API response into ConfluenceComment."""
+        body_content = ""
+        body = data.get("body", {})
+        if isinstance(body, dict):
+            storage = body.get("storage", {})
+            if isinstance(storage, dict):
+                body_content = storage.get("value", "")
+
+        return ConfluenceComment(
+            comment_id=str(data.get("id", "")),
+            page_id=page_id,
+            body=body_content,
+        )
+
+    async def add_comment(self, page_id: str, comment_body: str) -> ConfluenceComment:
+        """
+        Add a comment to a Confluence page.
+
+        Args:
+            page_id: The numeric page ID where the comment will be added
+            comment_body: The text content of the comment
+
+        Returns
+        -------
+            ConfluenceComment with the created comment data
+
+        Raises
+        ------
+            ConfluenceError: If page not found, permission denied, or invalid content
+            httpx.HTTPStatusError: If the API request fails with unexpected status
+        """
+        cloud_id = await self._get_cloud_id()
+        url = f"{ATLASSIAN_API_BASE}/ex/confluence/{cloud_id}/wiki/rest/api/content"
+
+        payload: dict[str, Any] = {
+            "type": "comment",
+            "container": {"id": page_id, "type": "page"},
+            "body": {
+                "storage": {
+                    "value": comment_body,
+                    "representation": "storage",
+                }
+            },
+        }
+
+        response = await self._client.post(url, json=payload)
+
+        if response.status_code == HTTPStatus.NOT_FOUND:
+            error_msg = self._extract_error_message(response)
+            raise ConfluenceError(
+                f"Page with ID '{page_id}' not found: {error_msg}",
+                status_code=404,
+            )
+
+        if response.status_code == HTTPStatus.FORBIDDEN:
+            raise ConfluenceError(
+                f"Permission denied: you don't have access to add comments to page '{page_id}'",
+                status_code=403,
+            )
+
+        if response.status_code == HTTPStatus.BAD_REQUEST:
+            error_msg = self._extract_error_message(response)
+            raise ConfluenceError(f"Invalid request: {error_msg}", status_code=400)
+
+        if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
+            raise ConfluenceError("Rate limit exceeded. Please try again later.", status_code=429)
+
+        response.raise_for_status()
+
+        return self._parse_comment_response(response.json(), page_id)
+
     async def __aenter__(self) -> "ConfluenceClient":
         """Async context manager entry."""
         return self

datarobot_genai/drmcp/tools/clients/jira.py

@@ -25,6 +25,18 @@ from .atlassian import get_atlassian_cloud_id
 
 logger = logging.getLogger(__name__)
 
+RESPONSE_JIRA_ISSUE_FIELDS = {
+    "id",
+    "key",
+    "summary",
+    "status",
+    "reporter",
+    "assignee",
+    "created",
+    "updated",
+}
+RESPONSE_JIRA_ISSUE_FIELDS_STR = ",".join(RESPONSE_JIRA_ISSUE_FIELDS)
+
 
 class _IssuePerson(BaseModel):
     email_address: str = Field(alias="emailAddress")
@@ -107,6 +119,42 @@ class JiraClient:
         self._cloud_id = await get_atlassian_cloud_id(self._client, service_type="jira")
         return self._cloud_id
 
+    async def _get_full_url(self, path: str) -> str:
+        """Return URL for Jira API."""
+        cloud_id = await self._get_cloud_id()
+        return f"{ATLASSIAN_API_BASE}/ex/jira/{cloud_id}/rest/api/3/{path}"
+
+    async def search_jira_issues(self, jql_query: str, max_results: int) -> list[Issue]:
+        """
+        Search Jira issues using JQL (Jira Query Language).
+
+        Args:
+            jql_query: JQL Query
+            max_results: Maximum number of issues to return
+
+        Returns
+        -------
+            List of Jira issues
+
+        Raises
+        ------
+            httpx.HTTPStatusError: If the API request fails
+        """
+        url = await self._get_full_url("search/jql")
+        response = await self._client.post(
+            url,
+            json={
+                "jql": jql_query,
+                "fields": list(RESPONSE_JIRA_ISSUE_FIELDS),
+                "maxResults": max_results,
+            },
+        )
+
+        response.raise_for_status()
+        raw_issues = response.json().get("issues", [])
+        issues = [Issue(**issue) for issue in raw_issues]
+        return issues
+
     async def get_jira_issue(self, issue_key: str) -> Issue:
         """
         Get a Jira issue by its key.
@@ -122,12 +170,8 @@ class JiraClient:
         ------
             httpx.HTTPStatusError: If the API request fails
         """
-        cloud_id = await self._get_cloud_id()
-        url = f"{ATLASSIAN_API_BASE}/ex/jira/{cloud_id}/rest/api/3/issue/{issue_key}"
-
-        response = await self._client.get(
-            url, params={"fields": "id,key,summary,status,reporter,assignee,created,updated"}
-        )
+        url = await self._get_full_url(f"issue/{issue_key}")
+        response = await self._client.get(url, params={"fields": RESPONSE_JIRA_ISSUE_FIELDS_STR})
 
         if response.status_code == HTTPStatus.NOT_FOUND:
             raise ValueError(f"{issue_key} not found")
@@ -136,6 +180,149 @@ class JiraClient:
         issue = Issue(**response.json())
         return issue
 
+    async def get_jira_issue_types(self, project_key: str) -> dict[str, str]:
+        """
+        Get Jira issue types possible for given project.
+
+        Args:
+            project_key: The key of the Jira project, e.g., 'PROJ'
+
+        Returns
+        -------
+            Dictionary where key is the issue type name and value is the issue type ID
+
+        Raises
+        ------
+            httpx.HTTPStatusError: If the API request fails
+        """
+        url = await self._get_full_url(f"issue/createmeta/{project_key}/issuetypes")
+        response = await self._client.get(url)
+
+        response.raise_for_status()
+        jsoned = response.json()
+        issue_types = {
+            issue_type["untranslatedName"]: issue_type["id"]
+            for issue_type in jsoned.get("issueTypes", [])
+        }
+        return issue_types
+
+    async def create_jira_issue(
+        self, project_key: str, summary: str, issue_type_id: str, description: str | None
+    ) -> str:
+        """
+        Create Jira issue.
+
+        Args:
+            project_key: The key of the Jira project, e.g., 'PROJ'
+            summary: Summary of Jira issue (title), e.g., 'Fix bug abc'
+            issue_type_id: ID type of Jira issue, e.g., "1"
+            description: Optional description of Jira issue
+
+        Returns
+        -------
+            Jira issue key
+
+        Raises
+        ------
+            httpx.HTTPStatusError: If the API request fails
+        """
+        url = await self._get_full_url("issue")
+        payload = {
+            "fields": {
+                "project": {"key": project_key},
+                "summary": summary,
+                "issuetype": {"id": issue_type_id},
+            }
+        }
+
+        if description:
+            payload["fields"]["description"] = {
+                "content": [
+                    {"content": [{"text": description, "type": "text"}], "type": "paragraph"}
+                ],
+                "type": "doc",
+                "version": 1,
+            }
+
+        response = await self._client.post(url, json=payload)
+
+        response.raise_for_status()
+        jsoned = response.json()
+        return jsoned["key"]
+
+    async def update_jira_issue(self, issue_key: str, fields: dict[str, Any]) -> list[str]:
+        """
+        Update Jira issue.
+
+        Args:
+            issue_key: The key of the Jira issue, e.g., 'PROJ-123'
+            fields: A dictionary of field names and their new values
+                e.g., {'description': 'New content'}
+
+        Returns
+        -------
+            List of updated fields
+
+        Raises
+        ------
+            httpx.HTTPStatusError: If the API request fails
+        """
+        url = await self._get_full_url(f"issue/{issue_key}")
+        payload = {"fields": fields}
+
+        response = await self._client.put(url, json=payload)
+
+        response.raise_for_status()
+        return list(fields.keys())
+
+    async def get_available_jira_transitions(self, issue_key: str) -> dict[str, str]:
+        """
+        Get Available Jira Transitions.
+
+        Args:
+            issue_key: The key of the Jira issue, e.g., 'PROJ-123'
+
+        Returns
+        -------
+            Dictionary where key is the transition name and value is the transition ID
+
+        Raises
+        ------
+            httpx.HTTPStatusError: If the API request fails
+        """
+        url = await self._get_full_url(f"issue/{issue_key}/transitions")
+        response = await self._client.get(url)
+        response.raise_for_status()
+        jsoned = response.json()
+        transitions = {
+            transition["name"]: transition["id"] for transition in jsoned.get("transitions", [])
+        }
+        return transitions
+
+    async def transition_jira_issue(self, issue_key: str, transition_id: str) -> None:
+        """
+        Transition Jira issue.
+
+        Args:
+            issue_key: The key of the Jira issue, e.g., 'PROJ-123'
+            transition_id: Id of target transitionm e.g. '123'.
+                Can be obtained from `get_available_jira_transitions`.
+
+        Returns
+        -------
+            Nothing
+
+        Raises
+        ------
+            httpx.HTTPStatusError: If the API request fails
+        """
+        url = await self._get_full_url(f"issue/{issue_key}")
+        payload = {"transition": {"id": transition_id}}
+
+        response = await self._client.post(url, json=payload)
+
+        response.raise_for_status()
+
     async def __aenter__(self) -> "JiraClient":
         """Async context manager entry."""
         return self

datarobot_genai/drmcp/tools/confluence/tools.py

@@ -23,6 +23,7 @@ from fastmcp.tools.tool import ToolResult
 from datarobot_genai.drmcp.core.mcp_instance import dr_mcp_tool
 from datarobot_genai.drmcp.tools.clients.atlassian import get_atlassian_access_token
 from datarobot_genai.drmcp.tools.clients.confluence import ConfluenceClient
+from datarobot_genai.drmcp.tools.clients.confluence import ConfluenceError
 
 logger = logging.getLogger(__name__)
 
@@ -65,8 +66,8 @@ async def confluence_get_page(
                         "'space_key' is required when identifying a page by title."
                     )
                 page_response = await client.get_page_by_title(page_id_or_title, space_key)
-    except ValueError as e:
-        logger.error(f"Value error getting Confluence page: {e}")
+    except ConfluenceError as e:
+        logger.error(f"Confluence error getting page: {e}")
         raise ToolError(str(e))
     except Exception as e:
         logger.error(f"Unexpected error getting Confluence page: {e}")
@@ -79,3 +80,109 @@ async def confluence_get_page(
         content=f"Successfully retrieved page '{page_response.title}'.",
         structured_content=page_response.as_flat_dict(),
     )
+
+
+@dr_mcp_tool(tags={"confluence", "write", "create", "page"})
+async def confluence_create_page(
+    *,
+    space_key: Annotated[str, "The key of the Confluence space where the new page should live."],
+    title: Annotated[str, "The title of the new page."],
+    body_content: Annotated[
+        str,
+        "The content of the page, typically in Confluence Storage Format (XML) or raw text.",
+    ],
+    parent_id: Annotated[
+        int | None,
+        "The ID of the parent page, used to create a child page.",
+    ] = None,
+) -> ToolResult:
+    """Create a new documentation page in a specified Confluence space.
+
+    Use this tool to create new Confluence pages with content in storage format.
+    The page will be created at the root level of the space unless a parent_id
+    is provided, in which case it will be created as a child page.
+
+    Usage:
+        - Root page: space_key="PROJ", title="New Page", body_content="<p>Content</p>"
+        - Child page: space_key="PROJ", title="Sub Page", body_content="<p>Content</p>",
+                      parent_id=123456
+    """
+    if not all([space_key, title, body_content]):
+        raise ToolError(
+            "Argument validation error: space_key, title, and body_content are required fields."
+        )
+
+    access_token = await get_atlassian_access_token()
+    if isinstance(access_token, ToolError):
+        raise access_token
+
+    try:
+        async with ConfluenceClient(access_token) as client:
+            page_response = await client.create_page(
+                space_key=space_key,
+                title=title,
+                body_content=body_content,
+                parent_id=parent_id,
+            )
+    except ConfluenceError as e:
+        logger.error(f"Confluence error creating page: {e}")
+        raise ToolError(str(e))
+    except Exception as e:
+        logger.error(f"Unexpected error creating Confluence page: {e}")
+        raise ToolError(
+            f"An unexpected error occurred while creating Confluence page "
+            f"'{title}' in space '{space_key}': {str(e)}"
+        )
+
+    return ToolResult(
+        content=f"New page '{title}' created successfully in space '{space_key}'.",
+        structured_content={"new_page_id": page_response.page_id, "title": page_response.title},
+    )
+
+
+@dr_mcp_tool(tags={"confluence", "write", "add", "comment"})
+async def confluence_add_comment(
+    *,
+    page_id: Annotated[str, "The numeric ID of the page where the comment will be added."],
+    comment_body: Annotated[str, "The text content of the comment."],
+) -> ToolResult:
+    """Add a new comment to a specified Confluence page for collaboration.
+
+    Use this tool to add comments to Confluence pages to facilitate collaboration
+    and discussion. Comments are added at the page level.
+
+    Usage:
+        - Add comment: page_id="856391684", comment_body="Great work on this documentation!"
+    """
+    if not page_id:
+        raise ToolError("Argument validation error: 'page_id' cannot be empty.")
+
+    if not comment_body:
+        raise ToolError("Argument validation error: 'comment_body' cannot be empty.")
+
+    access_token = await get_atlassian_access_token()
+    if isinstance(access_token, ToolError):
+        raise access_token
+
+    try:
+        async with ConfluenceClient(access_token) as client:
+            comment_response = await client.add_comment(
+                page_id=page_id,
+                comment_body=comment_body,
+            )
+    except ConfluenceError as e:
+        logger.error(f"Confluence error adding comment: {e}")
+        raise ToolError(str(e))
+    except Exception as e:
+        logger.error(f"Unexpected error adding comment to Confluence page: {e}")
+        raise ToolError(
+            f"An unexpected error occurred while adding comment to page '{page_id}': {str(e)}"
+        )
+
+    return ToolResult(
+        content=f"Comment added successfully to page ID {page_id}.",
+        structured_content={
+            "comment_id": comment_response.comment_id,
+            "page_id": page_id,
+        },
+    )