garf-core 0.0.7__tar.gz → 0.0.9__tar.gz

{garf_core-0.0.7 → garf_core-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: garf-core
-Version: 0.0.7
+Version: 0.0.9
 Summary: Abstracts fetching data from API based on provided SQL-like query.
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>
 License: Apache 2.0
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Operating System :: OS Independent
@@ -19,6 +20,8 @@ Description-Content-Type: text/markdown
 Requires-Dist: python-dateutil
 Requires-Dist: jinja2==3.1.4
 Requires-Dist: typing-extensions
+Requires-Dist: requests
+Requires-Dist: pyyaml
 Provides-Extra: pandas
 Requires-Dist: pandas; extra == "pandas"
 Provides-Extra: polars

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '0.0.7'
+__version__ = '0.0.9'

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/api_clients.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/base_query.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/exceptions.py

@@ -29,31 +29,3 @@ from __future__ import annotations
 
 class GarfError(Exception):
   """Base exception."""
-
-
-class GarfQueryException(GarfError):
-  """Base exception for Garf queries."""
-
-
-class GarfParserException(GarfError):
-  """Base exception for Garf parsers."""
-
-
-class GarfCustomizerException(GarfParserException):
-  """Specifies incorrect customizer."""
-
-
-class GarfVirtualColumnException(GarfParserException):
-  """Specifies incorrect virtual column type."""
-
-
-class GarfFieldException(GarfQueryException):
-  """Specifies incorrect Google Ads API field."""
-
-
-class GarfMacroException(GarfQueryException):
-  """Specifies incorrect macro in Garf query."""
-
-
-class GarfResourceException(GarfQueryException):
-  """Specifies incorrect resource name in Google Ads API."""

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/parsers.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,11 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Module for defining various parsing strategy for GoogleAdsRow elements.
-
-GoogleAdsRowParser parses a single GoogleAdsRow and applies different parsing
-strategies to each element of the row.
-"""
+"""Module for defining various parsing strategy for API response."""
 
 from __future__ import annotations
 
@@ -24,7 +20,7 @@ import contextlib
 import functools
 import operator
 from collections.abc import Mapping, MutableSequence
-from typing import Union
+from typing import Any, Union
 
 from typing_extensions import TypeAlias, override
 
@@ -34,44 +30,56 @@ ApiRowElement: TypeAlias = Union[int, float, str, bool, list, None]
 
 
 class BaseParser(abc.ABC):
-  @abc.abstractmethod
+  """An interface for all parsers to implement."""
+
   def parse_response(
-    self, response: api_clients.GarfApiResponse
+    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))
+    return results
+
+  @abc.abstractmethod
+  def parse_row(self, row, query_specification):
+    """Parses single row from response."""
 
 
 class ListParser(BaseParser):
+  """Returns API results as is."""
+
   @override
-  def parse_response(
+  def parse_row(
     self,
-    response: api_clients.GarfApiResponse,
+    row: list,
     query_specification: query_editor.BaseQueryElements,
   ) -> list[list[ApiRowElement]]:
-    del query_specification
-    return response.results
+    return row
 
 
 class DictParser(BaseParser):
+  """Extracts nested dict elements."""
+
   @override
-  def parse_response(
+  def parse_row(
     self,
-    response: api_clients.GarfApiResponse,
+    row: list,
     query_specification: query_editor.BaseQueryElements,
   ) -> list[list[ApiRowElement]]:
-    if not response.results:
-      return [[]]
-    if not isinstance(response.results[0], Mapping):
-      return GarfParserError
-    results = []
-    for result in response.results:
-      row = []
-      for field in query_specification.fields:
-        row.append(self.get_nested_field(result, field))
-      results.append(row)
-    return results
-
-  def get_nested_field(self, dictionary, key):
+    if not isinstance(row, Mapping):
+      raise GarfParserError
+    result = []
+    for field in query_specification.fields:
+      result.append(self.get_nested_field(row, field))
+    return result
+
+  def get_nested_field(self, dictionary: dict[str, Any], key: str):
+    """Returns nested fields from a dictionary."""
     key = key.split('.')
     try:
       return functools.reduce(operator.getitem, key, dictionary)
@@ -80,7 +88,11 @@ class DictParser(BaseParser):
 
 
 class NumericConverterDictParser(DictParser):
-  def get_nested_field(self, dictionary, key):
+  """Extracts nested dict elements with numerical conversions."""
+
+  def get_nested_field(self, dictionary: dict[str, Any], key: str):
+    """Extract nested field with int/float conversion."""
+
     def convert_field(value):
       for type_ in (int, float):
         with contextlib.suppress(ValueError):

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/query_editor.py

@@ -29,6 +29,30 @@ from typing_extensions import Self
 from garf_core import exceptions
 
 
+class GarfQueryError(exceptions.GarfError):
+  """Base exception for Garf queries."""
+
+
+class GarfCustomizerError(GarfQueryError):
+  """Specifies incorrect customizer."""
+
+
+class GarfVirtualColumnError(GarfQueryError):
+  """Specifies incorrect virtual column type."""
+
+
+class GarfFieldError(GarfQueryError):
+  """Specifies incorrect fields from API."""
+
+
+class GarfMacroError(GarfQueryError):
+  """Specifies incorrect macro in Garf query."""
+
+
+class GarfResourceError(GarfQueryError):
+  """Specifies incorrect resource name in the query."""
+
+
 @dataclasses.dataclass
 class ProcessedField:
   """Helper class to store fields with its customizers.
@@ -141,7 +165,7 @@ class VirtualColumn:
         substitute_expression=substitute_expression.replace('.', '_'),
       )
     if not _is_quoted_string(field):
