bigeye-cli 0.7.1__tar.gz → 0.7.3__tar.gz

{bigeye_cli-0.7.1 → bigeye_cli-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bigeye-cli
-Version: 0.7.1
+Version: 0.7.3
 Summary: Bigeye CLI offers developer tools for maintaining your developer workspace.
 Home-page: https://docs.bigeye.com/docs
 License: Proprietary
@@ -18,7 +18,7 @@ Requires-Dist: rich (>=14.1.0,<15.0.0)
 Description-Content-Type: text/markdown
 
 # **Bigeye CLI**
-Version: 0.7.1
+Version: 0.7.3
 ## Installation
 
 **Setting up your local/build environment**  
@@ -709,7 +709,7 @@ $ bigeye catalog [OPTIONS] COMMAND [ARGS]...
 
 **Commands**:
 
-* `regen-autometrics`: Regenerates Autometrics by warehouse id OR...
+* `regen-autometrics`: Regenerates Autometrics by warehouse id OR... (DEPRECATED)
 * `delete-metrics`: Delete metrics in a warehouse id, by...
 * `rebuild`: Rebuilds/Reprofiles a source by warehouse...
 * `get-table-info`: Outputs table info to a file for an entire...
@@ -721,8 +721,8 @@ $ bigeye catalog [OPTIONS] COMMAND [ARGS]...
 * `backfill-metrics`: Backfills metrics by warehouse id, schema...
 * `schedule-all-metrics`: Updates schedule for all metrics in a...
 * `unschedule-all-metrics`: Unschedule all metrics by warehouse,...
-* `set-metric-time`: Sets metric times from a list of possible...
-* `unset-metric-time`: Unsets metric times for whole warehouse or...
+* `set-metric-time`: Sets metric times from a list of possible... (DEPRECATED)
+* `unset-metric-time`: Unsets metric times for whole warehouse or... (DEPRECATED)
 * `get-metric-queries`: Gets the debug queries for all metrics by...
 * `upsert-template`: Create or update a template for a source.
 * `export-metric-template`: Export metric templates to yaml files

{bigeye_cli-0.7.1 → bigeye_cli-0.7.3}/bigeye_cli/CLI_DOCS.md

@@ -1,5 +1,5 @@
 # **Bigeye CLI**
-Version: 0.7.1
+Version: 0.7.3
 ## Installation
 
 **Setting up your local/build environment**  
@@ -690,7 +690,7 @@ $ bigeye catalog [OPTIONS] COMMAND [ARGS]...
 
 **Commands**:
 
-* `regen-autometrics`: Regenerates Autometrics by warehouse id OR...
+* `regen-autometrics`: Regenerates Autometrics by warehouse id OR... (DEPRECATED)
 * `delete-metrics`: Delete metrics in a warehouse id, by...
 * `rebuild`: Rebuilds/Reprofiles a source by warehouse...
 * `get-table-info`: Outputs table info to a file for an entire...
@@ -702,8 +702,8 @@ $ bigeye catalog [OPTIONS] COMMAND [ARGS]...
 * `backfill-metrics`: Backfills metrics by warehouse id, schema...
 * `schedule-all-metrics`: Updates schedule for all metrics in a...
 * `unschedule-all-metrics`: Unschedule all metrics by warehouse,...
-* `set-metric-time`: Sets metric times from a list of possible...
-* `unset-metric-time`: Unsets metric times for whole warehouse or...
+* `set-metric-time`: Sets metric times from a list of possible... (DEPRECATED)
+* `unset-metric-time`: Unsets metric times for whole warehouse or... (DEPRECATED)
 * `get-metric-queries`: Gets the debug queries for all metrics by...
 * `upsert-template`: Create or update a template for a source.
 * `export-metric-template`: Export metric templates to yaml files

{bigeye_cli-0.7.1 → bigeye_cli-0.7.3}/bigeye_cli/catalog/catalog_commands.py

@@ -72,7 +72,7 @@ would include metrics batched at any of these levels.
 """
 
 
-@app.command()
+@app.command(deprecated=True)
 def regen_autometrics(
         bigeye_conf: str = global_options.bigeye_conf,
         config_file: str = global_options.config_file,
@@ -629,7 +629,7 @@ def unschedule_all_metrics(
         response = client._call_datawatch(Method.POST, url=url, body=json.dumps(body))
 
 
-@app.command()
+@app.command(deprecated=True)
 def set_metric_time(
         bigeye_conf: str = global_options.bigeye_conf,
         config_file: str = global_options.config_file,
@@ -676,7 +676,7 @@ def set_metric_time(
         raise Exception("Must include either table IDs OR warehouse ID OR schema ID.")
 
 
-@app.command()
+@app.command(deprecated=True)
 def unset_metric_time(
         bigeye_conf: str = global_options.bigeye_conf,
         config_file: str = global_options.config_file,

{bigeye_cli-0.7.1 → bigeye_cli-0.7.3}/bigeye_cli/metric/metric_commands.py

@@ -1,12 +1,13 @@
-# create logger
+
 import warnings
+from collections import defaultdict
 from os import listdir
 from os.path import join, isfile
 from typing import List, Dict
 
 import smart_open
 import typer
-import json
+
 from pathlib import Path
 
 import yaml
@@ -36,9 +37,10 @@ from bigeye_cli.functions import (
 from bigeye_sdk.generated.com.bigeye.models.generated import (
     MetricInfoList,
     MetricInfo,
-    TableList,
     Table,
     MetricConfiguration,
+    NamedSchedule,
+    TemplateMetric
 )
 from bigeye_sdk.model.big_config import BigConfig, TagDeployment, ColumnSelector
 from bigeye_sdk.model.metric_facade import SimpleUpsertMetricRequest
@@ -176,6 +178,7 @@ def upsert_from_path(
     ).tables
 
     t_ix: Dict[str, Table] = {t.name: t for t in tables}
+    c_ix: Dict[str, List[int]] = defaultdict(list)
 
     if set_row_creation_time:
         warnings.warn(
@@ -183,43 +186,52 @@ def upsert_from_path(
             "Row creation time is managed in the metricConfiguration with the 'rctOverride' field.",
             DeprecationWarning
         )
+    named_schedules = {s.name.strip().lower(): s.id for s in client.get_named_schedule().named_schedules}
 
     for m in mil.metrics:
         mc = m.metric_configuration
+        try:
+            mc.id = 0
+            mc.warehouse_id = target_warehouse_id
+            mc.dataset_id = t_ix[m.metric_metadata.dataset_name].id
+
+            if mc.metric_schedule.named_schedule.id != 0:
+                if mc.metric_schedule.named_schedule.name.strip().lower() in named_schedules:
+                    mc.metric_schedule.named_schedule = NamedSchedule(id=named_schedules.get(
+                        mc.metric_schedule.named_schedule.name.strip().lower())
+                    )
+                else:
+                    log.info(f"Named schedule {mc.metric_schedule.named_schedule.name} "
+                             f"not found in workspace {client.config.workspace_id}. Creating...")
+                    ns = client.create_named_schedule(
+                        name=mc.metric_schedule.named_schedule.name, cron=mc.metric_schedule.named_schedule.cron)
+                    named_schedules[ns.name.strip().lower()] = ns.id
+                    mc.metric_schedule.named_schedule = NamedSchedule(id=ns.id)
 
-        log.info(mc)
+            log.info(f"Updated metric configuration: {mc}")
 
-        try:
-            rmc = client.upsert_metric(
-                schedule_frequency=mc.schedule_frequency,
-                filters=mc.filters,
-                group_bys=mc.group_bys,
-                thresholds=mc.thresholds,
-                notification_channels=mc.notification_channels,
-                warehouse_id=target_warehouse_id,
-                dataset_id=t_ix[m.metric_metadata.dataset_name].id,
-                metric_type=mc.metric_type,
-                parameters=mc.parameters,
-                lookback=mc.lookback,
-                lookback_type=mc.lookback_type,
-                metric_creation_state=mc.metric_creation_state,
-                grain_seconds=mc.grain_seconds,
-                muted_until_epoch_seconds=mc.muted_until_epoch_seconds,
-                name=mc.name,
-                description=mc.description,
-                rct_override=mc.rct_override
-            )
+            rmc = client.upsert_metric(metric_configuration=mc)
 
             if update_collections:
                 for c in m.collections:
-                    client.upsert_metric_to_collection(
-                        collection_name=c.display_name, add_metric_ids=[rmc.id]
-                    )
+                    c_ix[c.display_name].append(rmc.id)
+        except KeyError:
+            log.warning(f"Table {m.metric_metadata.dataset_name} not found in warehouse {target_warehouse_id}")
+            if m.metric_metadata.schema_name == "Bigeye Virtual Schema":
+                log.info("Virtual tables must created before migration. "
+                         "Use commands 'bigeye catalog export-virtual-table' and 'bigeye catalog upsert-virtual-table'"
+                         " to migrate to current workspace.")
 
         except Exception as e:
             log.exception(f"Error for file: {get_file_name_for_metric(m)}")
             log.exception(e)
 
+    if c_ix:
+        log.info(f"Upserting {len(c_ix)} collections...")
+        for name, mids in c_ix.items():
+            client.upsert_metric_to_collection(collection_name=name, add_metric_ids=mids)
+
+
 
 @app.command()
 def upsert(

{bigeye_cli-0.7.1 → bigeye_cli-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bigeye-cli"
-version = "0.7.1"
+version = "0.7.3"
 description = "Bigeye CLI offers developer tools for maintaining your developer workspace."
 license = "Proprietary"
 authors = ["Bigeye <support@bigeye.com>"]