Merge branch 'staging' of https://github.com/mindsdb/mindsdb_python_sdk into agents-base

Author: tmichaeldb

.github/workflows/mindsdb_python_sdk.yml

@@ -22,7 +22,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip==22.0.4
-        pip install -r requirements.txt
+        pip install -r requirements.txt        
+        pip install -r requirements_test.txt
         pip install --no-cache-dir .
     - name: Run tests
       run: |
@@ -54,8 +55,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install flake8 pytest pytest-cov
-          pip install -r requirements.txt
+          pip install flake8
+          pip install -r requirements.txt          
+          pip install -r requirements_test.txt
 
       - name: Build coverage file
         run: |

mindsdb_sdk/jobs.py

@@ -55,12 +55,7 @@ def __init__(self, project, api):
         self.project = project
         self.api = api
 
-    def list(self, name: str = None) -> List[Job]:
-        """
-        Show list of jobs in project
-
-        :return: list of Job objects
-        """
+    def _list(self, name: str = None) -> List[Job]:
 
         ast_query = Select(targets=[Star()], from_table=Identifier('jobs'))
 
@@ -78,6 +73,15 @@ def list(self, name: str = None) -> List[Job]:
             for item in df.to_dict('records')
         ]
 
+    def list(self) -> List[Job]:
+        """
+        Show list of jobs in project
+
+        :return: list of Job objects
+        """
+
+        return self._list()
+
     def get(self, name: str) -> Job:
         """
         Get job by name from project
@@ -86,7 +90,7 @@ def get(self, name: str) -> Job:
         :return: Job object
         """
 
-        jobs = self.list(name)
+        jobs = self._list(name)
         if len(jobs) == 1:
             return jobs[0]
         elif len(jobs) == 0:
@@ -133,7 +137,7 @@ def create(self, name: str, query_str: str,
         self.api.sql_query(ast_query.to_string(), database=self.project.name)
 
         # job can be executed and remove it is not repeatable
-        jobs = self.list(name)
+        jobs = self._list(name)
         if len(jobs) == 1:
             return jobs[0]
 

mindsdb_sdk/models.py

@@ -30,7 +30,7 @@ class Model:
 
     Get info
 
-    >>> print(model.status)
+    >>> print(model.get_status())
     >>> print(model.data)
 
     Update model data from server

requirements.txt

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

requirements_test.txt

@@ -0,0 +1,2 @@
+pytest
+pytest-cov

tests/test_sdk.py

@@ -108,7 +108,7 @@ def check_model(self, model, database, mock_post):
         model.predict(query)
 
         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")
+                       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  --------------
@@ -166,7 +166,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 models_versions set active=1 where (name = '{model2.name}') AND (version = 3)"
+                   'query'] == f"update models_versions set active=1 where name = '{model2.name}' AND version = 3"
 
     @patch('requests.Session.post')
     def check_table(self, table, mock_post):
@@ -176,7 +176,7 @@ def check_table(self, table, mock_post):
         table = table.limit(3)
         table.fetch()
         str(table)
-        check_sql_call(mock_post, f'SELECT * FROM {table.name} WHERE (a = 3) AND (b = \'2\') LIMIT 3')
+        check_sql_call(mock_post, f'SELECT * FROM {table.name} WHERE a = 3 AND b = \'2\' LIMIT 3')
 
 
 class Test(BaseFlow):
@@ -977,7 +977,7 @@ def check_database(self, database, mock_post):
 
         # -- delete in table --
         table2.delete(a=1, b='2')
-        check_sql_call(mock_post, f"DELETE FROM {database.name}.t2 WHERE (a = 1) AND (b = '2')")
+        check_sql_call(mock_post, f"DELETE FROM {database.name}.t2 WHERE a = 1 AND b = '2'")
 
         # -- update table --
         # from query