-      raise exceptions.GarfFieldException(f"Incorrect field '{field}'.")
+      raise GarfFieldError(f"Incorrect field '{field}'.")
     field = field.replace("'", '').replace('"', '')
     field = field.format(**macros) if macros else field
     return VirtualColumn(type='built-in', value=field)
@@ -183,9 +207,7 @@ class ExtractedLineElements:
     else:
       customizer = {}
     if virtual_column and not alias:
-      raise exceptions.GarfVirtualColumnException(
-        'Virtual attributes should be aliased'
-      )
+      raise GarfVirtualColumnError('Virtual attributes should be aliased')
     return ExtractedLineElements(
       field=_format_type_field_name(field)
       if not virtual_column and field
@@ -381,9 +403,7 @@ class QuerySpecification(CommonParametersMixin, TemplateProcessorMixin):
     try:
       self.query.text = query_text.format(**self.macros).strip()
     except KeyError as e:
-      raise exceptions.GarfMacroException(
-        f'No value provided for macro {str(e)}.'
-      ) from e
+      raise GarfMacroError(f'No value provided for macro {str(e)}.') from e
     return self
 
   def remove_comments(self) -> Self:
@@ -424,9 +444,7 @@ class QuerySpecification(CommonParametersMixin, TemplateProcessorMixin):
     ):
       self.query.resource_name = str(resource_name[0]).strip()
       return self
-    raise exceptions.GarfResourceException(
-      f'No resource found in query: {self.query.text}'
-    )
+    raise GarfResourceError(f'No resource found in query: {self.query.text}')
 
   def extract_fields(self) -> Self:
     for line in self._extract_query_lines():

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/report.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core/report_fetcher.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLf
+# Copyright 2025 Google LLf
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,12 +38,17 @@ class ApiReportFetcher:
 
   Attributes:
       api_client: a client used for connecting to API.
+      parser: Type of parser to convert API response.
+      query_specification_builder: Class to perform query parsing.
   """
 
   def __init__(
     self,
     api_client: api_clients.BaseApiClient,
     parser: parsers.BaseParser = parsers.ListParser,
+    query_specification_builder: query_editor.QuerySpecification = (
+      query_editor.QuerySpecification
+    ),
     **kwargs: str,
   ) -> None:
     """Instantiates ApiReportFetcher based on provided api client.
