MindsDB 25.5.3.0__py3-none-any.whl → 25.5.4.0__py3-none-any.whl

mindsdb/integrations/handlers/ms_teams_handler/ms_graph_api_teams_client.py

@@ -28,7 +28,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
         except RequestException as request_error:
             logger.error(f"Failed to check connection to Microsoft Teams: {request_error}")
             return False
-        
+
     def get_teams(self) -> List[Dict]:
         """
         Get teams from Microsoft Teams.
@@ -37,7 +37,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             List[Dict]: The teams data.
         """
         return self._get_all_groups()
-        
+
     def get_channels(self, group_id: Text = None, channel_ids: List[Text] = None) -> List[Dict]:
         """
         Get channels from Microsoft Teams.
@@ -57,7 +57,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             return self._get_channels_across_all_groups_by_ids(channel_ids)
         else:
             return self._get_all_channels_across_all_groups()
-        
+
     def get_channel_messages(self, group_id: Text, channel_id: Text, message_ids: List[Text] = None) -> List[Dict]:
         """
         Get channel messages from Microsoft Teams.
@@ -74,7 +74,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             return self._get_messages_in_channel_by_ids(group_id, channel_id, message_ids)
         else:
             return self._get_all_messages_in_channel(group_id, channel_id)
-        
+
     def get_chats(self, chat_ids: List[Text] = None) -> List[Dict]:
         """
         Get chats from Microsoft Teams.
@@ -89,7 +89,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             return self._get_chats_by_ids(chat_ids)
         else:
             return self._get_all_chats()
-        
+
     def get_chat_messages(self, chat_id: Text, message_ids: List[Text] = None) -> List[Dict]:
         """
         Get chat messages from Microsoft Teams.
@@ -118,7 +118,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             self._group_ids = [group["id"] for group in groups]
 
         return self._group_ids
-    
+
     @abstractmethod
     def _get_all_groups(self) -> List[Dict]:
         """
@@ -198,7 +198,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
         channel.update({"teamId": group_id})
 
         return channel
-    
+
     def _get_channels_in_group_by_ids(self, group_id: Text, channel_ids: List[Text]) -> List[Dict]:
         """
         Get channels by their IDs and the ID of the group that they belong to.
@@ -215,7 +215,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             channels.append(self._get_channel_in_group_by_id(group_id, channel_id))
 
         return channels
-        
+
     def _get_all_channels_in_group(self, group_id: Text) -> List[Dict]:
         """
         Get all channels of a group by its ID.
@@ -231,7 +231,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             channel["teamId"] = group_id
 
         return channels
-    
+
     def _get_all_channels_across_all_groups(self) -> List[Dict]:
         """
         Get all channels across all groups related to Microsoft Teams.
@@ -244,7 +244,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             channels += self._get_all_channels_in_group(group_id)
 
         return channels
-    
+
     def _get_channels_across_all_groups_by_ids(self, channel_ids: List[Text]) -> List[Dict]:
         """
         Get channels by their IDs.
@@ -258,7 +258,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
         channels = self._get_all_channels_across_all_groups()
 
         return [channel for channel in channels if channel["id"] in channel_ids]
-    
+
     def _get_message_in_channel_by_id(self, group_id: Text, channel_id: Text, message_id: Text) -> Dict:
         """
         Get a message by its ID, the ID of the group that it belongs to, and the ID of the channel that it belongs to.
@@ -272,7 +272,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             Dict: The message data.
         """
         return self.fetch_data_json(f"teams/{group_id}/channels/{channel_id}/messages/{message_id}")
-    
+
     def _get_messages_in_channel_by_ids(self, group_id: Text, channel_id: Text, message_ids: List[Text]) -> List[Dict]:
         """
         Get messages by their IDs, the ID of the group that they belong to, and the ID of the channel that they belong to.
@@ -310,7 +310,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
                 break
 
         return messages[:limit]
-    
+
     def _get_chats_by_ids(self, chat_ids: List[Text]) -> List[Dict]:
         """
         Get chats by their IDs.
@@ -326,7 +326,7 @@ class MSGraphAPITeamsClient(MSGraphAPIBaseClient, ABC):
             chats.append(self._get_chat_by_id(chat_id))
 
         return chats
-    
+
     def _get_messages_in_chat_by_ids(self, chat_id: Text, message_ids: List[Text]) -> List[Dict]:
         """
         Get messages by their IDs and the ID of the chat that they belong to.
