qase-python-commons 4.1.6__tar.gz → 4.1.8__tar.gz

{qase_python_commons-4.1.6 → qase_python_commons-4.1.8}/PKG-INFO

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

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

{qase_python_commons-4.1.6 → qase_python_commons-4.1.8}/src/qase/commons/client/api_v2_client.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, Union, Optional
 
 import certifi
 from qase.api_client_v2 import ResultsApi, ResultCreateFields
@@ -20,11 +20,16 @@ from ..models.config.framework import Video, Trace
 from ..models import Attachment, Result
 from ..models.config.qaseconfig import QaseConfig
 from ..models.step import StepType, Step
+from ..util.host_data import HostData
 
 
 class ApiV2Client(ApiV1Client):
-    def __init__(self, config: QaseConfig, logger: Logger):
+    def __init__(self, config: QaseConfig, logger: Logger, host_data: Optional[HostData] = None,
+                 framework: Union[str, None] = None, reporter_name: Union[str, None] = None):
         ApiV1Client.__init__(self, config, logger)
+        self.host_data = host_data or {}
+        self.framework = framework
+        self.reporter_name = reporter_name
 
         try:
             self.logger.log_debug("Preparing API V2 client")
@@ -40,10 +45,84 @@ class ApiV2Client(ApiV1Client):
                 self.web = f'https://{host}'
 
             self.client_v2 = ApiClient(configuration)
+            
+            # Add X-Client and X-Platform headers
+            self._add_client_headers()
+            
             self.logger.log_debug("API V2 client prepared")
         except Exception as e:
             self.logger.log(f"Error at preparing API V2 client: {e}", "error")
             raise ReporterException(e)
+    
+    def _add_client_headers(self):
+        """Add X-Client and X-Platform headers to API client"""
+        try:
+            # Use host_data passed from Core reporter
+            host_data = self.host_data
+            
+            # Use framework and reporter_name for names in X-Client header
+            framework = self.framework
+            reporter_name = self.reporter_name
+            
+            # Build X-Client header
+            # Format: reporter=qase-pytest;reporter_version=v1.0.0;framework=pytest;framework_version=7.0.0;client_version_v1=v1.0.0;client_version_v2=v2.0.0;core_version=v1.5.0
+            x_client_parts = []
+            
+            if reporter_name:
+                x_client_parts.append(f"reporter={reporter_name}")
+                reporter_version = host_data.get('reporter', '')
+                if reporter_version:
+                    x_client_parts.append(f"reporter_version=v{reporter_version}")
+            
+            if framework:
+                x_client_parts.append(f"framework={framework}")
+                framework_version = host_data.get('framework', '')
+                if framework_version:
+                    x_client_parts.append(f"framework_version={framework_version}")
+            
+            client_v1_version = host_data.get('apiClientV1', '')
+            if client_v1_version:
+                x_client_parts.append(f"client_version_v1=v{client_v1_version}")
+            
+            client_v2_version = host_data.get('apiClientV2', '')
+            if client_v2_version:
+                x_client_parts.append(f"client_version_v2=v{client_v2_version}")
+            
+            core_version = host_data.get('commons', '')
+            if core_version:
+                x_client_parts.append(f"core_version=v{core_version}")
+            
+            x_client = ";".join(x_client_parts)
+            
+            # Build X-Platform header
+            # Format: os=Linux;arch=aarch64;python=3.9.0;pip=22.0.0
+            x_platform_parts = []
+            
+            os_name = host_data.get('system', '')
+            if os_name:
+                x_platform_parts.append(f"os={os_name}")
+            
+            arch = host_data.get('arch', '')
+            if arch:
+                x_platform_parts.append(f"arch={arch}")
+            
+            python_version = host_data.get('python', '')
+            if python_version:
+                x_platform_parts.append(f"python={python_version}")
+            
+            pip_version = host_data.get('pip', '')
+            if pip_version:
+                x_platform_parts.append(f"pip={pip_version}")
+            
+            x_platform = ";".join(x_platform_parts)
+            
+            # Add headers to client
+            if x_client:
+                self.client_v2.default_headers['X-Client'] = x_client
+            if x_platform:
+                self.client_v2.default_headers['X-Platform'] = x_platform
+        except Exception as e:
+            self.logger.log(f"Error adding client headers: {e}", "error")
 
     def send_results(self, project_code: str, run_id: str, results: []) -> None:
         api_results = ResultsApi(self.client_v2)

{qase_python_commons-4.1.6 → qase_python_commons-4.1.8}/src/qase/commons/reporters/core.py

@@ -43,13 +43,22 @@ class QaseCoreReporter:
         host_data = get_host_info(framework, reporter_name)
         self.logger.log_debug(f"Host data: {host_data}")
 
+        # Store framework and reporter_name for passing to reporters
+        self.framework = framework
+        self.reporter_name = reporter_name
+        self.host_data = host_data
+
         # Reading reporter mode from config file
         mode = self.config.mode
 
         if mode == Mode.testops:
             try:
                 self._load_testops_plan()
