Version 1.0.2

.github/workflows/upload-pypi-core.yml

@@ -35,11 +35,33 @@ jobs:
       - name: Build and publish to PyPI
         working-directory: ./libs/core
         run: |
+          CURRENT_VERSION=$(poetry version --short)
+          FINAL_VERSION=$(echo "$CURRENT_VERSION" | sed -E 's/[a-zA-Z]+[0-9]*//')
+
+          echo "Checking for llmstudio-core==$FINAL_VERSION on PyPI..."
+          if python -m pip install llmstudio-core==$FINAL_VERSION --dry-run >/dev/null 2>&1; then
+            echo "Package llmstudio-core==$FINAL_VERSION is already available on PyPI. Please bump version."
+            exit 1
+          fi
+          done
+
+          poetry version "$FINAL_VERSION"
+          echo "Updated version: $(poetry version --short)"
+
           poetry build
           poetry publish
 
+      - name: Commit and push updated pyproject.toml
+        working-directory: ./libs/core
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git add pyproject.toml
+          git commit -m "[fix] bump release version in pyproject.toml"
+          git push
+
       # Extract the new version number from pyproject.toml
-      - name: Extract version for tagging Docker image
+      - name: Extract version.
         working-directory: ./libs/core
         run: |
           echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV

.github/workflows/upload-pypi-dev.yml

@@ -8,10 +8,10 @@ on:
         type: choice
         description: "Choose the library to deploy (note: it points to develop branch only)"
         options: 
-          - llmstudio
-          - llmstudio-core
-          - llmstudio-proxy
-          - llmstudio-tracker
+          - ./libs/llmstudio
+          - ./libs/core
+          - ./libs/proxy
+          - ./libs/tracker
       target_version:
         description: "Target version (e.g., 1.1.0)"
         required: true
