Merge pull request #217 from mindsdb/del-skills

Delete `skills` to align with changes in `mindsdb v26.0.0`

Author: StpMax

docs/source/index.rst

@@ -121,7 +121,6 @@ API documentation
    jobs
 
    knowledge_bases
-   skills
    agents
 
 

docs/source/skills.rst

@@ -1,13 +1,12 @@
-from requests.exceptions import HTTPError
 from typing import Iterable, List, Union
 from urllib.parse import urlparse
 from uuid import uuid4
 import datetime
-import json
+
+from requests.exceptions import HTTPError
 
 from mindsdb_sdk.knowledge_bases import KnowledgeBase
 from mindsdb_sdk.models import Model
-from mindsdb_sdk.skills import Skill
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 
 
@@ -82,24 +81,20 @@ def __init__(
             created_at: datetime.datetime,
             updated_at: datetime.datetime,
             model: Union[Model, str, dict] = None,
-            skills: List[Skill] = [],
             provider: str = None,
             data: dict = {},
             prompt_template: str = None,
             params: dict = {},
-            skills_extra_parameters: dict = {},
             collection: CollectionBase = None
     ):
         self.name = name
         self.created_at = created_at
         self.updated_at = updated_at
         self.model = model
-        self.skills = skills
         self.provider = provider
         self.data = data
         self.prompt_template = prompt_template
         self.params = params
-        self.skills_extra_parameters = skills_extra_parameters
         self.collection = collection
 
     def completion(self, messages: List[dict]) -> AgentCompletion:
@@ -178,7 +173,7 @@ def add_database(self, database: str, tables: List[str], description: str):
 
         :param database: Name of the database to be added.
         :param tables: List of tables to be added.
-        :param description: Description of the database tables. Used by the agent to know when to use SQL skill.
+        :param description: Description of the database tables. Used by the agent to know when to query the database.
         """
         self.collection.add_database(self.name, database, tables, description)
 
@@ -196,35 +191,25 @@ def __eq__(self, other):
             return False
         if self.prompt_template != other.prompt_template:
             return False
-        if self.skills != other.skills:
-            return False
         if self.params != other.params:
             return False
-        if self.skills_extra_parameters != other.skills_extra_parameters:
-            return False
         if self.created_at != other.created_at:
             return False
         return self.updated_at == other.updated_at
 
     @classmethod
     def from_json(cls, json: dict, collection: CollectionBase):
-        skills = []
-        if json.get('skills'):
-            skills = [Skill.from_json(skill) for skill in json['skills']]
-
         model = json.get('model') or json.get('model_name')
 
         return cls(
             json['name'],
             json['created_at'],
             json['updated_at'],
             model,
-            skills,
             json.get('provider'),
             json.get('data', {}),
             json.get('prompt_template'),
             json.get('params', {}),
-            json.get('skills_extra_parameters', {}),
             collection
         )
 
@@ -238,7 +223,6 @@ def __init__(self, project, api):
 
         self.knowledge_bases = project.knowledge_bases
         self.models = project.models
-        self.skills = project.skills
 
         self.databases = project.server.databases
         self.ml_engines = project.server.ml_engines
@@ -477,7 +461,6 @@ def create(
         name: str,
         model: Union[Model, str, dict] = None,
         provider: str = None,
-        skills: List[Union[Skill, str]] = None,
         data: dict = None,
         prompt_template: str = None,
         params: dict = None,
@@ -488,26 +471,12 @@ def create(
 
         :param name: Name of the agent to be created
         :param model: Model to be used by the agent. This can be a Model object, a string with model name, or a dictionary with model parameters.
-        :param skills: List of skills to be used by the agent. Currently only 'sql' is supported.
         :param provider: Provider of the model, e.g. 'mindsdb', 'openai', etc.
         :param data: Data to be used by the agent. This is usually a dictionary with 'tables' and/or 'knowledge_base' keys.
         :param params: Parameters for the agent
 
         :return: created agent object
         """
