testit-python-commons 5.1.2__py3-none-any.whl → 5.1.3.post580__py3-none-any.whl

testit_python_commons/client/api_client.py

@@ -30,6 +30,7 @@ from api_client_adapters.models import (
 from testit_python_commons.client.client_configuration import ClientConfiguration
 from testit_python_commons.client.converter import Converter
 from testit_python_commons.client.helpers.bulk_autotest_helper import BulkAutotestHelper
+from testit_python_commons.client.helpers.test_result_matching import pick_best_in_progress_id
 from typing import List
 
 from testit_python_commons.models.link import Link
@@ -62,6 +63,7 @@ class ApiClientWorker:
         self.__workflows_api = WorkflowsApi(api_client=api_client)
         self.__config = config
         self.__status_codes = self.__get_status_codes()
+        self.__claimed_in_progress_ids = set()
 
     @staticmethod
     @adapter_logger
@@ -535,37 +537,38 @@ class ApiClientWorker:
         logging.debug(f'Autotest was linked with workItem "{work_item_id}" by global id "{autotest_global_id}')
 
     @adapter_logger
-    def find_in_progress_test_result_id(self, external_id: str):
+    def find_in_progress_test_result_id(self, external_id: str, parameters=None):
         if not external_id:
             return None
 
-        matches = []
+        candidates = []
         for item in self.__get_test_results():
             if item is None:
                 continue
-            if getattr(item, "autotest_external_id", None) == external_id:
-                matches.append(item)
-
-        if not matches:
-            return None
-
-        orphan_id = None
-        for item in matches:
+            if getattr(item, "autotest_external_id", None) != external_id:
+                continue
             result_id = getattr(item, "id", None)
             if result_id is None:
                 continue
             result_id_str = str(result_id)
-            if self.__has_valid_test_point_id_v2(result_id_str):
-                return result_id_str
-            if orphan_id is None:
-                orphan_id = result_id_str
-        return orphan_id
-
-    def __has_valid_test_point_id_v2(self, test_result_id: str) -> bool:
-        """Hack: adapters OpenAPI omits testPointId — read GET /api/v2/testResults/{id}."""
+            if result_id_str in self.__claimed_in_progress_ids:
+                continue
+            meta = self.__get_test_result_v2_meta(result_id_str)
+            candidates.append({
+                "id": result_id_str,
+                "has_test_point": self.__is_valid_test_point_id(meta.get("testPointId")),
+                "parameters": meta.get("parameters") or {},
+            })
+
+        chosen = pick_best_in_progress_id(candidates, parameters)
+        if chosen:
+            self.__claimed_in_progress_ids.add(chosen)
+        return chosen
+
+    def __get_test_result_v2_meta(self, test_result_id: str) -> dict:
+        """Hack: adapters OpenAPI omits testPointId/parameters — read GET /api/v2/testResults/{id}."""
         import json
         import ssl
-        import urllib.error
         import urllib.request
 
         base = (self.__config.get_url() or "").rstrip("/")
@@ -583,15 +586,21 @@ class ApiClientWorker:
             if not self.__config.get_cert_validation():
                 context = ssl._create_unverified_context()
             with urllib.request.urlopen(request, timeout=10, context=context) as response:
-                payload = json.loads(response.read().decode("utf-8"))
-            test_point_id = payload.get("testPointId")
-            if test_point_id is None:
-                return False
-            value = str(test_point_id)
-            return bool(value) and value != "00000000-0000-0000-0000-000000000000"
+                return json.loads(response.read().decode("utf-8")) or {}
         except Exception as exc:
             logging.debug("v2 getTestResult %s failed: %s", test_result_id, exc)
+            return {}
+
+    @staticmethod
+    def __is_valid_test_point_id(test_point_id) -> bool:
+        if test_point_id is None:
             return False
+        value = str(test_point_id)
+        return bool(value) and value != "00000000-0000-0000-0000-000000000000"
+
+    def __has_valid_test_point_id_v2(self, test_result_id: str) -> bool:
+        meta = self.__get_test_result_v2_meta(test_result_id)
+        return self.__is_valid_test_point_id(meta.get("testPointId"))
 
     @adapter_logger
     @retry
@@ -624,7 +633,10 @@ class ApiClientWorker:
     @adapter_logger
     @retry
     def __load_test_result(self, test_result: TestResult) -> str:
-        existing_id = self.find_in_progress_test_result_id(test_result.get_external_id())
+        existing_id = self.find_in_progress_test_result_id(
+            test_result.get_external_id(),
+            test_result.get_parameters(),
+        )
         if existing_id:
             return self.__update_existing_test_result(existing_id, test_result)
 

testit_python_commons/client/helpers/test_result_matching.py

@@ -0,0 +1,41 @@
+"""Match InProgress test results by parameters (parametrized mode 0)."""
+
+
+def normalize_parameters(parameters) -> dict:
+    if not parameters:
+        return {}
+    if isinstance(parameters, dict):
+        return {str(k): "" if v is None else str(v) for k, v in parameters.items()}
+    return {}
+
+
+def parameters_empty(parameters) -> bool:
+    return not normalize_parameters(parameters)
+
+
+def pick_best_in_progress_id(candidates: list, incoming_parameters=None):
+    """
+    candidates: [{id: str, has_test_point: bool, parameters: dict}, ...]
+    Prefer: exact param match > empty TMS params (WI without params) > others skipped if incompatible.
+    Among equal match quality: prefer valid testPointId.
+    """
+    incoming = normalize_parameters(incoming_parameters)
+    ranked = []
+
+    for candidate in candidates:
+        if not candidate or not candidate.get("id"):
+            continue
+        cand_params = normalize_parameters(candidate.get("parameters"))
+        if cand_params == incoming:
+            match_score = 0
+        elif parameters_empty(cand_params):
+            match_score = 1
+        else:
+            continue
+        tp_score = 0 if candidate.get("has_test_point") else 1
+        ranked.append(((match_score, tp_score), candidate["id"]))
+
+    if not ranked:
+        return None
+    ranked.sort(key=lambda item: item[0])
+    return ranked[0][1]

{testit_python_commons-5.1.2.dist-info → testit_python_commons-5.1.3.post580.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-python-commons
-Version: 5.1.2
+Version: 5.1.3.post580
 Summary: Python commons for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team

{testit_python_commons-5.1.2.dist-info → testit_python_commons-5.1.3.post580.dist-info}/RECORD

@@ -211,11 +211,12 @@ testit_python_commons/decorators.py,sha256=QI8qMjDincTRZmcZByP5y5wHsf_Fwd1oc67Wu
 testit_python_commons/dynamic_methods.py,sha256=WKHHA6Uj61tWXI3DphALYOi2BV6TnQKvQy0-Vt2JR2I,8816
 testit_python_commons/step.py,sha256=CYUs_S8opmRg1tsTY1dVJOPzzt-HYR3_uLTBpYtHSfQ,3244
 testit_python_commons/client/__init__.py,sha256=zSJhxDHzWWTFHJ0s8bqCaBtM5FK2GcPgZxaKdI8zf-o,165
-testit_python_commons/client/api_client.py,sha256=iNzv6tXx-X3bWfP8VYU2XtgjuZVlZlijNiDSzKBplY4,27742
+testit_python_commons/client/api_client.py,sha256=dDS0EmWkUDnIuEnFEW-1iy2uvHKVXDpBb5wPLEQYZ9w,28392
 testit_python_commons/client/client_configuration.py,sha256=1M-OrROU3Xj0YGsUX4venG-l6Ewr43LNvUcyFfY57ys,2776
 testit_python_commons/client/converter.py,sha256=c4jea5FDSUqt_FeRhAW829aouDJbaHUHIHL7ayro0GE,27172
 testit_python_commons/client/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testit_python_commons/client/helpers/bulk_autotest_helper.py,sha256=L480JYYA3zphCciJOzefCOg1upWeRgdJWd6qWEKM45k,10920
+testit_python_commons/client/helpers/test_result_matching.py,sha256=XSGzzESs-vg41MrvcijD91snpczL3fiVTywOe2j2WZg,1373
 testit_python_commons/client/helpers/threads_manager.py,sha256=Ix8NJm3Yp9_7jxGTtojsAWqfuNvtYHEia9CiHFW9b3k,3509
 testit_python_commons/client/models/__init__.py,sha256=4c3yNkadtebFF1eEZw7JmfwcLtOim2zHkwbZIHvCK0A,284
 testit_python_commons/client/models/threads_for_create_and_result.py,sha256=qOEZDIhCX0r6uUndzc2SiDcykcMVuv5XTDEvBQGGslY,1458
@@ -248,7 +249,7 @@ testit_python_commons/services/sync_storage/__init__.py,sha256=Qmjs6Xk5l-i5FFItk
 testit_python_commons/services/sync_storage/sync_storage_runner.py,sha256=9FCbMxzGa84I79X7QOjYO_oSiUUu43LhJqPDs_JEEb0,20549
 testit_python_commons/utils/__init__.py,sha256=CUHziylwvFAuKyUM1tCp13ik5Z2Mw-VK8n7c92aVy-I,78
 testit_python_commons/utils/html_escape_utils.py,sha256=wx20lAVrMvhNiQ7bEu_f-SGqDBp85D-EBL2sgTmnJPY,8135
-testit_python_commons-5.1.2.dist-info/METADATA,sha256=zc91PBMfgTPiDkwm7AR36Zi8E4raK23LUbG7kNBmGbU,1675
-testit_python_commons-5.1.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-testit_python_commons-5.1.2.dist-info/top_level.txt,sha256=Jme7mbm0CtX-96d3cUiEonamIeb7kAo3Je4bSlxBndI,72
-testit_python_commons-5.1.2.dist-info/RECORD,,
+testit_python_commons-5.1.3.post580.dist-info/METADATA,sha256=s1Iypa6_DERIBc5ohOWcj_TULAvLOW86GexjQ8kl0Fk,1683
+testit_python_commons-5.1.3.post580.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+testit_python_commons-5.1.3.post580.dist-info/top_level.txt,sha256=Jme7mbm0CtX-96d3cUiEonamIeb7kAo3Je4bSlxBndI,72
+testit_python_commons-5.1.3.post580.dist-info/RECORD,,