Merge branch 'mindsdb:main' into java-sdk

Author: Better-Boy

.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: "MindsDB CLA Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]    
+jobs:
+  CLAssistant:
+    runs-on: ubuntu-latest
+    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/github-action@v2.6.1
+        env: 
+          GITHUB_TOKEN: ${{ secrets.CLA_TOKEN }}          
+          PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_TOKEN }}
+        with: 
+          path-to-signatures: 'assets/contributions-agreement/cla.json'
+          # Add path to the CLA here
+          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

assets/contributions-agreement/cla.json

@@ -38,7 +38,7 @@ def create(self, ds_config: DatabaseConfig, replace=False):
         if replace:
             try:
                 self.get(name)
-                self.drop(name)
+                self.drop(name, force=True)
             except exc.ObjectNotFound:
                 ...
 
@@ -76,11 +76,15 @@ def get(self, name: str) -> Datasource:
             raise exc.ObjectNotSupported(f'Wrong type of datasource: {name}')
         return Datasource(**data)
 
-    def drop(self, name: str):
+    def drop(self, name: str, force=False):
         """
         Drop datasource by name
 
         :param name: name of datasource
+        :param force: if True - remove from all minds, default: False
         """
+        data = None
+        if force:
+            data = {'cascade': True}
 
-        self.api.delete(f'/datasources/{name}')
+        self.api.delete(f'/datasources/{name}', data=data)

minds/datasources/datasources.py

@@ -37,8 +37,12 @@ def get(self, url):
         _raise_for_status(resp)
         return resp
 
-    def delete(self, url):
-        resp = requests.delete(self.base_url + url, headers=self._headers())
+    def delete(self, url, data=None):
+        resp = requests.delete(
+            self.base_url + url,
+            headers=self._headers(),
+            json=data
+        )
 
         _raise_for_status(resp)
         return resp

minds/rest_api.py

@@ -31,7 +31,7 @@ def test_datasources():
 
     # remove previous object
     try:
-        client.datasources.drop(example_ds.name)
+        client.datasources.drop(example_ds.name, force=True)
     except ObjectNotFound:
         ...