garf-core 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

garf_core/__init__.py

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

garf_core/fetchers/fake.py

@@ -20,6 +20,8 @@ from __future__ import annotations
 
 import logging
 import os
+from collections.abc import Sequence
+from typing import Any
 
 from garf_core import (
   api_clients,
@@ -36,7 +38,7 @@ class FakeApiReportFetcher(report_fetcher.ApiReportFetcher):
 
   def __init__(
     self,
-    data: list[dict[str, parsers.ApiRowElement]] | None = None,
+    api_client: api_clients.FakeApiClient | None = None,
     parser: parsers.BaseParser = parsers.DictParser,
     query_specification_builder: query_editor.QuerySpecification = (
       query_editor.QuerySpecification
@@ -46,29 +48,33 @@ class FakeApiReportFetcher(report_fetcher.ApiReportFetcher):
     json_location: str | os.PathLike[str] | None = None,
     **kwargs: str,
   ) -> None:
-    if not data and not (
+    if not api_client and not (
       data_location := json_location or csv_location or data_location
     ):
       raise report_fetcher.ApiReportFetcherError(
         'Missing fake data for the fetcher.'
       )
-    api_client = (
-      api_clients.FakeApiClient(data)
-      if data
-      else api_clients.FakeApiClient.from_file(data_location)
-    )
+    if not api_client:
+      api_client = api_clients.FakeApiClient.from_file(data_location)
     super().__init__(api_client, parser, query_specification_builder, **kwargs)
 
+  @classmethod
+  def from_data(cls, data: Sequence[dict[str, Any]]) -> FakeApiReportFetcher:
+    """Initializes FakeApiReportFetcher from a sequence of data."""
+    return FakeApiReportFetcher(
+      api_client=api_clients.FakeApiClient(results=data)
+    )
+
   @classmethod
   def from_csv(
     cls, file_location: str | os.PathLike[str]
   ) -> FakeApiReportFetcher:
-    """Initialized FakeApiReportFetcher from a csv file."""
+    """Initializes FakeApiReportFetcher from a csv file."""
     return FakeApiReportFetcher(csv_location=file_location)
 
   @classmethod
   def from_json(
     cls, file_location: str | os.PathLike[str]
   ) -> FakeApiReportFetcher:
-    """Initialized FakeApiReportFetcher from a json file."""
+    """Initializes FakeApiReportFetcher from a json file."""
     return FakeApiReportFetcher(json_location=file_location)

garf_core/fetchers/rest.py

@@ -40,11 +40,12 @@ class RestApiReportFetcher(report_fetcher.ApiReportFetcher):
 
   def __init__(
     self,
-    endpoint: str,
+    api_client: api_clients.RestApiClient | None = None,
     parser: parsers.BaseParser = parsers.DictParser,
     query_specification_builder: query_editor.QuerySpecification = (
       query_editor.QuerySpecification
     ),
+    endpoint: str | None = None,
     **kwargs: str,
   ) -> None:
     """Instantiates RestApiReportFetcher.
@@ -54,5 +55,17 @@ class RestApiReportFetcher(report_fetcher.ApiReportFetcher):
       parser: Type of parser to convert API response.
       query_specification_builder: Class to perform query parsing.
     """
-    api_client = api_clients.RestApiClient(endpoint)
+    if not api_client and not endpoint:
+      raise report_fetcher.ApiReportFetcherError(
+        'Missing api_client or endpoint for the fetcher.'
+      )
+    if not api_client:
+      api_client = api_clients.RestApiClient(endpoint)
     super().__init__(api_client, parser, query_specification_builder, **kwargs)
+
+  @classmethod
+  def from_endpoint(cls, endpoint: str) -> RestApiReportFetcher:
+    """Initializes RestApiReportFetcher: from an API endpoint."""
+    return RestApiReportFetcher(
+      api_client=api_clients.RestApiClient(endpoint=endpoint)
+    )

{garf_core-0.1.0.dist-info → garf_core-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-core
-Version: 0.1.0
+Version: 0.1.1
 Summary: Abstracts fetching data from API based on provided SQL-like query.
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>, Andrei Markin <andrey.markin.ppc@gmail.com>
 License: Apache 2.0

{garf_core-0.1.0.dist-info → garf_core-0.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-garf_core/__init__.py,sha256=TVigAs35ZN82B6dDphIRXsuJqB2gTIaFv23NVzjAtT8,598
+garf_core/__init__.py,sha256=5D5GNZp_18xDdFHuq7q1jn0HbR0-HD0s4vn0qzAAGKo,598
 garf_core/api_clients.py,sha256=k4vjFsA3JOx7Hp_pXIQNwzMXqq4u4dDcz-ddkJC0JhI,4651
 garf_core/base_query.py,sha256=ZDAw2ojmismXRO0HXEvKDukpS7OAc7390LnM8kvCSCY,1201
 garf_core/exceptions.py,sha256=Gzvkl2M-rA_XQRAMd3CC62KHeFQE_b6uby0fD0pouw4,1269
@@ -7,10 +7,10 @@ garf_core/query_editor.py,sha256=lA1aMFc_1wo6e2CyVISarnZxtH2jnKkuZfJecQqslDg,171
 garf_core/report.py,sha256=2z4tUR5mg29CkwodGaFIXs8Vpo2DCyyzwJWXhBrT0R4,19910
 garf_core/report_fetcher.py,sha256=o6YT_o0t9EPutiJk9R637lQabkHSaOrzoF2ciOmpQPA,4560
 garf_core/fetchers/__init__.py,sha256=_cSjg1D5RhUKxaVeVbaDdb8AAoI9glKJXgN5H4qXFkw,783
-garf_core/fetchers/fake.py,sha256=Ba8EnSIZyNkTza3kfo2OlWWQSKcOawp1aIoyoX-Uw74,2313
-garf_core/fetchers/rest.py,sha256=0d6sRVcxBSwWpMv5TH2L9lGGxad5vbK24q9-Ql8DcCc,1701
-garf_core-0.1.0.dist-info/METADATA,sha256=V9eJEM7smpVTRquelpfDiWhqQUxIKGQSocoHpcVXmrQ,2443
-garf_core-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-garf_core-0.1.0.dist-info/entry_points.txt,sha256=u4h-ujHO1hbxVXRQzwcC4ftju9_KBYtq5mCLKEBHMj0,69
-garf_core-0.1.0.dist-info/top_level.txt,sha256=Gj-Zp7fM2turGut5vTJuo5xEcKfow7cTLX3y3WFfNgA,10
-garf_core-0.1.0.dist-info/RECORD,,
+garf_core/fetchers/fake.py,sha256=fgJjxuHyd6EIUflUtj8r_HfaMS1YTDrOqDlaj6Kvbjs,2584
+garf_core/fetchers/rest.py,sha256=-5B2-Ck_t3hG99ym59AKwlzctiDxRFI2Nnc8STBxRDo,2201
+garf_core-0.1.1.dist-info/METADATA,sha256=OY4D0XX-hTCKypRrrea9bBYuqpR87Z58Y5WK35X31zo,2443
+garf_core-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+garf_core-0.1.1.dist-info/entry_points.txt,sha256=u4h-ujHO1hbxVXRQzwcC4ftju9_KBYtq5mCLKEBHMj0,69
+garf_core-0.1.1.dist-info/top_level.txt,sha256=Gj-Zp7fM2turGut5vTJuo5xEcKfow7cTLX3y3WFfNgA,10
+garf_core-0.1.1.dist-info/RECORD,,