Merge branch 'main' into add-tree-api

Author: ZoranPandovski

.github/workflows/cla.yml

@@ -0,0 +1,27 @@
+name: "MindsDB CLA Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+
+permissions:
+  actions: write
+  contents: write
+  pull-requests: write
+  statuses: write
+ 
+jobs:
+  CLAssistant:
+    runs-on: mdb-dev
+    steps:
+      - name: "CLA Assistant"
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        uses: contributor-assistant/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          path-to-signatures: 'assets/contributions-agreement/cla.json'
+          path-to-document: 'https://github.com/mindsdb/mindsdb/blob/main/assets/contributions-agreement/individual-contributor.md'
+          branch: 'cla'
+          allowlist: bot*, ZoranPandovski, torrmal, Stpmax, mindsdbadmin, ea-rus, tmichaeldb, dusvyat, hamishfagg, MinuraPunchihewa, martyna-mindsdb, lucas-koontz

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.7,3.8,3.9]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -31,11 +31,6 @@ jobs:
 
         fi
       shell: bash
-      env:
-        CHECK_FOR_UPDATES: False
-        DATABASE_CREDENTIALS_STRINGIFIED_JSON: ${{ secrets.DATABASE_CREDENTIALS }}
-        CLOUD_TEST_EMAIL: ${{ secrets.CLOUD_TEST_EMAIL }}
-        CLOUD_TEST_PASSWORD: ${{ secrets.CLOUD_TEST_PASSWORD }}
 
 
   deploy:
@@ -46,7 +41,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.7'
+        python-version: '3.9'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip==20.2.4

.github/workflows/test_prs.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.7,3.8,3.9]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -32,11 +32,6 @@ jobs:
 
         fi
       shell: bash
-      env:
-        CHECK_FOR_UPDATES: False
-        DATABASE_CREDENTIALS_STRINGIFIED_JSON: ${{ secrets.DATABASE_CREDENTIALS }}
-        CLOUD_TEST_EMAIL: ${{ secrets.CLOUD_TEST_EMAIL }}
-        CLOUD_TEST_PASSWORD: ${{ secrets.CLOUD_TEST_PASSWORD }}
 
   coverage:
     needs: test

LICENSE

@@ -1,10 +1,10 @@
 __title__ = 'mindsdb_sdk'
 __package_name__ = 'mindsdb_sdk'
-__version__ = '3.1.6'
+__version__ = '3.4.6'
 __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'

assets/contributions-agreement/cla.json

@@ -0,0 +1,150 @@
+from mindsdb_sdk.connectors.rest_api import RestAPI
+
+
+class Config():
+    """
+    **Configuration for MindsDB**
+    
+    This class provides methods to set and get the various configuration aspects of MindsDB.
+    
+    Working with configuration:
+
+    Set default LLM configuration:
+
+    >>> server.config.set_default_llm(
+    ...     provider='openai',
+    ...     model_name='gpt-4',
+    ...     api_key='sk-...'
+    ... )
+
+    Get default LLM configuration:
+
+    >>> llm_config = server.config.get_default_llm()
+    >>> print(llm_config)
+
+    Set default embedding model:
+
+    >>> server.config.set_default_embedding_model(
+    ...     provider='openai',
+    ...     model_name='text-embedding-ada-002',
+    ...     api_key='sk-...'
+    ... )
+
+    Get default embedding model:
+
+    >>> embedding_config = server.config.get_default_embedding_model()
+
+    Set default reranking model:
+
+    >>> server.config.set_default_reranking_model(
+    ...     provider='openai',
+    ...     model_name='gpt-4',
+    ...     api_key='sk-...'
+    ... )
+
+    Get default reranking model:
+
+    >>> reranking_config = server.config.get_default_reranking_model()
+    """
+    def __init__(self, api: RestAPI):
+        self.api = api
+    
+    def set_default_llm(
+        self,
+        provider: str,
+        model_name: str,
+        api_key: str = None,
+        **kwargs
+    ):
+        """
+        Set the default LLM configuration for MindsDB.
+
+        :param provider: The name of the LLM provider (e.g., 'openai', 'google').
+        :param model_name: The name of the model to use.
+        :param api_key: Optional API key for the provider.
+        :param kwargs: Additional parameters for the LLM configuration.
+        """
+        config = {
+            "default_llm": {
+                "provider": provider,
+                "model_name": model_name,
+                "api_key": api_key,
+                **kwargs
+            }
+        }
+        self.api.update_config(config)
+        
+    def get_default_llm(self):
+        """
+        Get the default LLM configuration for MindsDB.
+
+        :return: Dictionary containing the default LLM configuration.
+        """
+        return self.api.get_config().get("default_llm", {})
+        
+    def set_default_embedding_model(
+        self,
+        provider: str,
+        model_name: str,
+        api_key: str = None,
+        **kwargs
+    ):
+        """
+        Set the default embedding model configuration for MindsDB.
+
+        :param provider: The name of the embedding model provider (e.g., 'openai', 'google').
+        :param model_name: The name of the embedding model to use.
+        :param api_key: Optional API key for the provider.
+        :param kwargs: Additional parameters for the embedding model configuration.
+        """
+        config = {
+            "default_embedding_model": {
+                "provider": provider,
+                "model_name": model_name,
+                "api_key": api_key,
+                **kwargs
+            }
+        }
+        self.api.update_config(config)
+        
+    def get_default_embedding_model(self):
+        """
+        Get the default embedding model configuration for MindsDB.
+
+        :return: Dictionary containing the default embedding model configuration.
+        """
+        return self.api.get_config().get("default_embedding_model", {})
+        
+    def set_default_reranking_model(
+        self,
+        provider: str,
+        model_name: str,
+        api_key: str = None,
+        **kwargs
+    ):
+        """
+        Set the default reranking model configuration for MindsDB.
+
+        :param provider: The name of the reranking model provider (e.g., 'openai', 'google').
+        :param model_name: The name of the reranking model to use.
+        :param api_key: Optional API key for the provider.
+        :param kwargs: Additional parameters for the reranking model configuration.
+        """
+        config = {
+            "default_reranking_model": {
+                "provider": provider,
+                "model_name": model_name,
+                "api_key": api_key,
+                **kwargs
+            }
+        }
+        self.api.update_config(config)
+        
+    def get_default_reranking_model(self):
+        """
+        Get the default reranking model configuration for MindsDB.
+
+        :return: Dictionary containing the default reranking model configuration.
+        """
+        return self.api.get_config().get("default_reranking_model", {})
+        

mindsdb_sdk/__about__.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)