qase-python-commons 3.2.7__py3-none-any.whl → 3.3.0__py3-none-any.whl

qase/commons/client/api_v1_client.py

@@ -7,7 +7,7 @@ from qase.api_client_v1.configuration import Configuration
 from .. import Logger
 from .base_api_client import BaseApiClient
 from ..exceptions.reporter import ReporterException
-from ..models import Attachment, Result, Step
+from ..models import Attachment, InternalResult, Step
 from ..models.config.framework import Video, Trace
 from ..models.config.qaseconfig import QaseConfig
 from ..models.step import StepType
@@ -134,7 +134,7 @@ class ApiV1Client(BaseApiClient):
         )
         self.logger.log_debug(f"Results for run {run_id} sent successfully")
 
-    def _prepare_result(self, project_code: str, result: Result) -> Dict:
+    def _prepare_result(self, project_code: str, result: InternalResult) -> Dict:
         attached = []
         if result.attachments:
             for attachment in result.attachments:

qase/commons/client/api_v2_client.py

@@ -17,7 +17,7 @@ from .api_v1_client import ApiV1Client
 from .. import Logger
 from ..exceptions.reporter import ReporterException
 from ..models.config.framework import Video, Trace
-from ..models import Attachment, Result
+from ..models import Attachment, InternalResult
 from ..models.config.qaseconfig import QaseConfig
 from ..models.step import StepType, Step
 
@@ -53,7 +53,7 @@ class ApiV2Client(ApiV1Client):
                                       create_results_request_v2=CreateResultsRequestV2(results=results_to_send))
         self.logger.log_debug(f"Results for run {run_id} sent successfully")
 
-    def _prepare_result(self, project_code: str, result: Result) -> ResultCreate:
+    def _prepare_result(self, project_code: str, result: InternalResult) -> ResultCreate:
         attached = []
         if result.attachments:
             for attachment in result.attachments:
@@ -85,7 +85,6 @@ class ApiV2Client(ApiV1Client):
             steps_type=ResultStepsType.CLASSIC,
             params=result.params,
             param_groups=result.param_groups,
-            muted=False,
             message=result.message,
             defect=self.config.testops.defect,
         )

qase/commons/models/__init__.py

@@ -1,4 +1,4 @@
-from .result import Result, Field
+from .result import Result, InternalResult, Field
 from .run import Run
 from .attachment import Attachment
 from .relation import Relation
@@ -12,5 +12,6 @@ __all__ = [
     Relation,
     Step,
     Runtime,
-    Field
+    Field,
+    InternalResult
 ]

qase/commons/models/result.py

@@ -1,3 +1,4 @@
+import copy
 import time
 import uuid
 
@@ -65,6 +66,70 @@ class Request(BaseModel):
 
 
 class Result(BaseModel):
+    def __init__(self, title: str, signature: str) -> None:
+        self.id: str = str(uuid.uuid4())
+        self.title: str = title
+        self.signature: str = signature
+        self.run_id: Optional[str] = None
+        self.testops_id: Optional[List[int]] = None
+        self.execution: Type[Execution] = Execution()
+        self.fields: Dict[Type[Field]] = {}
+        self.attachments: List[Attachment] = []
+        self.steps: List[Type[Step]] = []
+        self.params: Optional[dict] = {}
+        self.param_groups: Optional[List[List[str]]] = []
+        self.author: Optional[str] = None
+        self.relations: Type[Relation] = None
+        self.muted: bool = False
+        self.message: Optional[str] = None
+        QaseUtils.get_host_data()
+
+    def add_message(self, message: str) -> None:
+        self.message = message
+
+    def add_field(self, field: Type[Field]) -> None:
+        self.fields[field.name] = field.value
+
+    def add_steps(self, steps: List[Type[Step]]) -> None:
+        self.steps = QaseUtils().build_tree(steps)
+
+    def add_attachment(self, attachment: Attachment) -> None:
+        self.attachments.append(attachment)
+
+    def add_param(self, key: str, value: str) -> None:
+        self.params[key] = value
+
+    def add_param_groups(self, values: List[str]) -> None:
+        self.param_groups.append(values)
+
+    def set_relation(self, relation: Relation) -> None:
+        self.relations = relation
+
+    def get_status(self) -> Optional[str]:
+        return self.execution.status
+
+    def get_id(self) -> str:
+        return self.id
+
+    def get_title(self) -> str:
+        return self.title
+
+    def get_field(self, name: str) -> Optional[Type[Field]]:
+        if name in self.fields:
+            return self.fields[name]
+        return None
+
+    def get_testops_id(self) -> Optional[List[int]]:
+        return self.testops_id
+
+    def get_duration(self) -> int:
+        return self.execution.duration
+
+    def set_run_id(self, run_id: str) -> None:
+        self.run_id = run_id
+
+
+class InternalResult(BaseModel):
     def __init__(self, title: str, signature: str) -> None:
         self.id: str = str(uuid.uuid4())
         self.title: str = title
