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

mindsdb/api/mcp/start.py

@@ -1,9 +1,16 @@
+import os
 from contextlib import asynccontextmanager
 from collections.abc import AsyncIterator
 from typing import Optional, Dict, Any
 from dataclasses import dataclass
 
+import uvicorn
+import anyio
 from mcp.server.fastmcp import FastMCP
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.requests import Request
+from starlette.responses import Response
+
 from mindsdb.api.mysql.mysql_proxy.classes.fake_mysql_proxy import FakeMysqlProxy
 from mindsdb.api.executor.data_types.response_type import RESPONSE_TYPE as SQL_RESPONSE_TYPE
 from mindsdb.utilities import log
@@ -70,10 +77,10 @@ def query(query: str, context: Optional[Dict] = None) -> Dict[str, Any]:
         if result.type == SQL_RESPONSE_TYPE.TABLE:
             return {
                 "type": SQL_RESPONSE_TYPE.TABLE,
-                "data": result.data.to_lists(json_types=True),
+                "data": result.result_set.to_lists(json_types=True),
                 "column_names": [
-                    x["alias"] or x["name"] if "alias" in x else x["name"]
-                    for x in result.columns
+                    column.alias or column.name
+                    for column in result.result_set.columns
                 ],
             }
         else:
@@ -116,7 +123,7 @@ def list_databases() -> Dict[str, Any]:
             return {"type": "ok"}
 
         elif result.type == SQL_RESPONSE_TYPE.TABLE:
-            data = result.data.to_lists(json_types=True)
+            data = result.result_set.to_lists(json_types=True)
             return data
 
     except Exception as e:
@@ -127,6 +134,36 @@ def list_databases() -> Dict[str, Any]:
         }
 
 
