Merge branch 'main' into feat-ml-188

Author: ea-rus

LICENSE

@@ -1,10 +1,10 @@
 __title__ = 'mindsdb_sdk'
 __package_name__ = 'mindsdb_sdk'
-__version__ = '3.1.6'
+__version__ = '3.2.0'
 __description__ = "MindsDB Python SDK, provides an SDK to use a remote mindsdb instance"
 __email__ = "[email protected]"
 __author__ = 'MindsDB Inc'
 __github__ = 'https://github.com/mindsdb/mindsdb_python_sdk'
 __pypi__ = 'https://pypi.org/project/mindsdb-sdk/'
-__license__ = 'GPL-3.0'
+__license__ = 'MIT'
 __copyright__ = 'Copyright 2020- mindsdb'

mindsdb_sdk/__about__.py

@@ -514,6 +514,7 @@ def update(self, name: str, updated_agent: Agent):
             self.project.name,
             name,
             updated_agent.name,
+            updated_agent.provider,
             updated_agent.model_name,
             list(skills_to_add),
             list(skills_to_remove),

mindsdb_sdk/agents.py

@@ -12,6 +12,7 @@ def connect(
         password: str = None,
         api_key: str = None,
         is_managed: bool = False,
+        cookies=None,
         headers=None) -> Server:
     """
     Create connection to mindsdb server
@@ -21,6 +22,7 @@ def connect(
     :param password: user password to login (for cloud version)
     :param api_key: API key to authenticate (for cloud version)
     :param is_managed: whether or not the URL points to a managed instance
+    :param cookies: addtional cookies to send with the connection, optional
     :param headers: addtional headers to send with the connection, optional
     :return: Server object
 
@@ -51,6 +53,7 @@ def connect(
             # is local
             url = DEFAULT_LOCAL_API_URL
 
-    api = RestAPI(url, login, password, api_key, is_managed, headers=headers)
+    api = RestAPI(url, login, password, api_key, is_managed, 
+                  cookies=cookies, headers=headers)
 
     return Server(api)

mindsdb_sdk/connect.py

@@ -37,7 +37,8 @@ def _raise_for_status(response):
 
 
 class RestAPI:
-    def __init__(self, url=None, login=None, password=None, api_key=None, is_managed=False, headers=None):
+    def __init__(self, url=None, login=None, password=None, api_key=None, is_managed=False, 
+                 cookies=None, headers=None):
 
         self.url = url
         self.username = login
@@ -46,6 +47,9 @@ def __init__(self, url=None, login=None, password=None, api_key=None, is_managed
         self.is_managed = is_managed
         self.session = requests.Session()
 
+        if cookies is not None:
+            self.session.cookies.update(cookies)
+
         self.session.headers['User-Agent'] = f'python-sdk/{__about__.__version__}'
         if headers is not None:
             self.session.headers.update(headers)
@@ -309,6 +313,7 @@ def update_agent(
             project: str,
             name: str,
             updated_name: str,
+            updated_provider: str,
             updated_model: str,
             skills_to_add: List[str],
             skills_to_remove: List[str],
@@ -321,6 +326,7 @@ def update_agent(
                 'agent': {
                     'name': updated_name,
                     'model_name': updated_model,
+                    'provider': updated_provider,
                     'skills_to_add': skills_to_add,
                     'skills_to_remove': skills_to_remove,
                     'params': updated_params

mindsdb_sdk/connectors/rest_api.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/databases.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/handlers.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/jobs.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/knowledge_bases.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