@@ -351,7 +351,7 @@ class MSGraphAPITeamsApplicationPermissionsClient(MSGraphAPITeamsClient):
     This client is used for accessing the Microsoft Teams specific endpoints of the Microsoft Graph API.
     Several common methods for submitting requests, fetching data, etc. are inherited from the base class.
     """
-        
+
     def _get_all_groups(self) -> List[Dict]:
         """
         Get all groups related to Microsoft Teams.
@@ -363,7 +363,7 @@ class MSGraphAPITeamsApplicationPermissionsClient(MSGraphAPITeamsClient):
             "/groups",
             params={"$filter": "resourceProvisioningOptions/Any(x:x eq 'Team')"}
         )
-    
+
     def _get_chat_by_id(self, chat_id: Text) -> Dict:
         """
         Get a chat by its ID.
@@ -375,7 +375,7 @@ class MSGraphAPITeamsApplicationPermissionsClient(MSGraphAPITeamsClient):
             Dict: The chat data.
         """
         return self.fetch_data_json(f"chats/{chat_id}")
-    
+
     def _get_all_chats(self, limit: int = None) -> List[Dict]:
         """
         Get all chats related to Microsoft Teams.
@@ -400,7 +400,7 @@ class MSGraphAPITeamsApplicationPermissionsClient(MSGraphAPITeamsClient):
             Dict: The message data.
         """
         return self.fetch_data_json(f"chats/{chat_id}/messages/{message_id}")
-    
+
     def _get_all_messages_in_chat(self, chat_id: Text, limit: int = None) -> List[Dict]:
         """
         Get messages of a chat by its ID.
@@ -421,13 +421,13 @@ class MSGraphAPITeamsApplicationPermissionsClient(MSGraphAPITeamsClient):
         return messages[:limit]
 
 
-class MSGraphAPITeamsDelegatedPermissionsClient(MSGraphAPITeamsClient): 
+class MSGraphAPITeamsDelegatedPermissionsClient(MSGraphAPITeamsClient):
     """
     The Microsoft Graph API client for the Microsoft Teams handler with delegated permissions.
     This client is used for accessing the Microsoft Teams specific endpoints of the Microsoft Graph API.
     Several common methods for submitting requests, fetching data, etc. are inherited from the base class.
     """
-        
+
     def _get_all_groups(self) -> List[Dict]:
         """
         Get all groups that the signed in user is a member of.
@@ -436,7 +436,7 @@ class MSGraphAPITeamsDelegatedPermissionsClient(MSGraphAPITeamsClient):
             List[Dict]: The groups data.
         """
         return self.fetch_data_json("me/joinedTeams")
-    
+
     def _get_chat_by_id(self, chat_id: Text) -> Dict:
         """
         Get a chat by its ID.
@@ -467,7 +467,7 @@ class MSGraphAPITeamsDelegatedPermissionsClient(MSGraphAPITeamsClient):
                 break
 
         return chats[:limit]
-    
+
     def _get_message_in_chat_by_id(self, chat_id: Text, message_id: Text) -> Dict:
         """
         Get a message by its ID and the ID of the chat that it belongs to.
@@ -480,7 +480,7 @@ class MSGraphAPITeamsDelegatedPermissionsClient(MSGraphAPITeamsClient):
             Dict: The message data.
         """
         return self.fetch_data_json(f"me/chats/{chat_id}/messages/{message_id}")
