garf-executors 0.1.5__tar.gz → 0.1.7__tar.gz

{garf_executors-0.1.5 → garf_executors-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-executors
-Version: 0.1.5
+Version: 0.1.7
 Summary: Executes queries against API and writes data to local/remote storage.
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>, Andrei Markin <andrey.markin.ppc@gmail.com>
 License: Apache 2.0

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/__init__.py

@@ -57,4 +57,4 @@ __all__ = [
   'ApiExecutionContext',
 ]
 
-__version__ = '0.1.5'
+__version__ = '0.1.7'

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/api_executor.py

@@ -20,7 +20,6 @@ GarfReport and saving it to local/remote storage.
 
 from __future__ import annotations
 
-import asyncio
 import logging
 
 from garf_core import report_fetcher
@@ -35,7 +34,7 @@ logger = logging.getLogger(__name__)
 class ApiExecutionContext(execution_context.ExecutionContext):
   """Common context for executing one or more queries."""
 
-  writer: str = 'console'
+  writer: str | list[str] = 'console'
 
 
 class ApiQueryExecutor(executor.Executor):
@@ -94,20 +93,27 @@ class ApiQueryExecutor(executor.Executor):
         args=context.query_parameters,
         **context.fetcher_parameters,
       )
-      writer_client = context.writer_client
-      logger.debug(
-        'Start writing data for query %s via %s writer',
-        title,
-        type(writer_client),
-      )
-      result = writer_client.write(results, title)
-      logger.debug(
-        'Finish writing data for query %s via %s writer',
-        title,
-        type(writer_client),
-      )
+      writer_clients = context.writer_clients
+      if not writer_clients:
+        logger.warning('No writers configured, skipping write operation')
+        return None
+      writing_results = []
+      for writer_client in writer_clients:
+        logger.debug(
+          'Start writing data for query %s via %s writer',
+          title,
+          type(writer_client),
+        )
+        result = writer_client.write(results, title)
+        logger.debug(
+          'Finish writing data for query %s via %s writer',
+          title,
+          type(writer_client),
+        )
+        writing_results.append(result)
       logger.info('%s executed successfully', title)
