[core] feat: init parser with query specification

Author: AndreyMarkinPPC

libs/garf_core/garf_core/parsers.py

@@ -32,21 +32,26 @@
 class BaseParser(abc.ABC):
   """An interface for all parsers to implement."""
 
+  def __init__(
+    self, query_specification: query_editor.BaseQueryElements
+  ) -> None:
+    """Initializes BaseParser."""
+    self.query_spec = query_specification
+
   def parse_response(
     self,
     response: api_clients.GarfApiResponse,
-    query_specification: query_editor.BaseQueryElements,
   ) -> list[list[ApiRowElement]]:
     """Parses response."""
     if not response.results:
       return [[]]
     results = []
     for result in response.results:
-      results.append(self.parse_row(result, query_specification))
+      results.append(self.parse_row(result))
     return results
 
   @abc.abstractmethod
-  def parse_row(self, row, query_specification):
+  def parse_row(self, row):
     """Parses single row from response."""
 
 
@@ -57,7 +62,6 @@ class ListParser(BaseParser):
   def parse_row(
     self,
     row: list,
-    query_specification: query_editor.BaseQueryElements,
   ) -> list[list[ApiRowElement]]:
     return row
 
@@ -69,12 +73,11 @@ class DictParser(BaseParser):
   def parse_row(
     self,
     row: list,
-    query_specification: query_editor.BaseQueryElements,
   ) -> list[list[ApiRowElement]]:
     if not isinstance(row, Mapping):
       raise GarfParserError
     result = []
-    for field in query_specification.fields:
+    for field in self.query_spec.fields:
       result.append(self.get_nested_field(row, field))
     return result
 

libs/garf_core/garf_core/report_fetcher.py

@@ -69,7 +69,7 @@ def __init__(
         Mapping between query name and function for generating GarfReport.
     """
     self.api_client = api_client
-    self.parser = parser()
+    self.parser = parser
     self.query_specification_builder = query_specification_builder
     self.query_args = kwargs
     self.builtin_queries = builtin_queries or {}
@@ -135,7 +135,7 @@ def fetch(
       return builtin_report(self, **kwargs)
 
     response = self.api_client.get_response(query, **kwargs)
-    parsed_response = self.parser.parse_response(response, query)
+    parsed_response = self.parser(query).parse_response(response)
     return report.GarfReport(
       results=parsed_response, column_names=query.column_names
     )

libs/garf_core/tests/unit/test_parsers.py

@@ -16,79 +16,65 @@
 
 from garf_core import api_clients, parsers, query_editor
 
+test_specification = query_editor.QuerySpecification(
+  'SELECT test_column_1 FROM test'
+).generate()
+
 
 class TestDictParser:
   @pytest.fixture
   def test_parser(self):
-    return parsers.DictParser()
-
-  @pytest.fixture
-  def test_specification(self):
-    return query_editor.QuerySpecification(
-      'SELECT test_column_1 FROM test'
-    ).generate()
+    return parsers.DictParser(test_specification)
 
-  def test_parse_row_returns_correct_result(
-    self, test_parser, test_specification
-  ):
+  def test_parse_row_returns_correct_result(self, test_parser):
     test_row = {'test_column_1': '1', 'test_column_2': 2}
 
-    parsed_row = test_parser.parse_row(test_row, test_specification)
+    parsed_row = test_parser.parse_row(test_row)
     expected_row = ['1']
 
     assert parsed_row == expected_row
 
-  def test_parse_results_returns_correct_result(
-    self, test_parser, test_specification
-  ):
+  def test_parse_results_returns_correct_result(self, test_parser):
     test_response = api_clients.GarfApiResponse(
       results=[
         {'test_column_1': '1', 'test_column_2': 2},
         {'test_column_1': '11', 'test_column_2': 22},
       ]
     )
 
-    parsed_row = test_parser.parse_response(test_response, test_specification)
+    parsed_row = test_parser.parse_response(test_response)
     expected_row = [['1'], ['11']]
 
     assert parsed_row == expected_row
 
   def test_parse_results_returns_empty_list_on_missing_results(
-    self, test_parser, test_specification
+    self, test_parser
   ):
     test_response = api_clients.GarfApiResponse(results=[])
 
-    parsed_row = test_parser.parse_response(test_response, test_specification)
+    parsed_row = test_parser.parse_response(test_response)
     expected_row = [[]]
 
     assert parsed_row == expected_row
 
   def test_parse_results_raises_garf_parse_error_on_incorrect_items_in_response(
-    self, test_parser, test_specification
+    self, test_parser
   ):
     test_response = api_clients.GarfApiResponse(results=[[1, 2]])
 
     with pytest.raises(parsers.GarfParserError):
-      test_parser.parse_response(test_response, test_specification)
+      test_parser.parse_response(test_response)
 
 
 class TestNumericDictParser:
   @pytest.fixture
   def test_parser(self):
-    return parsers.NumericConverterDictParser()
+    return parsers.NumericConverterDictParser(test_specification)
 
-  @pytest.fixture
-  def test_specification(self):
-    return query_editor.QuerySpecification(
-      'SELECT test_column_1 FROM test'
-    ).generate()
-
-  def test_parse_row_returns_converted_numeric_values(
-    self, test_parser, test_specification
-  ):
+  def test_parse_row_returns_converted_numeric_values(self, test_parser):
     test_row = {'test_column_1': '1', 'test_column_2': 2}
 
-    parsed_row = test_parser.parse_row(test_row, test_specification)
+    parsed_row = test_parser.parse_row(test_row)
     expected_row = [1]
 
     assert parsed_row == expected_row
@@ -97,19 +83,11 @@ def test_parse_row_returns_converted_numeric_values(
 class TestListParser:
   @pytest.fixture
   def test_parser(self):
-    return parsers.ListParser()
+    return parsers.ListParser(test_specification)
 
-  @pytest.fixture
-  def test_specification(self):
-    return query_editor.QuerySpecification(
-      'SELECT test_column_1 FROM test'
-    ).generate()
-
-  def test_parse_row_returns_converted_numeric_values(
-    self, test_parser, test_specification
-  ):
+  def test_parse_row_returns_converted_numeric_values(self, test_parser):
     test_row = {'test_column_1': '1', 'test_column_2': 2}
 
-    parsed_row = test_parser.parse_row(test_row, test_specification)
+    parsed_row = test_parser.parse_row(test_row)
 
     assert parsed_row == test_row