-    
+
     def _get_all_messages_in_chat(self, chat_id: Text, limit: int = None) -> List[Dict]:
         """
         Get messages of a chat by its ID.

mindsdb/integrations/handlers/ms_teams_handler/ms_teams_handler.py

@@ -1,4 +1,4 @@
-from typing import Callable, Dict, Text, Callable, Union
+from typing import Dict, Text, Callable, Union
 
 from botbuilder.schema import Activity, ActivityTypes
 from botbuilder.schema import ChannelAccount
@@ -19,7 +19,7 @@ from mindsdb.integrations.libs.response import (
     HandlerStatusResponse as StatusResponse,
 )
 from mindsdb.integrations.libs.api_handler import APIChatHandler
-from mindsdb.integrations.utilities.handlers.auth_utilities import (
+from mindsdb.integrations.utilities.handlers.auth_utilities.microsoft import (
     MSGraphAPIApplicationPermissionsManager,
     MSGraphAPIDelegatedPermissionsManager
 )
@@ -233,7 +233,7 @@ class MSTeamsHandler(APIChatHandler):
         callback(
             chat_id=request['conversation']['id'],
             message=chat_bot_message
-        )    
+        )
 
     @chatbot_only
     def respond(self, message: ChatBotMessage) -> None:

mindsdb/integrations/handlers/ms_teams_handler/ms_teams_tables.py

@@ -15,6 +15,7 @@ class TeamsTable(APIResource):
     """
     The table abstraction for the 'teams' resource of the Microsoft Graph API.
     """
+
     def list(
         self,
         conditions: List[FilterCondition] = None,
@@ -67,6 +68,7 @@ class ChannelsTable(APIResource):
     """
     The table abstraction for the 'channels' resource of the Microsoft Graph API.
     """
+
     def list(
         self,
         conditions: List[FilterCondition] = None,
@@ -146,6 +148,7 @@ class ChannelMessagesTable(APIResource):
     """
     The table abstraction for the 'channel messages' resource of the Microsoft Graph API.
     """
+
     def list(
         self,
         conditions: List[FilterCondition] = None,
@@ -206,7 +209,7 @@ class ChannelMessagesTable(APIResource):
 
         if not group_id or not channel_id:
             raise ValueError("The 'channelIdentity_teamId' and 'channelIdentity_channelId' columns are required.")
-        
+
         messages = client.get_channel_messages(group_id, channel_id, message_ids)
 
         messages_df = pd.json_normalize(messages, sep="_")
@@ -247,12 +250,13 @@ class ChannelMessagesTable(APIResource):
             "channelIdentity_teamId",
             "channelIdentity_channelId",
         ]
-    
+
 
 class ChatsTable(APIResource):
     """
     The table abstraction for the 'chats' resource of the Microsoft Graph API.
     """
+
     def list(
         self,
         conditions: List[FilterCondition] = None,
@@ -312,12 +316,13 @@ class ChatsTable(APIResource):
             "webUrl",
             "isHiddenForAllMembers"
         ]
-    
+
 
 class ChatMessagesTable(APIResource):
     """
     The table abstraction for the 'chat messages' resource of the Microsoft Graph API.
     """
+
     def list(
         self,
         conditions: List[FilterCondition] = None,
@@ -367,7 +372,7 @@ class ChatMessagesTable(APIResource):
 
         if not chat_id:
             raise ValueError("The 'chatId' column is required.")
-        
+
         messages = client.get_chat_messages(chat_id, message_ids)
 
         messages_df = pd.json_normalize(messages, sep="_")
@@ -405,4 +410,4 @@ class ChatMessagesTable(APIResource):
             "from_user_userIdentityType",
             "body_contentType",
             "body_content",
-        ]
+        ]

mindsdb/integrations/handlers/mssql_handler/mssql_handler.py

@@ -1,6 +1,10 @@
+from typing import Any
+import datetime
+
 import pymssql
 from pymssql import OperationalError
 import pandas as pd
+from pandas.api import types as pd_types
 
 from mindsdb_sql_parser import parse_sql
 from mindsdb_sql_parser.ast.base import ASTNode
@@ -46,10 +50,77 @@ def _map_type(mssql_type_text: str) -> MYSQL_DATA_TYPE:
         if internal_type_name in db_types_list:
             return mysql_data_type
 
-    logger.warning(f"MSSQL handler type mapping: unknown type: {internal_type_name}, use VARCHAR as fallback.")
+    logger.debug(f"MSSQL handler type mapping: unknown type: {internal_type_name}, use VARCHAR as fallback.")
     return MYSQL_DATA_TYPE.VARCHAR
 
 
+def _make_table_response(result: list[dict[str, Any]], cursor: pymssql.Cursor) -> Response:
+    """Build response from result and cursor.
+
+    Args:
+        result (list[dict[str, Any]]): result of the query.
+        cursor (pymssql.Cursor): cursor object.
+
+    Returns:
+        Response: response object.
+    """
+    description: list[tuple[Any]] = cursor.description
+    mysql_types: list[MYSQL_DATA_TYPE] = []
+
+    data_frame = pd.DataFrame(
+        result,
+        columns=[x[0] for x in cursor.description]
+    )
+
+    for column in description:
+        column_name = column[0]
+        column_type = column[1]
+        column_dtype = data_frame[column_name].dtype
+        match column_type:
+            case pymssql.NUMBER:
+                if pd_types.is_integer_dtype(column_dtype):
+                    mysql_types.append(MYSQL_DATA_TYPE.INT)
+                elif pd_types.is_float_dtype(column_dtype):
+                    mysql_types.append(MYSQL_DATA_TYPE.FLOAT)
+                elif pd_types.is_bool_dtype(column_dtype):
+                    # it is 'bit' type
+                    mysql_types.append(MYSQL_DATA_TYPE.TINYINT)
+                else:
+                    mysql_types.append(MYSQL_DATA_TYPE.DOUBLE)
+            case pymssql.DECIMAL:
+                mysql_types.append(MYSQL_DATA_TYPE.DECIMAL)
+            case pymssql.STRING:
+                mysql_types.append(MYSQL_DATA_TYPE.TEXT)
+            case pymssql.DATETIME:
+                mysql_types.append(MYSQL_DATA_TYPE.DATETIME)
+            case pymssql.BINARY:
+                # DATE and TIME types returned as 'BINARY' type, and dataframe type is 'object', so it is not possible
+                # to infer correct mysql type for them
+                if pd_types.is_datetime64_any_dtype(column_dtype):
+                    # pymssql return datetimes as 'binary' type
+                    # if timezone is present, then it is datetime.timezone
+                    series = data_frame[column_name]
+                    if (
+                        series.dt.tz is not None
+                        and isinstance(series.dt.tz, datetime.timezone)
+                        and series.dt.tz != datetime.timezone.utc
+                    ):
+                        series = series.dt.tz_convert('UTC')
+                        data_frame[column_name] = series.dt.tz_localize(None)
+                    mysql_types.append(MYSQL_DATA_TYPE.DATETIME)
+                else:
+                    mysql_types.append(MYSQL_DATA_TYPE.BINARY)
+            case _:
+                logger.warning(f"Unknown type: {column_type}, use TEXT as fallback.")
+                mysql_types.append(MYSQL_DATA_TYPE.TEXT)
+
+    return Response(
+        RESPONSE_TYPE.TABLE,
+        data_frame=data_frame,
+        mysql_types=mysql_types
+    )
+
+
 class SqlServerHandler(DatabaseHandler):
     """
     This handler handles connection and execution of the Microsoft SQL Server statements.
