Merge remote-tracking branch 'origin/dev' into node-shortcuts-refactor

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 {
   "name": "Langflow Dev Container",
   // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "image": "mcr.microsoft.com/devcontainers/python:1-3.10-bullseye",
+  "image": "mcr.microsoft.com/devcontainers/python:3.10",
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {

.github/workflows/pre-release-base.yml

@@ -13,9 +13,12 @@ env:
   POETRY_VERSION: "1.8.2"
 
 jobs:
-  if_release:
+  release:
+    name: Release Langflow Base
     if: inputs.release_package == true
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.check-version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry
@@ -49,6 +52,12 @@ jobs:
           POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           make publish base=true
+  docker_build:
+    name: Build Docker Image
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -65,4 +74,4 @@ jobs:
           push: true
           file: ./build_and_push_base.Dockerfile
           tags: |
-            logspace/langflow:base-${{ steps.check-version.outputs.version }}
+            langflowai/langflow:base-${{ needs.release.outputs.version }}

.github/workflows/pre-release-langflow.yml

@@ -17,9 +17,12 @@ env:
   POETRY_VERSION: "1.8.2"
 
 jobs:
-  if_release:
+  release:
+    name: Release Langflow
     if: inputs.release_package == true
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.check-version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry
@@ -49,6 +52,18 @@ jobs:
           POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }}
         run: |
           make publish main=true
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist
+          path: dist
+
+  docker_build:
+    name: Build Docker Image
+    runs-on: ubuntu-latest
+    needs: release
+    steps:
+      - uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -65,9 +80,18 @@ jobs:
           push: true
           file: ./build_and_push.Dockerfile
           tags: |
-            logspace/langflow:${{ steps.check-version.outputs.version }}
-            logspace/langflow:1.0-alpha
+            langflowai/langflow:${{ needs.release.outputs.version }}
+            langflowai/langflow:1.0-alpha
 
+  create_release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    needs: [docker_build, release]
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: dist
+          path: dist
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
@@ -76,5 +100,5 @@ jobs:
           draft: false
           generateReleaseNotes: true
           prerelease: true
-          tag: v${{ steps.check-version.outputs.version }}
+          tag: v${{ needs.release.outputs.version }}
           commit: dev

.github/workflows/release.yml

@@ -52,8 +52,8 @@ jobs:
           push: true
           file: ./build_and_push.Dockerfile
           tags: |
-            logspace/langflow:${{ steps.check-version.outputs.version }}
-            logspace/langflow:latest
+            langflowai/langflow:${{ steps.check-version.outputs.version }}
+            langflowai/langflow:latest
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:

.github/workflows/typescript_test.yml

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: [1, 2, 3, 4]
-        shardTotal: [4]
+        shardIndex: [1]
+        shardTotal: [1]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -38,27 +38,6 @@ jobs:
           npm ci
         if: ${{ steps.setup-node.outputs.cache-hit != 'true' }}
 
-      # Attempt to restore the correct Playwright browser binaries based on the
-      # currently installed version of Playwright (The browser binary versions
-      # may change with Playwright versions).
-      # Note: Playwright's cache directory is hard coded because that's what it
-      # says to do in the docs. There doesn't appear to be a command that prints
-      # it out for us.
-      # - uses: actions/cache@v4
-      #   id: playwright-cache
-      #   with:
-      #     path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}
-      #     key: "${{ runner.os }}-playwright-${{ hashFiles('src/frontend/package-lock.json') }}"
-      #     # As a fallback, if the Playwright version has changed, try use the
-      #     # most recently cached version. There's a good chance that at least one
-      #     # of the browser binary versions haven't been updated, so Playwright can
-      #     # skip installing that in the next step.
-      #     # Note: When falling back to an old cache, `cache-hit` (used below)
-      #     # will be `false`. This allows us to restore the potentially out of
-      #     # date cache, but still let Playwright decide if it needs to download
-      #     # new binaries or not.
-      #     restore-keys: |
-      #       ${{ runner.os }}-playwright-
       - name: Cache playwright binaries
         uses: actions/cache@v4
         id: playwright-cache
@@ -82,32 +61,26 @@ jobs:
           npx playwright install-deps
         if: steps.playwright-cache.outputs.cache-hit != 'true'
 
