Skip to content

Commit 0a3ae8b

Browse files
committed
rebase fixes
1 parent 8efbb0e commit 0a3ae8b

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

extension-framework/cpp-extension-lib/include/api/core/FlowFile.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
*/
1818
#pragma once
1919

20+
#include <exception>
2021
#include <memory>
2122
#include <stdexcept>
23+
2224
#include "minifi-c.h"
2325

2426
namespace org::apache::nifi::minifi::api::core {

extensions/llamacpp/processors/RunLlamaCppInference.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ MinifiStatus RunLlamaCppInference::onScheduleImpl(api::core::ProcessContext& con
3232
model_path_.clear();
3333
model_path_ = api::utils::parseProperty(context, ModelPath);
3434
multimodal_model_path_ = api::utils::parseOptionalProperty(context, MultiModalModelPath);
35-
system_prompt_ = context.getProperty(SystemPrompt).value_or("");
35+
system_prompt_ = api::utils::parseOptionalProperty(context, SystemPrompt).value_or("");
3636
output_attribute_ = api::utils::parseOptionalProperty(context, OutputAttributeName);
3737

3838
LlamaSamplerParams llama_sampler_params;

0 commit comments

Comments
 (0)