testit-python-commons 5.1.0__py3-none-any.whl → 5.1.1__py3-none-any.whl

testit_python_commons/client/api_client.py

@@ -30,6 +30,9 @@ 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 typing import List
+
+from testit_python_commons.models.link import Link
 from testit_python_commons.models.test_result import TestResult
 from testit_python_commons.services.logger import adapter_logger
 from testit_python_commons.services.retry import (
@@ -38,7 +41,6 @@ from testit_python_commons.services.retry import (
     retry,
     retry_on_connection_error,
 )
-from typing import List
 
 
 class ApiClientWorker:
@@ -80,14 +82,25 @@ class ApiClientWorker:
 
     @adapter_logger
     @retry
-    def create_test_run(self, test_run_name: str = None) -> str:
+    def create_test_run(
+            self,
+            test_run_name: str = None,
+            tags: List[str] = None,
+            links: List[Link] = None) -> str:
         test_run_name = f'TestRun_{datetime.today().strftime("%Y-%m-%dT%H:%M:%S")}' if \
             not test_run_name else test_run_name
         model = Converter.test_run_to_test_run_short_model(
             self.__config.get_project_id(),
-            test_run_name
+            test_run_name,
+            tags=tags,
+            links=links,
         )
 
+        logging.info(
+            'Creating test run with tags=%s, links=%s',
+            tags or [],
+            [link.get_url() for link in (links or [])],
+        )
         response = self.__test_run_api.adapters_test_runs_post(
             adapters_test_runs_post_request=model)
 
@@ -107,15 +120,55 @@ class ApiClientWorker:
         raise Exception(f"Test run by id {test_run_id} not found!")
 
     @retry
-    def update_test_run(self, test_run: TestRunApiResult) -> None:
+    def update_test_run(
+            self,
+            test_run: TestRunApiResult,
+            tags: List[str] = None,
+            links: List[Link] = None) -> None:
         """Function updates test run."""
-        model = Converter.build_update_empty_request(test_run)
+        model = Converter.build_update_empty_request(test_run, tags=tags, links=links)
         logging.debug(f"Updating test run with model: {model}")
 
         self.__test_run_api.adapters_test_runs_put(adapters_test_runs_put_request=model)
 
         logging.debug(f'Updated testrun (ID: {test_run.id})')
 
+    @adapter_logger
+    def apply_test_run_tags_and_links(
+            self,
+            test_run_id: str,
+            tags: List[str] = None,
+            links: List[Link] = None,
+            test_run_name: str = None) -> None:
+        tags = tags or []
+        links = links or []
+        if not tags and not links and not test_run_name:
+            return
+
+        try:
+            test_run = self.get_test_run(test_run_id)
+            name_changed = bool(test_run_name and test_run_name != test_run.name)
+            if name_changed:
+                test_run.name = test_run_name
+
+            if not tags and not links and not name_changed:
+                return
+
+            logging.info(
+                'Applying test run metadata to %s: tags=%s, links=%s, name=%s',
+                test_run_id,
+                tags,
+                [link.get_url() for link in links],
+                test_run_name,
+            )
+            self.update_test_run(test_run, tags=tags, links=links)
+        except Exception as exc:
+            logging.error(
+                'Cannot apply tags/links to test run %s: %s',
+                test_run_id,
+                exc,
+            )
+
     @adapter_logger
     def set_test_run_id(self, test_run_id: str) -> None:
         self.__config.set_test_run_id(test_run_id)

testit_python_commons/client/converter.py

@@ -48,11 +48,22 @@ from testit_python_commons.services.logger import adapter_logger
 class Converter:
     @staticmethod
     @adapter_logger
-    def test_run_to_test_run_short_model(project_id: str, name: str) -> AdaptersTestRunsPostRequest:
-        return AdaptersTestRunsPostRequest(
-            project_id=project_id,
-            name=name
-        )
+    def test_run_to_test_run_short_model(
+            project_id: str,
+            name: str,
+            tags: List[str] = None,
+            links: List[Link] = None) -> AdaptersTestRunsPostRequest:
+        kwargs = {
+            'project_id': project_id,
+            'name': name,
+        }
+        if tags:
+            kwargs['tags'] = tags
+        if links:
+            kwargs['links'] = [
+                Converter.link_to_create_link_api_model(link) for link in links
+            ]
+        return AdaptersTestRunsPostRequest(**kwargs)
 
     @staticmethod
     @adapter_logger
@@ -61,14 +72,51 @@ class Converter:
 
     @classmethod
     @adapter_logger
-    def build_update_empty_request(cls, test_run: TestRunApiResult) -> AdaptersTestRunsPutRequest:
+    def build_update_empty_request(
+            cls,
+            test_run: TestRunApiResult,
+            tags: List[str] = None,
+            links: List[Link] = None) -> AdaptersTestRunsPutRequest:
+        merged_tags = list(test_run.tags or [])
+        for tag in tags or []:
+            if tag not in merged_tags:
+                merged_tags.append(tag)
+
+        update_links = list(map(cls.build_update_link_api_model, test_run.links or []))
+        existing_urls = {link.url for link in (test_run.links or [])}
+        for link in links or []:
+            if link.get_url() not in existing_urls:
+                update_links.append(cls.link_to_update_link_api_model(link))
+                existing_urls.add(link.get_url())
+
         return AdaptersTestRunsPutRequest(
             id=test_run.id,
             name=test_run.name,
             description=test_run.description,
             launch_source=test_run.launch_source,
-            attachments=list(map(cls.build_assign_attachment_api_model, test_run.attachments)),
-            links=list(map(cls.build_update_link_api_model, test_run.links))
+            attachments=list(map(cls.build_assign_attachment_api_model, test_run.attachments or [])),
+            links=update_links,
+            tags=merged_tags,
+        )
+
+    @staticmethod
+    @adapter_logger
+    def link_to_create_link_api_model(link: Link) -> CreateLinkApiModel:
+        return CreateLinkApiModel(
+            url=link.get_url(),
+            title=link.get_title(),
+            type=LinkType(link.get_link_type() or "Related"),
+            description=link.get_description(),
+        )
+
+    @staticmethod
+    @adapter_logger
+    def link_to_update_link_api_model(link: Link) -> UpdateLinkApiModel:
+        return UpdateLinkApiModel(
+            url=link.get_url(),
+            title=link.get_title(),
+            type=LinkType(link.get_link_type() or "Related"),
+            description=link.get_description(),
         )
 
     @staticmethod

testit_python_commons/configurations/properties_names.py

@@ -7,6 +7,8 @@ class PropertiesNames:
     CONFIGURATION_ID = 'configurationid'
     TEST_RUN_ID = 'testrunid'
     TEST_RUN_NAME = 'testrunname'
+    TEST_RUN_TAGS = 'testruntags'
+    TEST_RUN_LINKS = 'testrunlinks'
     TMS_PROXY = 'tmsproxy'
     ADAPTER_MODE = 'adaptermode'
     CERT_VALIDATION = 'certvalidation'
@@ -23,6 +25,8 @@ ENV_TO_PROPERTY = {
     'TMS_CONFIGURATION_ID': PropertiesNames.CONFIGURATION_ID,
     'TMS_TEST_RUN_ID': PropertiesNames.TEST_RUN_ID,
     'TMS_TEST_RUN_NAME': PropertiesNames.TEST_RUN_NAME,
+    'TMS_TEST_RUN_TAGS': PropertiesNames.TEST_RUN_TAGS,
+    'TMS_TEST_RUN_LINKS': PropertiesNames.TEST_RUN_LINKS,
     'TMS_PROXY': PropertiesNames.TMS_PROXY,
     'TMS_ADAPTER_MODE': PropertiesNames.ADAPTER_MODE,
     'TMS_CERT_VALIDATION': PropertiesNames.CERT_VALIDATION,
@@ -40,6 +44,8 @@ OPTION_TO_PROPERTY = {
     'set_configuration_id': PropertiesNames.CONFIGURATION_ID,
     'set_test_run_id': PropertiesNames.TEST_RUN_ID,
     'set_test_run_name': PropertiesNames.TEST_RUN_NAME,
+    'set_test_run_tags': PropertiesNames.TEST_RUN_TAGS,
+    'set_test_run_links': PropertiesNames.TEST_RUN_LINKS,
     'set_tms_proxy': PropertiesNames.TMS_PROXY,
     'set_adapter_mode': PropertiesNames.ADAPTER_MODE,
     'set_cert_validation': PropertiesNames.CERT_VALIDATION,

testit_python_commons/services/adapter_manager.py

@@ -34,6 +34,7 @@ class AdapterManager:
         self.__fixture_manager = fixture_manager
         self.__test_result_map = {}
         self.__test_results = []
+        self.__test_run_metadata_applied = False
 
         # Sync Storage integration
         self.__sync_storage_runner = None
@@ -106,33 +107,35 @@ class AdapterManager:
             test_run_id = self.__config.get_test_run_id()
 
             if test_run_id:
-                self.__update_test_run_name(test_run_id)
+                self.__apply_test_run_metadata_early(test_run_id)
 
             return test_run_id or ""
 
         result = self.__config.get_test_run_id()
         if result is not None:
+            self.__apply_test_run_metadata_early(result)
             return result
 
         # create if not exists
         test_run_name = self.__config.get_test_run_name()
-        return self.__api_client.create_test_run(test_run_name if test_run_name else "")
+        return self.__api_client.create_test_run(
+            test_run_name if test_run_name else "",
+            tags=self.__config.get_test_run_tags(),
+            links=self.__config.get_test_run_links(),
+        )
 
     @adapter_logger
-    def __update_test_run_name(self, test_run_id: str) -> None:
-        test_run_name = self.__config.get_test_run_name()
-
-        if not test_run_name:
-            return
-
-        test_run = self.__api_client.get_test_run(test_run_id)
-
-        if test_run_name == test_run.name:
+    def __apply_test_run_metadata_early(self, test_run_id: str) -> None:
+        if self.__test_run_metadata_applied:
             return
 
-        test_run.name = test_run_name
-
-        self.__api_client.update_test_run(test_run)
+        self.__test_run_metadata_applied = True
+        self.__api_client.apply_test_run_tags_and_links(
+            test_run_id,
+            tags=self.__config.get_test_run_tags(),
+            links=self.__config.get_test_run_links(),
+            test_run_name=self.__config.get_test_run_name(),
+        )
 
     @adapter_logger
     def get_autotests_for_launch(self):

testit_python_commons/services/adapter_manager_configuration.py

@@ -1,8 +1,13 @@
+from typing import List
+
 from testit_python_commons.models.adapter_mode import AdapterMode
+from testit_python_commons.models.link import Link
 from testit_python_commons.services.logger import adapter_logger
+from testit_python_commons.services.test_run_metadata import parse_test_run_links, parse_test_run_tags
 from testit_python_commons.services.utils import Utils
 from testit_python_commons.configurations.properties_names import PropertiesNames
 
+
 class AdapterManagerConfiguration:
     __test_run_id = None
 
@@ -14,8 +19,11 @@ class AdapterManagerConfiguration:
         self.__automatic_creation_test_cases = Utils.convert_value_str_to_bool(
             app_properties.get(PropertiesNames.AUTOMATIC_CREATION_TEST_CASES).lower())
 
-        self.__import_realtime = Utils.convert_value_str_to_bool(app_properties.get(PropertiesNames.IMPORT_REALTIME).lower())
+        self.__import_realtime = Utils.convert_value_str_to_bool(
+            app_properties.get(PropertiesNames.IMPORT_REALTIME).lower())
         self.__test_run_name = app_properties.get(PropertiesNames.TEST_RUN_NAME)
+        self.__test_run_tags = parse_test_run_tags(app_properties.get(PropertiesNames.TEST_RUN_TAGS))
+        self.__test_run_links = parse_test_run_links(app_properties.get(PropertiesNames.TEST_RUN_LINKS))
 
     @adapter_logger
     def get_test_run_id(self):
@@ -29,6 +37,14 @@ class AdapterManagerConfiguration:
     def get_test_run_name(self):
         return self.__test_run_name
 
+    @adapter_logger
+    def get_test_run_tags(self) -> List[str]:
+        return self.__test_run_tags
+
+    @adapter_logger
+    def get_test_run_links(self) -> List[Link]:
+        return self.__test_run_links
+
     @adapter_logger
     def get_mode(self):
         return self.__adapter_mode

testit_python_commons/services/test_run_metadata.py

@@ -0,0 +1,50 @@
+import json
+import logging
+from typing import List, Optional
+
+from testit_python_commons.models.link import Link
+from testit_python_commons.services.utils import Utils
+
+
+def parse_test_run_tags(raw: Optional[str]) -> List[str]:
+    if not raw or not str(raw).strip():
+        return []
+
+    value = str(raw).strip()
+    if value.startswith('['):
+        try:
+            parsed = json.loads(value)
+        except json.JSONDecodeError:
+            logging.warning('Invalid test run tags JSON: %s', value)
+            return []
+        if not isinstance(parsed, list):
+            logging.warning('Test run tags JSON must be an array: %s', value)
+            return []
+        return [str(tag).strip() for tag in parsed if str(tag).strip()]
+
+    return [tag.strip() for tag in value.split(',') if tag.strip()]
+
+
+def parse_test_run_links(raw: Optional[str]) -> List[Link]:
+    if not raw or not str(raw).strip():
+        return []
+
+    value = str(raw).strip()
+    try:
+        parsed = json.loads(value)
+    except json.JSONDecodeError:
+        logging.warning('Invalid test run links JSON: %s', value)
+        return []
+
+    if not isinstance(parsed, list):
+        logging.warning('Test run links JSON must be an array: %s', value)
+        return []
+
+    links = []
+    for item in parsed:
+        if not isinstance(item, dict) or not item.get('url'):
+            logging.warning('Skipping invalid test run link (url is required): %s', item)
+            continue
+        links.append(Utils.convert_link_dict_to_link_model(item))
+
+    return links

{testit_python_commons-5.1.0.dist-info → testit_python_commons-5.1.1.dist-info}/METADATA

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

{testit_python_commons-5.1.0.dist-info → testit_python_commons-5.1.1.dist-info}/RECORD

@@ -211,9 +211,9 @@ 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=MQIqTE4VyBTugkpAP7wb3Kr27_2KfSHAIr9th4lcSTs,26025
+testit_python_commons/client/api_client.py,sha256=izH0bRWjC37aubt5hhREzCRc7SPe6DfFlcpkj0M3YXA,27693
 testit_python_commons/client/client_configuration.py,sha256=1M-OrROU3Xj0YGsUX4venG-l6Ewr43LNvUcyFfY57ys,2776
-testit_python_commons/client/converter.py,sha256=rVleh2OC2rKd3iR-BVO1-StP9kVqRSsNcp_HcPoNr2E,24653
+testit_python_commons/client/converter.py,sha256=pjnCHtaQNGTot-YWYb6IJ9gX9XlEos708Vi98oJBxws,26272
 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/threads_manager.py,sha256=Ix8NJm3Yp9_7jxGTtojsAWqfuNvtYHEia9CiHFW9b3k,3509
@@ -221,7 +221,7 @@ testit_python_commons/client/models/__init__.py,sha256=4c3yNkadtebFF1eEZw7JmfwcL
 testit_python_commons/client/models/threads_for_create_and_result.py,sha256=qOEZDIhCX0r6uUndzc2SiDcykcMVuv5XTDEvBQGGslY,1458
 testit_python_commons/client/models/threads_for_update_and_result.py,sha256=QedFC8CnG5hcku4RkqA157o-azktpZhp6cpwdcBqxFA,2129
 testit_python_commons/configurations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testit_python_commons/configurations/properties_names.py,sha256=DcMkFmJuyvRXylLjP3HgJTjiaXsNSJ0ZmQjKYgM1v00,2364
+testit_python_commons/configurations/properties_names.py,sha256=st-M0werA0w9fCcuELm0h3D7-nCEVn9vJmj4RCMPuaA,2662
 testit_python_commons/models/__init__.py,sha256=qtwpjoKOOaTCiRHiG0TlOWWQ26AFw7dumt4yV-u0LcE,90
 testit_python_commons/models/adapter_mode.py,sha256=4U3IlRvjoDCe6WJ6AS4HaiP2nS9ntXIMOUmKGKcblWE,87
 testit_python_commons/models/fixture.py,sha256=_KO-sWKHloHY1MFowp1anE3Dp5-ebdUeO8AAsLMNids,661
@@ -233,8 +233,8 @@ testit_python_commons/models/step_result.py,sha256=T9BbcPB6BCz3ZkrWXy2Z2Guj2wecv
 testit_python_commons/models/test_result.py,sha256=z6OB3V_whCQDJvr4jQdgVanoJSoeKh8ZXgPAACkNrdw,7515
 testit_python_commons/models/test_result_with_all_fixture_step_results_model.py,sha256=aI5nfJ_4EAhzZg7eIV1JhSf9i3EENiRiuQuqJvSUs3M,866
 testit_python_commons/services/__init__.py,sha256=yVVmiCgMyike_8OoNPiHLNoMqKhCDlWYhvmGW0IRHJM,1197
-testit_python_commons/services/adapter_manager.py,sha256=CtzPoTjGHKKCrjMWk_HEpF26Ww56OI6mwcsRXrTpx2Q,11541
-testit_python_commons/services/adapter_manager_configuration.py,sha256=KyLhB_iNUQaVEurfLQ0RANIZfhJPB19c_WUkGpqf0xo,1619
+testit_python_commons/services/adapter_manager.py,sha256=HiPxT5Ikbpdqe41EO-mmiUXvmDPms6ZRnsTCVdnybuE,11839
+testit_python_commons/services/adapter_manager_configuration.py,sha256=ZPgSRUskSh8sJNAtlpOSAXqGWWTdYNsDb3jaiuTFEc8,2228
 testit_python_commons/services/fixture_manager.py,sha256=PCSLBEPa3yJVbCPsMt_Y5badWLAhKrJsZTaUesq7oNI,2006
 testit_python_commons/services/fixture_storage.py,sha256=nAIW0p9lVvVWtiVdFNqaD7-gCBislY8DLrfdlh8OqFw,1205
 testit_python_commons/services/logger.py,sha256=E4LmykJeEHPIzuRjJShAuo2WvObfBBwOgBjYnaQi4C4,810
@@ -242,12 +242,13 @@ testit_python_commons/services/plugin_manager.py,sha256=IIPJZSCJrOKQWfm0kmL9jWG9
 testit_python_commons/services/retry.py,sha256=CD_ou5xcz9gjxYUfctGJTAFMmTcv8hMNqOt42VTxS2I,2476
 testit_python_commons/services/step_manager.py,sha256=pKTtEgpwOS_KJV_9kcBmKA8WRJkWvvdye_Y0ot0AKw0,1103
 testit_python_commons/services/step_result_storage.py,sha256=4axfi2dnP3LABlEql9k6lydftOgDFV3c2cXN-1uEvXU,633
+testit_python_commons/services/test_run_metadata.py,sha256=F3Ig8p6AwEkalZ4S93okzGIrP_2AYVybrT6LLc9_1cY,1547
 testit_python_commons/services/utils.py,sha256=5LBymIxEC1AKtGQz-S1-ipo3OYR-JzRUAC4WWFQylHc,4060
 testit_python_commons/services/sync_storage/__init__.py,sha256=Qmjs6Xk5l-i5FFItk0-XPrlVK_HkDuX6FD8FID1iKu0,154
 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.0.dist-info/METADATA,sha256=xxhtb3Ug-X3Xfu-CjyZ2EwK7_uOkpSwXXWFcN2uJcUI,1675
-testit_python_commons-5.1.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-testit_python_commons-5.1.0.dist-info/top_level.txt,sha256=Jme7mbm0CtX-96d3cUiEonamIeb7kAo3Je4bSlxBndI,72
-testit_python_commons-5.1.0.dist-info/RECORD,,
+testit_python_commons-5.1.1.dist-info/METADATA,sha256=xtmhARbQoOwie5KNvJOusxkUTxDrv0yXCep2ZBqqYTQ,1675
+testit_python_commons-5.1.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+testit_python_commons-5.1.1.dist-info/top_level.txt,sha256=Jme7mbm0CtX-96d3cUiEonamIeb7kAo3Je4bSlxBndI,72
+testit_python_commons-5.1.1.dist-info/RECORD,,

{testit_python_commons-5.1.0.dist-info → testit_python_commons-5.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (83.0.0)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any