Merge branch 'staging' into server-info

# Conflicts:
#	tests/test_sdk.py

Author: ea-rus

.github/workflows/mindsdb_python_sdk.yml

@@ -42,6 +42,8 @@ jobs:
     needs: test
     if: github.ref != 'refs/heads/stable'
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.8

mindsdb_sdk/__about__.py

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

mindsdb_sdk/server.py

@@ -23,9 +23,6 @@ class Server(Project):
 
     """
 
-    def a(self):
-        ...
-
     def __init__(self, api):
         # server is also mindsdb project
         super().__init__(api, 'mindsdb')

mindsdb_sdk/utils/objects_collection.py

@@ -19,39 +19,39 @@ def __getattr__(self, name):
         return self.get(name)
 
 
-class MethodCollection(CollectionBase):
-
-    def __init__(self, name, methods):
-        self.name = name
-        self.methods = methods
-
-    def __repr__(self):
-        return f'{self.__class__.__name__}({self.name})'
-
-    def get(self, *args, **kwargs):
-        method = self.methods.get('get')
-        if method is None:
-            raise NotImplementedError()
-
-        return method(*args, **kwargs)
-
-    def list(self, *args, **kwargs):
-        method = self.methods.get('list')
-        if method is None:
-            raise NotImplementedError()
-
-        return method(*args, **kwargs)
-
-    def create(self, *args, **kwargs):
-        method = self.methods.get('create')
-        if method is None:
-            raise NotImplementedError()
-
-        return method(*args, **kwargs)
-
-    def drop(self, name):
-        method = self.methods.get('drop')
-        if method is None:
-            raise NotImplementedError()
-
-        return method(name)
+# class MethodCollection(CollectionBase):
+#
+#     def __init__(self, name, methods):
+#         self.name = name
+#         self.methods = methods
+#
+#     def __repr__(self):
+#         return f'{self.__class__.__name__}({self.name})'
+#
+#     def get(self, *args, **kwargs):
+#         method = self.methods.get('get')
+#         if method is None:
+#             raise NotImplementedError()
+#
+#         return method(*args, **kwargs)
+#
+#     def list(self, *args, **kwargs):
+#         method = self.methods.get('list')
+#         if method is None:
+#             raise NotImplementedError()
+#
+#         return method(*args, **kwargs)
+#
+#     def create(self, *args, **kwargs):
+#         method = self.methods.get('create')
+#         if method is None:
+#             raise NotImplementedError()
+#
+#         return method(*args, **kwargs)
+#
+#     def drop(self, name):
+#         method = self.methods.get('drop')
+#         if method is None:
+#             raise NotImplementedError()
+#
+#         return method(name)

requirements.txt

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

tests/test_sdk.py

@@ -126,16 +126,16 @@ def check_model(self, model, database, mock_post):
             f'Finetune {model.project.name}.{model_name} FROM d1 (select a from t1)'
         )
 
-        model.retrain(query, options={ 'x': 2 })
+        model.retrain(query, options={'x': 2})
         check_sql_call(
             mock_post,
             f'RETRAIN {model.project.name}.{model_name} FROM {query.database} ({query.sql})  USING x=2'
         )
 
-        model.retrain('select a from t1', database='d1')
+        model.retrain('select a from t1', database='d1', engine='openai')
         check_sql_call(
             mock_post,
-            f'RETRAIN {model.project.name}.{model_name} FROM d1 (select a from t1)'
+            f'RETRAIN {model.project.name}.{model_name} FROM d1 (select a from t1) USING engine=\'openai\''
         )
 
         # describe
@@ -183,9 +183,15 @@ class Test(BaseFlow):
     @patch('requests.Session.post')
     def test_flow(self, mock_post, mock_put, mock_get):
 
+        # check local
+        server = mindsdb_sdk.connect()
+        str(server)
+
+        assert server.api.url == 'http://127.0.0.1:47334'
+
+        # check cloud login
         server = mindsdb_sdk.connect(login='a@b.com')
 
-        # check login
         call_args = mock_post.call_args
         assert call_args[0][0] == 'https://cloud.mindsdb.com/cloud/login'
         assert call_args[1]['json']['email'] == 'a@b.com'
@@ -203,6 +209,7 @@ def test_flow(self, mock_post, mock_put, mock_get):
         check_sql_call(mock_post, "select NAME from information_schema.databases where TYPE='data'")
 
         database = databases[0]
+        str(database)
         assert database.name == 'db1'
         self.check_database(database)
 
@@ -370,6 +377,7 @@ def check_project_models(self, project, database, mock_post):
             f'CREATE PREDICTOR m2 FROM example_db (select * from t1) PREDICT price ORDER BY date GROUP BY a, b WINDOW 10 HORIZON 2 USING module="LightGBM", `engine`="lightwood"'
         )
         assert model.name == 'm2'
+        model.wait_complete()
         self.check_model(model, database)
 
         # create, using deferred query.
@@ -379,6 +387,7 @@ def check_project_models(self, project, database, mock_post):
             predict='price',
             query=query,
         )
+        str(query)
 
         check_sql_call(
             mock_post,
@@ -605,6 +614,7 @@ def test_flow(self, mock_post, mock_put):
         self.check_project(project, database)
 
         project = con.projects.create('proj1')
+        str(project)
         check_sql_call(
             mock_post, 'CREATE DATABASE proj1 WITH ENGINE = "mindsdb", PARAMETERS = {}')
         self.check_project(project, database)
@@ -761,6 +771,7 @@ def check_project_models(self, project, database, mock_post):
 
         models = project.models.list()
         model = models[0]  # Model object
+        str(model)
 
         assert model.name == 'm1'
         assert model.get_status() == 'complete'
@@ -790,7 +801,7 @@ def check_project_models(self, project, database, mock_post):
                 'window': 10,
                 'horizon': 2
             },
-            module = 'LightGBM',  # has to be in options
+            module='LightGBM',  # has to be in options
         )
         check_sql_call(
             mock_post,
@@ -910,6 +921,11 @@ def check_database(self, database, mock_post):
         table2 = database.tables.create('t2', query)
         check_sql_call(mock_post, f'create table {database.name}.t2 (select * from tbl1)')
 
+        # create with replace
+        database.tables.create('t2', query, replace=True)
+        check_sql_call(mock_post, f'create or replace table {database.name}.t2 (select * from tbl1)')
+
+
         assert table2.name == 't2'
         self.check_table(table2)
 
@@ -968,7 +984,9 @@ def check_project_jobs(self, project, mock_post):
         assert job.name == 'job1'
         assert job.query_str == 'select 1'
 
+        dir(project.jobs)
         job = project.jobs.job1
+        str(job)
         assert job.name == 'job1'
         assert job.query_str == 'select 1'
 
@@ -978,6 +996,13 @@ def check_project_jobs(self, project, mock_post):
             f"select * from jobs where name = 'job1'"
         )
 
+        job.get_history()
+
+        check_sql_call(
+            mock_post,
+            f"select * from jobs_history where name = 'job1'"
+        )
+
         project.jobs.create(
             name='job2',
             query_str='retrain m1',
@@ -992,6 +1017,17 @@ def check_project_jobs(self, project, mock_post):
             call_stack_num=-2
         )
 
+        project.jobs.create(
+            name='job2',
+            query_str='retrain m1'
+        )
+
+        check_sql_call(
+            mock_post,
+            f"CREATE JOB job2 (retrain m1)",
+            call_stack_num=-2
+        )
+
         project.jobs.drop('job2')
 
         check_sql_call(