-      return result
+      # Return the last writer's result for backward compatibility
+      return writing_results[-1] if writing_results else None
     except Exception as e:
       logger.error('%s generated an exception: %s', title, str(e))
       raise exceptions.GarfExecutorError(

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/bq_executor.py

@@ -15,6 +15,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import os
 
 try:
@@ -103,20 +104,27 @@ class BigQueryExecutor(executor.Executor, query_editor.TemplateProcessorMixin):
       else:
         results = report.GarfReport()
       if context.writer and results:
-        writer_client = context.writer_client
-        logger.debug(
-          'Start writing data for query %s via %s writer',
-          title,
-          type(writer_client),
-        )
-        writing_result = writer_client.write(results, title)
-        logger.debug(
-          'Finish writing data for query %s via %s writer',
-          title,
-          type(writer_client),
-        )
-        logger.info('%s executed successfully', title)
-        return writing_result
+        writer_clients = context.writer_clients
+        if not writer_clients:
+          logger.warning('No writers configured, skipping write operation')
+        else:
+          writing_results = []
+          for writer_client in writer_clients:
+            logger.debug(
+              'Start writing data for query %s via %s writer',
+              title,
+              type(writer_client),
+            )
+            writing_result = writer_client.write(results, title)
+            logger.debug(
+              'Finish writing data for query %s via %s writer',
+              title,
+              type(writer_client),
+            )
+            writing_results.append(writing_result)
+          logger.info('%s executed successfully', title)
+          # Return the last writer's result for backward compatibility
+          return writing_results[-1] if writing_results else None
       return results
     except google_cloud_exceptions.GoogleCloudError as e:
       raise BigQueryExecutorError(e) from e
@@ -139,8 +147,9 @@ class BigQueryExecutor(executor.Executor, query_editor.TemplateProcessorMixin):
         except google_cloud_exceptions.NotFound:
           bq_dataset = bigquery.Dataset(dataset_id)
           bq_dataset.location = self.location
-          self.client.create_dataset(bq_dataset, timeout=30)
-          logger.info('Created new dataset %s', dataset_id)
+          with contextlib.suppress(google_cloud_exceptions.Conflict):
+            self.client.create_dataset(bq_dataset, timeout=30)
+            logger.info('Created new dataset %s', dataset_id)
 
 
 def extract_datasets(macros: dict | None) -> list[str]:

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/entrypoints/cli.py

@@ -97,18 +97,23 @@ def main():
     batch = {query: reader_client.read(query) for query in args.query}
     query_executor.execute_batch(batch, context, args.parallel_threshold)
   else:
-    extra_parameters = utils.ParamsParser(
-      ['source', args.output, 'macro', 'template']
-    ).parse(kwargs)
+    param_types = ['source', 'macro', 'template']
+    outputs = args.output.split(',')
+    extra_parameters = utils.ParamsParser([*param_types, *outputs]).parse(
+      kwargs
+    )
     source_parameters = extra_parameters.get('source', {})
+    writer_parameters = {}
+    for output in outputs:
+      writer_parameters.update(extra_parameters.get(output))
 
     context = garf_executors.api_executor.ApiExecutionContext(
       query_parameters={
         'macro': extra_parameters.get('macro'),
         'template': extra_parameters.get('template'),
       },
-      writer=args.output,
-      writer_parameters=extra_parameters.get(args.output),
+      writer=outputs,
+      writer_parameters=writer_parameters,
       fetcher_parameters=source_parameters,
     )
     query_executor = garf_executors.setup_executor(

garf_executors-0.1.7/garf_executors/entrypoints/grpc_server.py

@@ -0,0 +1,68 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+"""gRPC endpoint for garf."""
+
+import argparse
+import logging
+from concurrent import futures
+
+import grpc
+from google.protobuf.json_format import MessageToDict
+from grpc_reflection.v1alpha import reflection
+
+import garf_executors
+from garf_executors import garf_pb2, garf_pb2_grpc
+from garf_executors.entrypoints.tracer import initialize_tracer
+
+
+class GarfService(garf_pb2_grpc.GarfService):
+  def Execute(self, request, context):
+    query_executor = garf_executors.setup_executor(
+      request.source, request.context.fetcher_parameters
+    )
+    execution_context = garf_executors.execution_context.ExecutionContext(
+      **MessageToDict(request.context, preserving_proto_field_name=True)
+    )
+    result = query_executor.execute(
+      query=request.query,
+      title=request.title,
+      context=execution_context,
+    )
+    return garf_pb2.ExecuteResponse(results=[result])
+
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--port', dest='port', default=50051, type=int)
+  parser.add_argument(
+    '--parallel-threshold', dest='parallel_threshold', default=10, type=int
+  )
+  args, _ = parser.parse_known_args()
+  initialize_tracer()
+  server = grpc.server(
+    futures.ThreadPoolExecutor(max_workers=args.parallel_threshold)
+  )
+
+  service = GarfService()
+  garf_pb2_grpc.add_GarfServiceServicer_to_server(service, server)
+  SERVICE_NAMES = (
+    garf_pb2.DESCRIPTOR.services_by_name['GarfService'].full_name,
+    reflection.SERVICE_NAME,
+  )
+  reflection.enable_server_reflection(SERVICE_NAMES, server)
+  server.add_insecure_port(f'[::]:{args.port}')
+  server.start()
+  logging.info('Garf service started, listening on port %d', 50051)
+  server.wait_for_termination()

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/execution_context.py

@@ -35,7 +35,7 @@ class ExecutionContext(pydantic.BaseModel):
   Attributes:
     query_parameters: Parameters to dynamically change query text.
     fetcher_parameters: Parameters to specify fetching setup.
-    writer: Type of writer to use.
+    writer: Type of writer to use. Can be a single writer string or list of writers.
     writer_parameters: Optional parameters to setup writer.
   """
 
@@ -45,7 +45,7 @@ class ExecutionContext(pydantic.BaseModel):
   fetcher_parameters: dict[str, str | bool | int | list[str | int]] | None = (
     pydantic.Field(default_factory=dict)
   )
-  writer: str | None = None
+  writer: str | list[str] | None = None
   writer_parameters: dict[str, str] | None = pydantic.Field(
     default_factory=dict
   )
@@ -75,9 +75,42 @@ class ExecutionContext(pydantic.BaseModel):
 
   @property
   def writer_client(self) -> abs_writer.AbsWriter:
-    writer_client = writer.create_writer(self.writer, **self.writer_parameters)
-    if self.writer == 'bq':
+    """Returns single writer client."""
+    if isinstance(self.writer, list) and len(self.writer) > 0:
+      writer_type = self.writer[0]
+    else:
+      writer_type = self.writer
+
+    writer_params = self.writer_parameters or {}
+
+    if not writer_type:
+      raise ValueError('No writer specified')
+
+    writer_client = writer.create_writer(writer_type, **writer_params)
+    if writer_type == 'bq':
       _ = writer_client.create_or_get_dataset()
-    if self.writer == 'sheet':
+    if writer_type == 'sheet':
       writer_client.init_client()
     return writer_client
+
+  @property
+  def writer_clients(self) -> list[abs_writer.AbsWriter]:
+    """Returns list of writer clients."""
+    if not self.writer:
+      return []
+
+    # Convert single writer to list for uniform processing
+    writers_to_use = (
+      self.writer if isinstance(self.writer, list) else [self.writer]
+    )
+    writer_params = self.writer_parameters or {}
+
+    clients = []
+    for writer_type in writers_to_use:
+      writer_client = writer.create_writer(writer_type, **writer_params)
+      if writer_type == 'bq':
+        _ = writer_client.create_or_get_dataset()
+      if writer_type == 'sheet':
+        writer_client.init_client()
+      clients.append(writer_client)
+    return clients

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/fetchers.py

@@ -13,14 +13,16 @@
 # limitations under the License.
 
 import inspect
+import logging
 import sys
 from importlib.metadata import entry_points
 
 from garf_core import report_fetcher
-from opentelemetry import trace
 
 from garf_executors.telemetry import tracer
 
+logger = logging.getLogger(name='garf_executors.fetchers')
+
 
 @tracer.start_as_current_span('find_fetchers')
 def find_fetchers() -> set[str]:
@@ -57,8 +59,10 @@ def get_report_fetcher(source: str) -> type[report_fetcher.ApiReportFetcher]:
             obj, report_fetcher.ApiReportFetcher
           ):
             return getattr(fetcher_module, name)
-      except ModuleNotFoundError:
-        continue
+      except ModuleNotFoundError as e:
+        raise report_fetcher.ApiReportFetcherError(
+          f'Failed to load fetcher for source {source}, reason: {e}'
+        )
   raise report_fetcher.ApiReportFetcherError(
     f'No fetcher available for the source "{source}"'
   )

garf_executors-0.1.7/garf_executors/garf_pb2.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: garf.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'garf.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\ngarf.proto\x12\x04garf\x1a\x1cgoogle/protobuf/struct.proto\"g\n\x0e\x45xecuteRequest\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\r\n\x05title\x18\x02 \x01(\t\x12\r\n\x05query\x18\x03 \x01(\t\x12\'\n\x07\x63ontext\x18\x04 \x01(\x0b\x32\x16.garf.ExecutionContext\"\xbc\x01\n\x10\x45xecutionContext\x12/\n\x10query_parameters\x18\x01 \x01(\x0b\x32\x15.garf.QueryParameters\x12\x33\n\x12\x66\x65tcher_parameters\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0e\n\x06writer\x18\x03 \x01(\t\x12\x32\n\x11writer_parameters\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"d\n\x0fQueryParameters\x12&\n\x05macro\x18\x01 \x01(\x0b\x32\x17.google.protobuf.Struct\x12)\n\x08template\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\"\"\n\x0f\x45xecuteResponse\x12\x0f\n\x07results\x18\x01 \x03(\t2G\n\x0bGarfService\x12\x38\n\x07\x45xecute\x12\x14.garf.ExecuteRequest\x1a\x15.garf.ExecuteResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'garf_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_EXECUTEREQUEST']._serialized_start=50
+  _globals['_EXECUTEREQUEST']._serialized_end=153
+  _globals['_EXECUTIONCONTEXT']._serialized_start=156
+  _globals['_EXECUTIONCONTEXT']._serialized_end=344
+  _globals['_QUERYPARAMETERS']._serialized_start=346
+  _globals['_QUERYPARAMETERS']._serialized_end=446
+  _globals['_EXECUTERESPONSE']._serialized_start=448
+  _globals['_EXECUTERESPONSE']._serialized_end=482
+  _globals['_GARFSERVICE']._serialized_start=484
+  _globals['_GARFSERVICE']._serialized_end=555
+# @@protoc_insertion_point(module_scope)

garf_executors-0.1.7/garf_executors/garf_pb2_grpc.py

@@ -0,0 +1,97 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from . import garf_pb2 as garf__pb2
+
+GRPC_GENERATED_VERSION = '1.75.0'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in garf_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
+
+class GarfServiceStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.Execute = channel.unary_unary(
+                '/garf.GarfService/Execute',
+                request_serializer=garf__pb2.ExecuteRequest.SerializeToString,
+                response_deserializer=garf__pb2.ExecuteResponse.FromString,
+                _registered_method=True)
+
+
+class GarfServiceServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def Execute(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_GarfServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'Execute': grpc.unary_unary_rpc_method_handler(
+                    servicer.Execute,
+                    request_deserializer=garf__pb2.ExecuteRequest.FromString,
+                    response_serializer=garf__pb2.ExecuteResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'garf.GarfService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('garf.GarfService', rpc_method_handlers)
+
+
+ # This class is part of an EXPERIMENTAL API.
+class GarfService(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def Execute(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/garf.GarfService/Execute',
+            garf__pb2.ExecuteRequest.SerializeToString,
+            garf__pb2.ExecuteResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors/sql_executor.py

@@ -106,19 +106,26 @@ class SqlAlchemyQueryExecutor(
         finally:
           conn.connection.execute(f'DROP TABLE {temp_table_name}')
       if context.writer and results:
-        writer_client = context.writer_client
-        logger.debug(
-          'Start writing data for query %s via %s writer',
-          title,
-          type(writer_client),
-        )
-        writing_result = writer_client.write(results, title)
-        logger.debug(
-          'Finish writing data for query %s via %s writer',
-          title,
-          type(writer_client),
-        )
-        logger.info('%s executed successfully', title)
-        return writing_result
+        writer_clients = context.writer_clients
+        if not writer_clients:
+          logger.warning('No writers configured, skipping write operation')
+        else:
+          writing_results = []
+          for writer_client in writer_clients:
+            logger.debug(
+              'Start writing data for query %s via %s writer',
+              title,
+              type(writer_client),
+            )
+            writing_result = writer_client.write(results, title)
+            logger.debug(
+              'Finish writing data for query %s via %s writer',
+              title,
+              type(writer_client),
+            )
+            writing_results.append(writing_result)
+          logger.info('%s executed successfully', title)
+          # Return the last writer's result for backward compatibility
+          return writing_results[-1] if writing_results else None
       span.set_attribute('execute.num_results', len(results))
       return results

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-executors
-Version: 0.1.5
+Version: 0.1.7
 Summary: Executes queries against API and writes data to local/remote storage.
 Author-email: "Google Inc. (gTech gPS CSE team)" <no-reply@google.com>, Andrei Markin <andrey.markin.ppc@gmail.com>
 License: Apache 2.0

{garf_executors-0.1.5 → garf_executors-0.1.7}/garf_executors.egg-info/SOURCES.txt

@@ -8,6 +8,8 @@ garf_executors/exceptions.py
 garf_executors/execution_context.py
 garf_executors/executor.py
 garf_executors/fetchers.py
+garf_executors/garf_pb2.py
+garf_executors/garf_pb2_grpc.py
 garf_executors/sql_executor.py
 garf_executors/telemetry.py
 garf_executors.egg-info/PKG-INFO
@@ -18,6 +20,7 @@ garf_executors.egg-info/requires.txt
 garf_executors.egg-info/top_level.txt
 garf_executors/entrypoints/__init__.py
 garf_executors/entrypoints/cli.py
+garf_executors/entrypoints/grpc_server.py
 garf_executors/entrypoints/server.py
 garf_executors/entrypoints/tracer.py
 garf_executors/entrypoints/utils.py