garf-executors 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

garf_executors/__init__.py

@@ -11,7 +11,7 @@
 # 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.
-"""Executors to fetch data from various APIS and postprocess them."""
+"""Executors to fetch data from various APIs."""
 
 from __future__ import annotations
 
@@ -48,4 +48,4 @@ __all__ = [
   'ApiExecutionContext',
 ]
 
-__version__ = '0.0.10'
+__version__ = '0.0.12'

garf_executors/entrypoints/cli.py

@@ -20,6 +20,7 @@ storage.
 from __future__ import annotations
 
 import argparse
+import logging
 import sys
 
 from garf_io import reader
@@ -38,6 +39,7 @@ def main():
   parser.add_argument('--input', dest='input', default='file')
   parser.add_argument('--log', '--loglevel', dest='loglevel', default='info')
   parser.add_argument('--logger', dest='logger', default='local')
+  parser.add_argument('--log-name', dest='log_name', default='garf')
   parser.add_argument(
     '--parallel-queries', dest='parallel_queries', action='store_true'
   )
@@ -57,7 +59,7 @@ def main():
     print(garf_executors.__version__)
     sys.exit()
   logger = utils.init_logging(
-    loglevel=args.loglevel.upper(), logger_type=args.logger
+    loglevel=args.loglevel.upper(), logger_type=args.logger, name=args.log_name
   )
   if not args.query:
     logger.error('Please provide one or more queries to run')
@@ -102,6 +104,7 @@ def main():
       logger.info('Running queries sequentially')
       for query in args.query:
         query_executor.execute(reader_client.read(query), query, context)
+  logging.shutdown()
 
 
 if __name__ == '__main__':

garf_executors/entrypoints/utils.py

@@ -93,6 +93,7 @@ class GarfParamsException(Exception):
 class LoggerEnum(str, enum.Enum):
   local = 'local'
   rich = 'rich'
