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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-executors
-Version: 0.1.7
+Version: 1.0.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
@@ -17,25 +17,35 @@ Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: garf-core
-Requires-Dist: garf-io
+Requires-Dist: garf-core>=1.0.0
+Requires-Dist: garf-io>=1.0.0
 Requires-Dist: pyyaml
 Requires-Dist: pydantic
 Requires-Dist: opentelemetry-api
 Requires-Dist: opentelemetry-sdk
+Requires-Dist: opentelemetry-exporter-otlp
 Provides-Extra: bq
 Requires-Dist: garf-io[bq]; extra == "bq"
 Requires-Dist: pandas; extra == "bq"
 Requires-Dist: google-cloud-logging; extra == "bq"
+Requires-Dist: smart_open[gcs]; extra == "bq"
 Provides-Extra: sql
 Requires-Dist: garf-io[sqlalchemy]; extra == "sql"
 Requires-Dist: pandas; extra == "sql"
+Provides-Extra: gcp
+Requires-Dist: opentelemetry-exporter-gcp-trace; extra == "gcp"
 Provides-Extra: server
 Requires-Dist: fastapi[standard]; extra == "server"
 Requires-Dist: opentelemetry-instrumentation-fastapi; extra == "server"
-Requires-Dist: opentelemetry-exporter-otlp; extra == "server"
+Requires-Dist: typer; extra == "server"
+Requires-Dist: grpcio-reflection; extra == "server"
+Provides-Extra: tests
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-mock; extra == "tests"
+Requires-Dist: pytest-xdist; extra == "tests"
+Requires-Dist: pytest-grpc; extra == "tests"
 Provides-Extra: all
-Requires-Dist: garf-executors[bq,server,sql]; extra == "all"
+Requires-Dist: garf-executors[bq,gcp,server,sql]; extra == "all"
 
 # `garf-executors` - One stop-shop for interacting with Reporting APIs.
 
@@ -64,8 +74,14 @@ garf <QUERIES> --source <API_SOURCE> \
 where
 
 * `<QUERIES>`- local or remote path(s) to files with queries.
