Merge branch 'agents-base' of https://github.com/mindsdb/mindsdb_python_sdk into agents-base

Author: tmichaeldb

mindsdb_sdk/agents.py

@@ -22,29 +22,35 @@ class Agent:
     Working with agents:
 
     Get an agent by name:
+
     >>> agent = agents.get('my_agent')
 
     Query an agent:
+
     >>> completion = agent.completion([{'question': 'What is your name?', 'answer': None}])
     >>> print(completion.content)
 
     List all agents:
+
     >>> agents = agents.list()
 
     Create a new agent:
+
     >>> model = models.get('my_model') # Or use models.create(...)
     >>> # Connect your agent to a MindsDB table.
     >>> text_to_sql_skill = skills.create('text_to_sql', 'sql', { 'tables': ['my_table'], 'database': 'my_database' })
     >>> agent = agents.create('my_agent', model, [text_to_sql_skill])
 
     Update an agent:
+
     >>> new_model = models.get('new_model')
     >>> agent.model_name = new_model.name
     >>> new_skill = skills.create('new_skill', 'sql', { 'tables': ['new_table'], 'database': 'new_database' })
     >>> updated_agent.skills.append(new_skill)
     >>> updated_agent = agents.update('my_agent', agent)
 
     Delete an agent by name:
+
     >>> agents.delete('my_agent')
     """
     def __init__(

mindsdb_sdk/skills.py

@@ -9,19 +9,24 @@ class Skill():
     Working with skills:
 
     Get a skill by name:
+
     >>> skill = skills.get('my_skill')
 
     List all skills:
+
     >>> skills = skills.list()
 
     Create a new SQL skill:
+
     >>> text_to_sql_skill = skills.create('text_to_sql', 'sql', { 'tables': ['my_table'], 'database': 'my_database' })
 
     Update a skill:
+
     >>> skill.params = { 'tables': ['new_table'], 'database': 'new_database' }
     >>> updated_skill = skills.update('my_skill', skill)
 
     Delete a skill by name
+
     >>> skills.delete('my_skill')
     """
     def __init__(

tests/test_sdk.py

@@ -1095,7 +1095,7 @@ def test_list(self, mock_get):
         ])
         all_agents = server.agents.list()
         # Check API call.
-        assert mock_get.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents'
+        assert mock_get.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents'
 
         assert len(all_agents) == 1
         expected_agent = Agent(
@@ -1127,7 +1127,7 @@ def test_get(self, mock_get):
         )
         agent = server.agents.get('test_agent')
         # Check API call.
-        assert mock_get.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent'
+        assert mock_get.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent'
         expected_agent = Agent(
             'test_agent',
             'test_model',
@@ -1170,8 +1170,8 @@ def test_create(self, mock_post):
         )
         # Check API call.
         assert len(mock_post.call_args_list) == 2
-        assert mock_post.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents'
-        assert mock_post.call_args.kwargs['json'] == {
+        assert mock_post.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents'
+        assert mock_post.call_args[1]['json'] == {
             'agent': {
                 'name': 'test_agent',
                 'model_name':'m1',
@@ -1181,8 +1181,8 @@ def test_create(self, mock_post):
         }
 
         # Skill should have been created too.
-        assert mock_post.call_args_list[-2].args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills'
-        assert mock_post.call_args_list[-2].kwargs['json'] == {
+        assert mock_post.call_args_list[-2][0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills'
+        assert mock_post.call_args_list[-2][1]['json'] == {
            'skill': {
                 'name': 'test_skill',
                 'type': 'sql',
@@ -1250,8 +1250,8 @@ def test_update(self, mock_get, mock_put, _):
 
         updated_agent = server.agents.update('test_agent', expected_agent)
         # Check API calls.
-        assert mock_put.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent'
-        assert mock_put.call_args.kwargs['json'] == {
+        assert mock_put.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent'
+        assert mock_put.call_args[1]['json'] == {
             'agent': {
                 'name': 'test_agent',
                 'model_name': 'updated_model',
@@ -1280,8 +1280,8 @@ def test_completion(self, mock_post):
         }]
         completion = server.agents.completion('test_agent', messages)
         # Check API call.
-        assert mock_post.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent/completions'
-        assert mock_post.call_args.kwargs['json'] == {
+        assert mock_post.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent/completions'
+        assert mock_post.call_args[1]['json'] == {
            'messages': messages
         }
         assert completion.content == 'Angel Falls in Venezuela at 979m'
@@ -1291,7 +1291,7 @@ def test_delete(self, mock_delete):
         server = mindsdb_sdk.connect()
         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'
+        assert mock_delete.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/agents/test_agent'
 
 
 class TestSkills():
@@ -1301,7 +1301,7 @@ def test_list(self, mock_get):
         server = mindsdb_sdk.connect()
         # Check API call.
         assert len(server.skills.list()) == 0
-        assert mock_get.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills'
+        assert mock_get.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills'
 
         created_at = dt.datetime(2000, 3, 1, 9, 30)
         updated_at = dt.datetime(2001, 3, 1, 9, 30)
@@ -1334,7 +1334,7 @@ def test_get(self, mock_get):
         )
         skill = server.skills.get('test_skill')
         # Check API call.
-        assert mock_get.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills/test_skill'
+        assert mock_get.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills/test_skill'
         expected_skill = SQLSkill('test_skill', ['test_table'], 'test_database')
         assert skill == expected_skill
 
@@ -1357,8 +1357,8 @@ def test_create(self, mock_post):
             params={'tables': ['test_table'], 'database': 'test_database'}
         )
         # Check API call.
-        assert mock_post.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills'
-        assert mock_post.call_args.kwargs['json'] == {
+        assert mock_post.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills'
+        assert mock_post.call_args[1]['json'] == {
            'skill': {
                 'name': 'test_skill',
                 'type': 'sql',
@@ -1385,8 +1385,8 @@ def test_update(self, mock_put):
 
         updated_skill = server.skills.update('test_skill', expected_skill)
         # Check API call.
-        assert mock_put.call_args.args[0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills/test_skill'
-        assert mock_put.call_args.kwargs['json'] == {
+        assert mock_put.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills/test_skill'
+        assert mock_put.call_args[1]['json'] == {
            'skill': {
                 'name': 'test_skill',
                 'type': 'sql',
@@ -1401,4 +1401,4 @@ def test_delete(self, mock_delete):
         server = mindsdb_sdk.connect()
         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'
+        assert mock_delete.call_args[0][0] == f'{DEFAULT_LOCAL_API_URL}/api/projects/mindsdb/skills/test_skill'