Adding version to eco-ci v3 endpoint (#1470)

* Adding version to eco-ci v3 endpoint

* (test-fix): eco-ci version [skip ci]

Author: ArneTR

api/eco_ci.py

@@ -42,7 +42,7 @@ def _insert_ci_measurement(request: Request, measurement, user: User) -> Respons
     if used_client_ip is None:
         used_client_ip = get_connecting_ip(request)
 
-    for field in ["os_name", "cpu_arch", "job_id"]:
+    for field in ['os_name', 'cpu_arch', 'job_id', 'version']:
         params.append(getattr(measurement, field, None))
     params.append(used_client_ip)
     params.append(user._id)
@@ -77,14 +77,15 @@ def _insert_ci_measurement(request: Request, measurement, user: User) -> Respons
                              os_name,
                              cpu_arch,
                              job_id,
+                             version,
                              ip_address,
                              user_id,
                              note
                              )
         VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
                 %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
                 {tags_replacer},
-                %s, %s, %s, %s, %s, %s)
+                %s, %s, %s, %s, %s, %s, %s)
         """
 
     DB().query(query=query, params=params)
@@ -121,7 +122,7 @@ async def post_ci_measurement_add_v3(
     user: User = Depends(authenticate)  # pylint: disable=unused-argument
 ):
     """
-    v3: accepts additional fields (os_name, cpu_arch, job_id) via CI_MeasurementV3.
+    v3: accepts additional fields (os_name, cpu_arch, job_id, version) via CI_MeasurementV3.
     For now, the insert logic is the same as v2 and ignores these extra fields.
     """
     return _insert_ci_measurement(request, measurement, user)

api/object_specifications.py

@@ -102,6 +102,7 @@ class CI_MeasurementV3(CI_MeasurementBase):
     os_name: Optional[str] = None
     cpu_arch: Optional[str] = None
     job_id: Optional[str] = None
+    version: Optional[str] = None
 
     model_config = ConfigDict(extra='forbid')
 
@@ -232,4 +233,3 @@ def check_empty_elements(cls, value):
         if any(not item or item.strip() == '' for item in value):
             raise ValueError("The list contains empty elements.")
         return value
-

docker/structure.sql

@@ -416,6 +416,7 @@ CREATE TABLE ci_measurements (
     filter_tags text[] NOT NULL,
     os_name text,
     cpu_arch text,
+    version text,
     job_id text,
     user_id integer NOT NULL REFERENCES users(id) ON DELETE RESTRICT ON UPDATE CASCADE,
     created_at timestamp with time zone DEFAULT now(),

migrations/2025_11_22_add_fields_to_ci_measurements.sql

@@ -1,6 +1,7 @@
 ALTER TABLE "public"."ci_measurements" ADD COLUMN "os_name" text;
 ALTER TABLE "public"."ci_measurements" ADD COLUMN "cpu_arch" text;
 ALTER TABLE "public"."ci_measurements" ADD COLUMN "job_id" text;
+ALTER TABLE "public"."ci_measurements" ADD COLUMN "version" text;
 
 UPDATE users
 SET capabilities = jsonb_set(

tests/api/test_api_eco_ci.py

@@ -41,7 +41,8 @@ def test_ci_deprecated_endpoint():
                         'workflow_name': 'testWorkflowName',
                         'os_name': 'testOsName',
                         'cpu_arch': 'testCpuArch',
-                        'job_id': 'testJobID'}
+                        'job_id': 'testJobID',
+                        'version': 'v2.2'}
 
 def test_ci_measurement_add_default_user():
 

tests/frontend/test_frontend.py

@@ -182,9 +182,6 @@ def open_and_assert_ci_stats(self):
         ).text_content()
         assert carbon_all_steps.strip() == '0.11 s (± 0.00%)'
 
-
-    @pytest.mark.usefixtures('use_clean_db')
-
     def test_eco_ci_adding_data(self):
         for index in range(1,4):
             measurement = CI_Measurement(energy_uj=(13_000_000*index),
@@ -209,8 +206,6 @@ def test_eco_ci_adding_data(self):
             assert response.status_code == 204, Tests.assertion_info('success', response.text)
         self.open_and_assert_ci_stats()
 
-
-    @pytest.mark.usefixtures('use_clean_db')
     def test_eco_ci_adding_data_v3(self):
         for index in range(1, 4):
             measurement = CI_MeasurementV3(energy_uj=(13_000_000 * index),
@@ -232,7 +227,8 @@ def test_eco_ci_adding_data_v3(self):
                                            carbon_ug=323456,
                                            os_name='Linux',
                                            cpu_arch='x86_64',
-                                           job_id='testJobID'
+                                           job_id='testJobID',
+                                           version='v1.2'
                                            )
             response = requests.post(f"{API_URL}/v3/ci/measurement/add", json=measurement.model_dump(), timeout=15)
             assert response.status_code == 204, Tests.assertion_info('success', response.text)