client: Extend Python version support

Extend support to Python versions 3.10, 3.11, 3.12, and 3.13, updating
pyproject.toml and poetry.lock accordingly. Split the Python tests CI
action to run the client tests separately on all supported Python
versions and update the publish-client workflow to rely on the new job.
Extending Python version support allows for broader compatibility and
is an easy win given the minimal client dependencies.
Remove automated PyPI publishing for now.

Signed-off-by: Phoevos Kalemkeris <[email protected]>

Author: phoevos

.github/workflows/client-ci.yaml

@@ -0,0 +1,41 @@
+name: Client Python tests
+
+on:
+  push:
+    branches:
+    - main
+    tags:
+    - "v*.*.*"
+    paths:
+    - "client/**"
+  pull_request:
+    paths:
+    - "client/**"
+
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install Poetry
+      run: |
+        curl -sSL https://install.python-poetry.org | python3 -
+
+    - name: Install dependencies
+      run: |
+        poetry install -P client --with dev
+
+    - name: Run client tests
+      run: |
+        poetry run -P client pytest tests/unit/client

.github/workflows/ci.yaml renamed to .github/workflows/cmg-ci.yaml

@@ -1,4 +1,4 @@
-name: Python tests
+name: Gateway Python tests
 
 on:
   push:
@@ -27,13 +27,11 @@ jobs:
 
     - name: Install dependencies
       run: |
-        eval $(poetry env activate)
         poetry install --with dev
-        poetry install -P client
 
     - name: Run unit tests
       run: |
-        poetry run pytest tests/unit
+        poetry run pytest tests/unit --ignore=tests/unit/client
 
   integration:
     runs-on: ubuntu-latest

.github/workflows/publish-client.yml

@@ -3,26 +3,31 @@ name: Publish Python Client to PyPI
 on:
   workflow_run:
     workflows:
-      - "Python tests"
+      - "Client Python tests"
     types:
       - completed
-    paths:
-      - "client/**"
   workflow_dispatch:
 
 jobs:
   build-and-publish:
     runs-on: ubuntu-latest
     if: |
       github.event_name == 'workflow_dispatch' ||
-      github.event.workflow_run.conclusion == 'success'
+      (github.event_name == 'workflow_run' &&
+       github.event.workflow_run.conclusion == 'success' &&
+       startsWith(github.event.workflow_run.head_branch, 'v') &&
+       contains(github.event.workflow_run.head_branch, '.'))
     defaults:
       run:
         working-directory: client
+
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Build and publish to pypi
         uses: JRubics/[email protected]
         with:
           pypi_token: ${{ secrets.PYPI_API_TOKEN }}
+          plugins: "poetry-dynamic-versioning[plugin]"

.gitignore

@@ -95,6 +95,7 @@ ipython_config.py
 #Pipfile.lock
 
 # poetry
+.poetry/
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
 #   commonly ignored for libraries.

.pre-commit-config.yaml

@@ -27,3 +27,12 @@ repos:
     -   id: poetry-check
     -   id: poetry-lock
     -   id: poetry-install
+-   repo: https://github.com/python-poetry/poetry
+    rev: 2.1.3
+    hooks:
+    -   id: poetry-check
+        args: ["-P", "client"]
+    -   id: poetry-lock
+        args: ["-P", "client"]
+    -   id: poetry-install
+        args: ["-P", "client"]

CONTRIBUTING.md

@@ -29,7 +29,7 @@ getting you started.
     ```shell
     poetry install --with dev --with migrations
     # explicitly install the CogStackModel Gateway client for development
-    poetry install -P client
+    poetry install -P client --with dev
     ```
 
 ## Pre-commit Hooks

client/cogstack_model_gateway_client/client.py

@@ -140,7 +140,8 @@ async def get_task_result(self, task_uuid: str, parse: bool = True):
             pass
 
         try:
-            if jsonl := [json.loads(line) for line in result_str.split("\n") if line]:
+            jsonl = [json.loads(line) for line in result_str.split("\n") if line]
+            if jsonl:
                 return jsonl
         except Exception:
             pass
@@ -155,7 +156,8 @@ async def wait_for_task(
         start = asyncio.get_event_loop().time()
         while True:
             task = await self.get_task(task_uuid, detail=detail)
-            if (status := task.get("status")) in ("succeeded", "failed"):
+            status = task.get("status")
+            if status in ("succeeded", "failed"):
                 if status == "failed" and raise_on_error:
                     error_message = task.get("error_message", "Unknown error")
                     raise RuntimeError(f"Task '{task_uuid}' failed: {error_message}")