bigeye-cli 0.7.2__tar.gz → 0.7.4__tar.gz

{bigeye_cli-0.7.2 → bigeye_cli-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bigeye-cli
-Version: 0.7.2
+Version: 0.7.4
 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.2
+Version: 0.7.4
 ## 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.2 → bigeye_cli-0.7.4}/bigeye_cli/CLI_DOCS.md

@@ -1,5 +1,5 @@
 # **Bigeye CLI**
-Version: 0.7.2
+Version: 0.7.4
 ## 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.2 → bigeye_cli-0.7.4}/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.2 → bigeye_cli-0.7.4}/bigeye_cli/configure/configure_commands.py

@@ -2,17 +2,15 @@ import typer
 from rich import print
 from rich.table import Table
 from rich.text import Text
-from typing import List
 
 from bigeye_cli.functions import run_enum_menu, get_workspaces_for_user, get_workspace_id_for_user
 from bigeye_cli import global_options
 
-from bigeye_sdk.authentication.enums import AuthConfType, BrowserType
-from bigeye_sdk.authentication.api_authentication import BasicAPIAuth, BrowserAPIAuth, ApiAuth, APIKeyAuth
+from bigeye_sdk.authentication.enums import AuthConfType
+from bigeye_sdk.authentication.api_authentication import BasicAPIAuth, ApiAuth, APIKeyAuth
 from bigeye_sdk.authentication.config import Config
-from bigeye_sdk.client.datawatch_client import get_user_auth, create_api_key_for_configuration
-from bigeye_sdk.generated.com.bigeye.models.generated import WorkspaceIdNameAndRole
-from bigeye_sdk.exceptions.exceptions import WorkspaceNotSetException
+from bigeye_sdk.client.datawatch_client import create_api_key_for_configuration
+
 
 from bigeye_sdk.log import get_logger
 
@@ -40,22 +38,13 @@ def configure(
         # If configuring the default workspace or user specifically asked to enter creds, then perform credential
         # workflow
         if workspace == 'DEFAULT' or not use_default_credential:
-            auth_type = run_enum_menu(enum_clz=AuthConfType, default=AuthConfType.API_KEY_AUTH)
-
-            if auth_type == AuthConfType.BROWSER_AUTH:
-                browser_type = run_enum_menu(enum_clz=BrowserType, default=BrowserType.CHROME)
-
-                browser_profile_user_name = None
-
-                if browser_type == BrowserType.CHROME:
-                    # TODO Could condition on path containing Profile_N directories.
-                    browser_profile_user_name = Prompt.ask(
-                        "Enter the profile email if logged into Chrome (Default: None)")
-                base_url = Prompt.ask("Enter the Bigeye URL", default="https://app.bigeye.com")
-                cred = BrowserAPIAuth(browser=browser_type, base_url=base_url,
-                                      browser_profile_user_name=browser_profile_user_name)
+            auth_type = run_enum_menu(
+                enum_clz=AuthConfType,
+                default=AuthConfType.API_KEY_AUTH,
+                exclude=[AuthConfType.BROWSER_AUTH]
+            )
 
-            elif auth_type == AuthConfType.API_KEY_AUTH:
+            if auth_type == AuthConfType.API_KEY_AUTH:
                 base_url = Prompt.ask("Enter the Bigeye URL", default="https://app.bigeye.com")
                 username = Prompt.ask("Enter Bigeye username")
                 uses_sso = Confirm.ask("Do you use SSO to access the Bigeye UI?")

{bigeye_cli-0.7.2 → bigeye_cli-0.7.4}/bigeye_cli/functions.py

@@ -1,7 +1,7 @@
 import enum
 
 import os
-from typing import List, Dict, Optional
+from typing import List, Dict, Optional, TypeVar, Type
 import typer
 import yaml
 from rich.prompt import Prompt
@@ -219,8 +219,13 @@ def write_yaml_templates(metric_templates: List[MetricTemplate], output_path: Op
                 yaml.dump(data, outfile, indent=2, width=1000)
 
 
-def run_enum_menu(enum_clz: enum.EnumMeta, default: StrEnum) -> StrEnum:
-    valid_types: Dict[int, StrEnum] = {index: auth_type for index, auth_type in enumerate(list(enum_clz), start=1)}
+E = TypeVar('E', bound=StrEnum)
+
+
+def run_enum_menu(enum_clz: Type[E], default: E, exclude: Optional[List[E]] = None) -> E:
+    exclude = exclude or []
+    available_values = [v for v in enum_clz if v not in exclude]
+    valid_types: Dict[int, StrEnum] = {index: auth_type for index, auth_type in enumerate(available_values, start=1)}
     valid_type_by_type: Dict[StrEnum, int] = {v: k for k, v in valid_types.items()}
 
     user_chosen_type_ix = 0

{bigeye_cli-0.7.2 → bigeye_cli-0.7.4}/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
@@ -16,7 +17,6 @@ from bigeye_cli.enums import MetricFileType
 from bigeye_sdk.controller.metric_controller import MetricController
 from bigeye_sdk.functions.metric_functions import get_file_name_for_metric
 from bigeye_sdk.functions.bigconfig_functions import build_fq_name
-from bigeye_sdk.generated.com.bigeye.models._generated_root import NamedSchedule
 from bigeye_sdk.model.dbt_schema import (
     SimpleDbtSchema,
     relationships_test_names,
@@ -37,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
@@ -177,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(
@@ -201,9 +203,10 @@ def upsert_from_path(
                 else:
                     log.info(f"Named schedule {mc.metric_schedule.named_schedule.name} "
                              f"not found in workspace {client.config.workspace_id}. Creating...")
-                    mc.metric_schedule.named_schedule.id = client.create_named_schedule(
-                        name=mc.metric_schedule.named_schedule.name, cron=mc.metric_schedule.named_schedule.cron).id
-
+                    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(f"Updated metric configuration: {mc}")
 
@@ -211,14 +214,24 @@ def upsert_from_path(
 
             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.2 → bigeye_cli-0.7.4}/pyproject.toml

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