MindsDB 25.1.5.0__py3-none-any.whl → 25.1.5.2__py3-none-any.whl

{MindsDB-25.1.5.0.dist-info → MindsDB-25.1.5.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mindsdb/__about__.py,sha256=Hf4rpI4t4KpRan2XQZXlT2BYMNkK-Witu6DoRc7BrOM,444
+mindsdb/__about__.py,sha256=yTKWTlVHwoFNow5QlIHB7ZMW57IFpBcKN7fnskXu75M,444
 mindsdb/__init__.py,sha256=fZopLiAYa9MzMZ0d48JgHc_LddfFKDzh7n_8icsjrVs,54
 mindsdb/__main__.py,sha256=VQ3RetGs34NhFRT9d76o5S3UpKxdr-G3c0138kz3f8Y,21435
 mindsdb/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -71,7 +71,7 @@ mindsdb/api/http/namespaces/default.py,sha256=r8PXn00Um2eyKB5e_Kj7fzk4e4LYH-JCzX
 mindsdb/api/http/namespaces/file.py,sha256=u6xYa_moAMb0UXWGkNtErGw9nk-FbloRuLHrLCANjoU,6644
 mindsdb/api/http/namespaces/handlers.py,sha256=zRWZvPOplwSAbKDKeQz93J38TsCQT89-GSlSug6Mtug,7911
 mindsdb/api/http/namespaces/jobs.py,sha256=Oif6biw5Bii1fboSbYbpkFJ7cZW9Ad1jpednWX14Xws,3186
-mindsdb/api/http/namespaces/knowledge_bases.py,sha256=bkuEaekMVpFiUTTcpqOJnxYphoEqkCDmNgth020Qszw,16564
+mindsdb/api/http/namespaces/knowledge_bases.py,sha256=khPdoF5O0SQDtlGj5W0Q1gyPiuzoaq7DEgCYxpRPsXQ,16651
 mindsdb/api/http/namespaces/models.py,sha256=rCUFF02CQcF_QKeCQJcyAWIZzyyNXw-Jl-aX5lGnvBc,11240
 mindsdb/api/http/namespaces/projects.py,sha256=g2dv_f4MGy7xZRARRqpjghLGSxq_FjHx-fHqPBfRP-E,1407
 mindsdb/api/http/namespaces/skills.py,sha256=2eG5NtaqJSXQ_ex9Tus0sHA7oF4_SKOxPTdlpnz2tkk,5923
@@ -1401,7 +1401,7 @@ mindsdb/integrations/handlers/snowflake_handler/__about__.py,sha256=O2reZn6Jc5N1
 mindsdb/integrations/handlers/snowflake_handler/__init__.py,sha256=tPpKf8KwyX2DIgRy6XdrGgBjTf_H5G514XYH0fGFYsw,609
 mindsdb/integrations/handlers/snowflake_handler/connection_args.py,sha256=7pnJbHpbXMZwQbAS4U7LJUk8OWLLpPN2_q9IPr7wpec,1778
 mindsdb/integrations/handlers/snowflake_handler/icon.svg,sha256=Syi1A_eltgZH6HjPuKi8bi9Pzf8T879RfVAZnNzK0Qo,4088
-mindsdb/integrations/handlers/snowflake_handler/requirements.txt,sha256=5r0GR-Pbs4w_Mxp6OmX83aVj7D_y7hagqozmHE_ijyE,63
+mindsdb/integrations/handlers/snowflake_handler/requirements.txt,sha256=RC9MdPLYC6oRsCC2k5sLfgxDTEuEPvqe8OpyjMYEECs,63
 mindsdb/integrations/handlers/snowflake_handler/snowflake_handler.py,sha256=0NpP-KVaxduKaAkb7yKA--WzdDTWhzyNrWW9BoxNF2o,11090
 mindsdb/integrations/handlers/snowflake_handler/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mindsdb/integrations/handlers/snowflake_handler/tests/test_snowflake_handler.py,sha256=2_zTKNxqbvhzwVhU9JRmv5Chhh9rulGnMfj-GVIPA60,7369
@@ -1686,7 +1686,7 @@ mindsdb/integrations/libs/process_cache.py,sha256=Ad63SQKKVJiZemISb2RnWdjTsyKVeN
 mindsdb/integrations/libs/realtime_chat_handler.py,sha256=bJxlLKzYUb8tYShRUsecdubZ_E0kWxzExXK-v37gqYc,1171
 mindsdb/integrations/libs/response.py,sha256=iyadSLc5e7gY-rviaaoFNIrgIhDBJ-DZux062PxRRz8,3119
 mindsdb/integrations/libs/storage_handler.py,sha256=g4rcAD4TzmxWmEtS00235_NAnrdulIir4If6E4y_OUo,3512
-mindsdb/integrations/libs/vectordatabase_handler.py,sha256=E5gYqD3e9rqspCNecxfYWwtM-itfX3kdkP7cUwUtrag,17448
+mindsdb/integrations/libs/vectordatabase_handler.py,sha256=-TcUIzSSX21DPOGh7zI0-nuumqaW0NgUCElXzouWXjg,17523
 mindsdb/integrations/libs/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mindsdb/integrations/libs/llm/config.py,sha256=M14flGRcngP8n37sT8XLuJj5w-145B4IAyx3vLllogM,3548
 mindsdb/integrations/libs/llm/utils.py,sha256=vCiWWqCfmKElyyuka4Asd1UBhEZiH7YWn_xRAk3xies,24362
@@ -1770,7 +1770,7 @@ mindsdb/interfaces/agents/constants.py,sha256=VrtxjycDDsZ1z1kgVuz84yjfJicvDedeut
 mindsdb/interfaces/agents/langchain_agent.py,sha256=GswT0iPmQThJsoEIBOmWZG3K1eqwuLMuLQtCI36LQPg,25878
 mindsdb/interfaces/agents/langfuse_callback_handler.py,sha256=EIea9jsKgcGANPCZpdLe929bJy85SVA_bjdsyPiwp_g,4900
 mindsdb/interfaces/agents/mindsdb_chat_model.py,sha256=9e_LxCKrCSOZWqURHWavw-FQUK9PLJ5O18IGYSHD9us,6051
-mindsdb/interfaces/agents/mindsdb_database_agent.py,sha256=85kDikJSld6fUg8DKcVad41fzfdoQRaN7hRG08hXBQ8,2184
+mindsdb/interfaces/agents/mindsdb_database_agent.py,sha256=lk7UyE7tK807GXLBDr4-b2VVFUUzDtpMx2GjVtywv3o,2459
 mindsdb/interfaces/agents/safe_output_parser.py,sha256=x2G27UPT42iVjjj44vGUVNPEUDSHH3nlKJwe3GZDh9A,1605
 mindsdb/interfaces/chatbot/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 mindsdb/interfaces/chatbot/chatbot_controller.py,sha256=Ex-_CoZayYW3GAde0XozTL5s5M3rwWJqxt_c1uU09vg,14181
@@ -1794,7 +1794,7 @@ mindsdb/interfaces/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 mindsdb/interfaces/jobs/jobs_controller.py,sha256=xBleXIpGLZ_Sg3j5e7BeTRV-Hp6ELMuFuQwtVZyQ72s,18247
 mindsdb/interfaces/jobs/scheduler.py,sha256=m_C-QiTExljq0ilpe4vQiQv56AIWsrtfcdo0krMYQes,3664
 mindsdb/interfaces/knowledge_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mindsdb/interfaces/knowledge_base/controller.py,sha256=kCoqvJrBqrsGqmGXsF6kXEiJNPszrciUYOR3FOHxnPY,35657
+mindsdb/interfaces/knowledge_base/controller.py,sha256=2DhhWQmZXDtWuQnSEa-J4m-HEvr6fsvBZ5Chs8xS9QA,36304
 mindsdb/interfaces/knowledge_base/preprocessing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mindsdb/interfaces/knowledge_base/preprocessing/constants.py,sha256=0sLB2GOQhh3d46WNcVPF0iTmJc01CIXJoPT99XktuMo,295
 mindsdb/interfaces/knowledge_base/preprocessing/document_loader.py,sha256=t0ilsEKWLAC0iJrWNPnZXY4DxRNQjvwv4CweeHR9u0g,5542
@@ -1808,13 +1808,13 @@ mindsdb/interfaces/query_context/context_controller.py,sha256=YAmdcSFEzd3aOr4nRF
 mindsdb/interfaces/query_context/last_query.py,sha256=LbZwvPtDYJFVBRonJr6RgGZyCbCNGcJJdhS22pW_YE0,9331
 mindsdb/interfaces/skills/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 mindsdb/interfaces/skills/retrieval_tool.py,sha256=zuEEPky--GdKHa1rqd4VhM2wgtlGas5G72eFbooj-Hg,4480
-mindsdb/interfaces/skills/skill_tool.py,sha256=rcs5i5SVuBEowjyCPqZk2etGHvGq2Gi89kmOt2uddSw,12567
+mindsdb/interfaces/skills/skill_tool.py,sha256=8YjAmQ8PM0dhO8pRfKuwO2Bf3bKizLARelztjbwNz4c,12925
 mindsdb/interfaces/skills/skills_controller.py,sha256=CUY0B_9DBCUX7LzeODrdBs4WDNRivGPTPHYcGtH7b-M,6146
-mindsdb/interfaces/skills/sql_agent.py,sha256=2INHwWNzUQNYf3dWo9MQ55y5EyIe3TI-YpfucQ5ivXE,13523
+mindsdb/interfaces/skills/sql_agent.py,sha256=bZBrv2Ya-eRXvEkd4-BCXvXIzKMpTrERUmqEDh2_b7Y,14286
 mindsdb/interfaces/skills/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mindsdb/interfaces/skills/custom/text2sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mindsdb/interfaces/skills/custom/text2sql/mindsdb_sql_tool.py,sha256=CDi2v2Ym3u-0nr8jq7wyf8CymWRFy_wziCov4Y9b3Iw,1253
-mindsdb/interfaces/skills/custom/text2sql/mindsdb_sql_toolkit.py,sha256=G6H8u6EfCa5a6yOOeX0h5vLRb7SmEP_z4lRiDxwNtYA,6278
+mindsdb/interfaces/skills/custom/text2sql/mindsdb_sql_toolkit.py,sha256=xDMSe00nxdYe0m-rQM-awJnb6j5A2uR9Ve_Zx0HPMcc,7002
 mindsdb/interfaces/storage/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 mindsdb/interfaces/storage/db.py,sha256=L-nXGVVkt4izM2VgORfCitLUg3xVup8nwLi7B9PyKCg,19351
 mindsdb/interfaces/storage/fs.py,sha256=4Nyo-h23UtZc2nz_LWyVzboC_e1jlU58aph1_en8MdE,21155
@@ -1929,8 +1929,8 @@ mindsdb/utilities/profiler/__init__.py,sha256=d4VXl80uSm1IotR-WwbBInPmLmACiK0Azx
 mindsdb/utilities/profiler/profiler.py,sha256=KCUtOupkbM_nCoof9MtiuhUzDGezx4a4NsBX6vGWbPA,3936
 mindsdb/utilities/render/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mindsdb/utilities/render/sqlalchemy_render.py,sha256=XnG2IvB5tTF65EK-xV14HXrfGxyz2cQw7K6zEr9dclI,28287
-MindsDB-25.1.5.0.dist-info/LICENSE,sha256=ziqdjujs6WDn-9g3t0SISjHCBc2pLRht3gnRbQoXmIs,5804
-MindsDB-25.1.5.0.dist-info/METADATA,sha256=s852law0RiNoumZ_U3A_1MgIiwUsoutFz-QguUrawtU,42706
-MindsDB-25.1.5.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-MindsDB-25.1.5.0.dist-info/top_level.txt,sha256=10wPR96JDf3hM8aMP7Fz0lDlmClEP480zgXISJKr5jE,8
-MindsDB-25.1.5.0.dist-info/RECORD,,
+MindsDB-25.1.5.2.dist-info/LICENSE,sha256=ziqdjujs6WDn-9g3t0SISjHCBc2pLRht3gnRbQoXmIs,5804
+MindsDB-25.1.5.2.dist-info/METADATA,sha256=nY4sr8A-xoqcA4-VUSC8qeEjPeDFKsEh-YFBWjBEZAk,42706
+MindsDB-25.1.5.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+MindsDB-25.1.5.2.dist-info/top_level.txt,sha256=10wPR96JDf3hM8aMP7Fz0lDlmClEP480zgXISJKr5jE,8
+MindsDB-25.1.5.2.dist-info/RECORD,,

mindsdb/__about__.py

@@ -1,6 +1,6 @@
 __title__ = 'MindsDB'
 __package_name__ = 'mindsdb'
-__version__ = '25.1.5.0'
+__version__ = '25.1.5.2'
 __description__ = "MindsDB's AI SQL Server enables developers to build AI tools that need access to real-time data to perform their tasks"
 __email__ = "jorge@mindsdb.com"
 __author__ = 'MindsDB Inc'

mindsdb/api/http/namespaces/knowledge_bases.py

@@ -105,7 +105,10 @@ class KnowledgeBasesResource(Resource):
                 f'Knowledge Base with name {kb_name} already exists'
             )
 
