Skip to content

Fix: Standardize parameter case handling in parser #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mindsdb_sql_parser/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def evaluate_kb(self, p):
# -- Skills --
@_('CREATE SKILL if_not_exists_or_empty identifier USING kw_parameter_list')
def create_skill(self, p):
params = p.kw_parameter_list
params = {k.lower(): v for k, v in p.kw_parameter_list.items()}

return CreateSkill(
name=p.identifier,
Expand All @@ -180,12 +180,12 @@ def drop_skill(self, p):

@_('UPDATE SKILL identifier SET kw_parameter_list')
def update_skill(self, p):
return UpdateSkill(name=p.identifier, updated_params=p.kw_parameter_list)
return UpdateSkill(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})

# -- Agent --
@_('CREATE AGENT if_not_exists_or_empty identifier USING kw_parameter_list')
def create_agent(self, p):
params = p.kw_parameter_list
params = {k.lower(): v for k, v in p.kw_parameter_list.items()}

return CreateAgent(
name=p.identifier,
Expand All @@ -200,12 +200,12 @@ def drop_agent(self, p):

@_('UPDATE AGENT identifier SET kw_parameter_list')
def update_agent(self, p):
return UpdateAgent(name=p.identifier, updated_params=p.kw_parameter_list)
return UpdateAgent(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})

# -- ChatBot --
@_('CREATE CHATBOT identifier USING kw_parameter_list')
def create_chat_bot(self, p):
params = p.kw_parameter_list
params = {k.lower(): v for k, v in p.kw_parameter_list.items()}

database = Identifier(params.pop('database'))
model_param = params.pop('model', None)
Expand All @@ -224,7 +224,7 @@ def create_chat_bot(self, p):

@_('UPDATE CHATBOT identifier SET kw_parameter_list')
def update_chat_bot(self, p):
return UpdateChatBot(name=p.identifier, updated_params=p.kw_parameter_list)
return UpdateChatBot(name=p.identifier, updated_params={k.lower(): v for k, v in p.kw_parameter_list.items()})

@_('DROP CHATBOT identifier')
def drop_chat_bot(self, p):
Expand Down
99 changes: 99 additions & 0 deletions tests/test_mindsdb/test_case_handling.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import pytest
from mindsdb_sql_parser import parse_sql
from mindsdb_sql_parser.ast import Identifier
from mindsdb_sql_parser.ast.mindsdb import (
CreateSkill,
UpdateSkill,
CreateAgent,
UpdateAgent,
CreateChatBot,
UpdateChatBot,
)

class TestParameterCasing:
def test_create_skill_case_handling(self):
sql = """
CREATE SKILL my_skill
USING
TyPe = 'knowledge_base',
SoUrCe = 'my_knowledge_base'
"""
ast = parse_sql(sql)
expected_ast = CreateSkill(
name=Identifier('my_skill'),
type='knowledge_base',
params={'source': 'my_knowledge_base'}
)
assert ast.to_tree() == expected_ast.to_tree()

def test_update_skill_case_handling(self):
sql = """
UPDATE SKILL my_skill
SET
SoUrCe = 'new_source'
"""
ast = parse_sql(sql)
expected_ast = UpdateSkill(
name=Identifier('my_skill'),
updated_params={'source': 'new_source'}
)
assert ast.to_tree() == expected_ast.to_tree()

def test_create_agent_case_handling(self):
sql = """
CREATE AGENT my_agent
USING
MoDeL = 'my_model',
SkIlLs = ['skill1', 'skill2']
"""
ast = parse_sql(sql)
expected_ast = CreateAgent(
name=Identifier('my_agent'),
model='my_model',
params={'skills': ['skill1', 'skill2']}
)
assert ast.to_tree() == expected_ast.to_tree()

def test_update_agent_case_handling(self):
sql = """
UPDATE AGENT my_agent
SET
MoDeL = 'new_model',
SkIlLs = ['new_skill1', 'new_skill2']
"""
ast = parse_sql(sql)
expected_ast = UpdateAgent(
name=Identifier('my_agent'),
updated_params={'model': 'new_model', 'skills': ['new_skill1', 'new_skill2']}
)
assert ast.to_tree() == expected_ast.to_tree()

def test_create_chatbot_case_handling(self):
sql = """
CREATE CHATBOT my_chatbot
USING
DaTaBaSe = 'my_db',
MoDeL = 'my_model',
AgEnT = 'my_agent'
"""
ast = parse_sql(sql)
expected_ast = CreateChatBot(
name=Identifier('my_chatbot'),
database=Identifier('my_db'),
model=Identifier('my_model'),
agent=Identifier('my_agent')
)
assert ast.to_tree() == expected_ast.to_tree()

def test_update_chatbot_case_handling(self):
sql = """
UPDATE CHATBOT my_chatbot
SET
MoDeL = 'new_model'
"""
ast = parse_sql(sql)
expected_ast = UpdateChatBot(
name=Identifier('my_chatbot'),
updated_params={'model': 'new_model'}
)
assert ast.to_tree() == expected_ast.to_tree()