bigeye-cli 0.3.62__tar.gz → 0.3.63__tar.gz

{bigeye_cli-0.3.62 → bigeye_cli-0.3.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bigeye-cli
-Version: 0.3.62
+Version: 0.3.63
 Summary: Bigeye CLI offers developer tools for maintaining your developer workspace.
 Home-page: https://docs.bigeye.com/docs
 License: Proprietary
@@ -12,8 +12,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: PyGithub (>=1.57,<2.0)
-Requires-Dist: bigeye-sdk (>=0.4.83,<0.5.0)
+Requires-Dist: bigeye-sdk (>=0.4.84,<0.5.0)
 Requires-Dist: click (>=8.0.4,<9.0.0)
 Requires-Dist: rich (>=12.4.4,<13.0.0)
 Description-Content-Type: text/markdown

{bigeye_cli-0.3.62 → bigeye_cli-0.3.63}/bigeye_cli/bigconfig/bigconfig_commands.py

@@ -147,6 +147,8 @@ def export(
         name="Sample", description="SDK Generated"
     )
 
+    final_metric_ids: List[int] = []
+
     # Require at least 1 option to be specified
     if not collection_id and not table_id and not metric_ids:
         raise typer.BadParameter(
@@ -154,19 +156,23 @@ def export(
             "collection id (-cid), table id (-tid), or list of metric ids (-mid). "
         )
 
+    # Add metric ids if passed
+    if metric_ids:
+        final_metric_ids.extend(metric_ids)
+
     # Get existing collection if passed
     if collection_id:
         collection: SimpleCollection = SimpleCollection.from_datawatch_object(
             client.get_collection(collection_id=collection_id).collection
         )
-        metric_ids.extend(collection.metric_ids)
+        final_metric_ids.extend(collection.metric_ids)
 
     # Get metrics from table if passed
     if table_id:
         metrics_from_table = client.get_metric_info_batch_post(
             table_ids=[table_id]
         ).metrics
-        metric_ids.extend([m.metric_configuration.id for m in metrics_from_table])
+        final_metric_ids.extend([m.metric_configuration.id for m in metrics_from_table])
         if not metrics_from_table:
             raise typer.BadParameter(
                 f"No metrics found for given table id. Please check arguments and try again."
@@ -175,7 +181,7 @@ def export(
             collection.name = metrics_from_table[0].metric_metadata.dataset_name
 
     # Pull metric information
-    metrics: MetricInfoList = client.get_metric_info_batch_post(metric_ids=metric_ids)
+    metrics: MetricInfoList = client.get_metric_info_batch_post(metric_ids=final_metric_ids)
 
     if not output_path:
         output_path = client.config.bigconfig_output_path or Path.cwd()

{bigeye_cli-0.3.62 → bigeye_cli-0.3.63}/bigeye_cli/configure/configure_commands.py

@@ -8,10 +8,10 @@ from bigeye_cli.functions import run_enum_menu
 from bigeye_cli import global_options
 
 from bigeye_sdk.authentication.enums import AuthConfType, BrowserType
-from bigeye_sdk.authentication.api_authentication import BasicAPIAuth, BrowserAPIAuth, ApiAuth
+from bigeye_sdk.authentication.api_authentication import BasicAPIAuth, BrowserAPIAuth, ApiAuth, APIKeyAuth
 from bigeye_sdk.authentication.config import Config
 from bigeye_sdk.client.datawatch_client import get_user_auth
-from bigeye_sdk.generated.com.bigeye.models.generated import Workspace
+from bigeye_sdk.generated.com.bigeye.models.generated import Workspace, WorkspaceIdNameAndRole
 from bigeye_sdk.exceptions.exceptions import WorkspaceNotSetException
 
 
@@ -42,13 +42,7 @@ def configure(
         if workspace == 'DEFAULT' or not use_default_credential:
             auth_type = run_enum_menu(enum_clz=AuthConfType, default=AuthConfType.BASIC_AUTH)
 
-            if auth_type == AuthConfType.BASIC_AUTH:
-                base_url = Prompt.ask("Enter the Bigeye URL", default="https://app.bigeye.com")
-                username = Prompt.ask("Enter the username")
-                password = Prompt.ask("Enter the password", password=True)
-                cred = BasicAPIAuth(base_url=base_url, 
-                                    user=username,password=password)
-            else:
+            if auth_type == AuthConfType.BROWSER_AUTH:
                 browser_type = run_enum_menu(enum_clz=BrowserType, default=BrowserType.CHROME)
 
                 browser_profile_user_name = None
@@ -60,13 +54,25 @@ def configure(
                 cred = BrowserAPIAuth(browser=browser_type, base_url=base_url,
                                     browser_profile_user_name=browser_profile_user_name)
 
+            elif auth_type == AuthConfType.API_KEY_AUTH:
+                base_url = Prompt.ask("Enter the Bigeye URL", default="https://app.bigeye.com")
+                api_key = Prompt.ask("Enter the API Key", password=True)
+                cred = APIKeyAuth(base_url=base_url, api_key=api_key)
+
+            else:
+                base_url = Prompt.ask("Enter the Bigeye URL", default="https://app.bigeye.com")
+                username = Prompt.ask("Enter the username")
+                password = Prompt.ask("Enter the password", password=True)
+                cred = BasicAPIAuth(base_url=base_url,
+                                    user=username,password=password)
+
             cred.save_as_file(auth_filename=bigeye_conf,cred=cred,workspace=workspace)
         # If inheriting from default credential then load default credential
         else:
             cred = ApiAuth.load(auth_file=bigeye_conf,workspace='DEFAULT')
         
         # Only prompt user for workspace ID if they have access to multiple workspaces
-        accessible_workspaces: List[Workspace] = get_user_auth(cred).workspaces
+        accessible_workspaces: List[WorkspaceIdNameAndRole] = get_user_auth(cred).workspaces
         if len(accessible_workspaces) > 1:
             print(Text(text='\n** WORKSPACE OPTIONS **',style='bold green'))
             for wk in accessible_workspaces:
@@ -121,6 +127,7 @@ def set(
             f"Try one of the following: {str.join(', ',config_settings)}"
         )
 
+
 @app.command()
 def get(
         bigeye_conf: str = global_options.bigeye_conf,
@@ -153,6 +160,7 @@ def get(
             f"Try one of the following: {str.join(', ',config_settings)}"
         )
 
+
 @app.command()
 def list(
         bigeye_conf: str = global_options.bigeye_conf,
@@ -181,12 +189,14 @@ def list(
     table.add_column("Credential Type", justify="right", style="green")
     for key, value in config.items():
         cred_type = None
-        if auth.get(section=key,option='browser',fallback=None):
+        if auth.get(section=key, option='browser', fallback=None):
             cred_type = 'Browser'
-        elif auth.get(section=key,option='user',fallback=None):
+        elif auth.get(section=key, option='user', fallback=None):
             cred_type = 'Basic'
+        elif auth.get(section=key, option='api_key', fallback=None):
+            cred_type = 'Api Key'
         else:
             cred_type = 'Default'
         table.add_row(key,value.get('workspace_id'),cred_type)
 
-    print(table)
+    print(table)

{bigeye_cli-0.3.62 → bigeye_cli-0.3.63}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bigeye-cli"
-version = "0.3.62"
+version = "0.3.63"
 description = "Bigeye CLI offers developer tools for maintaining your developer workspace."
 license = "Proprietary"
 authors = ["Bigeye <support@bigeye.com>"]
@@ -19,7 +19,7 @@ bigeye = "bigeye_cli.__main__:app"
 [tool.poetry.dependencies]
 python = "^3.9.0"
 click = "^8.0.4"
-bigeye-sdk = "^0.4.83"
+bigeye-sdk = "^0.4.84"
 rich = "^12.4.4"
 PyGithub = '^1.57'
 
@@ -29,7 +29,7 @@ poethepoet = "^0.24.3"
 
 [tool.poe.tasks]
     pre_build = []
-    pre_publish = ["clean", "docgen"]
+    pre_publish = ["clean"]
     post_publish = ["clean"]
 
     [tool.poe.poetry_hooks]