@@ -126,3 +191,24 @@ class Result(BaseModel):
 
     def set_run_id(self, run_id: str) -> None:
         self.run_id = run_id
+
+    @classmethod
+    def convert_from_result(cls, result: Result, testops_id: Optional[int] = None):
+        int_result = cls(result.title, result.signature)
+
+        int_result.id = result.id
+        int_result.title = result.title
+        int_result.signature = result.signature
+        int_result.run_id = result.run_id
+        int_result.testops_id = testops_id
+        int_result.execution = copy.deepcopy(result.execution)
+        int_result.fields = result.fields
+        int_result.attachments = result.attachments
+        int_result.steps = result.steps
+        int_result.params = result.params
+        int_result.author = result.author
+        int_result.relations = result.relations
+        int_result.muted = result.muted
+        int_result.message = result.message
+
+        return int_result

qase/commons/reporters/core.py

@@ -1,5 +1,3 @@
-import os
-import json
 import time
 
 from ..config import ConfigManager
@@ -8,7 +6,7 @@ from ..logger import Logger
 from .report import QaseReport
 from .testops import QaseTestOps
 
-from ..models import Result, Attachment, Runtime
+from ..models import InternalResult, Result, Attachment, Runtime
 from ..models.config.qaseconfig import Mode
 from typing import Union, List
 
@@ -81,7 +79,21 @@ class QaseCoreReporter:
             try:
                 ts = time.time()
                 self.logger.log_debug(f"Adding result {result}")
-                self.reporter.add_result(result)
+                ids = result.get_testops_id()
+
+                if ids is None:
+                    int_result = InternalResult.convert_from_result(result)
+                    self.reporter.add_result(int_result)
+                else:
+                    first = True
+                    for testops_id in ids:
+                        int_result = InternalResult.convert_from_result(result, testops_id)
+                        if not first:
+                            int_result.execution.duration = 0
+                        else:
+                            first = False
+                        self.reporter.add_result(int_result)
+
                 self.logger.log_debug(f"Result {result.get_title()} added")
                 self.overhead += time.time() - ts
             except Exception as e:
@@ -180,7 +192,7 @@ class QaseCoreReporter:
                     host=self.config.testops.api.host
                 )
                 self._execution_plan = loader.load(self.config.testops.project,
-                                                  int(self.config.testops.plan.id))
+                                                   int(self.config.testops.plan.id))
         except Exception as e:
             self.logger.log('Failed to load test plan from Qase TestOps', 'info')
             self.logger.log(e, 'error')

qase/commons/reporters/report.py

@@ -3,7 +3,7 @@ import os
 import shutil
 import json
 import re
-from ..models import Result, Run, Attachment
+from ..models import InternalResult, Run, Attachment
 from .. import QaseUtils, Logger
 from ..models.config.connection import Format
 from ..models.config.qaseconfig import QaseConfig
@@ -40,7 +40,7 @@ class QaseReport:
     def complete_worker(self):
         pass
 
