Remove all use of rich coloring from logs

neomatamune · neomatamune · commit dc931106216a · 2025-02-11T14:51:57.000+01:00
Waiting for a better system to adjust text, language and formatting
diff --git a/cosmotech/coal/cli/commands/adx_send_scenariodata.py b/cosmotech/coal/cli/commands/adx_send_scenariodata.py
@@ -109,7 +109,7 @@ def adx_send_scenariodata(
                                    cluster_url=adx_uri,
                                    ingest_url=adx_ingest_uri)
     for k, v in queries.items():
-        LOGGER.info(f"Create table query: [bold green]{v}[/]")
+        LOGGER.info(f"Create table query: {v}")
         r: KustoResponseDataSet = adx_client.run_query(v)
         if r.errors_count == 0:
             LOGGER.info(f"Table {k} created successfully")
@@ -233,8 +233,8 @@ def insert_csv_files(files_data, adx_client: ADXQueriesWrapper, simulation_id, d
         status_color_mapping[IngestionStatus.FAILURE.value] = "red"
         status_color_mapping[IngestionStatus.SUCCESS.value] = "green"
         for _id, status in adx_client.check_ingestion_status(source_ids=list(ingestion_ids.keys())):
-            LOGGER.info(f"[bold cyan]{ingestion_ids[_id]}[/] - "
-                        f"[bold {status_color_mapping[status.value]}]{status.name}[/]")
+            LOGGER.info(f"{ingestion_ids[_id]} - "
+                        f"{status.name}")
     else:
         LOGGER.info("No wait for ingestion result")
 
diff --git a/cosmotech/coal/cli/commands/api/postgres_send_runner_metadata.py b/cosmotech/coal/cli/commands/api/postgres_send_runner_metadata.py
@@ -119,7 +119,7 @@ def postgres_send_runner_metadata(
                   DO
                     UPDATE SET name = EXCLUDED.name, last_run_id = EXCLUDED.last_run_id;
             """
-            LOGGER.info(f"creating table [cyan bold]{schema_table}[/]")
+            LOGGER.info(f"creating table {schema_table}")
             curs.execute(sql_create_table)
             conn.commit()
             LOGGER.info(f"adding/updating runner metadata")
diff --git a/cosmotech/coal/cli/commands/api/rds_send_csv.py b/cosmotech/coal/cli/commands/api/rds_send_csv.py
@@ -80,7 +80,7 @@ def rds_send_csv(
             with open(csv_path) as _f:
                 dr = DictReader(_f)
                 table_name = csv_path.name.replace(".csv", "")
-                LOGGER.info(f"Sending data to table [cyan bold]CD_{table_name}[/]")
+                LOGGER.info(f"Sending data to table CD_{table_name}")
                 LOGGER.debug(f"  - Column list: {dr.fieldnames}")
                 data = []
 
diff --git a/cosmotech/coal/cli/commands/api/rds_send_store.py b/cosmotech/coal/cli/commands/api/rds_send_store.py
@@ -80,7 +80,7 @@ def rds_send_store(
         api_run = RunApi(api_client)
         _s = Store()
         for table_name in _s.list_tables():
-            LOGGER.info(f"Sending data to table [cyan bold]CD_{table_name}[/]")
+            LOGGER.info(f"Sending data to table CD_{table_name}")
             data = convert_table_as_pylist(table_name)
             if not len(data):
                 LOGGER.info("  - No rows : skipping")
diff --git a/cosmotech/coal/cli/commands/api/run_load_data.py b/cosmotech/coal/cli/commands/api/run_load_data.py
@@ -82,8 +82,8 @@ def download_runner_data(organization_id: str, workspace_id: str, runner_id: str
                 "varType": var_type,
                 "isInherited": is_inherited
             })
-            LOGGER.debug(f"  - [yellow]{param_id:<{max_name_size}}[/] [cyan]{var_type:<{max_type_size}}[/] "
-                         f"\"{value}\"{' [red bold]inherited[/]' if is_inherited else ''}")
+            LOGGER.debug(f"  - {param_id:<{max_name_size}} {var_type:<{max_type_size}} "
+                         f"\"{value}\"{' inherited' if is_inherited else ''}")
 
         write_parameters(parameter_folder, parameters)
 
diff --git a/cosmotech/coal/cli/commands/api/runtemplate_load_handler.py b/cosmotech/coal/cli/commands/api/runtemplate_load_handler.py
@@ -60,8 +60,8 @@ def runtemplate_load_handler(workspace_id, organization_id, run_template_id, han
         try:
             r_data: Workspace = api_w.find_workspace_by_id(organization_id=organization_id, workspace_id=workspace_id)
         except ServiceException as e:
-            LOGGER.error(f"Workspace [green bold]{workspace_id}[/] was not found "
-                         f"in Organization [green bold]{organization_id}[/]")
+            LOGGER.error(f"Workspace {workspace_id} was not found "
+                         f"in Organization {organization_id}")
             LOGGER.debug(e.body)
             raise click.Abort()
         solution_id = r_data.solution.solution_id
@@ -72,17 +72,17 @@ def runtemplate_load_handler(workspace_id, organization_id, run_template_id, han
         template_path = root_path / run_template_id
         for handler_id in handler_list.split(','):
             handler_path: pathlib.Path = template_path / handler_id
-            LOGGER.info(f"Querying Handler [green bold]{handler_id}[/] for [green bold]{run_template_id}[/]")
+            LOGGER.info(f"Querying Handler {handler_id} for {run_template_id} ")
             try:
                 rt_data = api_sol.download_run_template_handler(organization_id=organization_id,
                                                                 solution_id=solution_id,
                                                                 run_template_id=run_template_id,
                                                                 handler_id=handler_id)
             except ServiceException as e:
                 LOGGER.error(
-                    f"Handler [green bold]{handler_id}[/] was not found "
-                    f"for Run Template [green bold]{run_template_id}[/] "
-                    f"in Solution [green bold]{solution_id}[/]")
+                    f"Handler {handler_id} was not found "
+                    f"for Run Template {run_template_id} "
+                    f"in Solution {solution_id} ")
                 LOGGER.debug(e.body)
                 has_errors = True
                 continue
@@ -93,7 +93,7 @@ def runtemplate_load_handler(workspace_id, organization_id, run_template_id, han
                 with ZipFile(BytesIO(rt_data)) as _zip:
                     _zip.extractall(handler_path)
             except BadZipfile:
-                LOGGER.error(f"Handler [green bold]{handler_id}[/] is not a [blue]zip file[/]")
+                LOGGER.error(f"Handler {handler_id} is not a zip file ")
                 has_errors = True
         if has_errors:
             LOGGER.error("Issues were met during run, please check the previous logs")
diff --git a/cosmotech/coal/cli/commands/api/scenariorun_load_data.py b/cosmotech/coal/cli/commands/api/scenariorun_load_data.py
@@ -59,12 +59,12 @@ def download_scenario_data(
         for k in datasets.keys():
             if k in scenario_data.dataset_list:
                 shutil.copytree(dl.dataset_to_file(k, datasets[k]), dataset_folder, dirs_exist_ok=True)
-                LOGGER.debug(f"  - [yellow]{dataset_folder}[/] ([green]{k}[/])")
+                LOGGER.debug(f"  - {dataset_folder} ({k} )")
             if k in datasets_parameters_ids.keys():
                 param_dir = os.path.join(parameter_folder, datasets_parameters_ids[k])
                 pathlib.Path(param_dir).mkdir(exist_ok=True, parents=True)
                 shutil.copytree(dl.dataset_to_file(k, datasets[k]), param_dir, dirs_exist_ok=True)
-                LOGGER.debug(f"  - [yellow]{datasets_parameters_ids[k]}[/] ([green]{k}[/])")
+                LOGGER.debug(f"  - {datasets_parameters_ids[k]} ({k} )")
     else:
         LOGGER.info("No dataset write asked, skipping")
 
@@ -91,8 +91,8 @@ def download_scenario_data(
                 "varType": var_type,
                 "isInherited": is_inherited
             })
-            LOGGER.debug(f"  - [yellow]{parameter_name:<{max_name_size}}[/] [cyan]{var_type:<{max_type_size}}[/] "
-                         f"\"{value}\"{' [red bold]inherited[/]' if is_inherited else ''}")
+            LOGGER.debug(f"  - {parameter_name:<{max_name_size}} {var_type:<{max_type_size}} "
+                         f"\"{value}\"{' inherited' if is_inherited else ''}")
         write_parameters(parameter_folder, parameters, write_csv, write_json)
 
 
diff --git a/cosmotech/coal/cli/commands/legacy/generate_orchestrator.py b/cosmotech/coal/cli/commands/legacy/generate_orchestrator.py
@@ -89,13 +89,13 @@ def from_api(workspace_id, organization_id, run_template_id, output, describe):
 
 
 def generate_from_solution(sol: Solution, run_template_id, output: str, describe: bool = False):
-    LOGGER.info(f"Searching [green bold]{run_template_id}[/] in the solution")
+    LOGGER.info(f"Searching {run_template_id} in the solution")
     if _t := [t for t in sol.run_templates if t.id == run_template_id]:
         template: RunTemplate = _t[0]
     else:
-        LOGGER.error(f"Run template [green bold]{run_template_id}[/] was not found.")
+        LOGGER.error(f"Run template {run_template_id} was not found.")
         raise click.Abort()
-    LOGGER.info(f"Found [green bold]{run_template_id}[/] in the solution generating json file")
+    LOGGER.info(f"Found {run_template_id} in the solution generating json file")
     generate_from_template(template, output)
     if describe:
         f = Orchestrator()
@@ -110,7 +110,7 @@ def generate_from_template(template: RunTemplate, output: str):
     previous = None
     LOGGER.debug(template)
     if template.fetch_datasets is not False or template.fetch_scenario_parameters:
-        LOGGER.info("- [green]fetch_scenario_parameters[/] step found")
+        LOGGER.info("- fetch_scenario_parameters step found")
         _s = Step(id="fetch_scenario_parameters",
                   commandId="csm-orc fetch-scenariorun-data",
                   stop_library_load=True)
@@ -122,7 +122,7 @@ def run_template_phase(name, condition, source, _previous, default):
         template_is_active = template.get(condition) if template.get(condition) is not None else default
         if template_is_active:
             if template.get(source) == "cloud":
-                LOGGER.info(f"- [green]{name}_cloud[/] step found")
+                LOGGER.info(f"- {name}_cloud step found")
                 _name = f"{name}_cloud"
                 _step_dl_cloud = Step(id=_name,
                                       command="csm-orc",
@@ -168,7 +168,7 @@ def run_template_phase(name, condition, source, _previous, default):
                     _step_dl_cloud.precedents = [_previous]
                 _previous = _name
                 _steps.append(_step_dl_cloud)
-            LOGGER.info(f"- [green]{name}[/] step found")
+            LOGGER.info(f"- {name} step found")
             _run_step = Step(id=name,
                              commandId="csm-orc run-step",
                              environment={
@@ -197,7 +197,7 @@ def run_template_phase(name, condition, source, _previous, default):
     previous, new_steps = run_template_phase("validator", "validate_data", "validator_source", previous, False)
     steps.extend(new_steps)
     if template.send_datasets_to_data_warehouse is True or template.send_input_parameters_to_data_warehouse is True:
-        LOGGER.info("- [green]send_to_adx[/] step found")
+        LOGGER.info("- send_to_adx step found")
         _send_to_adx_step = Step(id="send_to_adx",
                                  command="csm-orc",
                                  arguments=["send-to-adx"],
diff --git a/cosmotech/coal/cli/commands/legacy/init_local_parameter_folder.py b/cosmotech/coal/cli/commands/legacy/init_local_parameter_folder.py
@@ -146,13 +146,13 @@ def generate_parameters(
     write_json: bool,
     write_csv: bool
 ):
-    LOGGER.info(f"Searching [green bold]{run_template_id}[/] in the solution")
+    LOGGER.info(f"Searching {run_template_id} in the solution")
     if _t := [t for t in solution.run_templates if t.id == run_template_id]:
         template: RunTemplate = _t[0]
     else:
-        LOGGER.error(f"Run template [green bold]{run_template_id}[/] was not found.")
+        LOGGER.error(f"Run template {run_template_id} was not found.")
         raise click.Abort()
-    LOGGER.info(f"Found [green bold]{run_template_id}[/] in the solution generating json file")
+    LOGGER.info(f"Found {run_template_id} in the solution generating json file")
     parameter_groups = template.parameter_groups
     parameter_names = []
     for param_group in solution.parameter_groups:
@@ -173,7 +173,7 @@ def generate_parameters(
                 "isInherited": False
             })
     if not (write_csv or write_json or dataset_parameters):
-        LOGGER.warning(f"No parameters to write for [green bold]{run_template_id}[/]")
+        LOGGER.warning(f"No parameters to write for {run_template_id} ")
         return 1
     output_folder_path = pathlib.Path(output_folder)
     output_folder_path.mkdir(parents=True, exist_ok=True)
diff --git a/cosmotech/coal/cli/commands/store/dump_to_postgresql.py b/cosmotech/coal/cli/commands/store/dump_to_postgresql.py
@@ -89,16 +89,16 @@ def dump_to_postgresql(
 
     tables = list(_s.list_tables())
     if len(tables):
-        LOGGER.info(f"Sending tables to [green bold]{postgres_db}.{postgres_schema}[/]")
+        LOGGER.info(f"Sending tables to {postgres_db}.{postgres_schema} ")
         total_rows = 0
         _process_start = perf_counter()
         for table_name in tables:
             _s_time = perf_counter()
             target_table_name = f"{table_prefix}{table_name}"
-            LOGGER.info(f"  - [yellow]{target_table_name}[/]:")
+            LOGGER.info(f"  - {target_table_name} :")
             data = _s.get_table(table_name)
             if not len(data):
-                LOGGER.info(f"   -> [cyan bold]0[/] rows (skipping)")
+                LOGGER.info(f"   -> 0 rows (skipping)")
                 continue
             _dl_time = perf_counter()
             rows = send_pyarrow_table_to_postgresql(data,
@@ -112,11 +112,11 @@ def dump_to_postgresql(
                                                     replace)
             total_rows += rows
             _up_time = perf_counter()
-            LOGGER.info(f"   -> [cyan bold]{rows}[/] rows")
-            LOGGER.debug(f"   -> Load from datastore took [blue]{_dl_time - _s_time:0.3}s[/]")
-            LOGGER.debug(f"   -> Send to postgresql took [blue]{_up_time - _dl_time:0.3}s[/]")
+            LOGGER.info(f"   -> {rows} rows")
+            LOGGER.debug(f"   -> Load from datastore took {_dl_time - _s_time:0.3}s ")
+            LOGGER.debug(f"   -> Send to postgresql took {_up_time - _dl_time:0.3}s ")
         _process_end = perf_counter()
-        LOGGER.info(f"Sent [cyan bold]{total_rows}[/] rows "
-                    f"in [blue]{_process_end - _process_start:0.3}s[/]")
+        LOGGER.info(f"Sent {total_rows} rows "
+                    f"in {_process_end - _process_start:0.3}s ")
     else:
         LOGGER.info("Data store is empty")
diff --git a/cosmotech/coal/cosmotech_api/twin_data_layer.py b/cosmotech/coal/cosmotech_api/twin_data_layer.py
@@ -47,9 +47,9 @@ def __init__(self, file_path: pathlib.Path):
 
         if not has_id and not is_relation:
             LOGGER.error(f"'{file_path}' does not contains valid nodes or relationships")
-            LOGGER.error(f"  - Valid nodes contains at least the property [bold yellow]{ID_COLUMN}[/]")
+            LOGGER.error(f"  - Valid nodes contains at least the property {ID_COLUMN} ")
             LOGGER.error("  - Valid relationships contains at least the properties " +
-                         f"[bold yellow]{ID_COLUMN}, {SOURCE_COLUMN}, {TARGET_COLUMN}[/]")
+                         f"{ID_COLUMN}, {SOURCE_COLUMN}, {TARGET_COLUMN} ")
             raise ValueError(f"'{file_path}' does not contains valid nodes or relations")
 
         self.is_node = has_id and not is_relation
diff --git a/cosmotech/coal/cosmotech_api/workspace.py b/cosmotech/coal/cosmotech_api/workspace.py
@@ -35,7 +35,7 @@ def list_workspace_files(
             target_list.append(workspace_file.file_name)
 
     if not target_list:
-        LOGGER.error(f"No workspace file were found with filter [bold green]{file_prefix}[/]")
+        LOGGER.error(f"No workspace file were found with filter {file_prefix}")
         raise ValueError(f"No workspace file were found with filter {file_prefix} in workspace {workspace_id}")
 
     return target_list
@@ -62,7 +62,7 @@ def download_workspace_file(
         raise ValueError(f"{target_dir} is a file and not a directory")
     api_ws = cosmotech_api.api.workspace_api.WorkspaceApi(api_client)
 
-    LOGGER.info(f"Loading [bold green]{file_name}[/] from the API")
+    LOGGER.info(f"Loading {file_name} from the API")
 
     _file_content = api_ws.download_workspace_file(organization_id,
                                                    workspace_id,
@@ -74,7 +74,7 @@ def download_workspace_file(
     with open(local_target_file, "wb") as _file:
         _file.write(_file_content)
 
-    LOGGER.info(f"[bold green]{local_target_file}[/] successfuly loaded from the API")
+    LOGGER.info(f"{local_target_file} successfuly loaded from the API")
 
     return local_target_file
 
@@ -112,16 +112,16 @@ def upload_workspace_file(
     api_ws = cosmotech_api.api.workspace_api.WorkspaceApi(api_client)
     destination = workspace_path + target_file.name if workspace_path.endswith("/") else workspace_path
 
-    LOGGER.info(f"Sending [bold green]{target_file.name}[/] as [bold green]{destination}[/] to the API")
+    LOGGER.info(f"Sending {destination} to the API")
     try:
         _file = api_ws.upload_workspace_file(organization_id,
                                              workspace_id,
                                              target_file,
                                              overwrite,
                                              destination=destination)
     except cosmotech_api.exceptions.ApiException as e:
-        LOGGER.error(f"[bold green]{destination}[/] already exists, use the [cyan]overwrite flag[/] to replace it")
+        LOGGER.error(f"{destination}already exists, use the overwrite flag to replace it")
         raise e
 
-    LOGGER.info(f"[bold green]{_file.file_name}[/] successfuly sent to the API")
+    LOGGER.info(f"{_file.file_name} successfuly sent to the API")
     return _file.file_name
diff --git a/cosmotech/coal/utils/api.py b/cosmotech/coal/utils/api.py
@@ -49,8 +49,8 @@ def get_solution(organization_id, workspace_id) -> Optional[Solution]:
         try:
             r_data: Workspace = api_w.find_workspace_by_id(organization_id=organization_id, workspace_id=workspace_id)
         except ServiceException as e:
-            LOGGER.error(f"Workspace [green bold]{workspace_id}[/] was not found "
-                         f"in Organization [green bold]{organization_id}[/]")
+            LOGGER.error(f"Workspace {workspace_id} was not found "
+                         f"in Organization {organization_id}")
             LOGGER.debug(e.body)
             return None
         solution_id = r_data.solution.solution_id
diff --git a/requirements.txt b/requirements.txt
@@ -22,7 +22,7 @@ requests~=2.32.3
 singlestoredb~=1.10.0
 
 # Orchestrator templates requirements
-cosmotech-run-orchestrator~=1.6.0
+cosmotech-run-orchestrator~=1.6.1
 
 # Data store requirements
 pyarrow~=17.0.0
