Merge pull request #148 from fgcz/release_bfabric_scripts

Hot Fix: printing of YAML for parsing with shyaml #147

bfabric_scripts/doc/changelog.md

@@ -10,6 +10,12 @@ Versioning currently follows `X.Y.Z` where
 
 ## \[Unreleased\]
 
+## \[1.13.22\] - 2025-02-17
+
+### Fixed
+
+- Fix printing of YAML for parsing with shyaml, previously line breaks could have been introduced.
+
 ## \[1.13.21\] - 2025-02-11
 
 ### Fixed

bfabric_scripts/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "bfabric_scripts"
 description = "Python command line scripts for the B-Fabric API"
-version = "1.13.21"
+version = "1.13.22"
 
 dependencies = [
     "bfabric==1.13.20"

bfabric_scripts/src/bfabric_scripts/cli/api/cli_api_read.py

@@ -90,14 +90,18 @@ def render_output(results: list[dict[str, Any]], params: Params, client: Bfabric
             results = [{k: x.get(k) for k in params.columns} for x in results]
 
         if params.format == OutputFormat.JSON:
-            return json.dumps(results, indent=2)
+            result = json.dumps(results, indent=2)
         elif params.format == OutputFormat.YAML:
-            return yaml.dump(results)
+            result = yaml.dump(results)
         elif params.format == OutputFormat.TSV:
-            return flatten_relations(pl.DataFrame(results)).write_csv(separator="\t")
+            result = flatten_relations(pl.DataFrame(results)).write_csv(separator="\t")
         else:
             raise ValueError(f"output format {params.format} not supported")
 
+        # TODO check if we can add back colors (but it broke some stuff, because of forced line breaks, so be careful)
+        print(result)
+        return result
+
 
 @app.default
 @use_client
@@ -114,11 +118,6 @@ def read(params: Annotated[Params, cyclopts.Parameter(name="*")], *, client: Bfa
     results = sorted(results, key=lambda x: x["id"])
     console_out = Console()
     output = render_output(results, params=params, client=client, console=console_out)
-    if output is not None:
-        if params.format == OutputFormat.TSV:
-            print(output)
-        else:
-            console_out.print(output)
     if params.file:
         if output is None:
             logger.error("File output is not supported for the specified output format.")