garf-executors 0.1.2__tar.gz → 0.1.4__tar.gz

{garf_executors-0.1.2 → garf_executors-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-executors
-Version: 0.1.2
+Version: 0.1.4
 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.2 → garf_executors-0.1.4}/garf_executors/__init__.py

@@ -24,7 +24,10 @@ from garf_executors.telemetry import tracer
 
 @tracer.start_as_current_span('setup_executor')
 def setup_executor(
-  source: str, fetcher_parameters: dict[str, str]
+  source: str,
+  fetcher_parameters: dict[str, str | int | bool],
+  enable_cache: bool = False,
+  cache_ttl_seconds: int = 3600,
 ) -> type[executor.Executor]:
   """Initializes executors based on a source and parameters."""
   if source == 'bq':
@@ -40,7 +43,11 @@ def setup_executor(
   else:
     concrete_api_fetcher = fetchers.get_report_fetcher(source)
     query_executor = ApiQueryExecutor(
-      concrete_api_fetcher(**fetcher_parameters)
+      concrete_api_fetcher(
+        **fetcher_parameters,
+        enable_cache=enable_cache,
+        cache_ttl_seconds=cache_ttl_seconds,
+      )
     )
   return query_executor
 
@@ -50,4 +57,4 @@ __all__ = [
   'ApiExecutionContext',
 ]
 
-__version__ = '0.1.2'
+__version__ = '0.1.4'

{garf_executors-0.1.2 → garf_executors-0.1.4}/garf_executors/api_executor.py

@@ -62,24 +62,6 @@ class ApiQueryExecutor(executor.Executor):
     concrete_api_fetcher = fetchers.get_report_fetcher(source)
     return ApiQueryExecutor(concrete_api_fetcher(**fetcher_parameters))
 
-  async def aexecute(
-    self,
-    query: str,
-    title: str,
-    context: ApiExecutionContext,
-  ) -> str:
-    """Performs query execution asynchronously.
-
-    Args:
-      query: Location of the query.
-      title: Name of the query.
-      context: Query execution context.
-
-    Returns:
-      Result of writing the report.
-    """
-    return await asyncio.to_thread(self.execute, query, title, context)
-
   @tracer.start_as_current_span('api.execute')
   def execute(
     self,

{garf_executors-0.1.2 → garf_executors-0.1.4}/garf_executors/entrypoints/cli.py

@@ -56,7 +56,17 @@ def main():
   parser.add_argument(
     '--parallel-threshold', dest='parallel_threshold', default=10, type=int
   )
+  parser.add_argument(
+    '--enable-cache', dest='enable_cache', action='store_true'
+  )
+  parser.add_argument(
+    '--cache-ttl-seconds',
+    dest='cache_ttl_seconds',
+    default=3600,
+    type=int,
+  )
   parser.set_defaults(parallel_queries=True)
+  parser.set_defaults(enable_cache=False)
   parser.set_defaults(dry_run=False)
   args, kwargs = parser.parse_known_args()
 
@@ -79,7 +89,10 @@ def main():
         f'No execution context found for source {args.source} in {config_file}'
       )
     query_executor = garf_executors.setup_executor(
-      args.source, context.fetcher_parameters
+      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)
@@ -99,7 +112,10 @@ def main():
       fetcher_parameters=source_parameters,
     )
     query_executor = garf_executors.setup_executor(
-      args.source, context.fetcher_parameters
+      source=args.source,
+      fetcher_parameters=context.fetcher_parameters,
+      enable_cache=args.enable_cache,
+      cache_ttl_seconds=args.cache_ttl_seconds,
     )
     if args.parallel_queries:
       logger.info('Running queries in parallel')

{garf_executors-0.1.2 → garf_executors-0.1.4}/garf_executors/execution_context.py

@@ -42,8 +42,8 @@ class ExecutionContext(pydantic.BaseModel):
   query_parameters: query_editor.GarfQueryParameters | None = pydantic.Field(
     default_factory=dict
   )
-  fetcher_parameters: dict[str, str | list[str | int]] | None = pydantic.Field(
-    default_factory=dict
+  fetcher_parameters: dict[str, str | bool | int | list[str | int]] | None = (
+    pydantic.Field(default_factory=dict)
   )
   writer: str | None = None
   writer_parameters: dict[str, str] | None = pydantic.Field(

{garf_executors-0.1.2 → garf_executors-0.1.4}/garf_executors/executor.py

@@ -50,6 +50,24 @@ class Executor:
       )
     )
 
+  async def aexecute(
+    self,
+    query: str,
+    title: str,
+    context: execution_context.ExecutionContext,
+  ) -> str:
+    """Performs query execution asynchronously.
+
+    Args:
+      query: Location of the query.
+      title: Name of the query.
+      context: Query execution context.
+
+    Returns:
+      Result of writing the report.
+    """
+    return await asyncio.to_thread(self.execute, query, title, context)
+
   async def _run(
     self,
     batch: dict[str, str],

{garf_executors-0.1.2 → garf_executors-0.1.4}/garf_executors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-executors
-Version: 0.1.2
+Version: 0.1.4
 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