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

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

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

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

{garf_executors-0.1.3 → garf_executors-0.1.5}/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.3 → garf_executors-0.1.5}/garf_executors/entrypoints/cli.py

@@ -117,14 +117,17 @@ def main():
       enable_cache=args.enable_cache,
       cache_ttl_seconds=args.cache_ttl_seconds,
     )
-    if args.parallel_queries:
+    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:
-      logger.info('Running queries sequentially')
+      if len(args.query) > 1:
+        logger.info('Running queries sequentially')
       for query in args.query:
-        query_executor.execute(reader_client.read(query), query, context)
+        query_executor.execute(
+          query=reader_client.read(query), title=query, context=context
+        )
   logging.shutdown()
 
 

{garf_executors-0.1.3 → garf_executors-0.1.5}/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.3 → garf_executors-0.1.5}/garf_executors/sql_executor.py

@@ -25,6 +25,7 @@ except ImportError as e:
 
 import logging
 import re
+import uuid
 
 import pandas as pd
 from garf_core import query_editor, report
@@ -95,7 +96,7 @@ class SqlAlchemyQueryExecutor(
         conn.connection.executescript(query_text)
         results = report.GarfReport()
       else:
-        temp_table_name = f'temp_{title}'.replace('.', '_')
+        temp_table_name = f'temp_{uuid.uuid4().hex}'
         query_text = f'CREATE TABLE {temp_table_name} AS {query_text}'
         conn.connection.executescript(query_text)
         try:

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

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