fix: jinja not able to handle paths properly, and passing verbosity flags for fill

Author: apirogov

src/somesy/cli/fill.py

@@ -4,12 +4,9 @@
 from sys import stdin
 
 import typer
-from jinja2 import Environment, FileSystemLoader, FunctionLoader, select_autoescape
+from jinja2 import Environment, FunctionLoader, select_autoescape
 
-from somesy.core.core import discover_input
-
-from ..core.models import SomesyInput
-from .util import wrap_exceptions
+from .util import resolved_somesy_input, wrap_exceptions
 
 logger = logging.getLogger("somesy")
 app = typer.Typer()
@@ -56,19 +53,29 @@ def fill(
     ),
 ):
     """Fill a Jinja2 template with somesy project metadata (e.g. list authors in project docs)."""
-    somesy_input = SomesyInput.from_input_file(discover_input(input_file))
+    somesy_input = resolved_somesy_input(input_file=input_file)
+
     if template_file:
-        env = Environment(loader=FileSystemLoader("."), autoescape=select_autoescape())
-        template = env.get_template(str(template_file))
+        logger.debug(f"Reading Jinja2 template from '{template_file}'.")
+        with open(template_file, "r") as f:
+            template_str = f.read()
     else:
-        env = Environment(
-            loader=FunctionLoader(lambda _: stdin.read()),
+        logger.debug("Reading Jinja2 template from stdin.")
+        template_str = stdin.read()
+
+    result = (
+        Environment(
+            loader=FunctionLoader(lambda _: template_str),
             autoescape=select_autoescape(),
         )
-        template = env.get_template("")
-    result = template.render(project=somesy_input.project)
-    if not output_file:
-        print(result)
-    else:
+        .get_template("")
+        .render(project=somesy_input.project)
+    )
+
+    if output_file:
+        logger.debug(f"Writing result to '{output_file}'.")
         with open(output_file, "w") as f:
             f.write(result)
+    else:
+        logger.debug("Writing result to stdout.")
+        print(result)

src/somesy/cli/sync.py

@@ -1,17 +1,13 @@
 """Sync command for somesy."""
 import logging
 from pathlib import Path
-from typing import Optional
 
 import typer
-from rich.pretty import pretty_repr
 
 from somesy.commands import sync as sync_command
-from somesy.core.core import discover_input
-from somesy.core.log import SomesyLogLevel, get_log_level, set_log_level
-from somesy.core.models import SomesyConfig, SomesyInput
+from somesy.core.models import SomesyInput
 
-from .util import wrap_exceptions
+from .util import resolved_somesy_input, wrap_exceptions
 
 logger = logging.getLogger("somesy")
 
@@ -107,42 +103,17 @@ def sync(
     ),
 ):
     """Sync project metadata input with metadata files."""
-    # ---------------
-    # config from CLI (merged with possibly set CLI flags for logging)
-    passed_cli_args = {
-        k: v
-        for k, v in dict(
-            input_file=discover_input(input_file),
-            no_sync_cff=no_sync_cff,
-            cff_file=cff_file,
-            no_sync_pyproject=no_sync_pyproject,
-            pyproject_file=pyproject_file,
-            no_sync_package_json=no_sync_package_json,
-            package_json_file=package_json_file,
-            no_sync_codemeta=no_sync_codemeta,
-            codemeta_file=codemeta_file,
-        ).items()
-        if v is not None
-    }
-    somesy_conf = SomesyConfig(**passed_cli_args)
-
-    # cli_log_level is None if the user did not pass a log level (-> "default")
-    cli_log_level: Optional[SomesyLogLevel] = get_log_level()
-
-    if cli_log_level is not None:
-        # update log level flags if cli log level was set
-        somesy_conf.update_log_level(cli_log_level)
-
-    somesy_input: SomesyInput = somesy_conf.get_input()
-
-    if cli_log_level is None:
-        # no cli log level -> set it according to the loaded configuration
-        set_log_level(somesy_input.config.log_level())
-
-    logger.debug(
-        f"Combined config (Defaults + File + CLI):\n{pretty_repr(somesy_input.config)}"
+    somesy_input = resolved_somesy_input(
+        input_file=input_file,
+        no_sync_cff=no_sync_cff,
+        cff_file=cff_file,
+        no_sync_pyproject=no_sync_pyproject,
+        pyproject_file=pyproject_file,
+        no_sync_package_json=no_sync_package_json,
+        package_json_file=package_json_file,
+        no_sync_codemeta=no_sync_codemeta,
+        codemeta_file=codemeta_file,
     )
-    # --------
     run_sync(somesy_input)
 
 

src/somesy/cli/util.py

@@ -1,9 +1,15 @@
 """Utility functions for CLI commands."""
 import logging
 import traceback
+from typing import Optional
 
 import typer
 import wrapt
+from rich.pretty import pretty_repr
+
+from somesy.core.core import discover_input
+from somesy.core.log import SomesyLogLevel, get_log_level, set_log_level
+from somesy.core.models import SomesyConfig, SomesyInput
 
 logger = logging.getLogger("somesy")
 
@@ -18,3 +24,34 @@ def wrap_exceptions(wrapped, instance, args, kwargs):
         logger.error(f"[bold red]Error: {e}[/bold red]")
         logger.debug(f"[red]{traceback.format_exc()}[/red]")
         raise typer.Exit(code=1) from e
+
+
+def resolved_somesy_input(**cli_args) -> SomesyInput:
+    """Return a combined `SomesyInput` based on config file and passed CLI args.
+
+    Will also adjust log levels accordingly.
+    """
+    # figure out what input file to use
+    input_file = discover_input(cli_args.pop("input_file", None))
+
+    # create config based on passed arguments
+    passed_args = {k: v for k, v in cli_args.items() if v is not None}
+    somesy_conf = SomesyConfig(input_file=input_file, **passed_args)
+
+    # cli_log_level is None if the user did not pass a log level (-> "default")
+    cli_log_level: Optional[SomesyLogLevel] = get_log_level()
+
+    if cli_log_level is not None:
+        # update log level flags if cli log level was set
+        somesy_conf.update_log_level(cli_log_level)
+
+    somesy_input: SomesyInput = somesy_conf.get_input()
+
+    if cli_log_level is None:
+        # no cli log level -> set it according to the loaded configuration
+        set_log_level(somesy_input.config.log_level())
+
+    logger.debug(
+        f"Combined config (Defaults + File + CLI):\n{pretty_repr(somesy_input.config)}"
+    )
+    return somesy_input