+class CustomAuthMiddleware(BaseHTTPMiddleware):
+    """Custom middleware to handle authentication basing on header 'Authorization'
+    """
+    async def dispatch(self, request: Request, call_next):
+        mcp_access_token = os.environ.get('MINDSDB_MCP_ACCESS_TOKEN')
+        if mcp_access_token is not None:
+            auth_token = request.headers.get('Authorization', '').partition('Bearer ')[-1]
+            if mcp_access_token != auth_token:
+                return Response(status_code=401, content="Unauthorized", media_type="text/plain")
+
+        response = await call_next(request)
+
+        return response
+
+
+async def run_sse_async() -> None:
+    """Run the server using SSE transport."""
+    starlette_app = mcp.sse_app()
+    starlette_app.add_middleware(CustomAuthMiddleware)
+
+    config = uvicorn.Config(
+        starlette_app,
+        host=mcp.settings.host,
+        port=mcp.settings.port,
+        log_level=mcp.settings.log_level.lower(),
+    )
+    server = uvicorn.Server(config)
+    await server.serve()
+
+
 def start(*args, **kwargs):
     """Start the MCP server
     Args:
@@ -142,7 +179,7 @@ def start(*args, **kwargs):
     mcp.settings.port = port
 
     try:
-        mcp.run(transport="sse")  # Use SSE transport instead of stdio
+        anyio.run(run_sse_async)
     except Exception as e:
         logger.error(f"Error starting MCP server: {str(e)}")
         raise

mindsdb/api/mysql/mysql_proxy/data_types/mysql_packet.py

@@ -77,7 +77,6 @@ class Packet:
                     f"Packet with less than 4 bytes in length: {packet_string}"
                 )
                 return False
-                break
             len_header = struct.unpack("i", packet_string[:3] + b"\x00")[0]
             count_header = int(packet_string[3])
             if len_header == 0:

mindsdb/api/mysql/mysql_proxy/data_types/mysql_packets/binary_resultset_row_package.py

@@ -30,16 +30,18 @@ class BinaryResultsetRowPacket(Packet):
         columns = self._kwargs.get('columns', {})
 
         self.value = [b'\x00']
-        nulls = [0]
+
+        # NOTE: according to mysql's doc offset=0 only for COM_STMT_EXECUTE, mariadb's doc does't mention that
+        # but in fact it looks like offset=2 everywhere
+        offset = 2
+        nulls_bitmap = bytearray((len(columns) + offset + 7) // 8)
         for i, el in enumerate(data):
-            if i > 0 and (i + 2) % 8 == 0:
-                nulls.append(0)
-            if el is None:
-                if i < 6:
-                    nulls[-1] = nulls[-1] + (1 << ((i + 2) % 8))
-                else:
-                    nulls[-1] = nulls[-1] + (1 << ((i - 6) % 8))
-        self.value.append(bytes(nulls))
+            if el is not None:
+                continue
+            byte_index = (i + offset) // 8
+            bit_index = (i + offset) % 8
+            nulls_bitmap[byte_index] |= (1 << bit_index)
+        self.value.append(bytes(nulls_bitmap))
 
         for i, col in enumerate(columns):
             # NOTE at this moment all types sends as strings, and it works
@@ -65,6 +67,12 @@ class BinaryResultsetRowPacket(Packet):
             elif col_type == TYPES.MYSQL_TYPE_YEAR:
                 enc = '<h'
                 val = int(float(val))
+            elif col_type == TYPES.MYSQL_TYPE_SHORT:
+                enc = '<h'
+                val = int(val)
+            elif col_type == TYPES.MYSQL_TYPE_TINY:
+                enc = '<B'
+                val = int(val)
             elif col_type == TYPES.MYSQL_TYPE_DATE:
                 env_val = self.encode_date(val)
             elif col_type == TYPES.MYSQL_TYPE_TIMESTAMP:
@@ -72,9 +80,9 @@ class BinaryResultsetRowPacket(Packet):
             elif col_type == TYPES.MYSQL_TYPE_DATETIME:
                 env_val = self.encode_date(val)
             elif col_type == TYPES.MYSQL_TYPE_TIME:
-                enc = ''
+                env_val = self.encode_time(val)
             elif col_type == TYPES.MYSQL_TYPE_NEWDECIMAL:
-                enc = ''
+                enc = 'string'
             else:
                 enc = 'string'
 
@@ -90,21 +98,46 @@ class BinaryResultsetRowPacket(Packet):
                     env_val = struct.pack(enc, val)
                 self.value.append(env_val)
 
+    def encode_time(self, val: dt.time | str) -> bytes:
+        """ https://mariadb.com/kb/en/resultset-row/#time-binary-encoding
+        """
+        if isinstance(val, str):
+            try:
+                val = dt.datetime.strptime(val, '%H:%M:%S').time()
+            except ValueError:
+                val = dt.datetime.strptime(val, '%H:%M:%S.%f').time()
+        if val == dt.time(0, 0, 0):
+            return struct.pack('<B', 0)  # special case for 0 time
+        out = struct.pack('<B', 0)  # positive time
+        out += struct.pack('<L', 0)  # days
+        out += struct.pack('<B', val.hour)
+        out += struct.pack('<B', val.minute)
+        out += struct.pack('<B', val.second)
+        if val.microsecond > 0:
+            out += struct.pack('<L', val.microsecond)
+            len_bit = struct.pack('<B', 12)
+        else:
+            len_bit = struct.pack('<B', 8)
+        return len_bit + out
+
     def encode_date(self, val):
         # date_type = None
         # date_value = None
 
         if isinstance(val, str):
-            try:
-                date_value = dt.datetime.strptime(val, '%Y-%m-%d')
-                date_type = 'date'
-            except ValueError:
+            forms = [
+                '%Y-%m-%d', '%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M:%S.%f',
+                '%Y-%m-%dT%H:%M:%S', '%Y-%m-%dT%H:%M:%S.%f'
+            ]
+            for f in forms:
                 try:
-                    date_value = dt.datetime.strptime(val, '%Y-%m-%dT%H:%M:%S')
-                    date_type = 'datetime'
+                    date_value = dt.datetime.strptime(val, f)
+                    break
                 except ValueError:
-                    date_value = dt.datetime.strptime(val, '%Y-%m-%dT%H:%M:%S.%f')
-                    date_type = 'datetime'
+                    date_value = None
+            if date_value is None:
+                raise ValueError(f"Invalid date format: {val}")
+            date_type = 'datetime'
         elif isinstance(val, pd.Timestamp):
             date_value = val
             date_type = 'datetime'

mindsdb/api/mysql/mysql_proxy/executor/mysql_executor.py

@@ -7,6 +7,7 @@ from mindsdb.api.executor.sql_query import SQLQuery
 from mindsdb.api.executor.data_types.answer import ExecuteAnswer
 from mindsdb.api.executor.command_executor import ExecuteCommands
 from mindsdb.api.mysql.mysql_proxy.utilities import ErSqlSyntaxError
+from mindsdb.api.mysql.mysql_proxy.libs.constants.mysql import MYSQL_DATA_TYPE
 from mindsdb.utilities import log
 
 logger = log.getLogger(__name__)
@@ -19,8 +20,8 @@ class Executor:
 
         self.query = None
 
-        self.columns = []
-        self.params = []
+        self.columns: list[Column] = []
+        self.params: list[Column] = []
         self.data = None
         self.server_status = None
         self.is_executed = False
@@ -56,14 +57,11 @@ class Executor:
 
             sqlquery.prepare_query()
 
-            self.params = [
-                Column(
-                    alias=p.value,
-                    type="str",
-                    name=p.value,
-                )
-                for p in params
-            ]
+            self.params = [Column(
+                name=p.value,
+                alias=p.value,
+                type=MYSQL_DATA_TYPE.TEXT
+            ) for p in params]
 
             # TODO:
             #   select * from mindsdb.models doesn't invoke prepare_steps and columns_list is empty

mindsdb/api/mysql/mysql_proxy/libs/constants/mysql.py

@@ -9,6 +9,7 @@
  *******************************************************
 """
 import enum
