testit-cli 2.2.2.post522__tar.gz → 2.3.0.post523__tar.gz

{testit_cli-2.2.2.post522 → testit_cli-2.3.0.post523}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: testit-cli
-Version: 2.2.2.post522
+Version: 2.3.0.post523
 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==5.1.2.post522
+Requires-Dist: testit-api-client==5.0.0
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4
@@ -41,12 +41,13 @@ You can see more information in [official documentation](https://docs.testit.sof
 
 ## Compatibility
 
-| Test IT | Test IT CLI    |
-|---------|----------------|
-| 3.5+    | 0.1            |
-| 4.4     | 1.0            |
-| 4.5     | 1.2            |
-| 4.6     | 1.5            |
-| 5.0     | 2.0            |
-| 5.2     | 2.1            |
-| 5.2.2   | 2.2.1.post522  |
+| Test IT | Test IT CLI   |
+|---------|---------------|
+| 3.5+    | 0.1           |
+| 4.4     | 1.0           |
+| 4.5     | 1.2           |
+| 4.6     | 1.5           |
+| 5.0     | 2.0           |
+| 5.2     | 2.1           |
+| 5.2.2   | 2.2.1.post522 |
+| 5.2.3   | 2.3.0.post523 |

{testit_cli-2.2.2.post522 → testit_cli-2.3.0.post523}/README.md

@@ -9,12 +9,13 @@ You can see more information in [official documentation](https://docs.testit.sof
 
 ## Compatibility
 
-| Test IT | Test IT CLI    |
-|---------|----------------|
-| 3.5+    | 0.1            |
-| 4.4     | 1.0            |
-| 4.5     | 1.2            |
-| 4.6     | 1.5            |
-| 5.0     | 2.0            |
-| 5.2     | 2.1            |
-| 5.2.2   | 2.2.1.post522  |
+| Test IT | Test IT CLI   |
+|---------|---------------|
+| 3.5+    | 0.1           |
+| 4.4     | 1.0           |
+| 4.5     | 1.2           |
+| 4.6     | 1.5           |
+| 5.0     | 2.0           |
+| 5.2     | 2.1           |
+| 5.2.2   | 2.2.1.post522 |
+| 5.2.3   | 2.3.0.post523 |

{testit_cli-2.2.2.post522 → testit_cli-2.3.0.post523}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "2.2.2.post522"
+VERSION = "2.3.0.post523"
 
 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==5.1.2.post522', 'validators', 'tqdm', 'click~=8.0.4'],
+    install_requires=['testit-api-client==5.0.0', 'validators', 'tqdm', 'click~=8.0.4'],
     entry_points={
         'console_scripts': [
             'testit = testit_cli.__main__:console_main'

{testit_cli-2.2.2.post522 → testit_cli-2.3.0.post523}/src/testit_cli/apiclient.py

@@ -3,11 +3,10 @@ import logging
 import os
 import typing
 
-from testit_api_client import ApiClient as TmsClient, CreateEmptyTestRunApiModel, TestResultShortResponse, \
-    AutoTestApiResult, UpdateEmptyTestRunApiModel
+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 AttachmentPutModel
+from testit_api_client.models import AttachmentPutModel, TestRunV2PostShortModel, TestResultShortResponse
 
 from .converter import Converter
 from .models.testrun import TestRun
@@ -33,22 +32,22 @@ 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 = TestRunV2PostShortModel(project_id=project_id, name=name)
         logging.debug(f"Creating test run with model: {model}")
 
-        test_run = self.__test_run_api.create_empty(model)
+        test_run = self.__test_run_api.create_empty(test_run_v2_post_short_model=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_result_to_test_run(test_run)
+        return Converter.test_run_v2_get_model_to_test_run(test_run)
 
     def update_test_run(self, test_run: TestRun):
         """Function updates test run."""
-        model: UpdateEmptyTestRunApiModel = Converter.test_run_to_update_empty_request(test_run)
+        model = Converter.test_run_to_update_empty_request(test_run)
         logging.debug(f"Updating test run with model: {model}")
 
-        self.__test_run_api.update_empty(model)
+        self.__test_run_api.update_empty(test_run_v2_put_model=model)
 
         logging.info(f'Updated testrun (ID: {test_run.id})')
 
@@ -62,23 +61,22 @@ 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_result_to_test_run:
+    def get_test_run(self, test_run_id: str) -> Converter.test_run_v2_get_model_to_test_run:
         """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)
         if test_run is not None:
             logging.debug(f"Got testrun (ID: {test_run_id})")
-            return Converter.test_run_v2_get_result_to_test_run(test_run)
+            return Converter.test_run_v2_get_model_to_test_run(test_run)
 
         logging.error(f"Test run {test_run_id} not found!")
 
-    def get_autotests(self, model: Converter.project_id_and_external_id_to_autotests_search_post_request)\
-            -> list[AutoTestApiResult]:
+    def get_autotests(self, model: Converter.project_id_and_external_id_to_autotests_search_post_request):
         """Function returns list of AutoTestModel."""
         logging.debug(f"Getting autotests: {model}")
 
-        autotests: list[AutoTestApiResult] = self.__autotest_api.api_v2_auto_tests_search_post(auto_test_search_api_model=model)
+        autotests = self.__autotest_api.api_v2_auto_tests_search_post(autotests_select_model=model)
 
         logging.debug(f"Got autotests: {autotests}")
 
@@ -88,7 +86,7 @@ class ApiClient:
         """Function creates autotest and returns autotest id."""
         logging.debug(f"Creating autotest {model}")
 
-        response = self.__autotest_api.create_auto_test(model)
+        response = self.__autotest_api.create_auto_test(auto_test_post_model=model)
 
         logging.debug(f"Created autotest {response}")
 
@@ -99,7 +97,7 @@ class ApiClient:
         try:
             logging.debug(f"Updating autotest {model}")
 
-            self.__autotest_api.update_auto_test(model)
+            self.__autotest_api.update_auto_test(auto_test_put_model=model)
 
             logging.debug(f'Updated "{model.name}" successfully!')
         except Exception as exc:
@@ -113,7 +111,7 @@ class ApiClient:
             logging.debug(f"Adding autotest results to testrun {testrun_id}: {model}")
 
             self.__test_run_api.set_auto_test_results_for_test_run(
-                testrun_id, [model]
+                id=testrun_id, auto_test_results_for_test_run_model=[model]
             )
             logging.debug(
                 f"Added autotest results to testrun {testrun_id} successfully"
@@ -129,7 +127,8 @@ class ApiClient:
             if os.path.isfile(attachment):
                 with open(attachment, "rb+") as file:
                     try:
-                        attachment_response = self.__attachments_api.api_v2_attachments_post((file.name, file.read()))
+                        attachment_response = self.__attachments_api.api_v2_attachments_post(
+                            file=(file.name, file.read()))
 
                         attachment_ids.append(AttachmentPutModel(id=attachment_response.id))
 
@@ -143,12 +142,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) \
-            -> list[TestResultShortResponse]:
-        """Function returns list of TestResultShortResponse."""
+            model: Converter.testrun_id_and_configuration_id_and_in_progress_outcome_to_test_results_search_post_request
+    ) -> typing.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(model)
+        test_results = self.__test_results_api.api_v2_test_results_search_post(
+            test_results_filter_request=model)
 
         logging.debug(f"Got test results: {test_results}")
 

{testit_cli-2.2.2.post522 → testit_cli-2.3.0.post523}/src/testit_cli/converter.py

@@ -1,16 +1,19 @@
 import typing
 
-from testit_api_client import AutoTestSearchApiModel, AutoTestFilterApiModel, AutoTestSearchIncludeApiModel, \
-    TestResultsFilterApiModel, TestRunV2ApiResult, AttachmentApiResult, LinkApiResult, UpdateEmptyTestRunApiModel, \
-    AssignAttachmentApiModel
 from testit_api_client.models import (
+    AutotestFilterModel,
+    SearchAutoTestsQueryIncludesModel,
     AutoTestResultsForTestRunModel,
+    AutotestsSelectModel,
     AttachmentModel,
     AttachmentPutModel,
     AutoTestPostModel,
     AutoTestPutModel,
     LinkModel,
     LinkPutModel,
+    TestRunV2GetModel,
+    TestRunV2PutModel,
+    TestResultsFilterRequest,
     TestResultOutcome,
     TestResultShortResponse,
     AutoTestModel
@@ -21,43 +24,43 @@ 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(
+    def project_id_and_external_id_to_autotests_search_post_request(
+            project_id: str, external_id: str) -> AutotestsSelectModel:
+        autotests_filter = AutotestFilterModel(
             project_ids=[project_id],
             external_ids=[external_id],
             is_deleted=False)
-        autotests_includes = AutoTestSearchIncludeApiModel(
+        autotests_includes = SearchAutoTestsQueryIncludesModel(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return AutoTestSearchApiModel(filter=autotests_filter, includes=autotests_includes)
+        return AutotestsSelectModel(filter=autotests_filter, includes=autotests_includes)
 
     @staticmethod
-    def autotest_ids_to_autotests_search_post_request(autotest_ids: typing.List[int]) \
-            -> AutoTestSearchApiModel:
-        autotests_filter = AutoTestFilterApiModel(
+    def autotest_ids_to_autotests_search_post_request(
+            autotest_ids: typing.List[int]) -> AutotestsSelectModel:
+        autotests_filter = AutotestFilterModel(
             global_ids=autotest_ids)
-        autotests_includes = AutoTestSearchIncludeApiModel(
+        autotests_includes = SearchAutoTestsQueryIncludesModel(
             include_steps=False,
             include_links=False,
             include_labels=False)
 
-        return AutoTestSearchApiModel(filter=autotests_filter, includes=autotests_includes)
+        return AutotestsSelectModel(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) -> TestResultsFilterRequest:
+        return TestResultsFilterRequest(
             test_run_ids=[testrun_id],
             configuration_ids=[configuration_id],
             outcomes=[TestResultOutcome("InProgress")])
 
     @staticmethod
-    def test_result_short_get_models_to_autotest_ids(test_results: typing.List[TestResultShortResponse]) \
-            -> list[int]:
+    def test_result_short_get_models_to_autotest_ids(
+            test_results: typing.List[TestResultShortResponse]) -> typing.List[int]:
         autotest_ids = []
 
         for test_result in test_results:
@@ -66,8 +69,8 @@ class Converter:
         return autotest_ids
 
     @staticmethod
-    def autotest_models_to_external_keys(autotests: typing.List[AutoTestModel]) \
-            -> list[str]:
+    def autotest_models_to_external_keys(
+            autotests: typing.List[AutoTestModel]) -> typing.List[str]:
         external_keys = []
 
         for autotest in autotests:
@@ -81,8 +84,8 @@ class Converter:
         return external_keys
 
     @staticmethod
-    def test_result_to_create_autotest_request(result, external_id: str, project_id: str) \
-            -> AutoTestPostModel:
+    def test_result_to_create_autotest_request(
+            result, external_id: str, project_id: str) -> AutoTestPostModel:
         return AutoTestPostModel(
             external_id=external_id,
             project_id=project_id,
@@ -92,8 +95,8 @@ class Converter:
         )
 
     @staticmethod
-    def test_result_to_update_autotest_request(result, external_id: str, project_id: str) \
-            -> AutoTestPutModel:
+    def test_result_to_update_autotest_request(
+            result, external_id: str, project_id: str) -> AutoTestPutModel:
         return AutoTestPutModel(
             external_id=external_id,
             project_id=project_id,
@@ -117,16 +120,16 @@ class Converter:
         )
 
     @classmethod
-    def test_run_v2_get_result_to_test_run(cls, test_run_result: TestRunV2ApiResult) -> TestRun:
+    def test_run_v2_get_model_to_test_run(cls, test_run_model: TestRunV2GetModel) -> TestRun:
         return TestRun(
-            id=test_run_result.id,
-            project_id=test_run_result.project_id,
-            state=test_run_result.state_name.value,
-            name=test_run_result.name,
-            description=test_run_result.description,
-            launch_source=test_run_result.launch_source,
-            attachments=cls.attachment_results_to_attachment_put_models(test_run_result.attachments),
-            links=cls.link_results_to_link_put_models(test_run_result.links)
+            id=test_run_model.id,
+            project_id=test_run_model.project_id,
+            state=test_run_model.state_name.value,
+            name=test_run_model.name,
+            description=test_run_model.description,
+            launch_source=test_run_model.launch_source,
+            attachments=cls.attachment_models_to_attachment_put_models(test_run_model.attachments),
+            links=cls.link_models_to_link_put_models(test_run_model.links)
         )
 
     @classmethod
@@ -141,26 +144,10 @@ class Converter:
 
         return attachment_put_models
 
-    @classmethod
-    def attachment_results_to_attachment_put_models(
-            cls,
-            attachment_results: typing.List[AttachmentApiResult]) -> typing.List[AttachmentPutModel]:
-        attachment_put_models = []
-
-        for attachment_result in attachment_results:
-            attachment_put_models.append(
-                cls.attachment_result_to_attachment_put_model(attachment_result))
-
-        return attachment_put_models
-
     @staticmethod
     def attachment_model_to_attachment_put_model(attachment_model: AttachmentModel) -> AttachmentPutModel:
         return AttachmentPutModel(id=attachment_model.id)
 
-    @staticmethod
-    def attachment_result_to_attachment_put_model(attachment_result: AttachmentApiResult) -> AttachmentPutModel:
-        return AttachmentPutModel(id=attachment_result.id)
-
     @classmethod
     def link_models_to_link_put_models(
             cls,
@@ -173,18 +160,6 @@ class Converter:
 
         return link_put_models
 
-    @classmethod
-    def link_results_to_link_put_models(
-            cls,
-            link_results: typing.List[LinkApiResult]) -> typing.List[LinkPutModel]:
-        link_put_models = []
-
-        for link_result in link_results:
-            link_put_models.append(
-                cls.link_result_to_link_put_model(link_result))
-
-        return link_put_models
-
     @staticmethod
     def link_model_to_link_put_model(link_model: LinkModel) -> LinkPutModel:
         return LinkPutModel(
@@ -197,30 +172,12 @@ class Converter:
         )
 
     @staticmethod
-    def link_result_to_link_put_model(link_result: LinkApiResult) -> LinkPutModel:
-        return LinkPutModel(
-            url=link_result.url,
-            id=link_result.id,
-            title=link_result.title,
-            description=link_result.description,
-            type=link_result.type,
-            has_info=link_result.has_info
-        )
-
-    @staticmethod
-    def test_run_to_update_empty_request(test_run: TestRun) -> UpdateEmptyTestRunApiModel:
-        return UpdateEmptyTestRunApiModel(
+    def test_run_to_update_empty_request(test_run: TestRun) -> TestRunV2PutModel:
+        return TestRunV2PutModel(
             id=test_run.id,
             name=test_run.name,
             description=test_run.description,
             launch_source=test_run.launch_source,
-            attachments=Converter.test_run_attachments_to(test_run.attachments),
+            attachments=test_run.attachments,
             links=test_run.links
         )
-
-    @staticmethod
-    def test_run_attachments_to(attachments: list[AttachmentPutModel]) -> list[AssignAttachmentApiModel]:
-        def convert(x: AttachmentPutModel) -> AssignAttachmentApiModel:
-            return AssignAttachmentApiModel(id=x.id, model_config=x.model_config)
-
-        return [convert(x) for x in attachments]

{testit_cli-2.2.2.post522 → testit_cli-2.3.0.post523}/src/testit_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: testit-cli
-Version: 2.2.2.post522
+Version: 2.3.0.post523
 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==5.1.2.post522
+Requires-Dist: testit-api-client==5.0.0
 Requires-Dist: validators
 Requires-Dist: tqdm
 Requires-Dist: click~=8.0.4
@@ -41,12 +41,13 @@ You can see more information in [official documentation](https://docs.testit.sof
 
 ## Compatibility
 
-| Test IT | Test IT CLI    |
-|---------|----------------|
-| 3.5+    | 0.1            |
-| 4.4     | 1.0            |
-| 4.5     | 1.2            |
-| 4.6     | 1.5            |
-| 5.0     | 2.0            |
-| 5.2     | 2.1            |
-| 5.2.2   | 2.2.1.post522  |
+| Test IT | Test IT CLI   |
+|---------|---------------|
+| 3.5+    | 0.1           |
+| 4.4     | 1.0           |
+| 4.5     | 1.2           |
+| 4.6     | 1.5           |
+| 5.0     | 2.0           |
+| 5.2     | 2.1           |
+| 5.2.2   | 2.2.1.post522 |
+| 5.2.3   | 2.3.0.post523 |

testit_cli-2.3.0.post523/src/testit_cli.egg-info/requires.txt

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

testit_cli-2.2.2.post522/src/testit_cli.egg-info/requires.txt

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