MindsDB 25.3.4.0__py3-none-any.whl → 25.3.4.2__py3-none-any.whl

mindsdb/integrations/handlers/confluence_handler/confluence_handler.py

@@ -1,83 +1,92 @@
-from typing import Optional, Union
+from typing import Any, Dict
 
-import requests
-from atlassian import Confluence
-from mindsdb_sql_parser import parse_sql
-
-from mindsdb.integrations.handlers.confluence_handler.confluence_table import (
+from mindsdb.integrations.handlers.confluence_handler.confluence_api_client import ConfluenceAPIClient
+from mindsdb.integrations.handlers.confluence_handler.confluence_tables import (
+    ConfluenceBlogPostsTable,
+    ConfluenceDatabasesTable,
     ConfluencePagesTable,
+    ConfluenceSpacesTable,
+    ConfluenceTasksTable,
+    ConfluenceWhiteboardsTable,
 )
 from mindsdb.integrations.libs.api_handler import APIHandler
 from mindsdb.integrations.libs.response import (
     HandlerStatusResponse as StatusResponse,
 )
-from mindsdb_sql_parser import parse_sql
 from mindsdb.utilities import log
 
-from atlassian import Confluence
-from typing import Optional
-import requests
 
 logger = log.getLogger(__name__)
 
+
 class ConfluenceHandler(APIHandler):
-    """Confluence handler implementation"""
-
-    def __init__(self, name=None, **kwargs):
-        """Initialize the Confluence handler.
-        Parameters
-        ----------
-        name : str
-            name of a handler instance
-        """
-        super().__init__(name)
+    """
+    This handler handles the connection and execution of SQL statements on Confluence.
+    """
+
+    name = "confluence"
 
-        connection_data = kwargs.get("connection_data", {})
+    def __init__(self, name: str, connection_data: Dict, **kwargs: Any) -> None:
+        """
+        Initializes the handler.
 
-        self.parser = parse_sql
-        self.dialect = 'confluence'
+        Args:
+            name (str): The name of the handler instance.
+            connection_data (Dict): The connection data required to connect to the Confluence API.
+            kwargs: Arbitrary keyword arguments.
+        """
+        super().__init__(name)
         self.connection_data = connection_data
         self.kwargs = kwargs
+
         self.connection = None
         self.is_connected = False
+        self.thread_safe = True
 
-        confluence_pages_data = ConfluencePagesTable(self)
-        self._register_table("pages", confluence_pages_data)
+        self._register_table("spaces", ConfluenceSpacesTable(self))
+        self._register_table("pages", ConfluencePagesTable(self))
+        self._register_table("blogposts", ConfluenceBlogPostsTable(self))
+        self._register_table("whiteboards", ConfluenceWhiteboardsTable(self))
+        self._register_table("databases", ConfluenceDatabasesTable(self))
+        self._register_table("tasks", ConfluenceTasksTable(self))
 
-    def connect(self):
-        """Set up the connection required by the handler.
-        Returns
-        -------
-        StatusResponse
-            connection object
+    def connect(self) -> ConfluenceAPIClient:
+        """
+        Establishes a connection to the Confluence API.
+
+        Raises:
+            ValueError: If the required connection parameters are not provided.
+
+        Returns:
+            atlassian.confluence.Confluence: A connection object to the Confluence API.
         """
         if self.is_connected is True:
             return self.connection
-        
-        if not all(key in self.connection_data and self.connection_data.get(key) for key in ['url', 'username', 'password']):
-            raise ValueError('Required parameters (url, username, password) must be provided and should not be empty.')
-        
-        conf = Confluence(
-            url=self.connection_data.get('url'),
+
+        if not all(key in self.connection_data and self.connection_data.get(key) for key in ['api_base', 'username', 'password']):
+            raise ValueError('Required parameters (api_base, username, password) must be provided and should not be empty.')
+
+        self.connection = ConfluenceAPIClient(
+            url=self.connection_data.get('api_base'),
             username=self.connection_data.get('username'),
             password=self.connection_data.get('password'),
         )
-        self.connection = conf
+
         self.is_connected = True
         return self.connection
 
     def check_connection(self) -> StatusResponse:
-        """Check connection to the handler.
-        Returns
-        -------
-        StatusResponse
-            Status confirmation
+        """
+        Checks the status of the connection to the Confluence API.
+
+        Returns:
+            StatusResponse: An object containing the success status and an error message if an error occurs.
         """
         response = StatusResponse(False)
-        need_to_close = self.is_connected is False
 
         try:
-            self.connect()
+            connection = self.connect()
+            connection.get_spaces(limit=1)
             response.success = True
         except Exception as e:
             logger.error(f"Error connecting to Confluence API: {e}!")
@@ -86,17 +95,3 @@ class ConfluenceHandler(APIHandler):
         self.is_connected = response.success
 
         return response
-
-    def native_query(self, query: str) -> StatusResponse:
-        """Receive and process a raw query.
-        Parameters
-        ----------
-        query : str
-            query in a native format
-        Returns
-        -------
-        StatusResponse
-            Request status
-        """
-        ast = parse_sql(query)
-        return self.query(ast)