+from dataclasses import dataclass, field
 
 # CAPABILITIES
 # As defined in : https://dev.mysql.com/doc/dev/mysql-server/8.0.0/group__group__cs__capabilities__flags.html
@@ -128,10 +129,10 @@ class TYPES(object):
     MYSQL_TYPE_DATETIME2 = 18
     MYSQL_TYPE_TIME2 = 19
     MYSQL_TYPE_TYPED_ARRAY = 20
-    MYSQL_TYPE_VECTOR = 242,
-    MYSQL_TYPE_INVALID = 243,
-    MYSQL_TYPE_BOOL = 244,
-    MYSQL_TYPE_JSON = 245,
+    MYSQL_TYPE_VECTOR = 242
+    MYSQL_TYPE_INVALID = 243
+    MYSQL_TYPE_BOOL = 244
+    MYSQL_TYPE_JSON = 245
     MYSQL_TYPE_NEWDECIMAL = 246
     MYSQL_TYPE_ENUM = 247
     MYSQL_TYPE_SET = 248
@@ -312,40 +313,6 @@ MYSQL_DATA_TYPE_COLUMNS_DEFAULT = {
 }
 
 
-# Map between data types and C types
-# https://dev.mysql.com/doc/c-api/8.0/en/c-api-prepared-statement-type-codes.html
-DATA_C_TYPE_MAP = {
-    MYSQL_DATA_TYPE.TINYINT: C_TYPES.MYSQL_TYPE_TINY,
-    MYSQL_DATA_TYPE.SMALLINT: C_TYPES.MYSQL_TYPE_SHORT,
-    MYSQL_DATA_TYPE.MEDIUMINT: C_TYPES.MYSQL_TYPE_INT24,
-    MYSQL_DATA_TYPE.INT: C_TYPES.MYSQL_TYPE_LONG,
-    MYSQL_DATA_TYPE.BIGINT: C_TYPES.MYSQL_TYPE_LONGLONG,
-    MYSQL_DATA_TYPE.FLOAT: C_TYPES.MYSQL_TYPE_FLOAT,
-    MYSQL_DATA_TYPE.DOUBLE: C_TYPES.MYSQL_TYPE_DOUBLE,
-    MYSQL_DATA_TYPE.DECIMAL: C_TYPES.MYSQL_TYPE_NEWDECIMAL,
-    MYSQL_DATA_TYPE.YEAR: C_TYPES.MYSQL_TYPE_SHORT,
-    MYSQL_DATA_TYPE.TIME: C_TYPES.MYSQL_TYPE_TIME,
-    MYSQL_DATA_TYPE.DATE: C_TYPES.MYSQL_TYPE_DATE,
-    MYSQL_DATA_TYPE.DATETIME: C_TYPES.MYSQL_TYPE_DATETIME,
-    MYSQL_DATA_TYPE.TIMESTAMP: C_TYPES.MYSQL_TYPE_TIMESTAMP,
-    MYSQL_DATA_TYPE.CHAR: C_TYPES.MYSQL_TYPE_STRING,
-    MYSQL_DATA_TYPE.BINARY: C_TYPES.MYSQL_TYPE_STRING,
-    MYSQL_DATA_TYPE.VARCHAR: C_TYPES.MYSQL_TYPE_VAR_STRING,
-    MYSQL_DATA_TYPE.VARBINARY: C_TYPES.MYSQL_TYPE_VAR_STRING,
-    MYSQL_DATA_TYPE.TINYBLOB: C_TYPES.MYSQL_TYPE_TINY_BLOB,
-    MYSQL_DATA_TYPE.TINYTEXT: C_TYPES.MYSQL_TYPE_TINY_BLOB,
-    MYSQL_DATA_TYPE.BLOB: C_TYPES.MYSQL_TYPE_BLOB,
-    MYSQL_DATA_TYPE.TEXT: C_TYPES.MYSQL_TYPE_BLOB,
-    MYSQL_DATA_TYPE.MEDIUMBLOB: C_TYPES.MYSQL_TYPE_MEDIUM_BLOB,
-    MYSQL_DATA_TYPE.MEDIUMTEXT: C_TYPES.MYSQL_TYPE_MEDIUM_BLOB,
-    MYSQL_DATA_TYPE.LONGBLOB: C_TYPES.MYSQL_TYPE_LONG_BLOB,
-    MYSQL_DATA_TYPE.LONGTEXT: C_TYPES.MYSQL_TYPE_LONG_BLOB,
-    MYSQL_DATA_TYPE.BIT: C_TYPES.MYSQL_TYPE_BIT,
-    MYSQL_DATA_TYPE.BOOL: C_TYPES.MYSQL_TYPE_TINY,
-    MYSQL_DATA_TYPE.BOOLEAN: C_TYPES.MYSQL_TYPE_TINY
-}
-
-
 class FIELD_FLAG(object):
     __slots__ = ()
     NOT_NULL = 1                # field cannot be null
