Skip to content

support for simple str list ['123', '456'] and keep backward compatible #39

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jul 24, 2024
Merged

support for simple str list ['123', '456'] and keep backward compatible #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94fd258
support for simple str list ['123', '456'] and keep backward compatible
alon-p Jun 30, 2024
bd2ad92
using isinstance
alon-p Jul 1, 2024
a395ed0
fixed formatting
alon-p Jul 1, 2024
7deaebd
fixed type for list of int
alon-p Jul 1, 2024
6b4b534
using triple ''' for the f string
alon-p Jul 22, 2024
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
17 changes: 15 additions & 2 deletions graphql_query/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,20 @@ def _render_for_float(name: str, value: float) -> str:

@staticmethod
def _render_for_list_str(name: str, value: List[str]) -> str:
return _template_key_values.render(name=name, values=value)
clean_list = []
for item in value:
result = item.replace('"', '').split(',')
if isinstance(result, list):
trimmed_result = [i.strip() for i in result]
clean_list.extend(trimmed_result)
else:
clean_list.append(result)

return _template_key_values.render(name=name, values=[f'''\"{v.replace('"', '')}\"''' for v in clean_list])

@staticmethod
def _render_for_list_int(name: str, value: List[int]) -> str:
return _template_key_values.render(name=name, values=[str(v) for v in value])

@staticmethod
def _render_for_list_bool(name: str, value: List[bool]) -> str:
Expand Down Expand Up @@ -277,7 +290,7 @@ def render(self) -> str:
return self._render_for_list_float(self.name, self.value)

if self._check_is_list_of_int(self.value):
return self._render_for_list_str(self.name, [str(v) for v in self.value])
return self._render_for_list_int(self.name, self.value)

if self._check_is_list_of_arguments(self.value):
return self._render_for_list_argument(self.name, self.value)
Expand Down
53 changes: 33 additions & 20 deletions tests/test_argument/test_argument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,60 @@
def test_value_is_str():
assert Argument(name="arg1", value="VALUE1").render() == "arg1: VALUE1"
assert Argument(name="id", value='"1000"').render() == 'id: "1000"'
assert Argument(name="length", value='911').render() == 'length: 911'
assert Argument(name="length", value="911").render() == "length: 911"
assert Argument(name="unit", value="null").render() == "unit: null"


def test_value_is_int():
assert Argument(name="length", value=911).render() == 'length: 911'
assert Argument(name="length", value=0).render() == 'length: 0'
assert Argument(name="length", value=-1).render() == 'length: -1'
assert Argument(name="length", value=911).render() == "length: 911"
assert Argument(name="length", value=0).render() == "length: 0"
assert Argument(name="length", value=-1).render() == "length: -1"


def test_value_is_bool():
assert Argument(name="some", value=True).render() == 'some: true'
assert Argument(name="some", value=False).render() == 'some: false'
assert Argument(name="some", value=True).render() == "some: true"
assert Argument(name="some", value=False).render() == "some: false"


def test_value_is_float():
assert Argument(name="some", value=1.0).render() == 'some: 1.0'
assert Argument(name="some", value=0.2).render() == 'some: 0.2'
assert Argument(name="some", value=1.0).render() == "some: 1.0"
assert Argument(name="some", value=0.2).render() == "some: 0.2"


def test_value_is_list_str():
def test_value_is_list_str_with_backward_compatible_workarounds():
assert Argument(name="someListArgument", value=['"123"']).render() == 'someListArgument: ["123"]'
assert Argument(name="someListArgument", value=[]).render() == 'someListArgument: []'
assert Argument(name="someListArgument", value=[]).render() == "someListArgument: []"
assert Argument(name="someListArgument", value=['"123", "456"']).render() == 'someListArgument: ["123", "456"]'


def test_value_is_list_str():
assert Argument(name="someListArgument", value=["123", "456"]).render() == 'someListArgument: ["123", "456"]'
assert (
Argument(name="someListArgument", value=["hello", "world"]).render() == 'someListArgument: ["hello", "world"]'
)


def test_value_is_list_str_with_apostrophe():
assert (
Argument(name="someListArgument", value=["you'r", "isn't"]).render() == 'someListArgument: ["you\'r", "isn\'t"]'
)


def test_value_is_list_int():
assert Argument(name="someListArgument", value=[123]).render() == 'someListArgument: [123]'
assert Argument(name="someListArgument", value=[]).render() == 'someListArgument: []'
assert Argument(name="someListArgument", value=[123, 456]).render() == 'someListArgument: [123, 456]'
assert Argument(name="someListArgument", value=[123]).render() == "someListArgument: [123]"
assert Argument(name="someListArgument", value=[]).render() == "someListArgument: []"
assert Argument(name="someListArgument", value=[123, 456]).render() == "someListArgument: [123, 456]"


def test_value_is_list_bool():
assert Argument(name="someListArgument", value=[True, False]).render() == 'someListArgument: [true, false]'
assert Argument(name="someListArgument", value=[True]).render() == 'someListArgument: [true]'
assert Argument(name="someListArgument", value=[False]).render() == 'someListArgument: [false]'
assert Argument(name="someListArgument", value=[True, False]).render() == "someListArgument: [true, false]"
assert Argument(name="someListArgument", value=[True]).render() == "someListArgument: [true]"
assert Argument(name="someListArgument", value=[False]).render() == "someListArgument: [false]"


def test_value_is_list_float():
assert Argument(name="someListArgument", value=[1.0, 0.2]).render() == 'someListArgument: [1.0, 0.2]'
assert Argument(name="someListArgument", value=[42.0]).render() == 'someListArgument: [42.0]'
assert Argument(name="someListArgument", value=[1.0, 0.2]).render() == "someListArgument: [1.0, 0.2]"
assert Argument(name="someListArgument", value=[42.0]).render() == "someListArgument: [42.0]"


@pytest.mark.parametrize(
Expand All @@ -62,7 +75,7 @@ def test_value_is_list_float():
Argument(name="field", value=['"value1"', '"value2"']),
'filter: {\n field: ["value1", "value2"]\n}',
),
("filter", Argument(name="field", value=Variable(name="var", type="Variable")), 'filter: {\n field: $var\n}'),
("filter", Argument(name="field", value=Variable(name="var", type="Variable")), "filter: {\n field: $var\n}"),
],
)
def test_value_is_argument(name: str, value: Argument, result: str):
Expand All @@ -73,7 +86,7 @@ def test_value_is_argument(name: str, value: Argument, result: str):
def test_value_is_variable():
var = Variable(name="var", type="Variable")
arg = Argument(name="field", value=var)
assert arg.render() == 'field: $var'
assert arg.render() == "field: $var"


def test_value_is_list_of_args():
Expand Down
Loading