@@ -51,9 +56,11 @@ class ApiReportFetcher:
     Args:
       api_client: Instantiated api client.
       parser: Type of parser to convert API response.
+      query_specification_builder: Class to perform query parsing.
     """
     self.api_client = api_client
     self.parser = parser()
+    self.query_specification_builder = query_specification_builder
     self.query_args = kwargs
 
   async def afetch(
@@ -65,12 +72,12 @@ class ApiReportFetcher:
     """Asynchronously fetches data from API based on query_specification.
 
     Args:
-        query_specification: Query text that will be passed to API
-            alongside column_names, customizers and virtual columns.
-        args: Arguments that need to be passed to the query.
+      query_specification: Query text that will be passed to API
+        alongside column_names, customizers and virtual columns.
+      args: Arguments that need to be passed to the query.
 
     Returns:
-        GarfReport with results of query execution.
+      GarfReport with results of query execution.
     """
     return self.fetch(query_specification, args, **kwargs)
 
@@ -83,19 +90,19 @@ class ApiReportFetcher:
     """Fetches data from API based on query_specification.
 
     Args:
-        query_specification: Query text that will be passed to API
-            alongside column_names, customizers and virtual columns.
-        args: Arguments that need to be passed to the query.
+      query_specification: Query text that will be passed to API
+        alongside column_names, customizers and virtual columns.
+      args: Arguments that need to be passed to the query.
 
     Returns:
-        GarfReport with results of query execution.
+      GarfReport with results of query execution.
 
     Raises:
-        GarfExecutorException:
-            When customer_ids are not provided or API returned error.
+      GarfExecutorException:
+        When customer_ids are not provided or API returned error.
     """
     if not isinstance(query_specification, query_editor.QuerySpecification):
-      query_specification = query_editor.QuerySpecification(
+      query_specification = self.query_specification_builder(
         text=str(query_specification),
         args=args,
       )
@@ -119,12 +126,17 @@ class RestApiReportFetcher(ApiReportFetcher):
     self,
     endpoint: str,
     parser: parsers.BaseParser = parsers.DictParser,
+    query_specification_builder: query_editor.QuerySpecification = (
+      query_editor.QuerySpecification
+    ),
+    **kwargs: str,
   ) -> None:
     """Instantiates RestApiReportFetcher.
 
     Args:
       endpoint: URL of API endpoint.
       parser: Type of parser to convert API response.
+      query_specification_builder: Class to perform query parsing.
     """
-    self.api_client = api_clients.RestApiClient(endpoint)
-    self.parser = parser()
+    api_client = api_clients.RestApiClient(endpoint)
+    super().__init__(api_client, parser, query_specification_builder, **kwargs)

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: garf-core
-Version: 0.0.7
+Version: 0.0.9
 Summary: Abstracts fetching data from API based on provided SQL-like query.
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>
 License: Apache 2.0
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Operating System :: OS Independent
@@ -19,6 +20,8 @@ Description-Content-Type: text/markdown
 Requires-Dist: python-dateutil
 Requires-Dist: jinja2==3.1.4
 Requires-Dist: typing-extensions
+Requires-Dist: requests
+Requires-Dist: pyyaml
 Provides-Extra: pandas
 Requires-Dist: pandas; extra == "pandas"
 Provides-Extra: polars

{garf_core-0.0.7 → garf_core-0.0.9}/garf_core.egg-info/requires.txt

@@ -1,6 +1,8 @@
 python-dateutil
 jinja2==3.1.4
 typing-extensions
+requests
+pyyaml
 
 [all]
 garf-core[pandas,polars]

{garf_core-0.0.7 → garf_core-0.0.9}/pyproject.toml

@@ -8,6 +8,8 @@ dependencies = [
     "python-dateutil",
     "jinja2==3.1.4",
     "typing-extensions",
+    "requests",
+    "pyyaml",
 ]
 authors = [
   {name = "Google Inc. (gTech gPS CSE team)", email = "no-reply@google.com"},
@@ -23,6 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Operating System :: OS Independent",