Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: input value error when tweaks are active #4288

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion src/frontend/src/modals/apiModal/utils/get-curl-code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export function getCurlRunCode({
isAuth,
tweaksBuildedObject,
endpointName,
activeTweaks,
}: GetCodeType): string {
let tweaksString = "{}";
const inputs = useFlowStore.getState().inputs;
Expand All @@ -28,7 +29,7 @@ export function getCurlRunCode({
-H 'Content-Type: application/json'\\${
!isAuth ? `\n -H 'x-api-key: <your api key>'\\` : ""
}
-d '{"input_value": "message",
-d '{${!activeTweaks ? `"input_value": "message",` : ""}
"output_type": ${hasChatOutput ? '"chat"' : '"text"'},
"input_type": ${hasChatInput ? '"chat"' : '"text"'},
"tweaks": ${tweaksString}}'
Expand Down
25 changes: 13 additions & 12 deletions src/frontend/src/modals/apiModal/utils/get-js-api-code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default function getJsApiCode({
isAuth,
tweaksBuildedObject,
endpointName,
activeTweaks,
}: GetCodeType): string {
let tweaksString = "{}";
if (tweaksBuildedObject)
Expand All @@ -23,7 +24,7 @@ export default function getJsApiCode({
this.baseURL = baseURL;
this.apiKey = apiKey;
}

async post(endpoint, body, headers = {"Content-Type": "application/json"}) {
if (this.apiKey) {
headers["Authorization"] = \`Bearer \${this.apiKey}\`;
Expand All @@ -35,7 +36,7 @@ export default function getJsApiCode({
headers: headers,
body: JSON.stringify(body)
});

const responseMessage = await response.json();
if (!response.ok) {
throw new Error(\`\${response.status} \${response.statusText} - \${JSON.stringify(responseMessage)}\`);
Expand All @@ -46,12 +47,12 @@ export default function getJsApiCode({
throw error;
}
}

async initiateSession(flowId, inputValue, inputType = 'chat', outputType = 'chat', stream = false, tweaks = {}) {
const endpoint = \`/api/v1/run/\${flowId}?stream=\${stream}\`;
return this.post(endpoint, { input_value: inputValue, input_type: inputType, output_type: outputType, tweaks: tweaks });
return this.post(endpoint, { ${activeTweaks ? "" : "input_value: inputValue, "}input_type: inputType, output_type: outputType, tweaks: tweaks });
}

async handleStream(streamUrl, onUpdate, onClose, onError) {
try {
const response = await fetch(streamUrl);
Expand All @@ -66,7 +67,7 @@ export default function getJsApiCode({
}
const chunk = decoder.decode(value);
const lines = chunk.split(\'\\n\').filter(line => line.trim() !== '');

for (const line of lines) {
if (line.startsWith('data: ')) {
try {
Expand All @@ -83,7 +84,7 @@ export default function getJsApiCode({
onError(error);
}
}

async runFlow(flowIdOrName, inputValue, inputType = 'chat', outputType = 'chat', tweaks, stream = false, onUpdate, onClose, onError) {
try {
const initResponse = await this.initiateSession(flowIdOrName, inputValue, inputType, outputType, stream, tweaks);
Expand All @@ -98,13 +99,13 @@ export default function getJsApiCode({
}
}
}

async function main(inputValue, inputType = 'chat', outputType = 'chat', stream = false) {
const flowIdOrName = '${endpointName || flowId}';
const langflowClient = new LangflowClient('${window.location.protocol}//${window.location.host}',
${isAuth ? "'your-api-key'" : "null"});
const tweaks = ${tweaksString};

try {
const response = await langflowClient.runFlow(
flowIdOrName,
Expand All @@ -117,19 +118,19 @@ export default function getJsApiCode({
(message) => console.log("Stream Closed:", message), // onClose
(error) => console.error("Stream Error:", error) // onError
);

if (!stream && response) {
const flowOutputs = response.outputs[0];
const firstComponentOutputs = flowOutputs.outputs[0];
const output = firstComponentOutputs.outputs.message;

console.log("Final Output:", output.message.text);
}
} catch (error) {
console.error('Main Error:', error.message);
}
}

const args = process.argv.slice(2);
main(
args[0], // inputValue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default function getPythonApiCode({
flowId,
tweaksBuildedObject,
endpointName,
activeTweaks,
}: GetCodeType): string {
let tweaksString = "{}";
if (tweaksBuildedObject)
Expand Down Expand Up @@ -61,7 +62,7 @@ def run_flow(message: str,
api_url = f"{BASE_API_URL}/api/v1/run/{endpoint}"

payload = {
"input_value": message,
${!activeTweaks ? `"input_value": message,` : ""}
"output_type": output_type,
"input_type": input_type,
}
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/modals/apiModal/utils/get-python-code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { GetCodeType } from "@/types/tweaks";
export default function getPythonCode({
flowName,
tweaksBuildedObject,
activeTweaks,
}: GetCodeType): string {
let tweaksString = "{}";
if (tweaksBuildedObject)
Expand All @@ -21,8 +22,7 @@ export default function getPythonCode({
TWEAKS = ${tweaksString}

result = run_flow_from_json(flow="${flowName}.json",
input_value="message",
session_id="", # provide a session id if you want to use session state
${!activeTweaks ? `input_value="message",\n ` : ""}session_id="", # provide a session id if you want to use session state
fallback_to_env_vars=True, # False by default
tweaks=TWEAKS)`;
}
1 change: 1 addition & 0 deletions src/frontend/src/stores/tweaksStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export const useTweaksStore = create<TweaksStoreType>((set, get) => ({
isAuth: autoLogin,
tweaksBuildedObject: tweak,
endpointName: flow?.endpoint_name,
activeTweaks: get().activeTweaks,
};

if (getCodes) {
Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/types/tweaks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ export type GetCodeType = {
isAuth: boolean;
tweaksBuildedObject: {};
endpointName?: string | null;
activeTweaks: boolean;
};
Loading