-        skills = skills or []
-        skill_names = []
-        for skill in skills:
-            if isinstance(skill, str):
-                # Check if skill exists.
-                # TODO what this line does?
-                _ = self.skills.get(skill)
-                skill_names.append(skill)
-                continue
-            # Create the skill if it doesn't exist.
-            _ = self.skills.create(skill.name, skill.type, skill.params)
-            skill_names.append(skill.name)
-
         if params is None:
             params = {}
         params.update(kwargs)
@@ -526,7 +495,6 @@ def create(
             name,
             model_name,
             provider,
-            skill_names,
             data,
             model,
             prompt_template,
@@ -543,29 +511,6 @@ def update(self, name: str, updated_agent: Agent):
 
         :return: updated agent object
         """
-        updated_skills = set()
-        for skill in updated_agent.skills:
-            if isinstance(skill, str):
-                # Skill must exist.
-                _ = self.skills.get(skill)
-                updated_skills.add(skill)
-                continue
-            try:
-                # Create the skill if it doesn't exist.
-                _ = self.skills.get(skill.name)
-            except HTTPError as e:
-                if e.response.status_code != 404:
-                    raise e
-                # Doesn't exist
-                _ = self.skills.create(skill.name, skill.type, skill.params)
-            updated_skills.add(skill.name)
-
-        existing_agent = self.api.agent(self.project.name, name)
-
-        existing_skills = set([s['name'] for s in existing_agent.get('skills', [])])
-        skills_to_add = updated_skills.difference(existing_skills)
-        skills_to_remove = existing_skills.difference(updated_skills)
-
         updated_model_name = None
         updated_provider = updated_agent.provider
         updated_model = None
@@ -583,8 +528,6 @@ def update(self, name: str, updated_agent: Agent):
             updated_agent.name,
             updated_provider,
             updated_model_name,
-            list(skills_to_add),
-            list(skills_to_remove),
             updated_agent.data,
             updated_model,
             updated_agent.prompt_template,

mindsdb_sdk/agents.py

@@ -322,7 +322,6 @@ def create_agent(
         name: str,
         model_name: str = None,
         provider: str = None,
-        skills: List[str] = None,
         data: dict = None,
         model: dict = None,
         prompt_template: str = None,
@@ -336,7 +335,6 @@ def create_agent(
                     'name': name,
                     'model_name': model_name,
                     'provider': provider,
-                    'skills': skills,
                     'data': data,
                     'model': model,
                     'prompt_template': prompt_template,
@@ -355,8 +353,6 @@ def update_agent(
         updated_name: str,
         updated_provider: str,
         updated_model_name: str,
-        skills_to_add: List[str],
-        skills_to_remove: List[str],
         updated_data: dict,
         updated_model: dict,
         updated_prompt_template: str,
@@ -370,8 +366,6 @@ def update_agent(
                     'name': updated_name,
                     'model_name': updated_model_name,
                     'provider': updated_provider,
-                    'skills_to_add': skills_to_add,
-                    'skills_to_remove': skills_to_remove,
                     'data': updated_data,
                     'model': updated_model,
                     'prompt_template': updated_prompt_template,
@@ -388,67 +382,6 @@ def delete_agent(self, project: str, name: str):
         r = self.session.delete(url)
         _raise_for_status(r)
 
-    # Skills operations.
-    @_try_relogin
-    def skills(self, project: str):
-        r = self.session.get(self.url + f'/api/projects/{project}/skills')
-        _raise_for_status(r)
-
-        return r.json()
-
-    @_try_relogin
-    def skill(self, project: str, name: str):
-        r = self.session.get(self.url + f'/api/projects/{project}/skills/{name}')
-        _raise_for_status(r)
-
-        return r.json()
-
-    @_try_relogin
-    def create_skill(self, project: str, name: str, type: str, params: dict):
-        url = self.url + f'/api/projects/{project}/skills'
-        r = self.session.post(
-            url,
-            json={
-               'skill': {
-                    'name': name,
-                    'type': type,
-                    'params': params
-                }
-            }
-        )
-        _raise_for_status(r)
-
-        return r.json()
-
-    @_try_relogin
-    def update_skill(
-            self,
-            project: str,
-            name: str,
-            updated_name: str,
-            updated_type: str,
-            updated_params: dict
-            ):
-        url = self.url + f'/api/projects/{project}/skills/{name}'
-        r = self.session.put(
-            url,
-            json={
-               'skill': {
-                    'name': updated_name,
-                    'type': updated_type,
-                    'params': updated_params
-                }
-            }
-        )
-        _raise_for_status(r)
-        return r.json()
-
-    @_try_relogin
-    def delete_skill(self, project: str, name: str):
-        url = self.url + f'/api/projects/{project}/skills/{name}'
-        r = self.session.delete(url)
-        _raise_for_status(r)
-
     # Knowledge Base operations.
     @_try_relogin
     def insert_into_knowledge_base(self, project: str, knowledge_base_name: str, data):

mindsdb_sdk/connectors/rest_api.py

@@ -110,8 +110,9 @@ class Databases(CollectionBase):
 
     """
 
-    def __init__(self, api):
+    def __init__(self, server, api):
         self.api = api
+        self.server = server
 
     def _list_databases(self) -> Dict[str, Database]:
         data = self.api.sql_query(
@@ -120,7 +121,7 @@ def _list_databases(self) -> Dict[str, Database]:
         name_to_db = {}
         for _, row in data.iterrows():
             name_to_db[row["NAME"]] = Database(
-                self, row["NAME"], engine=row["ENGINE"], params=row["CONNECTION_DATA"]
+                self.server, row["NAME"], engine=row["ENGINE"], params=row["CONNECTION_DATA"]
             )
         return name_to_db
 
@@ -153,7 +154,7 @@ def create(
             parameters=connection_args,
         )
         self.api.sql_query(ast_query.to_string())
-        return Database(self, name, engine=engine, params=connection_args)
+        return Database(self.server, name, engine=engine, params=connection_args)
 
     def drop(self, name: str):
         """

mindsdb_sdk/databases.py

@@ -332,7 +332,7 @@ def describe(self, type: str = None) -> Union[pd.DataFrame, Query]:
         """
         Return description of the model
 
-        :param type: describe type (for lightwood is models, ensemble, features), optional
+        :param type: describe type, optional
         :return: dataframe with result of description
         """
         if self.version is not None:
@@ -455,7 +455,7 @@ def create(
         >>> model = models.create(
         ...   'rentals_model',
         ...   predict='price',
-        ...   engine='lightwood',
+        ...   engine='my_byom_engine',
         ...   database='example_db',
         ...   query='select * from table',
         ...   options={

mindsdb_sdk/models.py

@@ -5,7 +5,6 @@
 from mindsdb_sql_parser.ast import Identifier
 
 from mindsdb_sdk.agents import Agents
-from mindsdb_sdk.skills import Skills
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 
 from .models import Models
@@ -77,7 +76,6 @@ def __init__(self, server, api, name):
 
         self.knowledge_bases = KnowledgeBases(self, api)
 
-        self.skills = Skills(self, api)
         self.agents = Agents(self, api)
 
         self.minds = self.agents #alias

mindsdb_sdk/projects.py

@@ -1,11 +1,9 @@
 from typing import List
 
-from .agents import Agents
 from .databases import Databases
 from .projects import Project, Projects
 from .ml_engines import MLEngines
 from .handlers import Handlers
-from .skills import Skills
 from .tree import TreeNode
 from .config import Config
 
@@ -29,9 +27,9 @@ class Server(Project):
 
     """
 
-    def __init__(self, api, skills: Skills = None, agents: Agents = None):
+    def __init__(self, api):
         # server is also mindsdb project
-        self.databases = Databases(api)
+        self.databases = Databases(self, api)
         self.ml_engines = MLEngines(api)
         super().__init__(self, api, 'mindsdb')