-* `<API_SOURCE>`- type of API to use. Based on that the appropriate report fetcher will be initialized.
-* `<OUTPUT_TYPE>` - output supported by [`garf-io` library](../garf_io/README.md).
+* `source`- type of API to use. Based on that the appropriate report fetcher will be initialized. Explore supported APIs [here](https://google.github.io/garf/fetchers/overview/)
+* `output` - output supported by [`garf-io` library](https://google.github.io/garf/usage/writers/).
 
 If your report fetcher requires additional parameters you can pass them via key value pairs under `--source.` argument, i.e.`--source.regionCode='US'` - to get data only from *US*.
 > Concrete `--source` parameters are dependent on a particular report fetcher and should be looked up in a documentation for this fetcher.
+
+## Documentation
+
+Explore full documentation working with `garf-executors`
+
+* [Documentation](https://google.github.io/garf/usage/executors/)

{garf_executors-0.1.7 → garf_executors-1.0.7}/README.md

@@ -25,8 +25,14 @@ garf <QUERIES> --source <API_SOURCE> \
 where
 
 * `<QUERIES>`- local or remote path(s) to files with queries.
-* `<API_SOURCE>`- type of API to use. Based on that the appropriate report fetcher will be initialized.
-* `<OUTPUT_TYPE>` - output supported by [`garf-io` library](../garf_io/README.md).
+* `source`- type of API to use. Based on that the appropriate report fetcher will be initialized. Explore supported APIs [here](https://google.github.io/garf/fetchers/overview/)
+* `output` - output supported by [`garf-io` library](https://google.github.io/garf/usage/writers/).
 
 If your report fetcher requires additional parameters you can pass them via key value pairs under `--source.` argument, i.e.`--source.regionCode='US'` - to get data only from *US*.
 > Concrete `--source` parameters are dependent on a particular report fetcher and should be looked up in a documentation for this fetcher.
+
+## Documentation
+
+Explore full documentation working with `garf-executors`
+
+* [Documentation](https://google.github.io/garf/usage/executors/)

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/__init__.py

@@ -17,9 +17,9 @@ from __future__ import annotations
 
 import importlib
 
-from garf_executors import executor, fetchers
-from garf_executors.api_executor import ApiExecutionContext, ApiQueryExecutor
-from garf_executors.telemetry import tracer
+from garf.executors import executor, fetchers
+from garf.executors.api_executor import ApiExecutionContext, ApiQueryExecutor
+from garf.executors.telemetry import tracer
 
 
 @tracer.start_as_current_span('setup_executor')
@@ -31,10 +31,10 @@ def setup_executor(
 ) -> type[executor.Executor]:
   """Initializes executors based on a source and parameters."""
   if source == 'bq':
-    bq_executor = importlib.import_module('garf_executors.bq_executor')
+    bq_executor = importlib.import_module('garf.executors.bq_executor')
     query_executor = bq_executor.BigQueryExecutor(**fetcher_parameters)
   elif source == 'sqldb':
-    sql_executor = importlib.import_module('garf_executors.sql_executor')
+    sql_executor = importlib.import_module('garf.executors.sql_executor')
     query_executor = (
       sql_executor.SqlAlchemyQueryExecutor.from_connection_string(
         fetcher_parameters.get('connection_string')
@@ -43,7 +43,7 @@ def setup_executor(
   else:
     concrete_api_fetcher = fetchers.get_report_fetcher(source)
     query_executor = ApiQueryExecutor(
-      concrete_api_fetcher(
+      fetcher=concrete_api_fetcher(
         **fetcher_parameters,
         enable_cache=enable_cache,
         cache_ttl_seconds=cache_ttl_seconds,
@@ -57,4 +57,4 @@ __all__ = [
   'ApiExecutionContext',
 ]
 
-__version__ = '0.1.7'
+__version__ = '1.0.7'

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/api_executor.py

@@ -21,13 +21,19 @@ GarfReport and saving it to local/remote storage.
 from __future__ import annotations
 
 import logging
-
-from garf_core import report_fetcher
+import pathlib
+
+from garf.core import report_fetcher
+from garf.executors import (
+  exceptions,
+  execution_context,
+  executor,
+  fetchers,
+  query_processor,
+)
+from garf.executors.telemetry import tracer
 from opentelemetry import trace
 
-from garf_executors import exceptions, execution_context, executor, fetchers
-from garf_executors.telemetry import tracer
-
 logger = logging.getLogger(__name__)
 
 
@@ -51,15 +57,29 @@ class ApiQueryExecutor(executor.Executor):
         fetcher: Instantiated report fetcher.
     """
     self.fetcher = fetcher
+    super().__init__(
+      preprocessors=self.fetcher.preprocessors,
+      postprocessors=self.fetcher.postprocessors,
+    )
 
   @classmethod
   def from_fetcher_alias(
-    cls, source: str, fetcher_parameters: dict[str, str] | None = None
+    cls,
+    source: str,
+    fetcher_parameters: dict[str, str] | None = None,
+    enable_cache: bool = False,
+    cache_ttl_seconds: int = 3600,
   ) -> ApiQueryExecutor:
     if not fetcher_parameters:
       fetcher_parameters = {}
     concrete_api_fetcher = fetchers.get_report_fetcher(source)
-    return ApiQueryExecutor(concrete_api_fetcher(**fetcher_parameters))
+    return ApiQueryExecutor(
+      fetcher=concrete_api_fetcher(
+        **fetcher_parameters,
+        enable_cache=enable_cache,
+        cache_ttl_seconds=cache_ttl_seconds,
+      )
+    )
 
   @tracer.start_as_current_span('api.execute')
   def execute(
@@ -81,16 +101,21 @@ class ApiQueryExecutor(executor.Executor):
     Raises:
       GarfExecutorError: When failed to execute query.
     """
+    context = query_processor.process_gquery(context)
     span = trace.get_current_span()
-    span.set_attribute('fetcher', self.fetcher.__class__.__name__)
-    span.set_attribute('api_client', self.fetcher.api_client.__class__.__name__)
+    span.set_attribute('fetcher.class', self.fetcher.__class__.__name__)
+    span.set_attribute(
+      'api.client.class', self.fetcher.api_client.__class__.__name__
+    )
     try:
-      span.set_attribute('query_title', title)
-      span.set_attribute('query_text', query)
+      span.set_attribute('query.title', title)
+      span.set_attribute('query.text', query)
       logger.debug('starting query %s', query)
+      title = pathlib.Path(title).name.split('.')[0]
       results = self.fetcher.fetch(
         query_specification=query,
         args=context.query_parameters,
+        title=title,
         **context.fetcher_parameters,
       )
       writer_clients = context.writer_clients

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/bq_executor.py

@@ -28,11 +28,11 @@ except ImportError as e:
 
 import logging
 
-from garf_core import query_editor, report
+from garf.core import query_editor, report
+from garf.executors import exceptions, execution_context, executor
+from garf.executors.telemetry import tracer
 from google.cloud import exceptions as google_cloud_exceptions
-
-from garf_executors import exceptions, execution_context, executor
-from garf_executors.telemetry import tracer
+from opentelemetry import trace
 
 logger = logging.getLogger(__name__)
 
@@ -54,6 +54,7 @@ class BigQueryExecutor(executor.Executor, query_editor.TemplateProcessorMixin):
     self,
     project_id: str | None = os.getenv('GOOGLE_CLOUD_PROJECT'),
     location: str | None = None,
+    **kwargs: str,
   ) -> None:
     """Initializes BigQueryExecutor.
 
@@ -68,6 +69,7 @@ class BigQueryExecutor(executor.Executor, query_editor.TemplateProcessorMixin):
       )
     self.project_id = project_id
     self.location = location
+    super().__init__()
 
   @property
   def client(self) -> bigquery.Client:
@@ -93,41 +95,49 @@ class BigQueryExecutor(executor.Executor, query_editor.TemplateProcessorMixin):
     Returns:
       Report with data if query returns some data otherwise empty Report.
     """
+    span = trace.get_current_span()
+    span.set_attribute('query.title', title)
+    span.set_attribute('query.text', query)
+    logger.info('Executing script: %s', title)
     query_text = self.replace_params_template(query, context.query_parameters)
     self.create_datasets(context.query_parameters.macro)
     job = self.client.query(query_text)
     try:
       result = job.result()
+    except google_cloud_exceptions.GoogleCloudError as e:
+      raise BigQueryExecutorError(
+        f'Failed to execute query {title}: Reason: {e}'
+      ) from e
       logger.debug('%s launched successfully', title)
-      if result.total_rows:
-        results = report.GarfReport.from_pandas(result.to_dataframe())
+    if result.total_rows:
+      results = report.GarfReport.from_pandas(result.to_dataframe())
+    else:
+      results = report.GarfReport()
+    if context.writer and results:
+      writer_clients = context.writer_clients
+      if not writer_clients:
+        logger.warning('No writers configured, skipping write operation')
       else:
-        results = report.GarfReport()
-      if context.writer and results:
-        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
+        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)
+        # Return the last writer's result for backward compatibility
+        logger.info('%s executed successfully', title)
+        return writing_results[-1] if writing_results else None
+    logger.info('%s executed successfully', title)
+    span.set_attribute('execute.num_results', len(results))
+    return results
 
   @tracer.start_as_current_span('bq.create_datasets')
   def create_datasets(self, macros: dict | None) -> None:

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/config.py

@@ -24,8 +24,7 @@ import pathlib
 import pydantic
 import smart_open
 import yaml
-
-from garf_executors.execution_context import ExecutionContext
+from garf.executors.execution_context import ExecutionContext
 
 
 class Config(pydantic.BaseModel):
@@ -47,5 +46,7 @@ class Config(pydantic.BaseModel):
   def save(self, path: str | pathlib.Path | os.PathLike[str]) -> str:
     """Saves config to local or remote yaml file."""
     with smart_open.open(path, 'w', encoding='utf-8') as f:
-      yaml.dump(self.model_dump().get('sources'), f, encoding='utf-8')
+      yaml.dump(
+        self.model_dump(exclude_none=True).get('sources'), f, encoding='utf-8'
+      )
     return f'Config is saved to {str(path)}'

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/entrypoints/cli.py

@@ -21,15 +21,17 @@ from __future__ import annotations
 
 import argparse
 import logging
+import pathlib
+import re
 import sys
 
-from garf_io import reader
-
-import garf_executors
-from garf_executors import config, exceptions
-from garf_executors.entrypoints import utils
-from garf_executors.entrypoints.tracer import initialize_tracer
-from garf_executors.telemetry import tracer
+import garf.executors
+from garf.executors import config, exceptions, workflow
+from garf.executors.entrypoints import utils
+from garf.executors.entrypoints.tracer import initialize_tracer
+from garf.executors.telemetry import tracer
+from garf.io import reader
+from opentelemetry import trace
 
 initialize_tracer()
 
@@ -39,6 +41,7 @@ def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('query', nargs='*')
   parser.add_argument('-c', '--config', dest='config', default=None)
+  parser.add_argument('-w', '--workflow', dest='workflow', default=None)
   parser.add_argument('--source', dest='source', default=None)
   parser.add_argument('--output', dest='output', default='console')
   parser.add_argument('--input', dest='input', default='file')
@@ -70,32 +73,76 @@ def main():
   parser.set_defaults(dry_run=False)
   args, kwargs = parser.parse_known_args()
 
+  span = trace.get_current_span()
+  command_args = ' '.join(sys.argv[1:])
+  span.set_attribute('cli.command', f'garf {command_args}')
   if args.version:
-    print(garf_executors.__version__)
+    print(garf.executors.__version__)
     sys.exit()
   logger = utils.init_logging(
     loglevel=args.loglevel.upper(), logger_type=args.logger, name=args.log_name
   )
+  reader_client = reader.create_reader(args.input)
+  if workflow_file := args.workflow:
+    wf_parent = pathlib.Path.cwd() / pathlib.Path(workflow_file).parent
+    execution_workflow = workflow.Workflow.from_file(workflow_file)
+    for i, step in enumerate(execution_workflow.steps, 1):
+      step_span_name = f'{i}-{step.fetcher}'
+      if step.alias:
+        step_span_name = f'{step_span_name}-{step.alias}'
+      with tracer.start_as_current_span(step_span_name):
+        query_executor = garf.executors.setup_executor(
+          source=step.fetcher,
+          fetcher_parameters=step.fetcher_parameters,
+          enable_cache=args.enable_cache,
+          cache_ttl_seconds=args.cache_ttl_seconds,
+        )
+        batch = {}
+        if not (queries := step.queries):
+          logger.error('Please provide one or more queries to run')
+          raise exceptions.GarfExecutorError(
+            'Please provide one or more queries to run'
+          )
+        for query in queries:
+          if isinstance(query, garf.executors.workflow.QueryPath):
+            if re.match(
+              '^(http|gs|s3|aruze|hdfs|webhdfs|ssh|scp|sftp)', query.path
+            ):
+              batch[query.path] = reader_client.read(query.path)
+            else:
+              query_path = wf_parent / pathlib.Path(query.path)
+              if not query_path.exists():
+                raise workflow.GarfWorkflowError(
+                  f'Query: {query_path} not found'
+                )
+              batch[query.path] = reader_client.read(query_path)
+          elif isinstance(query, garf.executors.workflow.QueryFolder):
+            query_path = wf_parent / pathlib.Path(query.folder)
+            if not query_path.exists():
+              raise workflow.GarfWorkflowError(
+                f'Folder: {query_path} not found'
+              )
+            for p in query_path.rglob('*'):
+              if p.suffix == '.sql':
+                batch[p.stem] = reader_client.read(p)
+          else:
+            batch[query.query.title] = query.query.text
+        query_executor.execute_batch(
+          batch, step.context, args.parallel_threshold
+        )
+    sys.exit()
+
   if not args.query:
     logger.error('Please provide one or more queries to run')
     raise exceptions.GarfExecutorError(
       'Please provide one or more queries to run'
     )
-  reader_client = reader.create_reader(args.input)
   if config_file := args.config:
     execution_config = config.Config.from_file(config_file)
     if not (context := execution_config.sources.get(args.source)):
       raise exceptions.GarfExecutorError(
         f'No execution context found for source {args.source} in {config_file}'
       )
-    query_executor = garf_executors.setup_executor(
-      source=args.source,
-      fetcher_parameters=context.fetcher_parameters,
-      enable_cache=args.enable_cache,
-      cache_ttl_seconds=args.cache_ttl_seconds,
-    )
-    batch = {query: reader_client.read(query) for query in args.query}
-    query_executor.execute_batch(batch, context, args.parallel_threshold)
   else:
     param_types = ['source', 'macro', 'template']
     outputs = args.output.split(',')
@@ -107,7 +154,7 @@ def main():
     for output in outputs:
       writer_parameters.update(extra_parameters.get(output))
 
-    context = garf_executors.api_executor.ApiExecutionContext(
+    context = garf.executors.api_executor.ApiExecutionContext(
       query_parameters={
         'macro': extra_parameters.get('macro'),
         'template': extra_parameters.get('template'),
@@ -116,23 +163,24 @@ def main():
       writer_parameters=writer_parameters,
       fetcher_parameters=source_parameters,
     )
-    query_executor = garf_executors.setup_executor(
-      source=args.source,
-      fetcher_parameters=context.fetcher_parameters,
-      enable_cache=args.enable_cache,
-      cache_ttl_seconds=args.cache_ttl_seconds,
-    )
-    if args.parallel_queries and len(args.query) > 1:
-      logger.info('Running queries in parallel')
-      batch = {query: reader_client.read(query) for query in args.query}
-      query_executor.execute_batch(batch, context, args.parallel_threshold)
-    else:
-      if len(args.query) > 1:
-        logger.info('Running queries sequentially')
-      for query in args.query:
-        query_executor.execute(
-          query=reader_client.read(query), title=query, context=context
-        )
+  query_executor = garf.executors.setup_executor(
+    source=args.source,
+    fetcher_parameters=context.fetcher_parameters,
+    enable_cache=args.enable_cache,
+    cache_ttl_seconds=args.cache_ttl_seconds,
+  )
+  batch = {query: reader_client.read(query) for query in args.query}
+  if args.parallel_queries and len(args.query) > 1:
+    logger.info('Running queries in parallel')
+    batch = {query: reader_client.read(query) for query in args.query}
+    query_executor.execute_batch(batch, context, args.parallel_threshold)
+  else:
+    if len(args.query) > 1:
+      logger.info('Running queries sequentially')
+    for query in args.query:
+      query_executor.execute(
+        query=reader_client.read(query), title=query, context=context
+      )
   logging.shutdown()
 
 

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/entrypoints/grpc_server.py

@@ -18,21 +18,20 @@ import argparse
 import logging
 from concurrent import futures
 
+import garf.executors
 import grpc
+from garf.executors import garf_pb2, garf_pb2_grpc
+from garf.executors.entrypoints.tracer import initialize_tracer
 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(
+    query_executor = garf.executors.setup_executor(
       request.source, request.context.fetcher_parameters
     )
-    execution_context = garf_executors.execution_context.ExecutionContext(
+    execution_context = garf.executors.execution_context.ExecutionContext(
       **MessageToDict(request.context, preserving_proto_field_name=True)
     )
     result = query_executor.execute(
@@ -42,6 +41,22 @@ class GarfService(garf_pb2_grpc.GarfService):
     )
     return garf_pb2.ExecuteResponse(results=[result])
 
+  def Fetch(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.fetcher.fetch(
+      query_specification=request.query,
+      title=request.title,
+      args=execution_context.query_parameters,
+    )
+    return garf_pb2.FetchResponse(
+      columns=result.column_names, rows=result.to_list(row_type='dict')
+    )
+
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser()

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/entrypoints/server.py

@@ -17,18 +17,20 @@
 from typing import Optional, Union
 
 import fastapi
+import garf.executors
 import pydantic
+import typer
 import uvicorn
-from garf_io import reader
+from garf.executors import exceptions
+from garf.executors.entrypoints.tracer import initialize_tracer
+from garf.io import reader
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
-
-import garf_executors
-from garf_executors import exceptions
-from garf_executors.entrypoints.tracer import initialize_tracer
+from typing_extensions import Annotated
 
 initialize_tracer()
 app = fastapi.FastAPI()
 FastAPIInstrumentor.instrument_app(app)
+typer_app = typer.Typer()
 
 
 class ApiExecutorRequest(pydantic.BaseModel):
@@ -46,7 +48,7 @@ class ApiExecutorRequest(pydantic.BaseModel):
   title: Optional[str] = None
   query: Optional[str] = None
   query_path: Optional[Union[str, list[str]]] = None
-  context: garf_executors.api_executor.ApiExecutionContext
+  context: garf.executors.api_executor.ApiExecutionContext
 
   @pydantic.model_validator(mode='after')
   def check_query_specified(self):
@@ -75,18 +77,18 @@ class ApiExecutorResponse(pydantic.BaseModel):
 
 @app.get('/api/version')
 async def version() -> str:
-  return garf_executors.__version__
+  return garf.executors.__version__
 
 
 @app.get('/api/fetchers')
 async def get_fetchers() -> list[str]:
   """Shows all available API sources."""
-  return list(garf_executors.fetchers.find_fetchers())
+  return list(garf.executors.fetchers.find_fetchers())
 
 
 @app.post('/api/execute')
-async def execute(request: ApiExecutorRequest) -> ApiExecutorResponse:
-  query_executor = garf_executors.setup_executor(
+def execute(request: ApiExecutorRequest) -> ApiExecutorResponse:
+  query_executor = garf.executors.setup_executor(
     request.source, request.context.fetcher_parameters
   )
   result = query_executor.execute(request.query, request.title, request.context)
@@ -95,7 +97,7 @@ async def execute(request: ApiExecutorRequest) -> ApiExecutorResponse:
 
 @app.post('/api/execute:batch')
 def execute_batch(request: ApiExecutorRequest) -> ApiExecutorResponse:
-  query_executor = garf_executors.setup_executor(
+  query_executor = garf.executors.setup_executor(
     request.source, request.context.fetcher_parameters
   )
   reader_client = reader.FileReader()
@@ -104,5 +106,12 @@ def execute_batch(request: ApiExecutorRequest) -> ApiExecutorResponse:
   return ApiExecutorResponse(results=results)
 
 
+@typer_app.command()
+def main(
+  port: Annotated[int, typer.Option(help='Port to start the server')] = 8000,
+):
+  uvicorn.run(app, port=port)
+
+
 if __name__ == '__main__':
-  uvicorn.run(app)
+  typer_app()

{garf_executors-0.1.7/garf_executors → garf_executors-1.0.7/garf/executors}/entrypoints/tracer.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,8 +35,23 @@ def initialize_tracer():
   tracer_provider = TracerProvider(resource=resource)
 
   if otel_endpoint := os.getenv('OTEL_EXPORTER_OTLP_ENDPOINT'):
-    otlp_processor = BatchSpanProcessor(
-      OTLPSpanExporter(endpoint=otel_endpoint, insecure=True)
-    )
-    tracer_provider.add_span_processor(otlp_processor)
+    if gcp_project_id := os.getenv('OTEL_EXPORTER_GCP_PROJECT_ID'):
+      try:
+        from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
+      except ImportError as e:
+        raise ImportError(
+          'Please install garf-executors with GCP support '
+          '- `pip install garf-executors[gcp]`'
+        ) from e
+
+      cloud_span_processor = BatchSpanProcessor(
+        CloudTraceSpanExporter(project_id=gcp_project_id)
+      )
+      tracer_provider.add_span_processor(cloud_span_processor)
+    else:
+      otlp_processor = BatchSpanProcessor(
+        OTLPSpanExporter(endpoint=otel_endpoint, insecure=True)
+      )
+      tracer_provider.add_span_processor(otlp_processor)
+
   trace.set_tracer_provider(tracer_provider)