Update Python version to 3.12 (#270)

dbutenhof · web-flow · commit f35ffc84c644 · 2025-09-24T07:25:48.000-04:00
This commit updates the CPT Dashboard Python version from 3.9 to 3.12. This required switching from the old
&amp; crufty Elasticsearch compatible client to the more modern OpenSearch client. While it's plug-in compatible, the
older (v7 Elasticsearch / v1 OpenSearch) compatible Elasticsearch client required ancient versions of `pandas`
and `numpy` which aren't compatible with Python 3.12.

I upgraded the backend base container image from CentOS 9 to CentOS 10 as this comes with Python 3.12 as
the default -- however this required locking the `six` package (an indirect dependency) as we're now getting an
older `six` RPM package that `poetry` isn't able to replace with the latest. Furthermore, a "poetry update"
reveals a (known/reported) problem in `poetry`, which updates to a version of `virtualenv` that poetry itself
can't use.

There are more places to change the Python version than I'd like, but given the restrictions on GitHub repo
variables for actions on pull requests, I decided not to play with centralizing the version in one place. (This
was done some time ago for ARCA, which could serve as a template for some later cleanup.)

For some reason, the upgrade broke the ilab functional tests, because date range filtering wasn't working
the same. This is weird ... but there was a bug in an array slice that apparently didn't affect the behavior
before but now does. I added more strict checking as part of debugging, and left it.

There are several one-line miscellaneous fixes tossed in here for convenience:

1. I've noticed that the `e2e` front end tests fail when run locally because the container is unable to write to
the mounted `coverage` directory. I fixed that with a `:Z` label on the mount.
2. I ported a small tweak to the ArgoCD Applications from my RH CA (which is still in draft), hoping to fix
the automatic app update on merge.
diff --git a/.github/workflows/backend-check.yaml b/.github/workflows/backend-check.yaml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9.20"]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9.20"]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9.20"]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml
@@ -16,7 +16,7 @@ jobs:
         fetch-depth: 10
     - uses: actions/setup-python@v4
       with:
-        python-version: "3.9"
+        python-version: "3.12"
     - uses: Gr1N/setup-poetry@v9
     - name: Install dependencies
       run: |
diff --git a/.github/workflows/frontend-check.yaml b/.github/workflows/frontend-check.yaml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.12"
       - uses: Gr1N/setup-poetry@v9
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/poetry-check.yaml b/.github/workflows/poetry-check.yaml
@@ -11,7 +11,7 @@ jobs:
         - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
-            python-version: "3.9"
+            python-version: "3.12"
         - uses: Gr1N/setup-poetry@v9
         - name: verify poetry instalation
           run: poetry --version
diff --git a/.github/workflows/release-build-push.yaml b/.github/workflows/release-build-push.yaml
@@ -17,7 +17,7 @@ jobs:
         fetch-depth: 10
     - uses: actions/setup-python@v4
       with:
-        python-version: "3.9"
+        python-version: "3.12"
     - uses: Gr1N/setup-poetry@v9
     - name: Install dependencies
       run: |
diff --git a/argocd/templates/dashboard-dev.yaml b/argocd/templates/dashboard-dev.yaml
@@ -32,6 +32,7 @@ spec:
       labels:
         argocd.argoproj.io/managed-by: openshift-gitops
     automated:
+      enabled: true
       prune: true
       selfHeal: true
     syncOptions:
diff --git a/argocd/templates/dashboard.yaml b/argocd/templates/dashboard.yaml
@@ -32,6 +32,7 @@ spec:
       labels:
         argocd.argoproj.io/managed-by: openshift-gitops
     automated:
+      enabled: true
       prune: true
       selfHeal: true
     syncOptions:
diff --git a/backend/app/services/crucible_svc.py b/backend/app/services/crucible_svc.py
@@ -20,8 +20,8 @@
 
 from dateutil import rrule
 from dateutil.relativedelta import relativedelta
-from elasticsearch import AsyncElasticsearch
 from fastapi import HTTPException, status
+from opensearchpy import AsyncOpenSearch
 from pydantic import BaseModel
 
 from app import config
