From 75fa498cac7662e8f4a954a277477940141921c9 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Mon, 24 Jun 2024 17:07:35 -0300 Subject: [PATCH] chore: Update package versions in pyproject.toml files --- .github/workflows/release.yml | 136 +++++++++++++++++++++----------- pyproject.toml | 2 +- src/backend/base/pyproject.toml | 2 +- 3 files changed, 94 insertions(+), 46 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a764c6cae..d5e599f68 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,6 @@ name: Langflow Release run-name: Langflow (${{inputs.release_type}}) Release by @${{ github.actor }} + on: workflow_dispatch: inputs: @@ -8,25 +9,23 @@ on: required: true type: boolean default: false - release_type: - description: "Type of release (base or main)" - required: true - type: choice - options: - - base - - main pre_release: description: "Pre-release" required: false type: boolean default: true + branch: + description: "Branch to release from" + required: true + type: string + default: "main" env: POETRY_VERSION: "1.8.2" jobs: - release: - name: Release Langflow + release-base: + name: Release Langflow Base if: inputs.release_package == true runs-on: ubuntu-latest outputs: @@ -47,13 +46,8 @@ jobs: - name: Check Version id: check-version run: | - if [ "${{ inputs.release_type }}" == "base" ]; then - version=$(cd src/backend/base && poetry version --short) - last_released_version=$(curl -s "https://pypi.org/pypi/langflow-base/json" | jq -r '.releases | keys | .[]' | sort -V | tail -n 1) - else - version=$(poetry version --short) - last_released_version=$(curl -s "https://pypi.org/pypi/langflow/json" | jq -r '.releases | keys | .[]' | sort -V | tail -n 1) - fi + version=$(cd src/backend/base && poetry version --short) + last_released_version=$(curl -s "https://pypi.org/pypi/langflow-base/json" | jq -r '.releases | keys | .[]' | sort -V | tail -n 1) if [ "$version" = "$last_released_version" ]; then echo "Version $version is already released. Skipping release." exit 1 @@ -61,19 +55,10 @@ jobs: echo version=$version >> $GITHUB_OUTPUT fi - name: Build project for distribution - run: | - if [ "${{ inputs.release_type }}" == "base" ]; then - make build base=true - else - make build main=true - fi + run: make build base=true - name: Test CLI run: | - if [ "${{ inputs.release_type }}" == "base" ]; then - python -m pip install src/backend/base/dist/*.whl - else - python -m pip install dist/*.whl - fi + python -m pip install src/backend/base/dist/*.whl python -m langflow run --host 127.0.0.1 --port 7860 & SERVER_PID=$! # Wait for the server to start @@ -91,37 +76,100 @@ jobs: - name: Publish to PyPI env: POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }} - run: | - if [ "${{ inputs.release_type }}" == "base" ]; then - make publish base=true - else - make publish main=true - fi + run: make publish base=true - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: dist${{ inputs.release_type }} - path: ${{ inputs.release_type == 'base' && 'src/backend/base/dist' || 'dist' }} + name: dist-base + path: src/backend/base/dist + + release-main: + name: Release Langflow Main + if: inputs.release_package == true + needs: release-base + runs-on: ubuntu-latest + outputs: + version: ${{ steps.check-version.outputs.version }} + steps: + - uses: actions/checkout@v4 + - name: Install poetry + run: pipx install poetry==${{ env.POETRY_VERSION }} + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + cache: "poetry" + - name: Set up Nodejs 20 + uses: actions/setup-node@v4 + with: + node-version: "20" + - name: Check Version + id: check-version + run: | + version=$(poetry version --short) + last_released_version=$(curl -s "https://pypi.org/pypi/langflow/json" | jq -r '.releases | keys | .[]' | sort -V | tail -n 1) + if [ "$version" = "$last_released_version" ]; then + echo "Version $version is already released. Skipping release." + exit 1 + else + echo version=$version >> $GITHUB_OUTPUT + fi + - name: Wait for PyPI Propagation + run: sleep 300 # wait for 5 minutes to ensure PyPI propagation + - name: Build project for distribution + run: make build main=true + - name: Test CLI + run: | + python -m pip install dist/*.whl + python -m langflow run --host 127.0.0.1 --port 7860 & + SERVER_PID=$! + # Wait for the server to start + timeout 120 bash -c 'until curl -f http://127.0.0.1:7860/health; do sleep 2; done' || (echo "Server did not start in time" && kill $SERVER_PID && exit 1) + # Terminate the server + kill $SERVER_PID || (echo "Failed to terminate the server" && exit 1) + sleep 10 # give the server some time to terminate + # Check if the server is still running + if kill -0 $SERVER_PID 2>/dev/null; then + echo "Failed to terminate the server" + exit 1 + else + echo "Server terminated successfully" + fi + - name: Publish to PyPI + env: + POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }} + run: make publish main=true + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: dist-main + path: dist call_docker_build: name: Call Docker Build Workflow - needs: release + needs: [release-base, release-main] uses: langflow-ai/langflow/.github/workflows/docker-build.yml@main + strategy: + matrix: + release_type: + - base + - main with: - version: ${{ needs.release.outputs.version }} - release_type: ${{ inputs.release_type }} + # version should be needs.release-base.outputs.version if release_type is base + # version should be needs.release-main.outputs.version if release_type is main + version: ${{ matrix.release_type == 'base' && needs.release-base.outputs.version || matrix.release_type == 'main' && needs.release-main.outputs.version }} + release_type: ${{ matrix.release_type }} pre_release: ${{ inputs.pre_release }} secrets: inherit create_release: name: Create Release runs-on: ubuntu-latest - needs: [release] - if: ${{ inputs.release_type == 'main' }} + needs: release-main steps: - uses: actions/download-artifact@v4 with: - name: dist${{ inputs.release_type }} + name: dist-main path: dist - name: Create Release uses: ncipollo/release-action@v1 @@ -130,6 +178,6 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} draft: false generateReleaseNotes: true - prerelease: false - tag: v${{ needs.release.outputs.version }} - commit: dev + prerelease: ${{ inputs.pre_release }} + tag: v${{ needs.release-main.outputs.version }} + commit: ${{ inputs.branch }} \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 9fd1d3e04..5fc120287 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow" -version = "1.0.1" +version = "1.0.2" description = "A Python package with a built-in web application" authors = ["Langflow "] maintainers = [ diff --git a/src/backend/base/pyproject.toml b/src/backend/base/pyproject.toml index 232bdd0aa..102097591 100644 --- a/src/backend/base/pyproject.toml +++ b/src/backend/base/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "langflow-base" -version = "0.0.77" +version = "0.0.78" description = "A Python package with a built-in web application" authors = ["Langflow "] maintainers = [