Merge remote-tracking branch 'origin/dev' into saveComponent

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langflow"
-version = "0.5.1"
+version = "0.5.3"
 description = "A Python package with a built-in web application"
 authors = ["Logspace <contact@logspace.ai>"]
 maintainers = [

src/backend/langflow/__main__.py

@@ -61,6 +61,8 @@ def set_var_for_macos_issue():
         import os
 
         os.environ["OBJC_DISABLE_INITIALIZE_FORK_SAFETY"] = "YES"
+        # https://stackoverflow.com/questions/75747888/uwsgi-segmentation-fault-with-flask-python-app-behind-nginx-after-running-for-2 # noqa
+        os.environ["no_proxy"] = "*"  # to avoid error with gunicorn
         logger.debug("Set OBJC_DISABLE_INITIALIZE_FORK_SAFETY to YES to avoid error")
 
 

src/backend/langflow/alembic/versions/eb5866d51fd2_change_columns_to_be_nullable.py

@@ -9,6 +9,7 @@ from typing import Sequence, Union
 
 from alembic import op
 import sqlalchemy as sa
+from sqlalchemy import exc
 import sqlmodel  # noqa: F401
 
 # revision identifiers, used by Alembic.
@@ -20,16 +21,21 @@ depends_on: Union[str, Sequence[str], None] = None
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
+    connection = op.get_bind()
     try:
         op.drop_table("flowstyle")
         with op.batch_alter_table("component", schema=None) as batch_op:
             batch_op.drop_index("ix_component_frontend_node_id")
             batch_op.drop_index("ix_component_name")
+    except exc.SQLAlchemyError:
+        connection.execute("ROLLBACK")
     except Exception:
         pass
 
     try:
         op.drop_table("component")
+    except exc.SQLAlchemyError:
+        connection.execute("ROLLBACK")
     except Exception:
         pass
     # ### end Alembic commands ###

src/backend/langflow/components/agents/OpenAIConversationalAgent.py

@@ -79,4 +79,5 @@ class ConversationalAgent(CustomComponent):
             memory=memory,
             verbose=True,
             return_intermediate_steps=True,
+            handle_parsing_errors=True,
         )

src/backend/langflow/graph/vertex/base.py

@@ -359,7 +359,7 @@ class Vertex:
         except Exception as exc:
             logger.exception(exc)
             raise ValueError(
-                f"Error building node {self.vertex_type}: {str(exc)}"
+                f"Error building node {self.vertex_type}(ID:{self.id}): {str(exc)}"
             ) from exc
 
     def _update_built_object_and_artifacts(self, result):

src/backend/langflow/services/database/service.py

@@ -116,7 +116,35 @@ class DatabaseService(Service):
 
         return True
 
+    def init_alembic(self):
+        logger.info("Initializing alembic")
+        alembic_cfg = Config()
+        alembic_cfg.set_main_option("script_location", str(self.script_location))
+        alembic_cfg.set_main_option("sqlalchemy.url", self.database_url)
+        command.stamp(alembic_cfg, "head")
+        logger.info("Alembic initialized")
+
     def run_migrations(self):
+        # First we need to check if alembic has been initialized
+        # If not, we need to initialize it
+        # if not self.script_location.exists(): # this is not the correct way to check if alembic has been initialized
+        # We need to check if the alembic_version table exists
+        # if not, we need to initialize alembic
+        with Session(self.engine) as session:
+            # If the table does not exist it throws an error
+            # so we need to catch it
+            try:
+                session.execute("SELECT * FROM alembic_version")
+            except Exception:
+                logger.info("Alembic not initialized")
+                try:
+                    self.init_alembic()
+                except Exception as exc:
+                    logger.error(f"Error initializing alembic: {exc}")
+                    raise RuntimeError("Error initializing alembic") from exc
+            else:
+                logger.info("Alembic already initialized")
+
         logger.info(f"Running DB migrations in {self.script_location}")
         alembic_cfg = Config()
         alembic_cfg.set_main_option("script_location", str(self.script_location))