-      # If the Playwright browser binaries weren't able to be restored, we tell
-      # paywright to install everything for us.
-      # - name: Install Playwright's dependencies
-      #   if: steps.playwright-cache.outputs.cache-hit != 'true'
-      #   run: npx playwright install --with-deps
-
-      - name: Install Poetry
-        run: pipx install "poetry==${{ env.POETRY_VERSION }}"
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        id: setup-python
+      - name: Set up Python ${{ env.PYTHON_VERSION }} + Poetry ${{ env.POETRY_VERSION }}
+        uses: "./.github/actions/poetry_caching"
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          cache: "poetry"
-
+          poetry-version: ${{ env.POETRY_VERSION }}
+          cache-key: ${{ runner.os }}-poetry-${{ env.POETRY_VERSION }}-${{ hashFiles('**/poetry.lock') }}
       - name: Install Python dependencies
         run: |
           poetry env use ${{ env.PYTHON_VERSION }}
           poetry install
-        if: ${{ steps.setup-python.outputs.cache-hit != 'true' }}
+
+      - name: create .env
+        run: |
+          touch .env
+          echo "${{ secrets.ENV_VARS }}" > .env
 
       - name: Run Playwright Tests
         run: |
           cd src/frontend
-          npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+          npx playwright test
 
       - name: Upload blob report to GitHub Actions Artifacts
         if: always()

CODE_OF_CONDUCT.md

@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@logspace.ai.
+contact@langflow.org.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within

GCP_DEPLOYMENT.md

@@ -6,7 +6,7 @@ This guide will help you set up a Langflow development VM in a Google Cloud Plat
 
 ## Standard VM
 
