testit-cli 2.4.11.post540__tar.gz → 2.5.0__tar.gz

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-cli
-Version: 2.4.11.post540
+Version: 2.5.0
 Summary: This tool is the command line wrapper of Test IT allowing you to upload the test results in real time to Test IT
 Home-page: https://pypi.org/project/testit-cli/
 Author: Integration team
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: testit-api-client==6.3.1.post540
+Requires-Dist: testit-api-client==7.0.1
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4
@@ -54,4 +54,4 @@ You can see more information in [official documentation](https://docs.testit.sof
 | 5.2.3   | 2.3.0.post523  |
 | 5.3     | 2.4.5.post530  |
 | 5.4     | 2.4.11.post540 |
-| Cloud   | 2.4.10         |
+| Cloud   | 2.4.11         |

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/README.md

@@ -21,4 +21,4 @@ You can see more information in [official documentation](https://docs.testit.sof
 | 5.2.3   | 2.3.0.post523  |
 | 5.3     | 2.4.5.post530  |
 | 5.4     | 2.4.11.post540 |
-| Cloud   | 2.4.10         |
+| Cloud   | 2.4.11         |

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "2.4.11.post540"
+VERSION = "2.5.0"
 
 setup(
     name='testit-cli',
@@ -26,7 +26,7 @@ setup(
     py_modules=['testit_cli'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['testit-api-client==6.3.1.post540', 'validators', 'tqdm', 'click~=8.0.4'],
+    install_requires=['testit-api-client==7.0.1', 'validators', 'tqdm', 'click~=8.0.4'],
     entry_points={
         'console_scripts': [
             'testit = testit_cli.__main__:console_main'

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/apiclient.py

@@ -3,11 +3,20 @@ import logging
 import os
 import typing
 
-from testit_api_client import ApiClient as TmsClient, CreateEmptyTestRunApiModel, AutoTestApiResult, \
-    AutoTestSearchApiModel, AssignAttachmentApiModel
+from testit_api_client import ApiClient as TmsClient
 from testit_api_client import Configuration
-from testit_api_client.api import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi
-from testit_api_client.models import TestResultShortResponse
+from testit_api_client.apis import AttachmentsApi, AutoTestsApi, TestRunsApi, TestResultsApi
+from testit_api_client.model.api_v2_auto_tests_search_post_request import ApiV2AutoTestsSearchPostRequest
+from testit_api_client.model.api_v2_test_results_search_post_request import ApiV2TestResultsSearchPostRequest
+from testit_api_client.model.attachment_model import AttachmentModel
+from testit_api_client.model.attachment_put_model import AttachmentPutModel
+from testit_api_client.model.auto_test_model import AutoTestModel
+from testit_api_client.model.auto_test_results_for_test_run_model import AutoTestResultsForTestRunModel
+from testit_api_client.model.create_auto_test_request import CreateAutoTestRequest
+from testit_api_client.model.test_run_v2_api_result import TestRunV2ApiResult
+from testit_api_client.model.update_auto_test_request import UpdateAutoTestRequest
+from testit_api_client.model.update_empty_request import UpdateEmptyRequest
+from testit_api_client.models import TestResultShortResponse, CreateEmptyRequest, AutoTestApiResult
 
 from .converter import Converter
 from .models.testrun import TestRun
@@ -15,7 +24,7 @@ from .html_escape_utils import HtmlEscapeUtils
 
 
 class ApiClient:
-    """Class representing a api client"""
+    """Class representing an api client"""
 
     def __init__(self, url: str, token: str, disable_cert_validation: bool):
         client_config = Configuration(host=url)
@@ -34,28 +43,29 @@ class ApiClient:
 
     def create_test_run(self, project_id: str, name: str) -> TestRun:
         """Function creates test run and returns test run id."""
-        model = CreateEmptyTestRunApiModel(project_id=project_id, name=name)
+        model = CreateEmptyRequest(project_id=project_id, name=name)
         model = HtmlEscapeUtils.escape_html_in_object(model)
         logging.debug(f"Creating test run with model: {model}")
 
-        test_run = self.__test_run_api.create_empty(model)
+        test_run: TestRunV2ApiResult = self.__test_run_api.create_empty(create_empty_request=model)
 
         logging.info(f'Created new testrun (ID: {test_run.id})')
         logging.debug(f"Test run created: {test_run}")
 
         return Converter.test_run_v2_get_model_to_test_run(test_run)
 
-    def update_test_run(self, test_run: TestRun):
+    def update_test_run(self, test_run: TestRun) -> None:
         """Function updates test run."""
-        model = Converter.test_run_to_update_empty_request(test_run)
+        model: UpdateEmptyRequest = Converter.test_run_to_update_empty_request(test_run)
         model = HtmlEscapeUtils.escape_html_in_object(model)
         logging.debug(f"Updating test run with model: {model}")
 
-        self.__test_run_api.update_empty(model)
+        # UpdateEmptyRequest
+        self.__test_run_api.update_empty(update_empty_request=model)
 
         logging.info(f'Updated testrun (ID: {test_run.id})')
 
-    def complete_test_run(self, test_run_id: str):
+    def complete_test_run(self, test_run_id: str) -> None:
         """Function completes test run."""
         logging.debug(f"Completing test run {test_run_id}")
 
@@ -65,64 +75,67 @@ class ApiClient:
 
         logging.info(f"Completed testrun (ID: {test_run_id})")
 
-    def get_test_run(self, test_run_id: str) -> Converter.test_run_v2_get_model_to_test_run:
+    def get_test_run(self, test_run_id: str) -> TestRun:
         """Function gets test run and returns test run."""
         logging.debug(f"Getting test run {test_run_id}")
 
-        test_run = self.__test_run_api.get_test_run_by_id(test_run_id)
+        test_run: TestRunV2ApiResult = self.__test_run_api.get_test_run_by_id(test_run_id)
         if test_run is not None:
             logging.debug(f"Got testrun (ID: {test_run_id})")
             return Converter.test_run_v2_get_model_to_test_run(test_run)
 
         logging.error(f"Test run {test_run_id} not found!")
+        raise Exception("Test run {test_run_id} not found!")
 
-    def get_autotests(self, model: AutoTestSearchApiModel) \
+    def get_autotests(self, model: ApiV2AutoTestsSearchPostRequest) \
             -> list[AutoTestApiResult]:
         """Function returns list of AutoTestApiResult."""
         logging.debug(f"Getting autotests: {model}")
 
-        autotests = self.__autotest_api.api_v2_auto_tests_search_post(auto_test_search_api_model=model)
+        autotests: list[AutoTestApiResult] = (self.__autotest_api.api_v2_auto_tests_search_post
+                                              (api_v2_auto_tests_search_post_request=model))
 
         logging.debug(f"Got autotests: {autotests}")
 
         return autotests
 
-    def create_autotest(self, model: Converter.test_result_to_create_autotest_request):
+    def create_autotest(self, model: CreateAutoTestRequest) -> str:
         """Function creates autotest and returns autotest id."""
         model = HtmlEscapeUtils.escape_html_in_object(model)
 
         logging.debug(f"Creating autotest {model}")
 
-        response = self.__autotest_api.create_auto_test(auto_test_post_model=model)
+        response: AutoTestModel = self.__autotest_api.create_auto_test(create_auto_test_request=model)
 
         logging.debug(f"Created autotest {response}")
 
-        return response.id
+        return str(response.id)
 
-    def update_autotest(self, model: Converter.test_result_to_update_autotest_request):
+    def update_autotest(self, model: UpdateAutoTestRequest) -> None:
         """Function updates autotest"""
         try:
-            model = HtmlEscapeUtils.escape_html_in_object(model)
+            escaped_model: UpdateAutoTestRequest = HtmlEscapeUtils.escape_html_in_object(model)
 
-            logging.debug(f"Updating autotest {model}")
+            logging.debug(f"Updating autotest {escaped_model}")
 
-            self.__autotest_api.update_auto_test(auto_test_put_model=model)
+            # UpdateAutoTestRequest
+            self.__autotest_api.update_auto_test(update_auto_test_request=escaped_model)
 
             logging.debug(f'Updated "{model.name}" successfully!')
         except Exception as exc:
             logging.error(f'Updated "{model.name}" status: {exc}')
 
     def send_test_result(
-            self, testrun_id: str, model: Converter.test_result_to_testrun_result_post_model
-    ):
+            self, testrun_id: str, model: AutoTestResultsForTestRunModel
+    ) -> None:
         """Function sends autotest result to test run"""
         try:
-            model = HtmlEscapeUtils.escape_html_in_object(model)
+            escaped_model: AutoTestResultsForTestRunModel = HtmlEscapeUtils.escape_html_in_object(model)
 
-            logging.debug(f"Adding autotest results to testrun {testrun_id}: {model}")
+            logging.debug(f"Adding autotest results to testrun {testrun_id}: {escaped_model}")
 
             self.__test_run_api.set_auto_test_results_for_test_run(
-                id=testrun_id, auto_test_results_for_test_run_model=[model]
+                id=testrun_id, auto_test_results_for_test_run_model=[escaped_model]
             )
             logging.debug(
                 f"Added autotest results to testrun {testrun_id} successfully"
@@ -130,21 +143,23 @@ class ApiClient:
         except Exception as exc:
             logging.error(f"Set result status: {exc}")
 
-    def upload_attachments(self, attachments: typing.List[str]) -> typing.List[AssignAttachmentApiModel]:
+    def upload_attachments(self, attachments: typing.List[str]) -> typing.List[AttachmentPutModel]:
         """Function upload attachments and returns list of AttachmentPutModel."""
         attachment_ids = []
 
         for attachment in attachments:
             if os.path.isfile(attachment):
-                try:
-                    attachment_response = self.__attachments_api.api_v2_attachments_post(
-                        file=attachment)
+                with open(attachment, "rb+") as file:
+                    try:
+                        attachment_response: AttachmentModel = self.__attachments_api.api_v2_attachments_post(
+                            # file_type
+                            file=file)
 
-                    attachment_ids.append(AssignAttachmentApiModel(id=attachment_response.id))
+                        attachment_ids.append(AttachmentPutModel(id=attachment_response.id))
 
-                    logging.debug(f'Attachment "{attachment}" was uploaded')
-                except Exception as exc:
-                    logging.error(f'Upload attachment "{attachment}" status: {exc}')
+                        logging.debug(f'Attachment "{attachment}" was uploaded')
+                    except Exception as exc:
+                        logging.error(f'Upload attachment "{attachment}" status: {exc}')
             else:
                 logging.error(f'File "{attachment}" was not found!')
 
@@ -152,13 +167,13 @@ class ApiClient:
 
     def get_test_results(
             self,
-            model: Converter.testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request
-    ) -> typing.List[TestResultShortResponse]:
+            model: ApiV2TestResultsSearchPostRequest
+    ) -> list[TestResultShortResponse]:
         """Function returns list of TestResultShortGetModel."""
         logging.debug(f"Getting test results: {model}")
 
-        test_results = self.__test_results_api.api_v2_test_results_search_post(
-            test_results_filter_api_model=model)
+        test_results: list[TestResultShortResponse] = self.__test_results_api.api_v2_test_results_search_post(
+            api_v2_test_results_search_post_request=model)
 
         logging.debug(f"Got test results: {test_results}")
 

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/autotests_filter.py

@@ -1,5 +1,9 @@
 import hashlib
 
+from testit_api_client.model.api_v2_auto_tests_search_post_request import ApiV2AutoTestsSearchPostRequest
+from testit_api_client.model.api_v2_test_results_search_post_request import ApiV2TestResultsSearchPostRequest
+from testit_api_client.model.auto_test_api_result import AutoTestApiResult
+
 from .apiclient import ApiClient
 from .converter import Converter
 from .filter_factory import FilterFactory
@@ -13,11 +17,11 @@ class AutotestsFilter:
 
     def create_filter(self):
         """Function returns str of filter by autotests for test Framework run command."""
-        test_results_search_post_model = (
+        test_results_search_post_request: ApiV2TestResultsSearchPostRequest = (
             Converter.testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request(
                 self.__config.testrun_id,
                 self.__config.configuration_id))
-        test_results = self.__api_client.get_test_results(test_results_search_post_model)
+        test_results = self.__api_client.get_test_results(test_results_search_post_request)
 
         if len(test_results) == 0:
             exception = f"Couldn't get the test results in progress by test run id \"{self.__config.testrun_id}\" " + \
@@ -25,13 +29,14 @@ class AutotestsFilter:
 
             raise Exception(exception)
 
-        autotest_ids = Converter.test_result_short_get_models_to_autotest_ids(test_results)
-        autotests_search_post_model = Converter.autotest_ids_to_autotests_search_post_request(autotest_ids)
-        autotests = self.__api_client.get_autotests(autotests_search_post_model)
-        external_keys = Converter.autotest_models_to_external_keys(autotests)
+        autotest_ids: list[int] = Converter.test_result_short_get_models_to_autotest_ids(test_results)
+        autotests_search_post_request: ApiV2AutoTestsSearchPostRequest = (
+            Converter.autotest_ids_to_autotests_search_post_request(autotest_ids))
+        autotests: list[AutoTestApiResult] = self.__api_client.get_autotests(autotests_search_post_request)
+        external_keys: list[str] = Converter.autotest_models_to_external_keys(autotests)
 
         return FilterFactory.get(self.__config, external_keys)
 
     @staticmethod
-    def __get_external_id(value: str):
+    def __get_external_id(value: str) -> str:
         return hashlib.md5(value.encode("utf-8")).hexdigest()

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/converter.py

@@ -1,53 +1,61 @@
 import typing
 
-from testit_api_client import UpdateEmptyTestRunApiModel, TestRunV2ApiResult, LinkApiResult, AttachmentApiResult, \
-    AutoTestApiResult, AutoTestSearchApiModel, AutoTestFilterApiModel, AutoTestSearchIncludeApiModel, \
-    TestResultsFilterApiModel
+from testit_api_client.model.api_v2_auto_tests_search_post_request import ApiV2AutoTestsSearchPostRequest
+from testit_api_client.model.api_v2_test_results_search_post_request import ApiV2TestResultsSearchPostRequest
+from testit_api_client.model.attachment_api_result import AttachmentApiResult
+from testit_api_client.model.auto_test_api_result import AutoTestApiResult
+from testit_api_client.model.auto_test_search_api_model_filter import AutoTestSearchApiModelFilter
+from testit_api_client.model.auto_test_search_api_model_includes import AutoTestSearchApiModelIncludes
+from testit_api_client.model.create_auto_test_request import CreateAutoTestRequest
+from testit_api_client.model.link_api_result import LinkApiResult
+from testit_api_client.model.test_run_v2_api_result import TestRunV2ApiResult
+from testit_api_client.model.update_auto_test_request import UpdateAutoTestRequest
+from testit_api_client.model.update_empty_request import UpdateEmptyRequest
 from testit_api_client.models import (
     AutoTestResultsForTestRunModel,
     AttachmentPutModel,
-    AutoTestPostModel,
-    AutoTestPutModel,
     LinkPutModel,
     TestResultOutcome,
     TestResultShortResponse,
 )
+from testit_api_client.model.assign_attachment_api_model import AssignAttachmentApiModel
 
+from .models.testcase import TestCase
 from .models.testrun import TestRun
 
 
 class Converter:
     @staticmethod
     def project_id_and_external_id_to_autotests_search_post_request(
-            project_id: str, external_id: str) -> AutoTestSearchApiModel:
-        autotests_filter = AutoTestFilterApiModel(
+            project_id: str, external_id: str) -> ApiV2AutoTestsSearchPostRequest:
+        autotests_filter = AutoTestSearchApiModelFilter(
             project_ids=[project_id],
             external_ids=[external_id],
             is_deleted=False)
-        autotests_includes = AutoTestSearchIncludeApiModel(
+        autotests_includes = AutoTestSearchApiModelIncludes(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return AutoTestSearchApiModel(filter=autotests_filter, includes=autotests_includes)
+        return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
 
     @staticmethod
     def autotest_ids_to_autotests_search_post_request(
-            autotest_ids: typing.List[int]) -> AutoTestSearchApiModel:
-        autotests_filter = AutoTestFilterApiModel(
+            autotest_ids: typing.List[int]) -> ApiV2AutoTestsSearchPostRequest:
+        autotests_filter = AutoTestSearchApiModelFilter(
             global_ids=autotest_ids)
-        autotests_includes = AutoTestSearchIncludeApiModel(
+        autotests_includes = AutoTestSearchApiModelIncludes(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return AutoTestSearchApiModel(filter=autotests_filter, includes=autotests_includes)
+        return ApiV2AutoTestsSearchPostRequest(filter=autotests_filter, includes=autotests_includes)
 
     @staticmethod
     def testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request(
             testrun_id: str,
-            configuration_id: str) -> TestResultsFilterApiModel:
-        return TestResultsFilterApiModel(
+            configuration_id: str) -> ApiV2TestResultsSearchPostRequest:
+        return ApiV2TestResultsSearchPostRequest(
             test_run_ids=[testrun_id],
             configuration_ids=[configuration_id],
             outcomes=[TestResultOutcome("InProgress")])
@@ -79,8 +87,8 @@ class Converter:
 
     @staticmethod
     def test_result_to_create_autotest_request(
-            result, external_id: str, project_id: str) -> AutoTestPostModel:
-        return AutoTestPostModel(
+            result: TestCase, external_id: str, project_id: str) -> CreateAutoTestRequest:
+        return CreateAutoTestRequest(
             external_id=external_id,
             project_id=project_id,
             name=result.get_name(),
@@ -90,8 +98,8 @@ class Converter:
 
     @staticmethod
     def test_result_to_update_autotest_request(
-            result, external_id: str, project_id: str) -> AutoTestPutModel:
-        return AutoTestPutModel(
+            result: TestCase, external_id: str, project_id: str) -> UpdateAutoTestRequest:
+        return UpdateAutoTestRequest(
             external_id=external_id,
             project_id=project_id,
             name=result.get_name(),
@@ -102,7 +110,7 @@ class Converter:
 
     @staticmethod
     def test_result_to_testrun_result_post_model(
-        result, external_id: str, configuration_id: str
+        result: TestCase, external_id: str, configuration_id: str
     ) -> AutoTestResultsForTestRunModel:
         return AutoTestResultsForTestRunModel(
             configuration_id=configuration_id,
@@ -129,7 +137,7 @@ class Converter:
     @classmethod
     def attachment_models_to_attachment_put_models(
             cls,
-            attachment_models: typing.List[AttachmentApiResult]) -> typing.List[AttachmentPutModel]:
+            attachment_models: typing.List[AttachmentApiResult]) -> typing.List[AssignAttachmentApiModel]:
         attachment_put_models = []
 
         for attachment_model in attachment_models:
@@ -139,8 +147,17 @@ class Converter:
         return attachment_put_models
 
     @staticmethod
-    def attachment_model_to_attachment_put_model(attachment_model: AttachmentApiResult) -> AttachmentPutModel:
-        return AttachmentPutModel(id=attachment_model.id)
+    def attachment_model_to_attachment_put_model(attachment_model: AttachmentApiResult) -> AssignAttachmentApiModel:
+        return AssignAttachmentApiModel(id=attachment_model.id)
+
+    @staticmethod
+    def attachment_put_model_to_assign_attachment(attachment_model: AttachmentPutModel) -> AssignAttachmentApiModel:
+        return AssignAttachmentApiModel(id=attachment_model.id)
+
+    @staticmethod
+    def attachment_put_models_to_assign_attachments(attachment_models: list[AttachmentPutModel])\
+            -> list[AssignAttachmentApiModel]:
+        return list(map(lambda x: Converter.attachment_put_model_to_assign_attachment(x), attachment_models))
 
     @classmethod
     def link_models_to_link_put_models(
@@ -166,10 +183,13 @@ class Converter:
         )
 
     @staticmethod
-    def test_run_to_update_empty_request(test_run: TestRun) -> UpdateEmptyTestRunApiModel:
-        return UpdateEmptyTestRunApiModel(
+    def test_run_to_update_empty_request(test_run: TestRun) -> UpdateEmptyRequest:
+        return UpdateEmptyRequest(
+            # str
             id=test_run.id,
+            # str
             name=test_run.name,
+            # str
             description=test_run.description,
             launch_source=test_run.launch_source,
             attachments=test_run.attachments,

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/dir_worker.py

@@ -19,7 +19,7 @@ class DirWorker:
         return os.path.exists(path_to_dir) and os.path.isdir(path_to_dir)
 
     @staticmethod
-    def __split_path_to_dir_names(path_to_dir: str) -> tuple:
+    def __split_path_to_dir_names(path_to_dir: str) -> tuple[str, ...]:
         return PurePath(path_to_dir).parts[:-1]
 
     @staticmethod

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/file_worker.py

@@ -4,7 +4,7 @@ import os
 
 class FileWorker:
     @classmethod
-    def get_files(cls, path_to_files: str, files_type: str = None) -> list:
+    def get_files(cls, path_to_files: str, files_type: str = "") -> list[str]:
         if os.path.isdir(path_to_files):
             return glob.glob(cls.__get_pathname(path_to_files, files_type))
 
@@ -16,7 +16,7 @@ class FileWorker:
         return files
 
     @staticmethod
-    def __get_pathname(path_to_files: str, files_type: str):
+    def __get_pathname(path_to_files: str, files_type: str) -> str:
         if files_type:
             return f"{path_to_files}/*.{files_type}"
 

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/filter_factory.py

@@ -36,12 +36,12 @@ class FilterFactory:
         return initialization[config.framework](external_keys)
 
     @classmethod
-    def __initialize_pytest_filter(cls, external_keys: typing.List[str]):
+    def __initialize_pytest_filter(cls, external_keys: typing.List[str]) -> str:
         """Initialize filter for pytest run"""
         return '-k\n' + ' or '.join(external_keys)
 
     @staticmethod
-    def __initialize_robotframework_filter(external_keys: typing.List[str]):
+    def __initialize_robotframework_filter(external_keys: typing.List[str]) -> str:
         """Initialize filter for RobotFramework run"""
         robotframework_filter = ""
 
@@ -51,17 +51,17 @@ class FilterFactory:
         return robotframework_filter
 
     @staticmethod
-    def __initialize_behave_filter(external_keys: typing.List[str]):
+    def __initialize_behave_filter(external_keys: typing.List[str]) -> str:
         """Initialize filter for Behave run"""
         return '-n' + '|'.join(external_keys)
 
     @classmethod
-    def __initialize_nose_filter(cls, external_keys: typing.List[str]):
+    def __initialize_nose_filter(cls, external_keys: typing.List[str]) -> str:
         """Initialize filter for Nose run"""
         return ' '.join(external_keys)
 
     @staticmethod
-    def __initialize_gradle_testng_junit4_junit5_filter(external_keys: typing.List[str]):
+    def __initialize_gradle_testng_junit4_junit5_filter(external_keys: typing.List[str]) -> str:
         """Initialize filter for gradle TestNG or JUnit4 or JUnit5 run with gradle"""
         autotest_keys = []
 
@@ -76,7 +76,7 @@ class FilterFactory:
     #     return '+' + ' '.join(external_keys)
 
     @staticmethod
-    def __initialize_maven_testng_junit4_junit5_filter(external_keys: typing.List[str]):
+    def __initialize_maven_testng_junit4_junit5_filter(external_keys: typing.List[str]) -> str:
         """Initialize filter for TestNG or JUnit4 or JUnit5 run with maven"""
         autotest_keys = []
 
@@ -86,12 +86,12 @@ class FilterFactory:
         return ' '.join(autotest_keys)
 
     @classmethod
-    def __initialize_codeceptjs_mocha_playwright_filter(cls, external_keys: typing.List[str]):
+    def __initialize_codeceptjs_mocha_playwright_filter(cls, external_keys: typing.List[str]) -> str:
         """Initialize filter for CodeceptJS or Mocha or Playwright run"""
         return '|'.join(external_keys)
 
     @classmethod
-    def __initialize_cucumber_cucumberjs_jest_golang_filter(cls, external_keys: typing.List[str]):
+    def __initialize_cucumber_cucumberjs_jest_golang_filter(cls, external_keys: typing.List[str]) -> str:
         """Initialize filter for Cucumber or CucumberJS or Jest or Golang run"""
         autotest_keys = []
 
@@ -101,7 +101,7 @@ class FilterFactory:
         return '|'.join(autotest_keys)
 
     @staticmethod
-    def __initialize_mstest_nunit_xunit_filter(external_keys: typing.List[str]):
+    def __initialize_mstest_nunit_xunit_filter(external_keys: typing.List[str]) -> str:
         """Initialize filter for MSTest or NUnit or XUnit run"""
         autotest_keys = []
 
@@ -111,7 +111,7 @@ class FilterFactory:
         return '|'.join(autotest_keys)
 
     @staticmethod
-    def __initialize_specflow_filter(external_keys: typing.List[str]):
+    def __initialize_specflow_filter(external_keys: typing.List[str]) -> str:
         """Initialize filter for SpecFlow run"""
         autotest_keys = []
 

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/importer.py

@@ -1,5 +1,7 @@
 import hashlib
 
+from testit_api_client.model.api_v2_auto_tests_search_post_request import ApiV2AutoTestsSearchPostRequest
+from testit_api_client.model.auto_test_api_result import AutoTestApiResult
 from tqdm import tqdm
 
 from .apiclient import ApiClient
@@ -13,7 +15,7 @@ class Importer:
         self.__api_client = api_client
         self.__config = config
 
-    def send_results(self, results: [TestCase]):
+    def send_results(self, results: list[TestCase]) -> None:
         for result in tqdm(results, desc="Uploading"):
             external_id = self.__get_external_id(
                 result.get_name_space()
@@ -21,11 +23,10 @@ class Importer:
                 + result.get_name()
             )
 
-            autotests = self.__api_client.get_autotests(
-                Converter.project_id_and_external_id_to_autotests_search_post_request(
-                    self.__config.project_id, external_id
-                )
-            )
+            request: ApiV2AutoTestsSearchPostRequest = (Converter
+                                                        .project_id_and_external_id_to_autotests_search_post_request
+                                                        (self.__config.project_id, external_id))
+            autotests: list[AutoTestApiResult] = self.__api_client.get_autotests(request)
 
             if not autotests:
                 self.__api_client.create_autotest(
@@ -50,5 +51,5 @@ class Importer:
             )
 
     @staticmethod
-    def __get_external_id(value: str):
+    def __get_external_id(value: str) -> str:
         return hashlib.md5(value.encode("utf-8")).hexdigest()

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/logger.py

@@ -5,7 +5,7 @@ class Logger:
     """Class representing a logger factory"""
 
     @staticmethod
-    def register_logger(is_debug: bool):
+    def register_logger(is_debug: bool) -> None:
         """Function registers loggers."""
 
         logging.basicConfig(

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/models/config.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+import typing
 
 
 @dataclass
@@ -12,10 +13,10 @@ class Config:
     separator: str
     namespace: str
     classname: str
-    results: list
+    results: list[typing.Any]
     is_debug: bool
     output: str
-    paths_to_attachments: list
+    paths_to_attachments: list[typing.Any]
     disable_cert_validation: bool
     framework: str
     ignore_flaky_failure: bool

testit_cli-2.5.0/src/testit_cli/models/testcase.py

@@ -0,0 +1,61 @@
+from datetime import timedelta
+from typing import Optional
+
+from testit_api_client.models import AvailableTestResultOutcome
+
+from .status import Status
+
+
+class TestCase:
+    __name: Optional[str] = None
+    __name_space: Optional[str] = None
+    __class_name: Optional[str] = None
+    __duration: Optional[timedelta] = None
+    __status: Optional[Status] = None
+    __message: Optional[str] = None
+    __trace: Optional[str] = None
+    __is_flaky: Optional[bool] = None
+
+    def __init__(self, name, name_space, class_name, duration):
+        self.__name = name
+        self.__name_space = name_space
+        self.__class_name = class_name
+        self.__duration = timedelta(seconds=float(duration))
+        self.__status = Status.PASSED
+        self.__trace = ""
+
+    def get_name(self) -> Optional[str]:
+        return self.__name
+
+    def get_name_space(self) -> Optional[str]:
+        return self.__name_space
+
+    def get_class_name(self) -> Optional[str]:
+        return self.__class_name
+
+    def get_duration(self) -> Optional[float]:
+        return self.__duration.total_seconds()
+
+    def get_message(self) -> Optional[str]:
+        return self.__message
+
+    def set_message(self, value: str) -> None:
+        self.__message = value
+
+    def get_trace(self) -> Optional[str]:
+        return self.__trace
+
+    def set_trace(self, value: str) -> None:
+        self.__trace = value
+
+    def get_status(self) -> AvailableTestResultOutcome:
+        return AvailableTestResultOutcome(self.__status.value)
+
+    def set_status(self, value: Status) -> None:
+        self.__status = value
+
+    def get_is_flaky(self) -> Optional[bool]:
+        return self.__is_flaky
+
+    def set_is_flaky(self, value: bool) -> None:
+        self.__is_flaky = value

testit_cli-2.5.0/src/testit_cli/models/testrun.py

@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+from typing import List
+from testit_api_client.model.assign_attachment_api_model import AssignAttachmentApiModel
+from testit_api_client.model.link_put_model import LinkPutModel
+
+
+@dataclass
+class TestRun:
+    id: str
+    project_id: str
+    state: str
+    name: str
+    description: str
+    launch_source: str
+    attachments: List[AssignAttachmentApiModel]
+    links: List[LinkPutModel]

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/parser.py

@@ -1,4 +1,5 @@
 import logging
+import typing
 from xml.dom import minidom
 
 from .models.config import Config
@@ -92,7 +93,7 @@ class Parser:
         return results
 
     @classmethod
-    def __form_trace(cls, child_nodes: list) -> str:
+    def __form_trace(cls, child_nodes: list[typing.Any]) -> str:
         trace = ""
 
         for child in child_nodes:
@@ -104,9 +105,9 @@ class Parser:
         return trace
 
     @classmethod
-    def __get_testcases(cls, xml) -> list:
+    def __get_testcases(cls, xml: typing.Any) -> list[typing.Any]:
         for tag in cls.__TAGS_OF_TESTS:
-            testcases = xml.getElementsByTagName(tag)
+            testcases: list[typing.Any] = xml.getElementsByTagName(tag)
 
             if testcases:
                 return testcases

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli/service.py

@@ -1,6 +1,10 @@
 import logging
 
+from testit_api_client.model.assign_attachment_api_model import AssignAttachmentApiModel
+from testit_api_client.model.attachment_put_model import AttachmentPutModel
+
 from .autotests_filter import AutotestsFilter
+from .converter import Converter
 from .models.config import Config
 from .models.testrun import TestRun
 from .parser import Parser
@@ -54,7 +58,7 @@ class Service:
             self.__config.testrun_name
         )
 
-    def __upload_attachments(self) -> list:
+    def __upload_attachments(self) -> list[AttachmentPutModel]:
         files = []
 
         for path_to_attachments in self.__config.paths_to_attachments:
@@ -82,11 +86,13 @@ class Service:
 
         logging.info("Successfully sent test results")
 
-    def __update_test_run_with_attachments(self, test_run: TestRun):
-        test_run.attachments.extend(self.__upload_attachments())
+    def __update_test_run_with_attachments(self, test_run: TestRun) -> None:
+        attachments: list[AssignAttachmentApiModel] = Converter.attachment_put_models_to_assign_attachments(
+            self.__upload_attachments())
+        test_run.attachments.extend(attachments)
         self.__api_client.update_test_run(test_run)
 
-    def __write_to_output(self, content: str):
+    def __write_to_output(self, content: str) -> None:
         DirWorker.create_dir(self.__config.output)
 
         with open(self.__config.output, "w", encoding="utf-8") as text_file:

{testit_cli-2.4.11.post540 → testit_cli-2.5.0}/src/testit_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testit-cli
-Version: 2.4.11.post540
+Version: 2.5.0
 Summary: This tool is the command line wrapper of Test IT allowing you to upload the test results in real time to Test IT
 Home-page: https://pypi.org/project/testit-cli/
 Author: Integration team
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: testit-api-client==6.3.1.post540
+Requires-Dist: testit-api-client==7.0.1
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4
@@ -54,4 +54,4 @@ You can see more information in [official documentation](https://docs.testit.sof
 | 5.2.3   | 2.3.0.post523  |
 | 5.3     | 2.4.5.post530  |
 | 5.4     | 2.4.11.post540 |
-| Cloud   | 2.4.10         |
+| Cloud   | 2.4.11         |

testit_cli-2.5.0/src/testit_cli.egg-info/requires.txt

@@ -0,0 +1,4 @@
+testit-api-client==7.0.1
+validators
+tqdm
+click~=8.0.4

testit_cli-2.4.11.post540/src/testit_cli/models/testcase.py

@@ -1,60 +0,0 @@
-from datetime import timedelta
-
-from testit_api_client.models import AvailableTestResultOutcome
-
-from .status import Status
-
-
-class TestCase:
-    __name: str = None
-    __name_space: str = None
-    __class_name: str = None
-    __duration: timedelta = None
-    __status: Status = None
-    __message: str = None
-    __trace: str = None
-    __is_flaky: bool = None
-
-    def __init__(self, name, name_space, class_name, duration):
-        self.__name = name
-        self.__name_space = name_space
-        self.__class_name = class_name
-        self.__duration = timedelta(seconds=float(duration))
-        self.__status = Status.PASSED
-        self.__trace = ""
-
-    def get_name(self):
-        return self.__name
-
-    def get_name_space(self):
-        return self.__name_space
-
-    def get_class_name(self):
-        return self.__class_name
-
-    def get_duration(self):
-        return self.__duration.total_seconds()
-
-    def get_message(self):
-        return self.__message
-
-    def set_message(self, value: str):
-        self.__message = value
-
-    def get_trace(self):
-        return self.__trace
-
-    def set_trace(self, value: str):
-        self.__trace = value
-
-    def get_status(self):
-        return AvailableTestResultOutcome(self.__status.value)
-
-    def set_status(self, value: Status):
-        self.__status = value
-
-    def get_is_flaky(self) -> bool:
-        return self.__is_flaky
-
-    def set_is_flaky(self, value: bool):
-        self.__is_flaky = value

testit_cli-2.4.11.post540/src/testit_cli/models/testrun.py

@@ -1,13 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass
-class TestRun:
-    id: str
-    project_id: str
-    state: str
-    name: str
-    description: str
-    launch_source: str
-    attachments: list
-    links: list

testit_cli-2.4.11.post540/src/testit_cli.egg-info/requires.txt

@@ -1,4 +0,0 @@
-testit-api-client==6.3.1.post540
-validators
-tqdm
-click~=8.0.4