-                self.reporter = QaseTestOps(config=self.config, logger=self.logger)
+                # Create API client with host_data for headers
+                from ..client.api_v2_client import ApiV2Client
+                api_client = ApiV2Client(self.config, self.logger, host_data=host_data, 
+                                       framework=framework, reporter_name=reporter_name)
+                self.reporter = QaseTestOps(config=self.config, logger=self.logger, client=api_client)
             except Exception as e:
                 self.logger.log('Failed to initialize TestOps reporter. Using fallback.', 'info')
                 self.logger.log(e, 'error')

{qase_python_commons-4.1.6 → qase_python_commons-4.1.8}/src/qase/commons/reporters/testops.py

@@ -4,7 +4,6 @@ import urllib.parse
 from datetime import datetime
 from typing import List, Union
 from .. import Logger, ReporterException
-from ..client.api_v2_client import ApiV2Client
 from ..client.base_api_client import BaseApiClient
 from ..models import Result
 from ..models.config.qaseconfig import QaseConfig
@@ -15,12 +14,11 @@ DEFAULT_THREAD_COUNT = 4
 
 class QaseTestOps:
 
-    def __init__(self, config: QaseConfig, logger: Logger) -> None:
+    def __init__(self, config: QaseConfig, logger: Logger, client: BaseApiClient) -> None:
         self.config = config
         self.logger = logger
         self.__baseUrl = self.__get_host(config.testops.api.host)
-
-        self.client = self._prepare_client()
+        self.client = client
 
         run_id = self.config.testops.run.id
         plan_id = self.config.testops.plan.id
@@ -68,9 +66,6 @@ class QaseTestOps:
         """Verify that project exists in TestOps"""
         self.client.get_project(self.project_code)
 
-    def _prepare_client(self) -> BaseApiClient:
-        return ApiV2Client(self.config, self.logger)
-
     def _send_results_threaded(self, results):
         try:
             self.client.send_results(self.project_code, self.run_id, results)

{qase_python_commons-4.1.6 → qase_python_commons-4.1.8}/src/qase/commons/util/host_data.py

@@ -93,26 +93,33 @@ def find_package_in_requirements(package_name: Optional[str]) -> Optional[str]:
         return ""
 
 
+def remove_version_prefix(version: str) -> str:
+    """Remove 'v' prefix from version string if present."""
+    if version and version.startswith('v'):
+        return version[1:]
+    return version
+
+
 def get_host_info(framework: Optional[str], reporter_name: Optional[str]) -> HostData:
     try:
-        python_version = platform.python_version()
+        python_version = remove_version_prefix(platform.python_version())
         pip_version = exec_command("pip --version")
         if pip_version:
             pip_match = re.search(r'pip\s+(\S+)', pip_version)
-            pip_version = pip_match.group(1) if pip_match else ""
-        framework_version = get_package_version(framework) or find_package_in_requirements(framework) or ""
-        reporter_version = get_package_version(reporter_name) or find_package_in_requirements(reporter_name) or ""
-        commons_version = get_package_version("qase-python-commons") or find_package_in_requirements(
-            "qase-python-commons") or ""
-        api_client_version_1 = get_package_version("qase-api-client") or find_package_in_requirements(
-            "qase-api-client") or ""
-        api_client_version_2 = get_package_version("qase-api-v2-client") or find_package_in_requirements(
-            "qase-api-v2-client") or ""
+            pip_version = remove_version_prefix(pip_match.group(1) if pip_match else "")
+        framework_version = remove_version_prefix(get_package_version(framework) or find_package_in_requirements(framework) or "")
+        reporter_version = remove_version_prefix(get_package_version(reporter_name) or find_package_in_requirements(reporter_name) or "")
+        commons_version = remove_version_prefix(get_package_version("qase-python-commons") or find_package_in_requirements(
+            "qase-python-commons") or "")
+        api_client_version_1 = remove_version_prefix(get_package_version("qase-api-client") or find_package_in_requirements(
+            "qase-api-client") or "")
+        api_client_version_2 = remove_version_prefix(get_package_version("qase-api-v2-client") or find_package_in_requirements(
+            "qase-api-v2-client") or "")
         return {
             "system": platform.system().lower(),
             "machineName": platform.node(),
-            "release": platform.release(),
-            "version": get_detailed_os_info(),
+            "release": remove_version_prefix(platform.release()),
+            "version": remove_version_prefix(get_detailed_os_info()),
             "arch": platform.machine(),
             "python": python_version,
             "pip": pip_version,
@@ -127,7 +134,7 @@ def get_host_info(framework: Optional[str], reporter_name: Optional[str]) -> Hos
         return {
             "system": platform.system().lower(),
             "machineName": platform.node(),
-            "release": platform.release(),
+            "release": remove_version_prefix(platform.release()),
             "version": "",
             "arch": platform.machine(),
             "python": "",

{qase_python_commons-4.1.6 → qase_python_commons-4.1.8}/src/qase_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qase-python-commons
-Version: 4.1.6
+Version: 4.1.8
 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