+  gcloud = 'gcloud'
 
 
 def init_logging(
@@ -100,6 +101,7 @@ def init_logging(
   logger_type: str | LoggerEnum = 'local',
   name: str = __name__,
 ) -> logging.Logger:
+  loglevel = getattr(logging, loglevel)
   if logger_type == 'rich':
     logging.basicConfig(
       format='%(message)s',
@@ -109,6 +111,23 @@ def init_logging(
         rich_logging.RichHandler(rich_tracebacks=True),
       ],
     )
+  elif logger_type == 'gcloud':
+    try:
+      import google.cloud.logging as glogging
+    except ImportError as e:
+      raise ImportError(
+        'Please install garf-executors with Cloud logging support - '
+        '`pip install garf-executors[bq]`'
+      ) from e
+
+    client = glogging.Client()
+    handler = glogging.handlers.CloudLoggingHandler(client, name=name)
+    handler.close()
+    glogging.handlers.setup_logging(handler, log_level=loglevel)
+    logging.basicConfig(
+      level=loglevel,
+      handlers=[handler],
+    )
   else:
     logging.basicConfig(
       format='[%(asctime)s][%(name)s][%(levelname)s] %(message)s',

garf_executors/execution_context.py

@@ -55,6 +55,8 @@ class ExecutionContext(pydantic.BaseModel):
       self.fetcher_parameters = {}
     if self.writer_parameters is None:
       self.writer_parameters = {}
+    if not self.query_parameters:
+      self.query_parameters = query_editor.GarfQueryParameters()
 
   @classmethod
   def from_file(

{garf_executors-0.0.10.dist-info → garf_executors-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: garf-executors
-Version: 0.0.10
+Version: 0.0.12
 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
@@ -24,6 +24,7 @@ Requires-Dist: pydantic
 Provides-Extra: bq
 Requires-Dist: garf-io[bq]; extra == "bq"
 Requires-Dist: pandas; extra == "bq"
+Requires-Dist: google-cloud-logging; extra == "bq"
 Provides-Extra: sql
 Requires-Dist: garf-io[sqlalchemy]; extra == "sql"
 Requires-Dist: pandas; extra == "sql"

{garf_executors-0.0.10.dist-info → garf_executors-0.0.12.dist-info}/RECORD

@@ -1,18 +1,18 @@
-garf_executors/__init__.py,sha256=3TA3A8vmtWGJ4VZwMnDCgn03khkhwGHUI1oTmd0TnAg,1687
+garf_executors/__init__.py,sha256=lJfw7WgJxbHoLYH-QKtaikSkXfKG6ijIhrLLnNoV72Y,1666
 garf_executors/api_executor.py,sha256=gifws1Kv-k_v3TtRQGn-WJiRQ1yWSyAdOJk38ab-nms,3573
 garf_executors/bq_executor.py,sha256=yVgncimVLST8_60JMrS5Ain21RFt7K4TR2ePOja5WNA,4858
 garf_executors/config.py,sha256=TqCzijm1PRvL4p-9Zl-kPkcC1SFKjhgTfKMJFmJW3fQ,1688
 garf_executors/exceptions.py,sha256=U_7Q2ZMOUf89gzZd2pw7y3g7i1NeByPPKfpZ3q7p3ZU,662
-garf_executors/execution_context.py,sha256=IDupMfLi99QO64MwfCzzi-uRm1la2GMlE59gspBV0Xc,2686
+garf_executors/execution_context.py,sha256=21u-Z5wRyqYFrFzph_ocqaKXypXyTyjBzutUGQbeBY4,2785
 garf_executors/executor.py,sha256=bGTGlWZT5B7I_WIjhuQ0CkL7Dij_ijFCBxuC1jGVkng,1626
 garf_executors/fetchers.py,sha256=Uoolh9L3Na2E6QsrnKV6Pwv5RrCKkcjds5gkDo0IxOw,2128
 garf_executors/sql_executor.py,sha256=OGUN1AaSi6jC1v4YW0ZmcYXPE5EYfNbBRXrpdf4QTk4,3699
 garf_executors/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-garf_executors/entrypoints/cli.py,sha256=eBg1QoJ9ipBIV06wVRuGJEY3a4QJC-k1S_tNB3E-2A4,3969
+garf_executors/entrypoints/cli.py,sha256=JtlK-XG3hZo1G8YXlJU3Mt2BCJm10ehRyB9xJ_yd1M0,4094
 garf_executors/entrypoints/server.py,sha256=rdxL8uLsdRsQ3tFC3gasCsd06Pm-nZgiwcaaG1q5lHY,2872
-garf_executors/entrypoints/utils.py,sha256=IjAu-Q1REQPuYd-gVGKhxai4LLXvlHTmE-FEID038NM,3741
-garf_executors-0.0.10.dist-info/METADATA,sha256=mAHQeBbC2shQGnL1-YKmQCuxsvSWEIEGVbr-7R61e8E,2649
-garf_executors-0.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-garf_executors-0.0.10.dist-info/entry_points.txt,sha256=LskWNFIw8j0WJuI18-32OZrlASXAMg1XtrRYwsKBz2E,61
-garf_executors-0.0.10.dist-info/top_level.txt,sha256=sP4dCXOENPn1hDFAunjMV8Js4NND_KGeO_gQWuaT0EY,15
-garf_executors-0.0.10.dist-info/RECORD,,
+garf_executors/entrypoints/utils.py,sha256=5XiGR2IOxdzAOY0lEWUeUV7tIpKBGRnQaIwBYvzQB7c,4337
+garf_executors-0.0.12.dist-info/METADATA,sha256=UE4gPPj5c44YYooI3nq66yckmskMZDmXZEg1gFBXxCY,2700
+garf_executors-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+garf_executors-0.0.12.dist-info/entry_points.txt,sha256=LskWNFIw8j0WJuI18-32OZrlASXAMg1XtrRYwsKBz2E,61
+garf_executors-0.0.12.dist-info/top_level.txt,sha256=sP4dCXOENPn1hDFAunjMV8Js4NND_KGeO_gQWuaT0EY,15
+garf_executors-0.0.12.dist-info/RECORD,,