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

.github/workflows/release.yml

@@ -14,9 +14,7 @@ env:
 
 jobs:
  if_release:
- if: |
- ${{ github.event.pull_request.merged == true }}
- && ${{ contains(github.event.pull_request.labels.*.name, 'Release') }}
+ if: ${{ (github.event.pull_request.merged == true) && contains(github.event.pull_request.labels.*.name, 'Release') }}
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v3

.vscode/launch.json

@@ -1,4 +1,5 @@
 {
+ "version": "0.2.0",
  "configurations": [
  {
  "name": "Debug Backend",
@@ -38,6 +39,15 @@
  "request": "launch",
  "url": "http:https://localhost:3000/",
  "webRoot": "${workspaceRoot}/src/frontend"
+ },
+ {
+ "name": "Python: Debug Tests",
+ "type": "python",
+ "request": "launch",
+ "program": "${file}",
+ "purpose": ["debug-test"],
+ "console": "integratedTerminal",
+ "justMyCode": false
  }
  ]
 }

CONTRIBUTING.md

@@ -7,6 +7,11 @@ to contributions, whether it be in the form of a new feature, improved infra, or
 To contribute to this project, please follow a ["fork and pull request"](https://docs.github.com/en/get-started/quickstart/contributing-to-projects) workflow.
 Please do not try to push directly to this repo unless you are a maintainer.
 
+The branch structure is as follows:
+
+- `main`: The stable version of Langflow
+- `dev`: The development version of Langflow. This branch is used to test new features before they are merged into `main` and, as such, may be unstable.
+
 ## 🗺️Contributing Guidelines
 
 ## 🚩GitHub Issues

README.md

@@ -33,7 +33,7 @@
  - [HuggingFace Spaces](#huggingface-spaces)
 - [🖥️ Command Line Interface (CLI)](#️-command-line-interface-cli)
  - [Usage](#usage)
- - [Environment Variables](#environment-variables)
+  - [Environment Variables](#environment-variables)
 - [Deployment](#deployment)
  - [Deploy Langflow on Google Cloud Platform](#deploy-langflow-on-google-cloud-platform)
  - [Deploy Langflow on Jina AI Cloud](#deploy-langflow-on-jina-ai-cloud)
@@ -112,7 +112,6 @@ Each option is detailed below:
 - `--cache`: Selects the type of cache to use. Options are `InMemoryCache` and `SQLiteCache`. Can be set using the `LANGFLOW_LANGCHAIN_CACHE` environment variable. The default is `SQLiteCache`.
 - `--jcloud/--no-jcloud`: Toggles the option to deploy on Jina AI Cloud. The default is `no-jcloud`.
 - `--dev/--no-dev`: Toggles the development mode. The default is `no-dev`.
-- `--database-url`: Sets the database URL to connect to. If not provided, a local SQLite database will be used. Can be set using the `LANGFLOW_DATABASE_URL` environment variable.
 - `--path`: Specifies the path to the frontend directory containing build files. This option is for development purposes only. Can be set using the `LANGFLOW_FRONTEND_PATH` environment variable.
 - `--open-browser/--no-open-browser`: Toggles the option to open the browser after starting the server. Can be set using the `LANGFLOW_OPEN_BROWSER` environment variable. The default is `open-browser`.
 - `--remove-api-keys/--no-remove-api-keys`: Toggles the option to remove API keys from the projects saved in the database. Can be set using the `LANGFLOW_REMOVE_API_KEYS` environment variable. The default is `no-remove-api-keys`.
@@ -276,6 +275,8 @@ flow("Hey, have you heard of Langflow?")
 
 We welcome contributions from developers of all levels to our open-source project on GitHub. If you'd like to contribute, please check our [contributing guidelines](./CONTRIBUTING.md) and help make Langflow more accessible.
 
+---
+
 Join our [Discord](https://discord.com/invite/EqksyE2EX9) server to ask questions, make suggestions and showcase your projects! 🦾
 
 <p>

dev.Dockerfile

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

docker-compose.debug.yml

@@ -1,4 +1,4 @@
-version: '3.4'
+version: "3.4"
 
 services:
  backend:
@@ -7,7 +7,12 @@ services:
  build:
  context: ./
  dockerfile: ./dev.Dockerfile
- command: ["sh", "-c", "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn langflow.main:app --host 0.0.0.0 --port 7860 --reload"]
+ command:
+ [
+ "sh",
+ "-c",
+ "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",
+ ]
  ports:
  - 7860:7860
  - 5678:5678
@@ -22,7 +27,7 @@ services:
  ports:
  - "3000:3000"
  volumes:
- - ./src/frontend/public:/home/node/app/public
- - ./src/frontend/src:/home/node/app/src
- - ./src/frontend/package.json:/home/node/app/package.json
- restart: on-failure
+  - ./src/frontend/public:/home/node/app/public
+  - ./src/frontend/src:/home/node/app/src
+  - ./src/frontend/package.json:/home/node/app/package.json
+ restart: on-failure

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 
 services:
  backend:
@@ -9,7 +9,7 @@ services:
  - "7860:7860"
  volumes:
  - ./:/app
- command: bash -c "uvicorn langflow.main: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"
 
  frontend:
  build:
@@ -22,7 +22,7 @@ services:
  ports:
  - "3000:3000"
  volumes:
- - ./src/frontend/public:/home/node/app/public
- - ./src/frontend/src:/home/node/app/src
- - ./src/frontend/package.json:/home/node/app/package.json
- restart: on-failure
+  - ./src/frontend/public:/home/node/app/public
+  - ./src/frontend/src:/home/node/app/src
+  - ./src/frontend/package.json:/home/node/app/package.json
+ restart: on-failure

docker_example/docker-compose.yml

@@ -6,5 +6,5 @@ services:
  context: .
  dockerfile: Dockerfile
  ports:
- - "5003:5003"
+ - "7860:7860"
  command: langflow --host 0.0.0.0

docs/docs/guidelines/custom-component.mdx

@@ -385,17 +385,17 @@ Your structure should look something like this:
 
 ### Loading Custom Components
 
-You can specify the path to your custom components using the _`--components-path`_ argument when running the Langflow CLI, as shown below:
+The recommended way to load custom components is to set the _`LANGFLOW_COMPONENTS_PATH`_ environment variable to the path of your custom components directory. Then, run the Langflow CLI as usual.
 
 ```bash
-langflow --components-path /path/to/components
+export LANGFLOW_COMPONENTS_PATH=/path/to/components
+langflow
 ```
 
-Alternatively, you can set the `LANGFLOW_COMPONENTS_PATH` environment variable:
+Alternatively, you can specify the path to your custom components using the _`--components-path`_ argument when running the Langflow CLI, as shown below:
 
 ```bash
-export LANGFLOW_COMPONENTS_PATH=/path/to/components
-langflow
+langflow --components-path /path/to/components
 ```
 
 Langflow will attempt to load all of the components found in the specified directory. If a component fails to load due to errors in the component's code, Langflow will print an error message to the console but will continue loading the rest of the components.

docs/docs/guides/loading_document.mdx

@@ -43,7 +43,7 @@ This guide takes you through the process of augmenting the "Basic Chat with Prom
 
 8. Connect this loader to the `{context}` variable that we just added.
 
-9. In the "Web Page" field, enter "https://langflow.org/how-upload-examples".
+9. In the "Web Page" field, enter "https://docs.langflow.org/how-upload-examples".
 
 10. Now, click on "ConversationBufferMemory".
 

docs/static/CNAME

@@ -1 +1 @@
-langflow.org
+docs.langflow.org