Merge pull request #66 from mindsdb/staging

Release 1.0.6

Author: ea-rus

mindsdb_sdk/__about__.py

@@ -1,6 +1,6 @@
 __title__ = 'mindsdb_sdk'
 __package_name__ = 'mindsdb_sdk'
-__version__ = '1.0.5'
+__version__ = '1.0.6'
 __description__ = "MindsDB Python SDK, provides an SDK to use a remote mindsdb instance"
 __email__ = "jorge@mindsdb.com"
 __author__ = 'MindsDB Inc'

mindsdb_sdk/model.py

@@ -88,7 +88,8 @@ def predict(self, data: Union[pd.DataFrame, Query, dict], params: dict = None) -
             model_identifier.alias = Identifier('m')
 
             ast_query.parentheses = True
-            ast_query = Select(
+            ast_query.alias = Identifier('t')
+            upper_query = Select(
                 targets=[Identifier(parts=['m', Star()])],
                 from_table=Join(
                     join_type='join',
@@ -97,9 +98,9 @@ def predict(self, data: Union[pd.DataFrame, Query, dict], params: dict = None) -
                 )
             )
             if params is not None:
-                ast_query.using = params
+                upper_query.using = params
             # execute in query's database
-            return self.project.api.sql_query(ast_query.to_string(), database=data.database)
+            return self.project.api.sql_query(upper_query.to_string(), database=data.database)
 
         elif isinstance(data, dict):
             data = pd.DataFrame([data])

mindsdb_sdk/project.py

@@ -298,7 +298,7 @@ def drop_view(self, name: str):
         :param name: name of the view
         """
 
-        ast_query = DropView(names=[name])
+        ast_query = DropView(names=[Identifier(name)])
 
         self.query(ast_query.to_string()).fetch()
 
@@ -452,7 +452,7 @@ def drop_model(self, name: str):
 
         :param name: name of the model
         """
-        ast_query = DropPredictor(name=name)
+        ast_query = DropPredictor(name=Identifier(name))
         self.query(ast_query.to_string()).fetch()
 
     def drop_model_version(self, name: str, version: int):

mindsdb_sdk/server.py

@@ -101,7 +101,7 @@ def drop_database(self, name: str):
 
         :param name: name of integration
         """
-        ast_query = DropDatabase(name=name)
+        ast_query = DropDatabase(name=Identifier(name))
         self.api.sql_query(ast_query.to_string())
 
     def get_database(self, name: str) -> Database:
@@ -151,7 +151,7 @@ def drop_project(self, name: str):
 
         :param name: name of the project
         """
-        ast_query = DropDatabase(name=name)
+        ast_query = DropDatabase(name=Identifier(name))
         self.api.sql_query(ast_query.to_string())
 
     def get_project(self, name: str = 'mindsdb') -> Project:

requirements.txt

@@ -1,3 +1,3 @@
 requests
 pandas == 1.3.5
-mindsdb-sql >= 0.6.7, < 0.7.0
+mindsdb-sql >= 0.7.0, < 0.8.0

tests/test_sdk.py

@@ -95,8 +95,8 @@ def test_flow(self, mock_post, mock_put):
 
         self.check_database(database)
 
-        server.drop_database('pg1')
-        check_sql_call(mock_post, 'DROP DATABASE pg1')
+        server.drop_database('pg1-a')
+        check_sql_call(mock_post, 'DROP DATABASE `pg1-a`')
 
         # --------- projects -------------
         projects = server.list_projects()
@@ -114,8 +114,8 @@ def test_flow(self, mock_post, mock_put):
             mock_post, 'CREATE DATABASE proj1 WITH ENGINE = "mindsdb", PARAMETERS = {}')
         self.check_project(project, database)
 
-        server.drop_project('proj1')
-        check_sql_call(mock_post, 'DROP DATABASE proj1')
+        server.drop_project('proj1-1')
+        check_sql_call(mock_post, 'DROP DATABASE `proj1-1`')
 
         # test upload file
         response_mock(mock_post, pd.DataFrame([{'NAME': 'files'}]))
@@ -198,6 +198,9 @@ def check_project_views(self, project, database, mock_post, mock_get):
         project.drop_view('v2')
         check_sql_call(mock_post, 'DROP VIEW v2')
 
+        project.drop_view('v2-v')
+        check_sql_call(mock_post, 'DROP VIEW `v2-v`')
+
     @patch('requests.Session.post')
     def check_project_models(self, project, database, mock_post):
         # -----------  models  --------------
@@ -262,8 +265,8 @@ def check_project_models(self, project, database, mock_post):
         assert model.name == 'm2'
         self.check_model(model, database)
 
-        project.drop_model('m3')
-        check_sql_call(mock_post, f'DROP PREDICTOR m3')
+        project.drop_model('m3-a')
+        check_sql_call(mock_post, f'DROP PREDICTOR `m3-a`')
 
         # the old way of join model with table
         sql = '''
@@ -360,14 +363,14 @@ def check_model(self, model, database, mock_post):
         query = database.query('select a from t1')
         pred_df = model.predict(query, params={'x': '1'})
 
-        check_sql_call(mock_post, f'SELECT m.* FROM (SELECT a FROM t1) JOIN {model.project.name}.{model_name} AS m USING x="1"')
+        check_sql_call(mock_post, f'SELECT m.* FROM (SELECT a FROM t1) as t JOIN {model.project.name}.{model_name} AS m USING x="1"')
         assert (pred_df == pd.DataFrame(data_out)).all().bool()
 
         # time series prediction
         query = database.query('select * from t1 where type="house" and saledate>latest')
         model.predict(query)
 
-        check_sql_call(mock_post, f"SELECT m.* FROM (SELECT * FROM t1 WHERE (type = 'house') AND (saledate > LATEST)) JOIN {model.project.name}.{model_name} AS m")
+        check_sql_call(mock_post, f"SELECT m.* FROM (SELECT * FROM t1 WHERE (type = 'house') AND (saledate > LATEST)) as t JOIN {model.project.name}.{model_name} AS m")
         assert (pred_df == pd.DataFrame(data_out)).all().bool()
 
         # -----------  model managing  --------------