Merge pull request #111 from mindsdb/schema-refactor

Adapt for schema refactor

Author: ea-rus

mindsdb_sdk/models.py

@@ -7,7 +7,7 @@
 
 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, Update, Describe, Constant
+from mindsdb_sql.parser.ast import Identifier, Select, Star, Join, Describe, Set
 from mindsdb_sql import parse_sql
 from mindsdb_sql.exceptions import ParsingException
 
@@ -388,15 +388,9 @@ def set_active(self, version: int):
 
         :param version: version to set active
         """
-        ast_query = Update(
-            table=Identifier(parts=[self.project.name, 'models_versions']),
-            update_columns={
-                'active': Constant(1)
-            },
-            where=dict_to_binary_op({
-                'name': self.name,
-                'version': version
-            })
+        ast_query = Set(
+            category='active',
+            value=Identifier(parts=[self.project.name, self.name, str(version)])
         )
         sql = ast_query.to_string()
         if is_saving():
@@ -609,21 +603,22 @@ def list(self, with_versions: bool = False,
         :return: list of Model or ModelVersion objects
         """
 
-        table = 'models'
         model_class = Model
-        if with_versions:
-            table = 'models_versions'
-            model_class = ModelVersion
 
-        filters = { }
+        filters = {}
         if name is not None:
             filters['NAME'] = name
         if version is not None:
             filters['VERSION'] = version
 
+        if with_versions:
+            model_class = ModelVersion
+        else:
+            filters['ACTIVE'] = '1'
+
         ast_query = Select(
             targets=[Star()],
-            from_table=Identifier(table),
+            from_table=Identifier('models'),
             where=dict_to_binary_op(filters)
         )
         df = self.project.query(ast_query.to_string()).fetch()

mindsdb_sdk/projects.py

@@ -1,10 +1,8 @@
 from typing import  List
 
-from mindsdb_sql.parser.dialects.mindsdb import CreateDatabase
+from mindsdb_sql.parser.dialects.mindsdb import CreateDatabase, DropPredictor
 from mindsdb_sql.parser.ast import DropDatabase
-from mindsdb_sql.parser.ast import Identifier, Delete
-
-from mindsdb_sdk.utils.sql import dict_to_binary_op
+from mindsdb_sql.parser.ast import Identifier
 
 from mindsdb_sdk.agents import Agents
 from mindsdb_sdk.databases import Databases
@@ -96,21 +94,15 @@ def query(self, sql: str) -> Query:
         """
         return Query(self.api, sql, database=self.name)
 
-
     def drop_model_version(self, name: str, version: int):
         """
         Drop version of the model
 
         :param name: name of the model
         :param version: version to drop
         """
-        ast_query = Delete(
-            table=Identifier('models_versions'),
-            where=dict_to_binary_op({
-                'name': name,
-                'version': version
-            })
-        )
+        ast_query = DropPredictor(Identifier(parts=[name, str(version)]))
+
         self.query(ast_query.to_string()).fetch()
 
 

tests/test_sdk.py

@@ -183,7 +183,7 @@ def check_model(self, model, database, mock_post):
 
         # list all versions
         models = model.list_versions()
-        check_sql_call(mock_post, f"SELECT * FROM models_versions WHERE NAME = '{model.name}'",
+        check_sql_call(mock_post, f"SELECT * FROM models WHERE NAME = '{model.name}'",
                        database=model.project.name)
         model2 = models[0]  # Model object
 
@@ -194,8 +194,7 @@ def check_model(self, model, database, mock_post):
 
         # get call before last call
         mock_call = mock_post.call_args_list[-2]
-        assert mock_call[1]['json'][
-                   'query'] == f"update {model2.project.name}.models_versions set active=1 where name = '{model2.name}' AND version = 3"
+        assert mock_call[1]['json']['query'] == f"SET active {model2.project.name}.{model2.name}.`3`"
 
     @patch('requests.Session.post')
     def check_table(self, table, mock_post):
@@ -494,7 +493,7 @@ def check_project_models_versions(self, project, database, mock_post):
         self.check_model(model, database)
 
         project.drop_model_version('m1', 1)
-        check_sql_call(mock_post, f"delete from models_versions where name='m1' and version=1")
+        check_sql_call(mock_post, f"DROP PREDICTOR m1.`1`")
 
 
     @patch('requests.Session.post')
@@ -961,7 +960,7 @@ def check_project_models_versions(self, project, database, mock_post):
         self.check_model(model, database)
 
         project.models.m1.drop_version(1)
-        check_sql_call(mock_post, f"delete from models_versions where name='m1' and version=1")
+        check_sql_call(mock_post, f"DROP PREDICTOR m1.`1`")
 
     @patch('requests.Session.post')
     def check_database(self, database, mock_post):