Merge branch 'exec-fetcher' into exec

Author: AndreyMarkinPPC

libs/garf_core/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.1'
+__version__ = '0.1.2'

libs/garf_core/garf_core/report_fetcher.py

@@ -39,6 +39,17 @@ class ApiReportFetcherError(exceptions.GarfError):
   """Base exception for all ApiReportFetchers."""
 
 
+class MissingApiReportFetcherError(ApiReportFetcherError):
+  """Exception for not found report fetcher."""
+
+  def __init__(self, source: str) -> None:
+    """Initializes MissingApiReportFetcherError."""
+    self.source = source
+
+  def __str__(self) -> str:
+    return f'No fetcher available for the source "{self.source}"'
+
+
 class ApiReportFetcher:
   """Class responsible for getting data from report API.
 

libs/garf_executors/garf_executors/__init__.py

@@ -22,19 +22,13 @@
 def setup_executor(source: str, fetcher_parameters: dict[str, str]):
   """Initializes executors based on a source and parameters."""
   if source == 'bq':
-    query_executor = bq_executor.BigQueryExecutor(**fetcher_parameters)
-  elif source == 'sqldb':
-    query_executor = (
-      sql_executor.SqlAlchemyQueryExecutor.from_connection_string(
-        fetcher_parameters.get('connection_string')
-      )
+    return bq_executor.BigQueryExecutor(**fetcher_parameters)
+  if source == 'sqldb':
+    return sql_executor.SqlAlchemyQueryExecutor.from_connection_string(
+      fetcher_parameters.get('connection_string')
     )
-  else:
-    concrete_api_fetcher = fetchers.get_report_fetcher(source)
-    query_executor = ApiQueryExecutor(
-      concrete_api_fetcher(**fetcher_parameters)
-    )
-  return query_executor
+  concrete_api_fetcher = fetchers.get_report_fetcher(source)
+  return ApiQueryExecutor(concrete_api_fetcher(**fetcher_parameters))
 
 
 __all__ = [

libs/garf_executors/garf_executors/fetchers.py

@@ -33,8 +33,11 @@ def get_report_fetcher(source: str) -> type[report_fetcher.ApiReportFetcher]:
     Class for a found report fetcher.
 
   Raises:
-    ApiReportFetcherError: When fetcher not found or cannot be loaded.
+    ApiReportFetcherError: When fetcher cannot be loaded.
+    MissingApiReportFetcherError: When fetcher not found.
   """
+  if source not in find_fetchers():
+    raise report_fetcher.MissingApiReportFetcherError(source)
   fetchers = entry_points(group='garf')
   for fetcher in fetchers:
     if fetcher.name == source:
@@ -46,10 +49,7 @@ def get_report_fetcher(source: str) -> type[report_fetcher.ApiReportFetcher]:
           ):
             return getattr(fetcher_module, name)
       except ModuleNotFoundError:
-        raise exceptions.ApiReportFetcherError(
-          f'Failed to load fetcher for source "{source}"'
-        )
-    continue
+        continue
   raise exceptions.ApiReportFetcherError(
     f'No fetcher available for the source "{source}"'
   )