src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx

@@ -438,11 +438,7 @@ export default function ParameterComponent({
         ) : left === true && type === "prompt" ? (
           <div className="mt-2 w-full">
             <PromptAreaComponent
-              readonly={
-                data.node?.flow && data.node.template[name].dynamic
-                  ? true
-                  : false
-              }
+              readonly={data.node?.flow ? true : false}
               field_name={name}
               setNodeClass={(nodeClass) => {
                 data.node = nodeClass;

src/frontend/src/components/promptComponent/index.tsx

@@ -24,7 +24,8 @@ export default function PromptAreaComponent({
   }, [disabled]);
 
   useEffect(() => {
-    if (value !== "" && !editNode && !readonly) {
+    //prevent update from prompt template after group node if prompt is wrongly marked as not dynamic
+    if (value !== "" && !editNode && !readonly && !nodeClass?.flow) {
       postValidatePrompt(field_name!, value, nodeClass!).then((apiReturn) => {
         if (apiReturn.data) {
           setNodeClass!(apiReturn.data.frontend_node);

src/frontend/src/modals/EditNodeModal/index.tsx

@@ -438,12 +438,7 @@ const EditNodeModal = forwardRef(
                                 <div className="mx-auto">
                                   <PromptAreaComponent
                                     readonly={
-                                      myData.current.node?.flow &&
-                                      myData.current.node.template[
-                                        templateParam
-                                      ].dynamic
-                                        ? true
-                                        : false
+                                      myData.current.node?.flow ? true : false
                                     }
                                     field_name={templateParam}
                                     editNode={true}

src/frontend/src/utils/reactflowUtils.ts

@@ -437,8 +437,8 @@ export function convertValuesToNumbers(arr) {
     for (const key in obj) {
       if (obj.hasOwnProperty(key)) {
         let value = obj[key];
-        if (/\s/g.test(value)) {
-          value = value.trim();
+        if (/^\d+$/.test(value)) {
+          value = value?.toString().trim();
         }
         newObj[key] =
           value === "" || isNaN(value) ? value.toString() : Number(value);

src/frontend/tests/end-to-end/keyPairListComponent.spec.ts

@@ -21,7 +21,17 @@ test("KeypairListComponent", async ({ page }) => {
   await page.locator('//*[@id="keypair0"]').click();
   await page.locator('//*[@id="keypair0"]').fill("testtesttesttest");
   await page.locator('//*[@id="keypair100"]').click();
-  await page.locator('//*[@id="keypair100"]').fill("testtesttesttesttesttest");
+  await page
+    .locator('//*[@id="keypair100"]')
+    .fill("test test test test test test");
+
+  const valueWithSpace = await page
+    .locator('//*[@id="keypair100"]')
+    .inputValue();
+
+  if (valueWithSpace !== "test test test test test test") {
+    expect(false).toBeTruthy();
+  }
 
   const plusButtonLocatorNode = page.locator('//*[@id="plusbtn0"]');
   const elementCountNode = await plusButtonLocatorNode.count();
@@ -94,7 +104,7 @@ test("KeypairListComponent", async ({ page }) => {
     await page.locator('//*[@id="keypair100"]').click();
     await page
       .locator('//*[@id="keypair100"]')
-      .fill("testtesttesttesttesttest");
+      .fill("test test test test test test");
 
     const plusButtonLocator = page.locator('//*[@id="plusbtn0"]');
     const elementCount = await plusButtonLocator.count();
@@ -132,7 +142,7 @@ test("KeypairListComponent", async ({ page }) => {
 
       if (
         key1 === "testtesttesttest" &&
-        value1 === "testtesttesttesttesttest" &&
+        value1 === "test test test test test test" &&
         key2 === "testtesttesttest2" &&
         value2 === "testtesttesttesttesttest2"
       ) {