@@ -169,13 +240,7 @@ class SqlServerHandler(DatabaseHandler):
                 cur.execute(query)
                 if cur.description:
                     result = cur.fetchall()
-                    response = Response(
-                        RESPONSE_TYPE.TABLE,
-                        data_frame=pd.DataFrame(
-                            result,
-                            columns=[x[0] for x in cur.description]
-                        )
-                    )
+                    response = _make_table_response(result, cur)
                 else:
                     response = Response(RESPONSE_TYPE.OK, affected_rows=cur.rowcount)
                 connection.commit()

mindsdb/integrations/handlers/mysql_handler/__about__.py

@@ -1,9 +1,9 @@
-__title__ = 'MindsDB MySQL handler'
-__package_name__ = 'mindsdb_mysql_handler'
-__version__ = '0.0.1'
+__title__ = "MindsDB MySQL handler"
+__package_name__ = "mindsdb_mysql_handler"
+__version__ = "0.0.1"
 __description__ = "MindsDB handler for MySQL"
-__author__ = 'MindsDB Inc'
-__github__ = 'https://github.com/mindsdb/mindsdb'
-__pypi__ = 'https://pypi.org/project/mindsdb/'
-__license__ = 'MIT'
-__copyright__ = 'Copyright 2022- mindsdb'
+__author__ = "MindsDB Inc"
+__github__ = "https://github.com/mindsdb/mindsdb"
+__pypi__ = "https://pypi.org/project/mindsdb/"
+__license__ = "MIT"
+__copyright__ = "Copyright 2022- mindsdb"

mindsdb/integrations/handlers/mysql_handler/__init__.py

@@ -2,19 +2,29 @@ from mindsdb.integrations.libs.const import HANDLER_TYPE
 
 from .__about__ import __version__ as version, __description__ as description
 from .connection_args import connection_args, connection_args_example
+
 try:
     from .mysql_handler import MySQLHandler as Handler
+
     import_error = None
 except Exception as e:
     Handler = None
     import_error = e
 
-title = 'MySQL'
-name = 'mysql'
+title = "MySQL"
+name = "mysql"
 type = HANDLER_TYPE.DATA