@@ -726,7 +726,7 @@ def __init__(self, configpath: str = "crucible"):
         self.auth = (self.user, self.password) if self.user or self.password else None
         self.url = self.cfg.get(configpath + ".url")
         self.versions = set()
-        self.elastic = AsyncElasticsearch(
+        self.elastic = AsyncOpenSearch(
             self.url, http_auth=self.auth, verify_certs=False
         )
         self.logger.info("Initializing CDM service to %s", self.url)
diff --git a/backend/app/services/search.py b/backend/app/services/search.py
@@ -2,8 +2,8 @@
 from datetime import datetime, timedelta
 import traceback
 
-from elasticsearch import AsyncElasticsearch
 from fastapi.encoders import jsonable_encoder
+from opensearchpy import AsyncOpenSearch
 
 from app import config
 import app.api.v1.commons.constants as constants
@@ -39,11 +39,11 @@ def initialize_es(self, config, path, index):
             esUser = config.get(path + ".username")
             esPass = config.get(path + ".password")
         if esUser:
-            es = AsyncElasticsearch(
+            es = AsyncOpenSearch(
                 url, use_ssl=False, verify_certs=False, http_auth=(esUser, esPass)
             )
         else:
-            es = AsyncElasticsearch(url, verify_certs=False)
+            es = AsyncOpenSearch(url, verify_certs=False)
         return es, indice, index_prefix
 
     async def post(
diff --git a/backend/backend.containerfile b/backend/backend.containerfile
@@ -1,11 +1,11 @@
-FROM quay.io/centos/centos:stream9
+FROM quay.io/centos/centos:stream10
 
 # 0) Configure Poetry and environment for OpenShift non-root execution
 ENV POETRY_VIRTUALENVS_CREATE=false \
     HOME=/backend \
     XDG_CONFIG_HOME=/backend/.config \
     XDG_CACHE_HOME=/backend/.cache
-
+    
 # 1) Install system deps + Poetry globally (root)
 #    Installing Poetry globally ensures the binary is on /usr/local/bin
 #    and therefore available in both OpenShift (random UID) and Podman (root) environments
diff --git a/backend/poetry.lock b/backend/poetry.lock
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "openshift_perfscale_api"
-requires-python = ">=3.9,<3.10"
+requires-python = ">=3.12,<3.13"
 dynamic = ["dependencies"]
 version = "0.2.2"
 description = "Aggregator for Performance & Scale CPT data"
@@ -15,25 +15,27 @@ packages = [
 aiohttp = "^3.11.11"
 atlassian-python-api = "^3.41.9.20"
 cryptography = "^3.4.8"
-elasticsearch = "7.13.4"
 fastapi = "^0.115.6"
 httptools = "^0.6.4"
 httpx = "^0.28.1"
-numpy = "1.26.4"
+numpy = "^2.3"
 orjson = "^3.5.3"
-pandas = "1.2.4"
-pydantic = "2.10.5"
-python = ">=3.9,<3.10"
+opensearch-py = "^2.8.0"
+pandas = "^2.3"
+pydantic = "^2.10.5"
+python = ">=3.12,<3.13"
 python-keycloak = "^3.12.0"
 pytest = "^8.3.5"
 pytest-asyncio = "^0.24"
 pytest-cov = "^6.0"
 semver = "2.13.0"
+six = "1.16" # CentOS Stream 10 has 1.16.0: Poetry can't update RPM installation
 splunk-sdk = "2.0.1"
 tox = "^4.23.2"
 trio = "^0.28.0"
 uvicorn = "^0.34.0"
 uvloop = "^0.21.0"
+virtualenv = ">=20.26.6,<20.33.0" # Poetry doesn't like 20.33.0
 vyper-config = "1.0.0"
 tomlkit = "^0.13.3"
 
@@ -63,7 +65,7 @@ env_list = ["functional", "unit", "format", "lint", "isort"]
 
 [tool.tox.env_run_base]
 description = "Run test under {base_python}"
-base_python = ["python3.9"]
+base_python = ["python3.12"]
 deps = [
     "pytest",
     "pytest-asyncio",
diff --git a/backend/tests/functional/test_ilab_runs.py b/backend/tests/functional/test_ilab_runs.py
@@ -180,16 +180,22 @@ def test_date_filter(self, server, start, end):
         if start:
             first = start
             stime = datetime.fromtimestamp(RUNS[start].start / 1000, timezone.utc)
-            sdate = f"{stime:%Y-%m-%dT%H:%M:%S}"
+            sdate = stime.isoformat()
         if end:
             last = end
             etime = datetime.fromtimestamp(RUNS[end].start / 1000, tz=timezone.utc)
-            edate = f"{etime:%Y-%m-%dT%H:%M:%S}"
+            edate = f"{etime:%Y-%m-%dT%H:%M:%S.%f%z}"
         response = requests.get(
             f"{server}/api/v1/ilab/runs", {"start_date": sdate, "end_date": edate}
         )
         result = response.json()
-        ids = {r.id for r in RUNS[first:last]}
+        ids = {r.id for r in RUNS[first : last + 1]}
+        for r in result["results"]:
+            date = datetime.fromisoformat(r["begin_date"])
+            if sdate:
+                assert date >= stime, f"{r['id']}: {date} >= {sdate}"
+            if edate:
+                assert date <= etime, f"{r['id']}: {date} <= {edate}"
         assert result["total"] == len(ids)
         assert {r["id"] for r in result["results"]} == ids
 
diff --git a/backend/tests/unit/conftest.py b/backend/tests/unit/conftest.py
@@ -24,7 +24,7 @@ def fake_elastic(monkeypatch, fake_config):
     """Replace the actual elastic client with a fake"""
     fake_elastic = FakeAsyncElasticsearch("http://elastic.example.com:9200")
     monkeypatch.setattr(
-        "app.services.crucible_svc.AsyncElasticsearch",
+        "app.services.crucible_svc.AsyncOpenSearch",
         lambda *args, **kwargs: fake_elastic,
     )
     return fake_elastic
diff --git a/backend/tests/unit/fake_elastic.py b/backend/tests/unit/fake_elastic.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from typing import Any, Optional, Union
 
-from elasticsearch import AsyncElasticsearch
+from opensearchpy import AsyncOpenSearch
 
 
 @dataclass
@@ -26,7 +26,7 @@ def __eq__(self, other) -> bool:
         return iok and bok and dok and pok and hok and kok
 
 
-class FakeAsyncElasticsearch(AsyncElasticsearch):
+class FakeAsyncElasticsearch(AsyncOpenSearch):
     hosts: Union[str, list[str]]
     args: dict[str, Any]
     closed: bool
@@ -114,7 +114,7 @@ def set_query(
         for c in range(repeat):
             self.data[index].append(response)
 
-    # Faked AsyncElasticsearch methods
+    # Faked AsyncOpenSearch methods
     async def close(self):
         self.closed = True
 
diff --git a/backend/tests/unit/test_crucible.py b/backend/tests/unit/test_crucible.py
@@ -1,8 +1,8 @@
 from datetime import datetime, timezone
 import json
 
-from elasticsearch import AsyncElasticsearch
 from fastapi import HTTPException
+from opensearchpy import AsyncOpenSearch
 import pytest
 
 import app.config
@@ -832,7 +832,7 @@ async def test_create(self, fake_crucible):
 
         assert fake_crucible
         assert isinstance(fake_crucible, CrucibleService)
-        assert isinstance(fake_crucible.elastic, AsyncElasticsearch)
+        assert isinstance(fake_crucible.elastic, AsyncOpenSearch)
         assert app.config.get_config().get("TEST.url") == fake_crucible.url
         elastic = fake_crucible.elastic
         await fake_crucible.close()
diff --git a/backend/tests/unit/test_search.py b/backend/tests/unit/test_search.py
@@ -103,7 +103,7 @@ def mock_config_no_auth(mock_config):
 class TestElasticService:
     """Test class for ElasticService"""
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     def test_init_with_internal(self, mock_es, mock_config_full):
         """Test ElasticService initialization with internal elasticsearch"""
 
@@ -116,7 +116,7 @@ def test_init_with_internal(self, mock_es, mock_config_full):
         assert service.prev_index == "internal-index"
         assert service.prev_index_prefix == "internal-"
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     def test_init_without_internal(self, mock_es, mock_config_no_internal):
         """Test ElasticService initialization without internal elasticsearch"""
 
@@ -125,7 +125,7 @@ def test_init_without_internal(self, mock_es, mock_config_no_internal):
         assert service.new_es is not None
         assert service.prev_es is None
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     def test_initialize_es_with_auth(self, mock_es, mock_config_full):
         """Test initialize_es method with authentication"""
 
@@ -143,7 +143,7 @@ def test_initialize_es_with_auth(self, mock_es, mock_config_full):
         assert indice == "test-index"
         assert prefix == "test-"
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     def test_initialize_es_without_auth(self, mock_es, mock_config_no_auth):
         """Test initialize_es method without authentication"""
 
@@ -156,7 +156,7 @@ def test_initialize_es_without_auth(self, mock_es, mock_config_no_auth):
         assert indice == "custom-index"
         assert prefix == ""
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     @patch("app.services.search.jsonable_encoder")
     async def test_post_aggregation_query(
         self, mock_encoder, mock_es, mock_config_full
@@ -179,7 +179,7 @@ async def test_post_aggregation_query(
             index="internal-internal-index*", body={"query": "test"}, size=0
         )
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     @patch("app.services.search.datetime")
     async def test_post_with_timestamp_field(
         self, mock_datetime, mock_es, mock_config_full
@@ -220,7 +220,7 @@ async def test_post_with_timestamp_field(
         assert "data" in result
         assert "total" in result
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     async def test_post_without_timestamp_field(self, mock_es, mock_config_no_internal):
         """Test post method without timestamp field"""
 
@@ -439,7 +439,7 @@ def test_merge_aggregations(self, mock_config):
         assert "platform" in result
         assert result["platform"]["buckets"][0]["key"] == "aws"
 
-    @patch("app.services.search.AsyncElasticsearch")
+    @patch("app.services.search.AsyncOpenSearch")
     async def test_close(self, mock_es, mock_config_full):
         """Test close method"""
 
diff --git a/backend/tests/unit/test_telco.py b/backend/tests/unit/test_telco.py
@@ -908,7 +908,7 @@ async def test_telco_config_error_handling(self, fake_splunk):
                 # This test demonstrates the bug exists (UnboundLocalError)
                 with pytest.raises(
                     UnboundLocalError,
-                    match="local variable 'jenkins_url' referenced before assignment",
+                    match="local variable 'jenkins_url'",
                 ):
                     result = await telco.getData(
                         start_datetime=date(2024, 1, 1),
diff --git a/frontend/tests/e2e.sh b/frontend/tests/e2e.sh
@@ -15,7 +15,7 @@ mkdir -p "${FRONTEND}/coverage"
 
  
 podman run ${POD} \
-    -v "${FRONTEND}/coverage:/usr/src/cpt-dashboard/coverage" \
+    -v "${FRONTEND}/coverage:/usr/src/cpt-dashboard/coverage:Z" \
     --name="${CYPRESS}" \
     localhost/cypress
 
diff --git a/testing/db_seed.py b/testing/db_seed.py
@@ -4,8 +4,8 @@
 import time
 
 from typing import Optional
-from elasticsearch import Elasticsearch
-from elasticsearch.exceptions import TransportError, ConnectionError
+from opensearchpy import OpenSearch
+from opensearchpy.exceptions import TransportError, ConnectionError
 from vyper import v
 
 
@@ -32,7 +32,7 @@ def __init__(self, config_path: str):
         self.url = v.get(config_path + ".url")
         self.user = v.get(config_path + ".username")
         self.pwd = v.get(config_path + ".password")
-        self.client = Elasticsearch(
+        self.client = OpenSearch(
             self.url,
             basic_auth=(self.user, self.pwd) if self.user else None,
             verify_certs=False,
diff --git a/testing/functional.containerfile b/testing/functional.containerfile
diff --git a/testing/pod_setup.sh b/testing/pod_setup.sh
