switch to mindsdb_sql_parser

Author: ea-rus

mindsdb_sdk/databases.py

@@ -1,7 +1,7 @@
 from typing import List, Union
 
-from mindsdb_sql.parser.dialects.mindsdb import CreateDatabase
-from mindsdb_sql.parser.ast import DropDatabase, Identifier
+from mindsdb_sql_parser.ast.mindsdb import CreateDatabase
+from mindsdb_sql_parser.ast import DropDatabase, Identifier
 
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 

mindsdb_sdk/handlers.py

@@ -2,7 +2,7 @@
 import dataclasses
 from typing import List
 
-from mindsdb_sql.parser.ast import Show, Identifier, BinaryOperation, Constant
+from mindsdb_sql_parser.ast import Show, Identifier, BinaryOperation, Constant
 
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 

mindsdb_sdk/jobs.py

@@ -1,11 +1,10 @@
 import datetime as dt
 from typing import Union, List
 
-
 import pandas as pd
 
-from mindsdb_sql.parser.dialects.mindsdb import CreateJob, DropJob
-from mindsdb_sql.parser.ast import Identifier, Star, Select
+from mindsdb_sql_parser.ast.mindsdb import CreateJob, DropJob
+from mindsdb_sql_parser.ast import Identifier, Star, Select
 
 from mindsdb_sdk.query import Query
 from mindsdb_sdk.utils.sql import dict_to_binary_op

mindsdb_sdk/knowledge_bases.py

@@ -4,8 +4,8 @@
 
 import pandas as pd
 
-from mindsdb_sql.parser.dialects.mindsdb import CreateKnowledgeBase, DropKnowledgeBase
-from mindsdb_sql.parser.ast import Identifier, Star, Select, BinaryOperation, Constant, Insert
+from mindsdb_sql_parser.ast.mindsdb import CreateKnowledgeBase, DropKnowledgeBase
+from mindsdb_sql_parser.ast import Identifier, Star, Select, BinaryOperation, Constant, Insert
 
 from mindsdb_sdk.utils.sql import dict_to_binary_op, query_to_native_query
 from mindsdb_sdk.utils.objects_collection import CollectionBase

mindsdb_sdk/ml_engines.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 from typing import List, Union
 
-from mindsdb_sql.parser.ast import Show, Identifier
-from mindsdb_sql.parser.dialects.mindsdb import CreateMLEngine, DropMLEngine
+from mindsdb_sql_parser.ast import Show, Identifier
+from mindsdb_sql_parser.ast.mindsdb import CreateMLEngine, DropMLEngine
 
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 

mindsdb_sdk/models.py

@@ -5,11 +5,11 @@
 
 import pandas as pd
 
-from mindsdb_sql.parser.dialects.mindsdb import CreatePredictor, DropPredictor
-from mindsdb_sql.parser.dialects.mindsdb import RetrainPredictor, FinetunePredictor
-from mindsdb_sql.parser.ast import Identifier, Select, Star, Join, Describe, Set
-from mindsdb_sql import parse_sql
-from mindsdb_sql.exceptions import ParsingException
+from mindsdb_sql_parser.ast.mindsdb import CreatePredictor, DropPredictor
+from mindsdb_sql_parser.ast.mindsdb import RetrainPredictor, FinetunePredictor
+from mindsdb_sql_parser.ast import Identifier, Select, Star, Join, Describe, Set
+from mindsdb_sql_parser import parse_sql
+from mindsdb_sql_parser.exceptions import ParsingException
 
 from .ml_engines import MLEngine
 

mindsdb_sdk/projects.py

@@ -1,12 +1,10 @@
 from typing import  List
 
-from mindsdb_sql.parser.dialects.mindsdb import CreateDatabase, DropPredictor
-from mindsdb_sql.parser.ast import DropDatabase
-from mindsdb_sql.parser.ast import Identifier
+from mindsdb_sql_parser.ast.mindsdb import CreateDatabase, DropPredictor
+from mindsdb_sql_parser.ast import DropDatabase
+from mindsdb_sql_parser.ast import Identifier
 
 from mindsdb_sdk.agents import Agents
-from mindsdb_sdk.databases import Databases
-from mindsdb_sdk.ml_engines import MLEngines
 from mindsdb_sdk.skills import Skills
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 

mindsdb_sdk/tables.py

@@ -4,8 +4,8 @@
 
 import pandas as pd
 
-from mindsdb_sql.parser.ast import DropTables, CreateTable
-from mindsdb_sql.parser.ast import Select, Star, Identifier, Constant, Delete, Insert, Update, Last, BinaryOperation
+from mindsdb_sql_parser.ast import DropTables, CreateTable
+from mindsdb_sql_parser.ast import Select, Star, Identifier, Constant, Delete, Insert, Update, Last, BinaryOperation
 
 from mindsdb_sdk.utils.sql import dict_to_binary_op, add_condition, query_to_native_query
 from mindsdb_sdk.utils.objects_collection import CollectionBase

mindsdb_sdk/utils/sql.py

@@ -1,6 +1,7 @@
-from mindsdb_sql.parser.ast import BinaryOperation, Identifier, Constant, Select, Star, NativeQuery
+from mindsdb_sql_parser.ast import BinaryOperation, Identifier, Constant, Select, Star, NativeQuery
 from mindsdb_sdk.query import Query
 
+
 def dict_to_binary_op(filters):
     where = None
     for name, value in filters.items():

mindsdb_sdk/views.py

@@ -1,8 +1,8 @@
 from typing import List, Union
 
-from mindsdb_sql.parser.dialects.mindsdb import CreateView
-from mindsdb_sql.parser.ast import DropView
-from mindsdb_sql.parser.ast import Identifier
+from mindsdb_sql_parser.ast.mindsdb import CreateView
+from mindsdb_sql_parser.ast import DropView
+from mindsdb_sql_parser.ast import Identifier
 
 from mindsdb_sdk.utils.objects_collection import CollectionBase