-icon_path = 'icon.svg'
+icon_path = "icon.svg"
 
 __all__ = [
-    'Handler', 'version', 'name', 'type', 'title', 'description',
-    'connection_args', 'connection_args_example', 'import_error', 'icon_path'
+    "Handler",
+    "version",
+    "name",
+    "type",
+    "title",
+    "description",
+    "connection_args",
+    "connection_args_example",
+    "import_error",
+    "icon_path",
 ]

mindsdb/integrations/handlers/mysql_handler/connection_args.py

@@ -5,72 +5,68 @@ from mindsdb.integrations.libs.const import HANDLER_CONNECTION_ARG_TYPE as ARG_T
 
 connection_args = OrderedDict(
     url={
-        'type': ARG_TYPE.STR,
-        'description': 'The URI-Like connection string to the MySQL server. If provided, it will override the other connection arguments.',
-        'required': False,
-        'label': 'URL'
+        "type": ARG_TYPE.STR,
+        "description": "The URI-Like connection string to the MySQL server. If provided, it will override the other connection arguments.",
+        "required": False,
+        "label": "URL",
     },
     user={
-        'type': ARG_TYPE.STR,
-        'description': 'The user name used to authenticate with the MySQL server.',
-        'required': True,
-        'label': 'User'
+        "type": ARG_TYPE.STR,
+        "description": "The user name used to authenticate with the MySQL server.",
+        "required": True,
+        "label": "User",
     },
     password={
-        'type': ARG_TYPE.PWD,
-        'description': 'The password to authenticate the user with the MySQL server.',
-        'required': True,
-        'label': 'Password',
-        'secret': True
+        "type": ARG_TYPE.PWD,
+        "description": "The password to authenticate the user with the MySQL server.",
+        "required": True,
+        "label": "Password",
+        "secret": True,
     },
     database={
-        'type': ARG_TYPE.STR,
-        'description': 'The database name to use when connecting with the MySQL server.',
-        'required': True,
-        'label': 'Database'
+        "type": ARG_TYPE.STR,
+        "description": "The database name to use when connecting with the MySQL server.",
+        "required": True,
+        "label": "Database",
     },
     host={
-        'type': ARG_TYPE.STR,
-        'description': 'The host name or IP address of the MySQL server. NOTE: use \'127.0.0.1\' instead of \'localhost\' to connect to local server.',
-        'required': True,
-        'label': 'Host'
+        "type": ARG_TYPE.STR,
+        "description": "The host name or IP address of the MySQL server. NOTE: use '127.0.0.1' instead of 'localhost' to connect to local server.",
+        "required": True,
+        "label": "Host",
     },
     port={
-        'type': ARG_TYPE.INT,
-        'description': 'The TCP/IP port of the MySQL server. Must be an integer.',
-        'required': True,
-        'label': 'Port'
+        "type": ARG_TYPE.INT,
+        "description": "The TCP/IP port of the MySQL server. Must be an integer.",
+        "required": True,
+        "label": "Port",
     },
     ssl={
-        'type': ARG_TYPE.BOOL,
-        'description': 'Set it to True to enable ssl.',
-        'required': False,
-        'label': 'ssl'
+        "type": ARG_TYPE.BOOL,
+        "description": "Set it to True to enable ssl.",
+        "required": False,
+        "label": "ssl",
     },
     ssl_ca={
-        'type': ARG_TYPE.PATH,
-        'description': 'Path or URL of the Certificate Authority (CA) certificate file',
-        'required': False,
-        'label': 'ssl_ca'
+        "type": ARG_TYPE.PATH,
+        "description": "Path or URL of the Certificate Authority (CA) certificate file",
+        "required": False,
+        "label": "ssl_ca",
     },
     ssl_cert={
-        'type': ARG_TYPE.PATH,
-        'description': 'Path name or URL of the server public key certificate file',
-        'required': False,
-        'label': 'ssl_cert'
+        "type": ARG_TYPE.PATH,
+        "description": "Path name or URL of the server public key certificate file",
+        "required": False,
+        "label": "ssl_cert",
     },
     ssl_key={
-        'type': ARG_TYPE.PATH,
-        'description': 'The path name or URL of the server private key file',
-        'required': False,
-        'label': 'ssl_key',
-    }
+        "type": ARG_TYPE.PATH,
+        "description": "The path name or URL of the server private key file",
+        "required": False,
+        "label": "ssl_key",
+    },
 )
 
 connection_args_example = OrderedDict(
-    host='127.0.0.1',
-    port=3306,
-    user='root',
-    password='password',
-    database='database'
+    host="127.0.0.1", port=3306, user="root", password="password", database="database"
 )