-        embedding_model_identifier = Identifier(parts=[knowledge_base['model']])
+        embedding_model_identifier = None
+        if knowledge_base.get('model'):
+            embedding_model_identifier = Identifier(parts=[knowledge_base['model']])
+
         storage = knowledge_base.get('storage')
         embedding_table_identifier = None
         if storage is not None:

mindsdb/integrations/handlers/snowflake_handler/requirements.txt

@@ -1,2 +1,2 @@
-snowflake-connector-python==3.12.3
+snowflake-connector-python==3.13.1
 snowflake-sqlalchemy==1.7.0

mindsdb/integrations/libs/vectordatabase_handler.py

@@ -337,7 +337,7 @@ class VectorStoreHandler(BaseHandler):
         # dispatch delete
         return self.delete(table_name, conditions=conditions)
 
-    def _dispatch_select(self, query: Select):
+    def dispatch_select(self, query: Select, conditions: List[FilterCondition] = None):
         """
         Dispatch select query to the appropriate method.
         """
@@ -357,7 +357,8 @@ class VectorStoreHandler(BaseHandler):
 
         # check if columns are allowed
         where_statement = query.where
-        conditions = self._extract_conditions(where_statement)
+        if conditions is None:
+            conditions = self._extract_conditions(where_statement)
 
         # get offset and limit
         offset = query.offset.value if query.offset is not None else None
