Made agents/skills part of a project

Author: tmichaeldb

mindsdb_sdk/agents.py

@@ -102,7 +102,7 @@ class Agents(CollectionBase):
     def __init__(self, api, project: str, skills: Skills = None):
         self.api = api
         self.project = project
-        self.skills = skills or Skills(self.api)
+        self.skills = skills or Skills(self.api, project)
 
     def list(self) -> List[Agent]:
         """
@@ -208,10 +208,10 @@ def update(self, name: str, updated_agent: Agent):
         )
         return Agent.from_json(data, self)
 
-    def delete(self, name: str):
+    def drop(self, name: str):
         """
-        Delete an agent by name.
+        Drop an agent by name.
 
-        :param name: Name of the agent to be deleted
+        :param name: Name of the agent to be dropped
         """
         _ = self.api.delete_agent(self.project, name)

mindsdb_sdk/projects.py

@@ -6,6 +6,8 @@
 
 from mindsdb_sdk.utils.sql import dict_to_binary_op
 
+from mindsdb_sdk.agents import Agents
+from mindsdb_sdk.skills import Skills
 from mindsdb_sdk.utils.objects_collection import CollectionBase
 
 from .models import Models
@@ -45,7 +47,7 @@ class Project:
 
     """
 
-    def __init__(self, api, name):
+    def __init__(self, api, name, agents: Agents = None, skills: Skills = None):
         self.name = name
         self.api = api
 
@@ -73,6 +75,9 @@ def __init__(self, api, name):
         self.create_job = self.jobs.create
         self.drop_job = self.jobs.drop
 
+        self.skills = skills or Skills(api, name)
+        self.agents = agents or Agents(api, name, self.skills)
+
     def __repr__(self):
         return f'{self.__class__.__name__}({self.name})'
 

mindsdb_sdk/server.py

@@ -28,7 +28,7 @@ class Server(Project):
     def __init__(self, api, skills: Skills = None, agents: Agents = None):
         # server is also mindsdb project
         project_name = 'mindsdb'
-        super().__init__(api, project_name)
+        super().__init__(api, project_name, skills=skills, agents=agents)
 
         self.projects = Projects(api)
 
@@ -51,9 +51,6 @@ def __init__(self, api, skills: Skills = None, agents: Agents = None):
         self.ml_handlers = Handlers(self.api, 'ml')
         self.data_handlers = Handlers(self.api, 'data')
 
-        self.skills = skills or Skills(api, project_name)
-        self.agents = agents or Agents(api, project_name, self.skills)
-
     def status(self) -> dict:
         """
         Get server information. It could content version

mindsdb_sdk/skills.py

@@ -45,7 +45,9 @@ def __repr__(self):
 
     @classmethod
     def from_json(cls, json: dict):
-        return cls(json['name'], json['type'], json['params'])
+        if json['type'] == 'sql':
+            return SQLSkill.from_json(json)
+        raise NotImplementedError(f'Unknown skill type: {json["type"]}')
 
 
 class SQLSkill(Skill):
@@ -111,10 +113,10 @@ def update(self, name: str, updated_skill: Skill) -> Skill:
         data = self.api.update_skill(self.project, name, updated_skill.name, updated_skill.type, updated_skill.params)
         return Skill.from_json(data)
 
-    def delete(self, name: str):
+    def drop(self, name: str):
         """
-        Delete a skill by name.
+        Drop a skill by name.
 
-        :param name: Name of the skill to be deleted
+        :param name: Name of the skill to be dropped
         """
         _ = self.api.delete_skill(self.project, name)

tests/test_sdk.py

@@ -1289,7 +1289,7 @@ def test_completion(self, mock_post):
     @patch('requests.Session.delete')
     def test_delete(self, mock_delete):
         server = mindsdb_sdk.connect()
-        server.agents.delete('test_agent')
+        server.agents.drop('test_agent')
         # Check API call.
         assert mock_delete.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent'
 
@@ -1399,6 +1399,6 @@ def test_update(self, mock_put):
     @patch('requests.Session.delete')
     def test_delete(self, mock_delete):
         server = mindsdb_sdk.connect()
-        server.skills.delete('test_skill')
+        server.skills.drop('test_skill')
         # Check API call.
         assert mock_delete.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills/test_skill'