Mtor/refactor api group

Babylon/commands/api/datasets/delete.py

@@ -1,10 +1,6 @@
-import click
-
 from logging import getLogger
 from typing import Any
-from click import command
-from click import option
-
+from click import command, option, echo, style
 from Babylon.commands.api.datasets.services.datasets_api_svc import DatasetService
 from Babylon.utils.credentials import pass_keycloak_token
 from Babylon.utils.decorators import retrieve_state, injectcontext
@@ -33,7 +29,7 @@ def delete(state: Any,
     _data = [""]
     _data.append("Delete a dataset")
     _data.append("")
-    click.echo(click.style("\n".join(_data), bold=True, fg="green"))
+    echo(style("\n".join(_data), bold=True, fg="green"))
     service_state = state["services"]
     service_state["api"]["organization_id"] = (organization_id or service_state["api"]["organization_id"])
     service_state["api"]["workspace_id"] = (workspace_id or service_state["api"]["workspace_id"])

Babylon/commands/api/datasets/get.py

@@ -1,9 +1,8 @@
-import click
 import json
 
 from logging import getLogger
 from typing import Any
-from click import command, option
+from click import command, option, echo, style
 from Babylon.commands.api.datasets.services.datasets_api_svc import DatasetService
 from Babylon.utils.decorators import retrieve_state
 from Babylon.utils.decorators import output_to_file
@@ -29,13 +28,13 @@ def get(state: Any, keycloak_token: str, organization_id: str, workspace_id: str
     _data = [""]
     _data.append("Get dataset details")
     _data.append("")
-    click.echo(click.style("\n".join(_data), bold=True, fg="green"))
+    echo(style("\n".join(_data), bold=True, fg="green"))
     service_state = state["services"]
     service_state["api"]["organization_id"] = (organization_id or service_state["api"]["organization_id"])
     service_state["api"]["workspace_id"] = (workspace_id or service_state["api"]["workspace_id"])
     service_state["api"]["dataset_id"] = (dataset_id or service_state["api"]["dataset_id"])
     service = DatasetService(keycloak_token=keycloak_token, state=service_state)
-    logger.info(f"[api] Searching dataset {[service_state['api']['dataset_id']]}")
+    logger.info(f"[api] Retrieving dataset {[service_state['api']['dataset_id']]}")
     response = service.get()
     if response is None:
         return CommandResponse.fail()

Babylon/commands/api/datasets/get_all.py

@@ -1,10 +1,9 @@
 import jmespath
-import click
 import json
+
 from logging import getLogger
 from typing import Any, Optional
-from click import command
-from click import option
+from click import command, option, echo, style
 from Babylon.commands.api.datasets.services.datasets_api_svc import DatasetService
 from Babylon.utils.credentials import pass_keycloak_token
 from Babylon.utils.decorators import output_to_file
@@ -35,7 +34,7 @@ def get_all(state: Any,
     _data = [""]
     _data.append("Get all datasets details")
     _data.append("")
-    click.echo(click.style("\n".join(_data), bold=True, fg="green"))
+    echo(style("\n".join(_data), bold=True, fg="green"))
     service_state = state["services"]
     service_state["api"]["organization_id"] = (organization_id or service_state["api"]["organization_id"])
     service_state["api"]["workspace_id"] = (workspace_id or service_state["api"]["workspace_id"])

Babylon/commands/api/datasets/search.py

@@ -1,10 +1,8 @@
-import click
 import json
 
 from logging import getLogger
 from typing import Any
-from click import argument
-from click import command, option
+from click import command, option, argument, echo, style
 from Babylon.commands.api.datasets.services.datasets_api_svc import DatasetService
 from Babylon.utils.credentials import pass_keycloak_token
 from Babylon.utils.decorators import output_to_file
@@ -29,7 +27,7 @@ def search(state: Any, keycloak_token: str, organization_id: str, workspace_id:
     _data = [""]
     _data.append("Get dataset with the given tag")
     _data.append("")
-    click.echo(click.style("\n".join(_data), bold=True, fg="green"))
+    echo(style("\n".join(_data), bold=True, fg="green"))
     service_state = state["services"]
     service_state["api"]["organization_id"] = (organization_id or service_state["api"]["organization_id"])
     service_state["api"]["workspace_id"] = (workspace_id or service_state["api"]["workspace_id"])

Babylon/commands/api/datasets/security/add.py

@@ -1,10 +1,8 @@
 import json
-import click
 
 from logging import getLogger
 from typing import Any
-from click import command
-from click import option
+from click import command, option, style, echo
 from Babylon.commands.api.datasets.services.datasets_security_svc import DatasetSecurityService
 from Babylon.utils.credentials import pass_keycloak_token
 from Babylon.utils.decorators import output_to_file
@@ -46,7 +44,7 @@ def add(state: Any,
     _data = [""]
     _data.append(" Add dataset users RBAC access")
     _data.append("")
-    click.echo(click.style("\n".join(_data), bold=True, fg="green"))
+    echo(style("\n".join(_data), bold=True, fg="green"))
     service_state = state["services"]
     service_state["api"]["organization_id"] = organization_id or service_state["api"]["organization_id"]
     service_state["api"]["workspace_id"] = (workspace_id or service_state["api"]["workspace_id"])

Babylon/commands/api/datasets/security/delete.py

@@ -1,7 +1,5 @@
-import logging
-import click
-
-from click import command, option
+from click import command, option, echo, style
+from logging import getLogger
 from Babylon.commands.api.datasets.services.datasets_security_svc import DatasetSecurityService
 from Babylon.utils.credentials import pass_keycloak_token
 from Babylon.utils.decorators import output_to_file
@@ -10,7 +8,7 @@
 from Babylon.utils.environment import Environment
 from Babylon.utils.response import CommandResponse
 
-logger = logging.getLogger("Babylon")
+logger = getLogger("Babylon")
 env = Environment()
 
 
@@ -31,7 +29,7 @@ def delete(state: dict, keycloak_token: str, email: str, organization_id: str, w
     _data = [""]
     _data.append(" Delete dataset users RBAC access")
     _data.append("")
-    click.echo(click.style("\n".join(_data), bold=True, fg="green"))
+    echo(style("\n".join(_data), bold=True, fg="green"))
     service_state = state["services"]
     service_state["api"]["organization_id"] = organization_id or service_state["api"]["organization_id"]
     service_state["api"]["workspace_id"] = (workspace_id or service_state["api"]["workspace_id"])