@@ -20,14 +20,6 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    env:
-      MODULE_PATH: |
-        ${{ 
-          inputs.library == 'llmstudio' && './libs/llmstudio' ||
-          inputs.library == 'llmstudio-core' && './libs/core' ||
-          inputs.library == 'llmstudio-proxy' && './libs/proxy' ||
-          inputs.library == 'llmstudio-tracker' && './libs/tracker'
-        }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -47,49 +39,38 @@ jobs:
         run: poetry config pypi-token.pypi ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Check PyPI for Target Version
-        working-directory: ${{ env.MODULE_PATH }}
+        working-directory: ${{ inputs.library }}
         id: check-version
         run: |
           TARGET_VERSION="${{ github.event.inputs.target_version }}"
-          PACKAGE_NAME=${{ inputs.library }}
+          PACKAGE_NAME=$(poetry version | awk '{print $1}')
           RESPONSE=$(curl -s "https://pypi.org/pypi/$PACKAGE_NAME/json" || echo "{}")
           echo "$RESPONSE" | jq -r '.releases | keys[]' > all_versions.txt
-          if grep -qx "$TARGET_VERSION" all_versions.txt; then
-            echo "exists=true" >> $GITHUB_ENV
-          else
-            echo "exists=false" >> $GITHUB_ENV
-          fi
 
-      # Step 4: Decide on the next alpha version
-      - name: Determine Next Alpha Version
-        id: determine-version
-        run: |
-          if [[ "${{ env.exists }}" == "true" ]]; then
+          if grep -qx "$TARGET_VERSION" all_versions.txt; then
             echo "Error: Version ${{ github.event.inputs.target_version }} already exists on PyPI."
             exit 1
           fi
-          BASE_VERSION="${{ github.event.inputs.target_version }}"
-          PACKAGE_NAME=${{ inputs.library }}
-          ALPHA_VERSIONS=$(grep -E "^$BASE_VERSIONa[0-9]+$" all_versions.txt | sort -V || true)
-          if [[ -z "$ALPHA_VERSIONS" ]]; then
-            NEW_VERSION="${BASE_VERSION}a0"
+
+          NEXT_ALPHA=$(grep "^${TARGET_VERSION}a[0-9]*$" all_versions.txt | sort -V | tail -n 1 | awk -F'a' '{print $2}')
+
+          if [[ -z "$NEXT_ALPHA" ]]; then
+            NEW_VERSION="${TARGET_VERSION}a0"
           else
-            LATEST_ALPHA=$(echo "$ALPHA_VERSIONS" | tail -n 1)
-            NEXT_ALPHA_NUM=$(( $(echo "$LATEST_ALPHA" | grep -oE '[0-9]+$') + 1 ))
-            NEW_VERSION="${BASE_VERSION}a${NEXT_ALPHA_NUM}"
+            NEW_VERSION="${TARGET_VERSION}a$((NEXT_ALPHA + 1))"
           fi
           echo "new_version=$NEW_VERSION" >> $GITHUB_ENV
           echo "Determined new version: $NEW_VERSION"
 
       - name: Build and publish to PyPI as development release
-        working-directory: ${{ env.MODULE_PATH }}
+        working-directory: ${{ inputs.library }}
         run: |
           poetry version ${{ env.new_version }}
           poetry build
           poetry publish
 
       - name: Commit and push updated pyproject.toml
-        working-directory: ${{ env.MODULE_PATH }}
+        working-directory: ${{ inputs.library }}
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
@@ -98,43 +79,21 @@ jobs:
           git push
 
       - name: Wait for PyPI to update
-        working-directory: ${{ env.MODULE_PATH }}
+        working-directory: ${{ inputs.library }}
         run: |
           VERSION=$(poetry version --short)
-          echo "Checking for ${{ github.event.inputs.library }}==$VERSION on PyPI..."
+          PACKAGE_NAME=$(poetry version | awk '{print $1}')
+          echo "Checking for $PACKAGE_NAME==$VERSION on PyPI..."
           for i in {1..10}; do
-            if python -m pip install ${{ github.event.inputs.library }}==${VERSION} --dry-run >/dev/null 2>&1; then
-              echo "Package ${{ github.event.inputs.library }}==${VERSION} is available on PyPI."
+            if python -m pip install $PACKAGE_NAME==${VERSION} --dry-run >/dev/null 2>&1; then
+              echo "Package $PACKAGE_NAME==${VERSION} is available on PyPI."
               break
             else
-              echo "Package ${{ github.event.inputs.library }}==${VERSION} not available yet. Waiting 15 seconds..."
+              echo "Package $PACKAGE_NAME==${VERSION} not available yet. Waiting 15 seconds..."
               sleep 15
             fi
             if [ $i -eq 10 ]; then
               echo "Package did not become available in time."
               exit 1
             fi
           done
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract version for tagging Docker image
-        working-directory: ${{ env.MODULE_PATH }}
-        id: get_version
-        run: echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
-
-      - name: Build Docker images
-        working-directory: ./deploy
-        run: |
-          make version=${{ env.VERSION }} build-${{ github.event.inputs.library }}
-
-      - name: Push Docker images
-        run: |
-          docker push tensoropsai/${{ github.event.inputs.library }}:${{ env.VERSION }}

.github/workflows/upload-pypi-proxy.yml

@@ -35,14 +35,35 @@ jobs:
       - name: Build and publish to PyPI
         working-directory: ./libs/proxy
         run: |
+          CURRENT_VERSION=$(poetry version --short)
+          FINAL_VERSION=$(echo "$CURRENT_VERSION" | sed -E 's/[a-zA-Z]+[0-9]*//')
+
+          echo "Checking for llmstudio-proxy==$FINAL_VERSION on PyPI..."
+          if python -m pip install llmstudio-proxy==$FINAL_VERSION --dry-run >/dev/null 2>&1; then
+            echo "Package llmstudio-proxy==$FINAL_VERSION is already available on PyPI. Please bump version."
+            exit 1
+          fi
+          done
+
+          poetry version "$FINAL_VERSION"
+          echo "Updated version: $(poetry version --short)"
+
           poetry build
           poetry publish
 
-      # Extract the new version number from pyproject.toml
-      - name: Extract version for tagging Docker image
+      - name: Commit and push updated pyproject.toml
         working-directory: ./libs/proxy
         run: |
-          echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git add pyproject.toml
+          git commit -m "[fix] bump release version in pyproject.toml"
+          git push
+
+      - name: Extract version for tagging Docker image
+        working-directory: ./libs/proxy
+        id: get_version
+        run: echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
 
       # Wait for the package to become available on PyPI
       - name: Wait for PyPI to update
@@ -71,11 +92,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Extract version for tagging Docker image
-        working-directory: ./libs/proxy
-        id: get_version
-        run: echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
-
       - name: Build Docker images
         working-directory: ./deploy
         run: |

.github/workflows/upload-pypi-sdk.yml

@@ -35,14 +35,30 @@ jobs:
       - name: Build and publish to PyPI
         working-directory: ./libs/llmstudio
         run: |
+          CURRENT_VERSION=$(poetry version --short)
+          FINAL_VERSION=$(echo "$CURRENT_VERSION" | sed -E 's/[a-zA-Z]+[0-9]*//')
+
+          echo "Checking for llmstudio==$FINAL_VERSION on PyPI..."
+          if python -m pip install llmstudio==$FINAL_VERSION --dry-run >/dev/null 2>&1; then
+            echo "Package llmstudio==$FINAL_VERSION is already available on PyPI. Please bump version."
+            exit 1
+          fi
+          done
+
+          poetry version "$FINAL_VERSION"
+          echo "Updated version: $(poetry version --short)"
+
           poetry build
           poetry publish
 
-      # Extract the new version number from pyproject.toml
-      - name: Extract version for tagging Docker image
+      - name: Commit and push updated pyproject.toml
         working-directory: ./libs/llmstudio
         run: |
-          echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git add pyproject.toml
+          git commit -m "[fix] bump release version in pyproject.toml"
+          git push
 
       # Wait for the package to become available on PyPI
       - name: Wait for PyPI to update

.github/workflows/upload-pypi-tracker.yml

@@ -35,14 +35,35 @@ jobs:
       - name: Build and publish to PyPI
         working-directory: ./libs/tracker
         run: |
+          CURRENT_VERSION=$(poetry version --short)
+          FINAL_VERSION=$(echo "$CURRENT_VERSION" | sed -E 's/[a-zA-Z]+[0-9]*//')
+
+          echo "Checking for llmstudio-tracker==$FINAL_VERSION on PyPI..."
+          if python -m pip install llmstudio-tracker==$FINAL_VERSION --dry-run >/dev/null 2>&1; then
+            echo "Package llmstudio-tracker==$FINAL_VERSION is already available on PyPI. Please bump version."
+            exit 1
+          fi
+          done
+
+          poetry version "$FINAL_VERSION"
+          echo "Updated version: $(poetry version --short)"
+
           poetry build
           poetry publish
 
-      # Extract the new version number from pyproject.toml
-      - name: Extract version for tagging Docker image
+      - name: Commit and push updated pyproject.toml
         working-directory: ./libs/tracker
         run: |
-          echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git add pyproject.toml
+          git commit -m "[fix] bump release version in pyproject.toml"
+          git push
+
+      - name: Extract version for tagging Docker image
+        working-directory: ./libs/tracker
+        id: get_version
+        run: echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
 
       # Wait for the package to become available on PyPI
       - name: Wait for PyPI to update
@@ -71,11 +92,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Extract version for tagging Docker image
-        working-directory: ./libs/tracker
-        id: get_version
-        run: echo "VERSION=$(poetry version --short)" >> $GITHUB_ENV
-
       - name: Build Docker images
         working-directory: ./deploy
         run: |