Skip to content
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

[Easy] Makefile & QueryParam.__repr__ #35

Merged
merged 1 commit into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist
*.egg-info
_version.py
.idea/
venv/
40 changes: 40 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
VENV = venv
PYTHON = $(VENV)/bin/python3
PIP = $(VENV)/bin/pip


$(VENV)/bin/activate: requirements/dev.txt
python3 -m venv $(VENV)
$(PIP) install --upgrade pip
$(PIP) install -r requirements/dev.txt


install:
make $(VENV)/bin/activate

clean:
rm -rf __pycache__

fmt:
black ./

lint:
pylint dune_client/

types:
mypy dune_client/ --strict

check:
make fmt
make lint
make types

test-unit:
python -m pytest tests/unit

test-e2e:
python -m pytest tests/e2e

test-all:
make test-unit
make test-e2e
12 changes: 8 additions & 4 deletions dune_client/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,13 @@ def from_dict(cls, obj: dict[str, Any]) -> QueryParameter:
raise ValueError(f"Could not parse Query parameter from {obj}")

def __str__(self) -> str:
# For less cryptic logging.
return (
f"QueryParameter("
f"name: {self.key}, "
f"value: {self.value}, "
f"type: {self.type.value})"
f"Parameter("
f"name={self.key}, "
f"value={self.value}, "
f"type={self.type.value})"
)

def __repr__(self) -> str:
return str(self)
34 changes: 28 additions & 6 deletions tests/unit/test_types.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import datetime
import unittest

from dune_client.query import Query
from dune_client.types import QueryParameter, Address


Expand Down Expand Up @@ -47,22 +48,43 @@ def test_inequality(self):


class TestQueryParameter(unittest.TestCase):
def setUp(self) -> None:
self.number_type = QueryParameter.number_type("Number", 1)
self.text_type = QueryParameter.text_type("Text", "hello")
self.date_type = QueryParameter.date_type(
"Date", datetime.datetime(2022, 3, 10)
)

def test_constructors_and_to_dict(self):
number_type = QueryParameter.number_type("Number", 1)
text_type = QueryParameter.text_type("Text", "hello")
date_type = QueryParameter.date_type("Date", datetime.datetime(2022, 3, 10))

self.assertEqual(
number_type.to_dict(), {"key": "Number", "type": "number", "value": "1"}
self.number_type.to_dict(),
{"key": "Number", "type": "number", "value": "1"},
)
self.assertEqual(
text_type.to_dict(), {"key": "Text", "type": "text", "value": "hello"}
self.text_type.to_dict(), {"key": "Text", "type": "text", "value": "hello"}
)
self.assertEqual(
date_type.to_dict(),
self.date_type.to_dict(),
{"key": "Date", "type": "datetime", "value": "2022-03-10 00:00:00"},
)

def test_repr_method(self):
query = Query(
query_id=1,
name="Test Query",
params=[self.number_type, self.text_type],
)

self.assertEqual(
"Query(query_id=1, name='Test Query', "
"params=["
"Parameter(name=Number, value=1, type=number), "
"Parameter(name=Text, value=hello, type=text)"
"])",
str(query),
)


if __name__ == "__main__":
unittest.main()