@@ -368,6 +335,55 @@ class FIELD_FLAG(object):
 FIELD_FLAG = FIELD_FLAG()
 
 
+@dataclass(frozen=True)
+class CTypeProperties:
+    """Properties that describe int-representation of mysql column.
+
+    Attributes:
+        code (int): Code of the mysql type.
+        size (int | None): Size of the column. If not specified, then size is variable (text/blob types).
+        flags (list[int]): Flags of the mysql type.
+    """
+    code: int
+    size: int | None = None
+    flags: list[int] = field(default_factory=list)
+
+
+# Map between data types and C types
+# Fields size and flags been taken from tcp dump of mysql-server response
+# https://dev.mysql.com/doc/c-api/8.0/en/c-api-prepared-statement-type-codes.html
+DATA_C_TYPE_MAP = {
+    MYSQL_DATA_TYPE.TINYINT: CTypeProperties(C_TYPES.MYSQL_TYPE_TINY, 4),
+    MYSQL_DATA_TYPE.SMALLINT: CTypeProperties(C_TYPES.MYSQL_TYPE_SHORT, 6),
+    MYSQL_DATA_TYPE.MEDIUMINT: CTypeProperties(C_TYPES.MYSQL_TYPE_INT24, 9),
+    MYSQL_DATA_TYPE.INT: CTypeProperties(C_TYPES.MYSQL_TYPE_LONG, 11),
+    MYSQL_DATA_TYPE.BIGINT: CTypeProperties(C_TYPES.MYSQL_TYPE_LONGLONG, 20),
+    MYSQL_DATA_TYPE.FLOAT: CTypeProperties(C_TYPES.MYSQL_TYPE_FLOAT, 12),
+    MYSQL_DATA_TYPE.DOUBLE: CTypeProperties(C_TYPES.MYSQL_TYPE_DOUBLE, 22),
+    MYSQL_DATA_TYPE.DECIMAL: CTypeProperties(C_TYPES.MYSQL_TYPE_NEWDECIMAL),
+    MYSQL_DATA_TYPE.YEAR: CTypeProperties(C_TYPES.MYSQL_TYPE_YEAR, 4, [FIELD_FLAG.UNSIGNED, FIELD_FLAG.ZEROFILL_FLAG]),
+    MYSQL_DATA_TYPE.TIME: CTypeProperties(C_TYPES.MYSQL_TYPE_TIME, 10, [FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.DATE: CTypeProperties(C_TYPES.MYSQL_TYPE_DATE, 10, [FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.DATETIME: CTypeProperties(C_TYPES.MYSQL_TYPE_DATETIME, 19, [FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.TIMESTAMP: CTypeProperties(C_TYPES.MYSQL_TYPE_TIMESTAMP, 19, [FIELD_FLAG.BINARY_COLLATION, FIELD_FLAG.TIMESTAMP]),
+    MYSQL_DATA_TYPE.CHAR: CTypeProperties(C_TYPES.MYSQL_TYPE_STRING),
+    MYSQL_DATA_TYPE.BINARY: CTypeProperties(C_TYPES.MYSQL_TYPE_STRING, flags=[FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.VARCHAR: CTypeProperties(C_TYPES.MYSQL_TYPE_VAR_STRING),
+    MYSQL_DATA_TYPE.VARBINARY: CTypeProperties(C_TYPES.MYSQL_TYPE_VAR_STRING, flags=[FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.TINYBLOB: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB, FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.TINYTEXT: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB]),
+    MYSQL_DATA_TYPE.BLOB: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB, FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.TEXT: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB]),
+    MYSQL_DATA_TYPE.MEDIUMBLOB: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB, FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.MEDIUMTEXT: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB]),
+    MYSQL_DATA_TYPE.LONGBLOB: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB, FIELD_FLAG.BINARY_COLLATION]),
+    MYSQL_DATA_TYPE.LONGTEXT: CTypeProperties(C_TYPES.MYSQL_TYPE_BLOB, flags=[FIELD_FLAG.BLOB]),
+    MYSQL_DATA_TYPE.BIT: CTypeProperties(C_TYPES.MYSQL_TYPE_BIT, 8, [FIELD_FLAG.UNSIGNED]),
+    MYSQL_DATA_TYPE.BOOL: CTypeProperties(C_TYPES.MYSQL_TYPE_TINY, 1),
+    MYSQL_DATA_TYPE.BOOLEAN: CTypeProperties(C_TYPES.MYSQL_TYPE_TINY, 1)
+}
+
+
 # HANDSHAKE
 
 DEFAULT_COALLITION_ID = 83