Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prich/core/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from prich.core.template_utils import should_run_step
from prich.core.steps.step_render_template import render_template
from prich.core.steps.step_run_command import run_command_step
from prich.core.steps.step_sent_to_llm import send_to_llm
from prich.core.steps.step_send_to_llm import send_to_llm

from prich.models.template import LLMStep, PythonStep, RenderStep, \
CommandStep, ValidateStepOutput
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from prich.models.template import TemplateModel, LLMStep


def send_to_llm(template: TemplateModel, step: LLMStep, provider: str, config: ConfigModel, variables: dict) -> str:
def send_to_llm(template: TemplateModel, step: LLMStep, provider: str|None, config: ConfigModel, variables: dict) -> str:
from prich.llm_providers.get_llm_provider import get_llm_provider

if not step.input:
Expand All @@ -18,14 +18,14 @@ def send_to_llm(template: TemplateModel, step: LLMStep, provider: str, config: C
elif step.provider:
selected_provider_name = step.provider
# Use Provider to template assignment from config settings
elif config.settings.provider_assignments and template.id in config.settings.provider_assignments.keys():
elif (config.settings and config.settings.provider_assignments) and template.id in config.settings.provider_assignments.keys():
selected_provider_name = config.settings.provider_assignments[template.id]
# Use default provider from config
else:
selected_provider_name = config.settings.default_provider
selected_provider = config.providers.get(selected_provider_name)
selected_provider_name = config.settings.default_provider if config.settings else None
selected_provider = config.providers.get(selected_provider_name) if selected_provider_name else None
if not selected_provider:
raise click.ClickException(f"Provider {selected_provider_name} configuration not found. Check your config.yaml file.")
raise click.ClickException(f"Provider {f'{selected_provider_name} ' if selected_provider_name else ''}configuration not found. Check your config.yaml file.")
if is_verbose():
console_print(f"Selected LLM provider: {selected_provider_name}")

Expand All @@ -50,8 +50,6 @@ def send_to_llm(template: TemplateModel, step: LLMStep, provider: str, config: C
prompt_lines.append(step.rendered_instructions)
if step.rendered_input:
prompt_lines.append(step.rendered_input)
if step.rendered_prompt:
prompt_lines.append(step.rendered_prompt)
prompt_full = '\n'.join(prompt_lines)

if is_verbose():
Expand Down
2 changes: 1 addition & 1 deletion prich/llm_providers/echo_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ def send_prompt(self, prompt: str = None, instructions: str = None, input_: str
if prompt:
return prompt
else:
return f"{instructions}\n{input_}"
return (f"{instructions}\n" if instructions else "") + input_
Loading