qase-python-commons 3.4.0__tar.gz → 3.4.1__tar.gz

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qase-python-commons
-Version: 3.4.0
+Version: 3.4.1
 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.4.0 → qase_python_commons-3.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qase-python-commons"
-version = "3.4.0"
+version = "3.4.1"
 description = "A library for Qase TestOps and Qase Report"
 readme = "README.md"
 authors = [{name = "Qase Team", email = "support@qase.io"}]

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase/commons/client/api_v2_client.py

@@ -125,18 +125,18 @@ class ApiV2Client(ApiV1Client):
                 prepared_step['data']['action'] = step.data.request_method + " " + step.data.request_url
 
                 if step.data.request_body:
-                    step.attachments.append(
+                    step.add_attachment(
                         Attachment(file_name='request_body.txt', content=step.data.request_body, mime_type='text/plain',
                                    temporary=True))
                 if step.data.request_headers:
-                    step.attachments.append(
+                    step.add_attachment(
                         Attachment(file_name='request_headers.txt', content=step.data.request_headers,
                                    mime_type='text/plain', temporary=True))
                 if step.data.response_body:
-                    step.attachments.append(Attachment(file_name='response_body.txt', content=step.data.response_body,
-                                                       mime_type='text/plain', temporary=True))
+                    step.add_attachment(Attachment(file_name='response_body.txt', content=step.data.response_body,
+                                                   mime_type='text/plain', temporary=True))
                 if step.data.response_headers:
-                    step.attachments.append(
+                    step.add_attachment(
                         Attachment(file_name='response_headers.txt', content=step.data.response_headers,
                                    mime_type='text/plain', temporary=True))
 
@@ -149,9 +149,9 @@ class ApiV2Client(ApiV1Client):
             if step.step_type == StepType.SLEEP:
                 prepared_step['data']['action'] = f"Sleep for {step.data.duration} seconds"
 
-            if step.attachments:
+            if step.execution.attachments:
                 uploaded_attachments = []
-                for file in step.attachments:
+                for file in step.execution.attachments:
                     attach_id = self._upload_attachment(project_code, file)
                     if attach_id:
                         uploaded_attachments.extend(attach_id)

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase/commons/logger.py

@@ -24,7 +24,12 @@ class Logger:
     def log(self, message: str, level: str = 'info'):
         time_str = self._get_timestamp("%H:%M:%S")
         log = f"[Qase][{time_str}][{level}] {message}\n"
-        print(log)
+
+        try:
+            print(log, end='')
+        except (OSError, IOError):
+            pass
+
         if self.debug:
             with self.lock:
                 with open(Logger._log_file, 'a', encoding='utf-8') as f:

qase_python_commons-3.4.1/src/qase/commons/models/basemodel.py

@@ -0,0 +1,16 @@
+import json
+
+from enum import Enum
+
+
+class BaseModel:
+    def __str__(self, enum_as_name=False) -> str:
+        def serialize(o):
+            if isinstance(o, Enum):
+                return o.name if enum_as_name else o.value
+            elif hasattr(o, '__dict__'):
+                return o.__dict__
+            else:
+                return str(o)
+
+        return json.dumps(self, default=serialize, indent=4, sort_keys=True)

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase/commons/models/result.py

@@ -69,7 +69,6 @@ class Result(BaseModel):
         self.id: str = str(uuid.uuid4())
         self.title: str = title
         self.signature: str = signature
-        self.run_id: Optional[str] = None
         self.testops_ids: Optional[List[int]] = None
         self.execution: Type[Execution] = Execution()
         self.fields: Dict[Type[Field]] = {}
@@ -77,11 +76,9 @@ class Result(BaseModel):
         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
@@ -123,6 +120,3 @@ class Result(BaseModel):
 
     def get_duration(self) -> int:
         return self.execution.duration
-
-    def set_run_id(self, run_id: str) -> None:
-        self.run_id = run_id

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase/commons/models/run.py

@@ -1,5 +1,3 @@
-import json
-
 from typing import Optional, List
 
 from .basemodel import BaseModel
@@ -71,6 +69,7 @@ class Run(BaseModel):
             "duration": result["execution"]["duration"],
             "thread": result["execution"]["thread"]
         }
+        self._extract_path_from_relations(result)
         self.results.append(compact_result)
         self.execution.track(result)
         self.stats.track(result)
@@ -79,3 +78,16 @@ class Run(BaseModel):
 
     def add_host_data(self, host_data: dict):
         self.host_data = host_data
+
+    def _extract_path_from_relations(self, relations_dict):
+
+        titles = []
+        if "relations" in relations_dict and "suite" in relations_dict["relations"]:
+            if "data" in relations_dict["relations"]["suite"]:
+                data_list = relations_dict["relations"]["suite"]["data"]
+                titles = [item["title"] for item in data_list if "title" in item]
+
+        path = "/".join(titles)
+
+        if path and path not in self.suites:
+            self.suites.append(path)

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase/commons/models/step.py

@@ -20,6 +20,7 @@ class StepTextData(BaseModel):
     def __init__(self, action: str, expected_result: Optional[str] = None):
         self.action = action
         self.expected_result = expected_result
+        self.input_data = None
 
 
 class StepAssertData(BaseModel):
@@ -78,6 +79,7 @@ class StepExecution(BaseModel):
         self.status = status
         self.end_time = end_time
         self.duration = duration
+        self.attachments = []
 
     def set_status(self, status: Optional[str]):
         if status in ['passed', 'failed', 'skipped', 'blocked', 'untested']:
@@ -89,6 +91,9 @@ class StepExecution(BaseModel):
         self.end_time = time.time()
         self.duration = int((self.end_time - self.start_time) * 1000)
 
+    def add_attachment(self, attachment: Attachment):
+        self.attachments.append(attachment)
+
 
 class Step(BaseModel):
     def __init__(self,
@@ -107,7 +112,6 @@ class Step(BaseModel):
         self.data = data
         self.parent_id = parent_id
         self.execution = StepExecution()
-        self.attachments = []
         self.steps = []
 
     def set_parent_id(self, parent_id: Optional[str]):
@@ -132,4 +136,4 @@ class Step(BaseModel):
         self.steps = steps
 
     def add_attachment(self, attachment: Attachment):
-        self.attachments.append(attachment)
+        self.execution.add_attachment(attachment)

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase/commons/reporters/report.py

@@ -41,7 +41,6 @@ class QaseReport:
         pass
 
     def add_result(self, result: Result):
-        result.set_run_id(self.run_id)
         for attachment in result.attachments:
             self._persist_attachment(attachment)
 
@@ -84,8 +83,8 @@ class QaseReport:
 
     def _persist_attachments_in_steps(self, steps: list):
         for step in steps:
-            if step.attachments:
-                for attachment in step.attachments:
+            if step.execution.attachments:
+                for attachment in step.execution.attachments:
                     self._persist_attachment(attachment)
                 if step.steps:
                     self._persist_attachments_in_steps(step.steps)

{qase_python_commons-3.4.0 → qase_python_commons-3.4.1}/src/qase_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qase-python-commons
-Version: 3.4.0
+Version: 3.4.1
 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.4.0/src/qase/commons/models/basemodel.py

@@ -1,7 +0,0 @@
-import json
-
-
-class BaseModel:
-    def __str__(self) -> str:
-        return json.dumps(self, default=lambda o: o.__dict__ if hasattr(o, '__dict__') else str(o), indent=4,
-                          sort_keys=True)