From fd8a82fc4985d949782a5deb1fd78410a2188078 Mon Sep 17 00:00:00 2001 From: dxxky <143929171+dxxky@users.noreply.github.com> Date: Thu, 18 Jan 2024 17:16:23 +0800 Subject: [PATCH 1/4] Update AzureChatOpenAI.py Add API Supported versions - 2023-09-01-preview --- src/backend/langflow/components/llms/AzureChatOpenAI.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/langflow/components/llms/AzureChatOpenAI.py b/src/backend/langflow/components/llms/AzureChatOpenAI.py index 4595e3322..a272d72d6 100644 --- a/src/backend/langflow/components/llms/AzureChatOpenAI.py +++ b/src/backend/langflow/components/llms/AzureChatOpenAI.py @@ -25,6 +25,7 @@ class AzureChatOpenAIComponent(CustomComponent): "2023-06-01-preview", "2023-07-01-preview", "2023-08-01-preview", + "2023-09-01-preview", "2023-12-01-preview" ] From 0f0488e59a9de434aa40a8ce6076a3866f581e60 Mon Sep 17 00:00:00 2001 From: cristhianzl Date: Thu, 18 Jan 2024 18:18:18 -0300 Subject: [PATCH 2/4] fix(parameterComponent): update id and data-testid for textarea component to use the name of the parameter instead of index fix(EditNodeModal): update id and data-testid for textarea component to use the name of the template parameter instead of index fix(promptModalComponent.spec): update data-testid for textarea components to use the name of the prompt instead of index fix(group.spec): update data-testid for textarea component to use a more descriptive name instead of index fix(saveComponents.spec): update data-testid for textarea component to use a more descriptive name instead of index --- .../components/parameterComponent/index.tsx | 4 +- .../src/modals/EditNodeModal/index.tsx | 20 +++++-- .../end-to-end/promptModalComponent.spec.ts | 56 +++++++++---------- src/frontend/tests/onlyFront/group.spec.ts | 2 +- .../tests/onlyFront/saveComponents.spec.ts | 4 +- 5 files changed, 47 insertions(+), 39 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 81bf945a5..9720a9862 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -400,8 +400,8 @@ export default function ParameterComponent({ disabled={disabled} value={data.node.template[name].value ?? ""} onChange={handleOnNewValue} - id={"textarea-" + index} - data-testid={"textarea-" + index} + id={"textarea-" + data.node.template[name].name} + data-testid={"textarea-" + data.node.template[name].name} /> ) : ( { handleOnNewValue(value, templateParam); }} - id={"prompt-area-edit" + index} + id={ + "prompt-area-edit-" + + myData.node.template[templateParam].name + } data-testid={ - "modal-prompt-input-" + index + "modal-prompt-input-" + + myData.node.template[templateParam].name } /> diff --git a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts index 56e3396a7..690ec2d05 100644 --- a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts +++ b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts @@ -44,7 +44,7 @@ test("PromptTemplateComponent", async ({ page }) => { await page.getByTestId("genericModalBtnSave").click(); - await page.getByTestId("div-textarea-5").click(); + await page.getByTestId("div-textarea-prompt").click(); await page.getByTestId("text-area-modal").fill("prompt_value_!@#!@#"); value = await page.getByTestId("text-area-modal").inputValue(); @@ -55,7 +55,7 @@ test("PromptTemplateComponent", async ({ page }) => { await page.getByTestId("genericModalBtnSave").click(); - await page.getByTestId("div-textarea-6").click(); + await page.getByTestId("div-textarea-prompt1").click(); await page .getByTestId("text-area-modal") .fill("prompt_name_test_123123!@#!@#"); @@ -77,29 +77,31 @@ test("PromptTemplateComponent", async ({ page }) => { await page.getByTestId("more-options-modal").click(); await page.getByTestId("edit-button-modal").click(); - value = await page.locator('//*[@id="textarea-edit-1"]').inputValue(); + value = await page.locator('//*[@id="textarea-edit-prompt"]').inputValue(); if (value != "prompt_value_!@#!@#") { expect(false).toBeTruthy(); } - value = await page.locator('//*[@id="textarea-edit-2"]').inputValue(); + value = await page.locator('//*[@id="textarea-edit-prompt1"]').inputValue(); if (value != "prompt_name_test_123123!@#!@#") { expect(false).toBeTruthy(); } - value = await page.locator('//*[@id="prompt-area-edit0"]').innerText(); + value = await page + .locator('//*[@id="prompt-area-edit-template"]') + .innerText(); if (value != "{prompt} example {prompt1}") { expect(false).toBeTruthy(); } await page - .locator('//*[@id="textarea-edit-2"]') + .locator('//*[@id="textarea-edit-prompt1"]') .fill("prompt_edit_test_12312312321!@#$"); await page - .locator('//*[@id="textarea-edit-1"]') + .locator('//*[@id="textarea-edit-prompt"]') .fill("prompt_edit_test_44444444444!@#$"); await page.locator('//*[@id="showtemplate"]').click(); @@ -141,35 +143,29 @@ test("PromptTemplateComponent", async ({ page }) => { await page.locator('//*[@id="saveChangesBtn"]').click(); - const plusButtonLocator = page.locator('//*[@id="textarea-8"]'); - const elementCount = await plusButtonLocator.count(); - if (elementCount === 0) { - expect(true).toBeTruthy(); + await page.getByTestId("more-options-modal").click(); + await page.getByTestId("edit-button-modal").click(); - await page.getByTestId("more-options-modal").click(); - await page.getByTestId("edit-button-modal").click(); + await page.locator('//*[@id="showprompt1"]').click(); + expect(await page.locator('//*[@id="showprompt1"]').isChecked()).toBeTruthy(); - await page.locator('//*[@id="showprompt1"]').click(); - expect( - await page.locator('//*[@id="showprompt1"]').isChecked() - ).toBeTruthy(); + value = await page.locator('//*[@id="textarea-edit-prompt"]').inputValue(); - value = await page.locator('//*[@id="textarea-edit-1"]').inputValue(); + if (value != "prompt_edit_test_44444444444!@#$") { + expect(false).toBeTruthy(); + } - if (value != "prompt_edit_test_44444444444!@#$") { - expect(false).toBeTruthy(); - } + value = await page.locator('//*[@id="textarea-edit-prompt1"]').inputValue(); - value = await page.locator('//*[@id="textarea-edit-2"]').inputValue(); + if (value != "prompt_edit_test_12312312321!@#$") { + expect(false).toBeTruthy(); + } - if (value != "prompt_edit_test_12312312321!@#$") { - expect(false).toBeTruthy(); - } + value = await page + .locator('//*[@id="prompt-area-edit-template"]') + .innerText(); - value = await page.locator('//*[@id="prompt-area-edit0"]').innerText(); - - if (value != "{prompt} example {prompt1}") { - expect(false).toBeTruthy(); - } + if (value != "{prompt} example {prompt1}") { + expect(false).toBeTruthy(); } }); diff --git a/src/frontend/tests/onlyFront/group.spec.ts b/src/frontend/tests/onlyFront/group.spec.ts index f4cbe8458..dcd557279 100644 --- a/src/frontend/tests/onlyFront/group.spec.ts +++ b/src/frontend/tests/onlyFront/group.spec.ts @@ -67,7 +67,7 @@ test.describe("group node test", () => { await page.getByRole("button", { name: "Group" }).click(); - const textArea = page.getByTestId("div-textarea-2"); + const textArea = page.getByTestId("div-textarea-description"); const elementCountText = await textArea.count(); if (elementCountText > 0) { expect(true).toBeTruthy(); diff --git a/src/frontend/tests/onlyFront/saveComponents.spec.ts b/src/frontend/tests/onlyFront/saveComponents.spec.ts index a123a422e..10a0c9c77 100644 --- a/src/frontend/tests/onlyFront/saveComponents.spec.ts +++ b/src/frontend/tests/onlyFront/saveComponents.spec.ts @@ -74,7 +74,7 @@ test.describe("save component tests", () => { await page.getByRole("button", { name: "Group" }).click(); - let textArea = page.getByTestId("div-textarea-2"); + let textArea = page.getByTestId("div-textarea-description"); let elementCountText = await textArea.count(); if (elementCountText > 0) { expect(true).toBeTruthy(); @@ -102,7 +102,7 @@ test.describe("save component tests", () => { await page.mouse.up(); await page.mouse.down(); - textArea = page.getByTestId("div-textarea-2"); + textArea = page.getByTestId("div-textarea-description"); elementCountText = await textArea.count(); if (elementCountText > 0) { expect(true).toBeTruthy(); From 77d5e839b04fff1c68506dca535a691fc5575851 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 18 Jan 2024 18:28:05 -0300 Subject: [PATCH 3/4] Update version number in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7fadb4f8a..8abaf6ebe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow" -version = "0.6.5a8" +version = "0.6.5a9" description = "A Python package with a built-in web application" authors = ["Logspace "] maintainers = [ From fd25788a9b5468c8b058bd0b5d803ff23d3b79b2 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 18 Jan 2024 18:50:57 -0300 Subject: [PATCH 4/4] fix(codeTabsComponent): set readonly prop to true for CodeAreaComponent to prevent editing when node template field is dynamic --- src/frontend/src/components/codeTabsComponent/index.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/frontend/src/components/codeTabsComponent/index.tsx b/src/frontend/src/components/codeTabsComponent/index.tsx index b1bc7ef34..2bea4265f 100644 --- a/src/frontend/src/components/codeTabsComponent/index.tsx +++ b/src/frontend/src/components/codeTabsComponent/index.tsx @@ -631,14 +631,7 @@ export default function CodeTabsComponent({