@@ -382,7 +383,7 @@ class VectorStoreHandler(BaseHandler):
             Insert: self._dispatch_insert,
             Update: self._dispatch_update,
             Delete: self._dispatch_delete,
-            Select: self._dispatch_select,
+            Select: self.dispatch_select,
         }
         if type(query) in dispatch_router:
             resp = dispatch_router[type(query)](query)

mindsdb/interfaces/agents/mindsdb_database_agent.py

@@ -11,6 +11,17 @@ from mindsdb.interfaces.skills.sql_agent import SQLAgent
 logger = log.getLogger(__name__)
 
 
+def extract_essential(input: str) -> str:
+    """ Sometimes LLM include to input unnecessary data. We can't control stochastic nature of LLM, so we need to
+        'clean' input somehow. LLM prompt contains instruction to enclose input between '$START$' and '$STOP$'.
+    """
+    if '$START$' in input:
+        input = input.partition('$START$')[-1]
+    if '$STOP$' in input:
+        input = input.partition('$STOP$')[0]
+    return input.strip(' ')
+
+
 class MindsDBSQL(SQLDatabase):
     @staticmethod
     def custom_init(
@@ -51,12 +62,9 @@ class MindsDBSQL(SQLDatabase):
 
     def get_table_info_no_throw(self, table_names: Optional[List[str]] = None) -> str:
         for i in range(len(table_names)):
-            if '$START$' in table_names[i]:
-                table_names[i] = table_names[i].partition('$START$')[-1]
-            if '$END$' in table_names[i]:
-                table_names[i] = table_names[i].partition('$END$')[0]
-            table_names[i] = table_names[i].strip(' ')
+            table_names[i] = extract_essential(table_names[i])
         return self._sql_agent.get_table_info_safe(table_names)
 
     def run_no_throw(self, command: str, fetch: str = "all") -> str:
+        command = extract_essential(command)
         return self._sql_agent.query_safe(command)

mindsdb/interfaces/knowledge_base/controller.py

@@ -26,6 +26,9 @@ from mindsdb.integrations.libs.vectordatabase_handler import (
 )
 from mindsdb.integrations.utilities.rag.rag_pipeline_builder import RAG
 from mindsdb.integrations.utilities.rag.config_loader import load_rag_config
+from mindsdb.integrations.utilities.sql_utils import (
+    extract_comparison_conditions, filter_dataframe, FilterCondition, FilterOperator
+)
 from mindsdb.interfaces.agents.constants import DEFAULT_EMBEDDINGS_MODEL_CLASS
 from mindsdb.interfaces.agents.langchain_agent import create_chat_model, get_llm_provider
 from mindsdb.interfaces.database.projects import ProjectController
@@ -101,18 +104,30 @@ class KnowledgeBaseTable:
         # Get response from vector db
         db_handler = self.get_vector_db()
         logger.debug(f"Using vector db handler: {type(db_handler)}")
-        resp = db_handler.query(query)
 
-        if resp.data_frame is not None:
-            logger.debug(f"Query returned {len(resp.data_frame)} rows")
-            logger.debug(f"Columns in response: {resp.data_frame.columns.tolist()}")
+        vector_filters, outer_filters = [], []
+        # update vector handlers, mark conditions as applied inside
+        for op, arg1, arg2 in extract_comparison_conditions(query.where):
+            condition = FilterCondition(arg1, FilterOperator(op.upper()), arg2)
+            if arg1 in (TableField.ID.value, TableField.CONTENT.value, TableField.EMBEDDINGS.value):
+                vector_filters.append(condition)
+            else:
+                outer_filters.append([op, arg1, arg2])
+
+        df = db_handler.dispatch_select(query, conditions=vector_filters)
+
+        if df is not None:
+            df = filter_dataframe(df, outer_filters)
+
+            logger.debug(f"Query returned {len(df)} rows")
+            logger.debug(f"Columns in response: {df.columns.tolist()}")
             # Log a sample of IDs to help diagnose issues
-            if not resp.data_frame.empty:
-                logger.debug(f"Sample of IDs in response: {resp.data_frame['id'].head().tolist()}")
+            if not df.empty:
+                logger.debug(f"Sample of IDs in response: {df['id'].head().tolist()}")
         else:
             logger.warning("Query returned no data")
 
-        return resp.data_frame
+        return df
 
     def insert_files(self, file_names: List[str]):
         """Process and insert files"""

mindsdb/interfaces/skills/custom/text2sql/mindsdb_sql_toolkit.py

@@ -15,20 +15,25 @@ class MindsDBSQLToolkit(SQLDatabaseToolkit):
         list_sql_database_tool = ListSQLDatabaseTool(
             name=f'sql_db_list_tables{prefix}',
             db=self.db,
-            description=(
-                "Input is an empty string, output is a comma-separated list of tables in the database. "
-                "Each table name in the list may be in one of two formats: database_name.table_name or "
-                "database_name.schema_name.table_name."
-                "If the table name is enclosed in backticks marks, then always use the table name with backticks marks in subsequent queries."
-            )
+            description=dedent("""\n
+                Input is an empty string, output is a comma-separated list of tables in the database. Each table name is escaped using backticks.
+                Each table name in the list may be in one of two formats: database_name.`table_name` or database_name.schema_name.`table_name`.
+                Table names in response to the user must be escaped using backticks.
+            """)
         )
 
         info_sql_database_tool_description = (
-            "Input: A comma-separated list of tables enclosed between the symbols $START$ and $END$. Output: Schema and sample rows for those tables. "
-            f"Ensure tables exist by calling {list_sql_database_tool.name} first. "
+            "Input: A comma-separated list of tables enclosed between the symbols $START$ and $STOP$. The tables names itself must be escaped using backticks.\n"
+            "Output: Schema and sample rows for those tables. \n"
             "Use this tool to investigate table schemas for needed columns. "
-            "Get sample data with 'SELECT * FROM table LIMIT 3' before answering questions. "
-            "Example Input: $START$ table1, table2, table3 $END$"
+            f"Ensure tables exist by calling {list_sql_database_tool.name} first. "
+            # "The names of tables, schemas, and databases must be escaped using backticks. "
+            # "Always enclose the names of tables, schemas, and databases in backticks. "
+            "Get sample data with 'SELECT * FROM `database`.`table` LIMIT 3' before answering questions. \n"
+            "Example of correct Input:\n    $START$ `database`.`table1`, `database`.`table2`, `database`.`table3` $STOP$\n"
+            "    $START$ `table1` `table2` `table3` $STOP$\n"
+            "Example of wrong Input:\n    $START$ `database.table1`, `database.table2`, `database.table3` $STOP$\n"
+            "    $START$ table1 table2 table3 $STOP$\n"
         )
         info_sql_database_tool = InfoSQLDatabaseTool(
             name=f'sql_db_schema{prefix}',
@@ -36,7 +41,7 @@ class MindsDBSQLToolkit(SQLDatabaseToolkit):
         )
 
         query_sql_database_tool_description = dedent(f"""\
-            Input: A detailed SQL query.
+            Input: A detailed and well-structured SQL query. The query must be enclosed between the symbols $START$ and $STOP$.
             Output: Database result or error message. For errors, rewrite and retry the query. For 'Unknown column' errors, use '{info_sql_database_tool.name}' to check table fields.
             This system is a highly intelligent and reliable PostgreSQL SQL skill designed to work with databases.
             Follow these instructions with utmost precision:
@@ -64,6 +69,7 @@ class MindsDBSQLToolkit(SQLDatabaseToolkit):
                  SELECT NOW() - INTERVAL 1 YEAR;
             6. Query Best Practices:
                - Always send only one query at a time.
+               - Always enclose the names of tables, schemas, and databases in backticks.
                - The input SQL query must end with a semicolon.
                - Query only necessary columns, not all.
                - Use only existing column names from correct tables.

mindsdb/interfaces/skills/skill_tool.py

@@ -126,6 +126,10 @@ class SkillToolController:
 
         command_executor = self.get_command_executor()
 
+        def escape_table_name(name: str) -> str:
+            name = name.strip(' `')
+            return f'`{name}`'
+
         tables_list = []
         for skill in skills:
             database = skill.params['database']
@@ -137,19 +141,22 @@ class SkillToolController:
                 else:
                     response = handler.get_tables()
                 # no restrictions
+                columns = [c.lower() for c in response.data_frame.columns]
+                name_idx = columns.index('table_name') if 'table_name' in columns else 0
+
                 if 'table_schema' in response.data_frame.columns:
                     for _, row in response.data_frame.iterrows():
-                        tables_list.append(f"{database}.{row['table_schema']}.{row['table_name']}")
+                        tables_list.append(f"{database}.{row['table_schema']}.{escape_table_name(row[name_idx])}")
                 else:
-                    for _, row in response.data_frame.iterrows():
-                        tables_list.append(f"{database}.{row['table_name']}")
+                    for table_name in response.data_frame.iloc[:, name_idx]:
+                        tables_list.append(f"{database}.{escape_table_name(table_name)}")
                 continue
             for schema_name, tables in restriction_on_tables.items():
                 for table in tables:
                     if schema_name is None:
-                        tables_list.append(f'{database}.{table}')
+                        tables_list.append(f'{database}.{escape_table_name(table)}')
                     else:
-                        tables_list.append(f'{database}.{schema_name}.{table}')
+                        tables_list.append(f'{database}.{schema_name}.{escape_table_name(table)}')
 
         sql_agent = SQLAgent(
             command_executor=command_executor,

mindsdb/interfaces/skills/sql_agent.py

@@ -1,7 +1,9 @@
 
 import re
+import csv
 import inspect
-from typing import Iterable, List, Optional
+from io import StringIO
+from typing import Iterable, List, Optional, Any
 
 import pandas as pd
 from mindsdb_sql_parser import parse_sql
@@ -14,6 +16,22 @@ from mindsdb.integrations.utilities.query_traversal import query_traversal
 logger = log.getLogger(__name__)
 
 
+def list_to_csv_str(array: List[List[Any]]) -> str:
+    """Convert a 2D array into a CSV string.
+
+    Args:
+        array (List[List[Any]]): A 2D array/list of values to convert to CSV format
+
+    Returns:
+        str: The array formatted as a CSV string using Excel dialect
+    """
+    output = StringIO()
+    writer = csv.writer(output, dialect='excel')
+    str_array = [[str(item) for item in row] for row in array]
+    writer.writerows(str_array)
+    return output.getvalue()
+
+
 def split_table_name(table_name: str) -> List[str]:
     """Split table name from llm to parst
 
@@ -24,40 +42,36 @@ def split_table_name(table_name: str) -> List[str]:
         List[str]: parts of table identifier like ['database', 'schema', 'table']
 
     Example:
-        Input: 'aaa.bbb', Output: ['aaa', 'bbb']
-        Input: '`aaa.bbb`', Output: ['aaa', 'bbb']
-        Input: '`aaa.`bbb``', Output: ['aaa', 'bbb']
-        Input: 'aaa.bbb.ccc', Output: ['aaa', 'bbb', 'ccc']
-        Input: '`aaa.bbb.ccc`', Output: ['aaa', 'bbb', 'ccc']
-        Input: '`aaa.`bbb.ccc``', Output: ['aaa', 'bbb.ccc']
-        Input: 'aaa.`bbb.ccc`', Output: ['aaa', 'bbb.ccc']
-        Input: 'aaa.`bbb.ccc`', Output: ['aaa', 'bbb.ccc']
-        Input: '`` aaa.`bbb.ccc``  \n`', Output: ['aaa', 'bbb.ccc']
+        'input': '`aaa`.`bbb.ccc`', 'output': ['aaa', 'bbb.ccc']
+        'input': '`aaa`.`bbb`.`ccc`', 'output': ['aaa', 'bbb', 'ccc']
+        'input': 'aaa.bbb', 'output': ['aaa', 'bbb']
+        'input': '`aaa.bbb`', 'output': ['aaa.bbb']
+        'input': '`aaa.bbb.ccc`', 'output': ['aaa.bbb.ccc']
+        'input': 'aaa.`bbb`', 'output': ['aaa', 'bbb']
+        'input': 'aaa.bbb.ccc', 'output': ['aaa', 'bbb', 'ccc']
+        'input': 'aaa.`bbb.ccc`', 'output': ['aaa', 'bbb.ccc']
+        'input': '`aaa`.`bbb.ccc`', 'output': ['aaa', 'bbb.ccc']
     """
-    table_name = table_name.strip(' "\'\n\r')
-    while table_name.startswith('`') and table_name.endswith('`'):
-        table_name = table_name[1:-1]
-        table_name = table_name.strip(' "\'\n\r')
-
     result = []
-    part = []
-    inside_quotes = False
-
-    for char in table_name:
-        if char == '`':
-            inside_quotes = not inside_quotes
-            continue
-
-        if char == '.' and not inside_quotes:
-            result.append(''.join(part))
-            part = []
+    current = ''
+    in_backticks = False
+
+    i = 0
+    while i < len(table_name):
+        if table_name[i] == '`':
+            in_backticks = not in_backticks
+        elif table_name[i] == '.' and not in_backticks:
+            if current:
+                result.append(current.strip('`'))
+                current = ''
         else:
-            part.append(char)
+            current += table_name[i]
+        i += 1
 
-    if part:
-        result.append(''.join(part))
+    if current:
+        result.append(current.strip('`'))
 
-    return [x for x in result if len(x) > 0]
+    return result
 
 
 class SQLAgent:
@@ -208,12 +222,15 @@ class SQLAgent:
 
             # Some LLMs (e.g. gpt-4o) may include backticks or quotes when invoking tools.
             table_parts = split_table_name(table_name)
+            if len(table_parts) == 1:
+                # most likely LLM enclosed all table name in backticks `database.table`
+                table_parts = split_table_name(table_name)
 
             # resolved table
             table_identifier = tables_idx.get(tuple(table_parts))
 
             if table_identifier is None:
-                raise ValueError(f"Table {table} not found in database")
+                raise ValueError(f"Table {table} not found in the database")
             tables.append(table_identifier)
 
         return tables
@@ -262,8 +279,7 @@ class SQLAgent:
             dtypes.append(column.get('type', ''))
 
         info = f'Table named `{table_str}`:\n'
-        info += f"\nSample with first {self._sample_rows_in_table_info} rows from table {table_str}:\n"
-        info += "\t".join([field for field in fields])
+        info += f"\nSample with first {self._sample_rows_in_table_info} rows from table {table_str} in CSV format (dialect is 'excel'):\n"
         info += self._get_sample_rows(table_str, fields) + "\n"
         info += '\nColumn data types: ' + ",\t".join(
             [f'\n`{field}` : `{dtype}`' for field, dtype in zip(fields, dtypes)]) + '\n'  # noqa
@@ -274,9 +290,14 @@ class SQLAgent:
         try:
             ret = self._call_engine(command)
             sample_rows = ret.data.to_lists()
+
+            def truncate_value(val):
+                str_val = str(val)
+                return str_val if len(str_val) < 100 else (str_val[:100] + '...')
+
             sample_rows = list(
-                map(lambda ls: [str(i) if len(str(i)) < 100 else str[:100] + '...' for i in ls], sample_rows))
-            sample_rows_str = "\n" + "\n".join(["\t".join(row) for row in sample_rows])
+                map(lambda row: [truncate_value(value) for value in row], sample_rows))
+            sample_rows_str = "\n" + list_to_csv_str([fields] + sample_rows)
         except Exception as e:
             logger.warning(e)
             sample_rows_str = "\n" + "\t [error] Couldn't retrieve sample rows!"
@@ -294,9 +315,6 @@ class SQLAgent:
         If the statement returns no rows, an empty string is returned.
         """
 
-        def _tidy(result: List) -> str:
-            return '\n'.join(['\t'.join([str(value) for value in row]) for row in result])
-
         def _repr_result(ret):
             limit_rows = 30
 
@@ -312,16 +330,16 @@ class SQLAgent:
                 res += f'First {limit_rows} rows:\n'
 
             else:
-                res += 'Result:\n'
-
-            res += _tidy(data[:limit_rows])
+                res += "Result in CSV format (dialect is 'excel'):\n"
+            res += list_to_csv_str([[col.name for col in ret.columns]] + data[:limit_rows])
             return res
 
         ret = self._call_engine(self._clean_query(command))
         if fetch == "all":
             result = _repr_result(ret.data)
         elif fetch == "one":
-            result = _tidy(ret.data.to_lists()[0])
+            result = "Result in CSV format (dialect is 'excel'):\n"
+            result += list_to_csv_str([[col.name for col in ret.data.columns]] + [ret.data.to_lists()[0]])
         else:
             raise ValueError("Fetch parameter must be either 'one' or 'all'")
         return str(result)