-    def add_result(self, result: Result):
+    def add_result(self, result: InternalResult):
         result.set_run_id(self.run_id)
         for attachment in result.attachments:
             self._persist_attachment(attachment)
@@ -91,7 +91,7 @@ class QaseReport:
                     self._persist_attachments_in_steps(step.steps)
 
     # Method saves result to a file
-    def _store_result(self, result: Result):
+    def _store_result(self, result: InternalResult):
         self._store_object(result, self.report_path + "/results/", result.id)
 
     def _check_report_path(self):

qase/commons/reporters/testops.py

@@ -6,7 +6,7 @@ from typing import List
 from .. import Logger, ReporterException
 from ..client.api_v1_client import ApiV1Client
 from ..client.base_api_client import BaseApiClient
-from ..models import Result
+from ..models import InternalResult
 from ..models.config.qaseconfig import QaseConfig
 
 DEFAULT_BATCH_SIZE = 200
@@ -129,7 +129,7 @@ class QaseTestOps:
         if len(self.results) > 0:
             self._send_results()
 
-    def add_result(self, result: Result) -> None:
+    def add_result(self, result: InternalResult) -> None:
         if result.get_status() == 'failed':
             self.__show_link(result.testops_id, result.title)
         self.results.append(result)

{qase_python_commons-3.2.7.dist-info → qase_python_commons-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: qase-python-commons
-Version: 3.2.7
+Version: 3.3.0
 Summary: A library for Qase TestOps and Qase Report
 Author-email: Qase Team <support@qase.io>
 Project-URL: Homepage, https://github.com/qase-tms/qase-python/tree/main/qase-python-commons

{qase_python_commons-3.2.7.dist-info → qase_python_commons-3.3.0.dist-info}/RECORD

@@ -3,15 +3,15 @@ qase/commons/config.py,sha256=dtF8JPHeGe4SxpR36WbvzX76yP-0nP43NpCf6sh9d-I,9245
 qase/commons/loader.py,sha256=-MMY4HgSI6q1xq3NaJoq_w4liM73qdFKjYLVCT1E7Pc,1064
 qase/commons/logger.py,sha256=K_8kE0EqpFbF2RbRU5TBw4Hl6GfK6PacpwkRXqHabl0,1234
 qase/commons/utils.py,sha256=OOr6kQ5hPZEyHXwbwiTOTkonRxmmtkyZPPGqXQKp5vY,2799
-qase/commons/client/api_v1_client.py,sha256=0SOuYKdlS0o2s1um5hGxDIp_laJ3vZIEvnZ-E1vLoGo,12715
-qase/commons/client/api_v2_client.py,sha256=EIiueZUgQPEc1fXuYyG_OaH2lbnDzwIRji1MAFaKf7c,8307
+qase/commons/client/api_v1_client.py,sha256=FiCvFQZEGVidmR-AaDyF2er3EbCoHj9JCmYcm7LhYoc,12731
+qase/commons/client/api_v2_client.py,sha256=afA-BfOA8Z4yM58H8NMEm-naOErOSt_UkGAke1yRxcY,8298
 qase/commons/client/base_api_client.py,sha256=H8JnjqSrBFNfghDd3T3zxYOyKYHYe9QiJQXol1JqdQk,2613
 qase/commons/exceptions/reporter.py,sha256=dP-Mwcq8HKBOjgu3YqhyULDmDGU09BmT6Fh9HjICaUc,45
-qase/commons/models/__init__.py,sha256=FTt5dYASBX4r6-tQi-_JAUVx4uvJs9GTxROdAZEV6Jo,272
+qase/commons/models/__init__.py,sha256=9RH4aKBEvE6vHLcb_o_ngn2jNfGfcwpQ4u7ABEis85k,308
 qase/commons/models/attachment.py,sha256=Rjq1mAP11uk7TN2RrtImntw6DUMV7U0R-44TYj8O5j0,1432
 qase/commons/models/basemodel.py,sha256=nyDSXhpQUecKdzhB-eWqujmso20oXB9p_42qpOsGVuQ,213
 qase/commons/models/relation.py,sha256=HymHeh1uBcoQnTs4Vra7WJ_KFkhryj5o7cShjoGQImI,511
-qase/commons/models/result.py,sha256=RWryOX85T-_T3AngrGuREtwmPq6FyOPvM77H949vm1I,3953
+qase/commons/models/result.py,sha256=59uEHgobscRiXJW8KoNoKyfHXnlj8S1zezoh4Gy3joQ,6819
 qase/commons/models/run.py,sha256=KkplvlHJNvVLORzVkdz5mHsLFBTUAdtuEYCqCy_RcvU,2469
 qase/commons/models/runtime.py,sha256=mfK-mOViD1orXOx-jP6nIgtnN0tUmRYY1aMH0qFDmXA,1287
 qase/commons/models/step.py,sha256=M-btRYZ4febYavDhwFqmKcCdLAgrhtuv7E_M3TKZdfg,4281
@@ -29,11 +29,11 @@ qase/commons/profilers/db.py,sha256=Am1tvvLgJq4_A8JsuSeBGf47BD2lnSX-5KiMjSgr-Ko,
 qase/commons/profilers/network.py,sha256=zKNBnTQG4BMg8dn8O--tQzQLpu-qs5ADhHEnqIas0gM,4950
 qase/commons/profilers/sleep.py,sha256=HT6h0R-2XHZAoBYRxS2T_KC8RrnEoVjP7MXusaE4Nec,1624
 qase/commons/reporters/__init__.py,sha256=J0aNLzb_MPPT_zF8BtX_w9nj_U7Ad06RGpyWK5Pxq1o,169
-qase/commons/reporters/core.py,sha256=0x5G-KVfEOWyXiXaX5__7JBIr3Rxy8vhy0cByUSZUc0,8021
-qase/commons/reporters/report.py,sha256=zyGeUOcJCOEoGtsewCOf3kypbPttJH7EM-LmZ_Y5huY,4829
-qase/commons/reporters/testops.py,sha256=f5BcorFwIK5BSeA4Rv4IKDddkWrAXL_w-Y5Xn--NdYs,6264
+qase/commons/reporters/core.py,sha256=eLn24JWPK6MoqGonPx7YnjVtpK1gSLM379Fmlxea3LE,8603
+qase/commons/reporters/report.py,sha256=50PDOBZJZA3_Z45bggBtkNfntycUkO9RaGYnzjdy8uA,4853
+qase/commons/reporters/testops.py,sha256=9GOXHTmuAX-kglXINyi4z0ul01IqaYQmJtTX-S2A2ek,6280
 qase/commons/validators/base.py,sha256=wwSn-4YiuXtfGMGnSKgo9Vm5hAKevVmmfd2Ro6Q7MYQ,173
-qase_python_commons-3.2.7.dist-info/METADATA,sha256=Q3TPeO0H2MW4QXseIzPiQPs6JdZs6T2V3ybbgPxqSTg,1857
-qase_python_commons-3.2.7.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-qase_python_commons-3.2.7.dist-info/top_level.txt,sha256=Mn5aFk7H7Uia4s1NRDsvebu8vCrFy9nOuRIBfkIY5kQ,5
-qase_python_commons-3.2.7.dist-info/RECORD,,
+qase_python_commons-3.3.0.dist-info/METADATA,sha256=jfwvrB4LAPlIvYvNo3ogp87fJf8dopIpZ0x_bAqXV3M,1857
+qase_python_commons-3.3.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+qase_python_commons-3.3.0.dist-info/top_level.txt,sha256=Mn5aFk7H7Uia4s1NRDsvebu8vCrFy9nOuRIBfkIY5kQ,5
+qase_python_commons-3.3.0.dist-info/RECORD,,

{qase_python_commons-3.2.7.dist-info → qase_python_commons-3.3.0.dist-info}/WHEEL

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