-[![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/langflow-ai/langflow&working_dir=scripts&shellonly=true&tutorial=walkthroughtutorial.md)
+[![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/langflow-ai/langflow&working_dir=scripts/gcp&shellonly=true&tutorial=walkthroughtutorial.md)
 
 This script sets up a Debian-based VM with the Langflow package, Nginx, and the necessary configurations to run the Langflow Dev environment.
 
@@ -14,7 +14,7 @@ This script sets up a Debian-based VM with the Langflow package, Nginx, and the
 
 ## Spot/Preemptible Instance
 
-[![Open in Cloud Shell - Spot Instance](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/langflow-ai/langflow&working_dir=scripts&shellonly=true&tutorial=walkthroughtutorial_spot.md)
+[![Open in Cloud Shell - Spot Instance](https://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/langflow-ai/langflow&working_dir=scripts/gcp&shellonly=true&tutorial=walkthroughtutorial_spot.md)
 
 When running as a [spot (preemptible) instance](https://cloud.google.com/compute/docs/instances/preemptible), the code and VM will behave the same way as in a regular instance, executing the startup script to configure the environment, install necessary dependencies, and run the Langflow application. However, **due to the nature of spot instances, the VM may be terminated at any time if Google Cloud needs to reclaim the resources**. This makes spot instances suitable for fault-tolerant, stateless, or interruptible workloads that can handle unexpected terminations and restarts.
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Logspace
+Copyright (c) 2024 Langflow
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

base.Dockerfile

@@ -63,8 +63,10 @@ RUN --mount=type=cache,target=/root/.cache \
 
 # copy project requirement files here to ensure they will be cached.
 WORKDIR $PYSETUP_PATH
+# Copy just one file to avoid rebuilding the whole image
 COPY poetry.lock pyproject.toml ./
-COPY ./src/backend/langflow/main.py ./src/backend/langflow/main.py
+COPY ./src/backend/langflow ./src/backend/langflow
+COPY ./src/backend/base/pyproject.toml ./src/backend/base/pyproject.toml
 # Copy README.md to the build context
 COPY README.md .
 # install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
@@ -84,7 +86,7 @@ COPY --from=builder-base $POETRY_HOME $POETRY_HOME
 COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
 
 # Copy just one file to avoid rebuilding the whole image
-COPY ./src/backend/langflow/__init__.py ./src/backend/langflow/__init__.py
+COPY ./src/backend/langflow ./src/backend/langflow
 # quicker install as runtime deps are already installed
 RUN --mount=type=cache,target=/root/.cache \
     poetry install --with=dev --extras deploy

build_and_push.Dockerfile

@@ -74,10 +74,11 @@ RUN $POETRY_HOME/bin/poetry build
 FROM python-base as final
 
 # Copy virtual environment and built .tar.gz from builder base
+RUN useradd -m -u 1000 user
 COPY --from=builder-base /app/dist/*.tar.gz ./
-
 # Install the package from the .tar.gz
-RUN pip install *.tar.gz
+RUN python -m pip install *.tar.gz --user
 
 WORKDIR /app
-CMD ["python", "-m", "langflow", "run", "--host", "0.0.0.0", "--port", "7860"]
+ENTRYPOINT ["python", "-m", "langflow", "run"]
+CMD ["--host", "0.0.0.0", "--port", "7860"]

build_and_push_base.Dockerfile

@@ -82,10 +82,11 @@ RUN cd src/backend/base && $POETRY_HOME/bin/poetry build --format sdist
 FROM python-base as final
 
 # Copy virtual environment and built .tar.gz from builder base
+RUN useradd -m -u 1000 user
 COPY --from=builder-base /app/src/backend/base/dist/*.tar.gz ./
-
 # Install the package from the .tar.gz
-RUN pip install *.tar.gz
+RUN pip install *.tar.gz --user
 
 WORKDIR /app
-CMD ["python", "-m", "langflow", "run", "--host", "0.0.0.0", "--port", "7860"]
+ENTRYPOINT ["python", "-m", "langflow", "run"]
+CMD ["--host", "0.0.0.0", "--port", "7860"]

container-cmd-cdk.sh

@@ -1,5 +1,5 @@
 export LANGFLOW_DATABASE_URL="mysql+pymysql://${username}:${password}@${host}:3306/${dbname}"
 # echo $LANGFLOW_DATABASE_URL
-uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload --log-level debug
+uvicorn --factory langflow.main:create_app --host 0.0.0.0 --port 7860 --reload --log-level debug --loop asyncio
 
 # python -m langflow run --host 0.0.0.0 --port 7860

deploy/base.Dockerfile

@@ -1,92 +0,0 @@
-
-
-# syntax=docker/dockerfile:1
-# Keep this syntax directive! It's used to enable Docker BuildKit
-
-# Based on https://github.com/python-poetry/poetry/discussions/1879?sort=top#discussioncomment-216865
-# but I try to keep it updated (see history)
-
-################################
-# PYTHON-BASE
-# Sets up all our shared environment variables
-################################
-FROM python:3.10-slim as python-base
-
-# python
-ENV PYTHONUNBUFFERED=1 \
-    # prevents python creating .pyc files
-    PYTHONDONTWRITEBYTECODE=1 \
-    \
-    # pip
-    PIP_DISABLE_PIP_VERSION_CHECK=on \
-    PIP_DEFAULT_TIMEOUT=100 \
-    \
-    # poetry
-    # https://python-poetry.org/docs/configuration/#using-environment-variables
-    POETRY_VERSION=1.8.2 \
-    # make poetry install to this location
-    POETRY_HOME="/opt/poetry" \
-    # make poetry create the virtual environment in the project's root
-    # it gets named `.venv`
-    POETRY_VIRTUALENVS_IN_PROJECT=true \
-    # do not ask any interactive question
-    POETRY_NO_INTERACTION=1 \
-    \
-    # paths
-    # this is where our requirements + virtual environment will live
-    PYSETUP_PATH="/opt/pysetup" \
-    VENV_PATH="/opt/pysetup/.venv"
-
-
-# prepend poetry and venv to path
-ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
-
-
-################################
-# BUILDER-BASE
-# Used to build deps + create our virtual environment
-################################
-FROM python-base as builder-base
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    # deps for installing poetry
-    curl \
-    # deps for building python deps
-    build-essential
-
-# install poetry - respects $POETRY_VERSION & $POETRY_HOME
-# The --mount will mount the buildx cache directory to where
-# Poetry and Pip store their cache so that they can reuse it
-RUN --mount=type=cache,target=/root/.cache \
-    curl -sSL https://install.python-poetry.org | python3 -
-
-# copy project requirement files here to ensure they will be cached.
-WORKDIR $PYSETUP_PATH
-COPY ./poetry.lock ./pyproject.toml ./
-# Copy README.md to the build context
-COPY ./README.md ./
-# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
-RUN --mount=type=cache,target=/root/.cache \
-    poetry install --without dev --extras deploy
-
-
-################################
-# DEVELOPMENT
-# Image used during development / testing
-################################
-FROM python-base as development
-WORKDIR $PYSETUP_PATH
-
-# copy in our built poetry + venv
-COPY --from=builder-base $POETRY_HOME $POETRY_HOME
-COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
-
-# Copy just one file to avoid rebuilding the whole image
-COPY ./src/backend/langflow/__init__.py ./src/backend/langflow/__init__.py
-# quicker install as runtime deps are already installed
-RUN --mount=type=cache,target=/root/.cache \
-    poetry install --with=dev --extras deploy
-
-# copy in our app code
-COPY ./src/backend ./src/backend
-COPY ./tests ./tests

deploy/docker-compose.yml

@@ -69,10 +69,7 @@ services:
         - traefik.http.routers.${STACK_NAME?Variable not set}-proxy-http.middlewares=${STACK_NAME?Variable not set}-www-redirect,${STACK_NAME?Variable not set}-https-redirect
 
   backend: &backend
-    image: "ogabrielluiz/langflow:latest"
-    build:
-      context: ../
-      dockerfile: base.Dockerfile
+    image: "langflowai/langflow:latest"
     depends_on:
       - db
       - broker
@@ -143,9 +140,6 @@ services:
     <<: *backend
     env_file:
       - .env
-    build:
-      context: ../
-      dockerfile: base.Dockerfile
     command: celery -A langflow.worker.celery_app worker --loglevel=INFO --concurrency=1 -n lf-worker@%h -P eventlet
     healthcheck:
       test: "exit 0"
@@ -158,9 +152,6 @@ services:
       - .env
     networks:
       - default
-    build:
-      context: ../
-      dockerfile: base.Dockerfile
     environment:
       - FLOWER_PORT=5555
 

dev.Dockerfile

@@ -15,4 +15,4 @@ COPY ./ ./
 # Install dependencies
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi
 
-CMD ["uvicorn", "--factory", "src.backend.langflow.main:create_app", "--host", "0.0.0.0", "--port", "7860", "--reload", "--log-level", "debug"]
+CMD ["uvicorn", "--factory", "langflow.main:create_app", "--host", "0.0.0.0", "--port", "7860", "--reload", "--log-level", "debug", "--loop", "asyncio"]

docker-compose.debug.yml

@@ -11,7 +11,7 @@ services:
       [
         "sh",
         "-c",
-        "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload",
+        "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn --factory langflow.main:create_app --host 0.0.0.0 --port 7860 --reload --loop asyncio",
       ]
     ports:
       - 7860:7860

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - "7860:7860"
     volumes:
       - ./:/app
-    command: bash -c "uvicorn --factory src.backend.langflow.main:create_app --host 0.0.0.0 --port 7860 --reload"
+    command: bash -c "uvicorn --factory langflow.main:create_app --host 0.0.0.0 --port 7860 --reload --loop asyncio",
     networks:
       - langflow
   frontend:
@@ -23,7 +23,7 @@ services:
       args:
         - BACKEND_URL=http://backend:7860
     depends_on:
-        - backend
+      - backend
     environment:
       - VITE_PROXY_TARGET=http://backend:7860
     ports:

docker_example/Dockerfile

@@ -1,3 +1,3 @@
-FROM logspace/langflow:latest
+FROM langflowai/langflow:latest
 
 CMD ["python", "-m", "langflow", "run", "--host", "0.0.0.0", "--port", "7860"]

docker_example/README.md

@@ -35,7 +35,7 @@ The Docker Compose configuration spins up two services: `langflow` and `postgres
 
 ### LangFlow Service
 
-The `langflow` service uses the `logspace/langflow:latest` Docker image and exposes port 7860. It depends on the `postgres` service.
+The `langflow` service uses the `langflowai/langflow:latest` Docker image and exposes port 7860. It depends on the `postgres` service.
 
 Environment variables:
 
@@ -62,4 +62,4 @@ Volumes:
 
 ## Switching to a Specific LangFlow Version
 
-If you want to use a specific version of LangFlow, you can modify the `image` field under the `langflow` service in the Docker Compose file. For example, to use version 1.0-alpha, change `logspace/langflow:latest` to `logspace/langflow:1.0-alpha`.
+If you want to use a specific version of LangFlow, you can modify the `image` field under the `langflow` service in the Docker Compose file. For example, to use version 1.0-alpha, change `langflowai/langflow:latest` to `langflowai/langflow:1.0-alpha`.

docker_example/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   langflow:
-    image: logspace/langflow:latest
+    image: langflowai/langflow:latest
     ports:
       - "7860:7860"
     depends_on: