build: Fix pypi publish CU-869a1x4fh (#72)

* build(medcat-trainer): Fix pypi publish paths for medcat-trainer client

* build: Fix pypi publish for medcat now that the secrets are added

Author: alhendrickson

.github/workflows/medcat-trainer_qa.yml

@@ -48,7 +48,7 @@ jobs:
         with:
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
-          packages-dir: medcat-trainer/dist
+          packages_dir: medcat-trainer/client/dist
 
   # Build and test webapp container
   build-and-push:
@@ -75,7 +75,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Push to DockerHub
         run: |

.github/workflows/medcat-trainer_release.yml

@@ -20,7 +20,8 @@ jobs:
           ref: "main"
 
       - name: Release Tag
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+        # If GITHUB_REF=refs/tags/medcat-trainer/v0.1.2, this returns v0.1.2. Note it's including the "v" though it probably shouldnt
+        run: echo "RELEASE_VERSION=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -51,8 +52,9 @@ jobs:
         if: startsWith(github.ref, 'refs/tags') && ! github.event.release.prerelease
         uses: pypa/[email protected]
         with:
+          # TODO CU-869a25n7e Use Trusted Platform Publisher based PyPI release
           password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: medcat-trainer/dist
+          packages_dir: medcat-trainer/client/dist
 
   # Build and test webapp container
   build-and-push:
@@ -83,7 +85,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Push to DockerHub
         env:

.github/workflows/medcat-v1_main.yml

@@ -74,13 +74,11 @@ jobs:
           python tests/check_deprecations.py "$VERSION" --next-version --remove-prefix
 
   publish-to-test-pypi:
-    # Disable pypy publish waiting for TEST_PYPI_API_TOKEN
     if: |
       github.repository == 'CogStack/cogstack-nlp' &&
       github.ref == 'refs/heads/main' &&
       github.event_name == 'push' &&
-      startsWith(github.ref, 'refs/tags') != true &&
-      false 
+      startsWith(github.ref, 'refs/tags') != true
     runs-on: ubuntu-24.04
     timeout-minutes: 45
     concurrency: publish-to-test-pypi

.github/workflows/medcat-v1_production.yml

@@ -1,6 +1,5 @@
 # TODO: Fix Medcat V1 Release Actions
 # Disabled waiting for designed release process
-# Disabled waiting for PYPI_API_TOKEN
 name: medcat-v1 - production
 
 on:
@@ -18,8 +17,7 @@ jobs:
     runs-on: ubuntu-24.04
     concurrency: build-n-publish-to-pypi
     if: | 
-     github.repository == 'CogStack/cogstack-nlp' &&
-     false   
+     github.repository == 'CogStack/cogstack-nlp'
 
     steps:
       - name: Checkout production
@@ -65,4 +63,5 @@ jobs:
         if: startsWith(github.ref, 'refs/tags') && ! github.event.release.prerelease
         uses: pypa/[email protected]
         with:
+          # TODO CU-869a25n7e Use Trusted Platform Publisher based PyPI release
           password: ${{ secrets.PYPI_API_TOKEN }}