qase-python-commons 5.1.5__tar.gz → 5.1.6__tar.gz

{qase_python_commons-5.1.5 → qase_python_commons-5.1.6}/PKG-INFO

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

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

{qase_python_commons-5.1.5 → qase_python_commons-5.1.6}/src/qase/commons/client/api_v1_client.py

@@ -9,6 +9,7 @@ from qase.api_client_v1.configuration import Configuration
 from .. import Logger
 from .base_api_client import BaseApiClient
 from ..retry import send_with_retry
+from ..util.api_host import get_web_app_url
 from ..exceptions.reporter import ReporterException
 from ..models import Attachment
 from ..models.config.framework import Video, Trace
@@ -31,12 +32,11 @@ class ApiV1Client(BaseApiClient):
             # pinned off so it cannot multiply with the application-level one.
             configuration.retries = 0
             host = self.config.testops.api.host
+            self.web = get_web_app_url(host)
             if host == 'qase.io':
                 configuration.host = f'https://api.{host}/v1'
-                self.web = f'https://app.{host}'
             else:
                 configuration.host = f'https://api-{host}/v1'
-                self.web = f'https://{host}'
 
             self.client = ApiClient(configuration)
             self.logger.log_debug("API client prepared")

{qase_python_commons-5.1.5 → qase_python_commons-5.1.6}/src/qase/commons/client/api_v2_client.py

@@ -20,6 +20,7 @@ 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.api_host import get_web_app_url
 from ..util.host_data import HostData
 
 
@@ -42,12 +43,11 @@ class ApiV2Client(ApiV1Client):
             # 9 requests, the opposite of what is wanted on a 429.
             configuration.retries = 0
             host = self.config.testops.api.host
+            self.web = get_web_app_url(host)
             if host == 'qase.io':
                 configuration.host = f'https://api.{host}/v2'
-                self.web = f'https://app.{host}'
             else:
                 configuration.host = f'https://api-{host}/v2'
-                self.web = f'https://{host}'
 
             self.client_v2 = ApiClient(configuration)
             

{qase_python_commons-5.1.5 → qase_python_commons-5.1.6}/src/qase/commons/reporters/testops.py

@@ -9,6 +9,7 @@ from ..client.base_api_client import BaseApiClient
 from ..models import Result
 from ..models.config.qaseconfig import QaseConfig
 from ..retry import send_with_retry
+from ..util.api_host import get_web_app_url
 
 DEFAULT_BATCH_SIZE = 200
 DEFAULT_THREAD_COUNT = 4
@@ -20,7 +21,7 @@ class QaseTestOps:
     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.__baseUrl = get_web_app_url(config.testops.api.host)
         self.client = client
 
         run_id = self.config.testops.run.id
@@ -210,10 +211,3 @@ class QaseTestOps:
         if ids is not None and len(ids) > 0:
             return f"{link}{self.project_code}-{ids[0]}"
         return f"{link}{urllib.parse.quote_plus(title)}"
-
-    @staticmethod
-    def __get_host(host: str):
-        if host == 'qase.io':
-            return 'https://app.qase.io'
-
-        return f'https://{host.replace("api", "app")}'

{qase_python_commons-5.1.5 → qase_python_commons-5.1.6}/src/qase/commons/reporters/testops_multi.py

@@ -10,6 +10,7 @@ from ..client.base_api_client import BaseApiClient
 from ..models import Result
 from ..models.config.qaseconfig import QaseConfig
 from ..retry import send_with_retry
+from ..util.api_host import get_web_app_url
 
 DEFAULT_BATCH_SIZE = 200
 DEFAULT_THREAD_COUNT = 4
@@ -21,7 +22,7 @@ class QaseTestOpsMulti:
     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.__baseUrl = get_web_app_url(config.testops.api.host)
         self.client = client
 
         self.multi_config = config.testops_multi
@@ -369,10 +370,3 @@ class QaseTestOpsMulti:
         if ids is not None and len(ids) > 0:
             return f"{link}{project_code}-{ids[0]}"
         return f"{link}{urllib.parse.quote_plus(title)}"
-
-    @staticmethod
-    def __get_host(host: str):
-        """Get host URL for Qase."""
-        if host == 'qase.io':
-            return 'https://app.qase.io'
-        return f'https://{host.replace("api", "app")}'

qase_python_commons-5.1.6/src/qase/commons/util/api_host.py

@@ -0,0 +1,24 @@
+from typing import Optional
+
+DEFAULT_HOST = 'qase.io'
+
+# Enterprise hosts share the `api-<name>.qase.io` shape but serve the web app on
+# `<name>.qase.io`, so a cluster cannot be inferred from the API hostname and has
+# to be listed explicitly.
+CLUSTER_APP_HOSTS = {
+    'api-eu.qase.io': 'app-eu.qase.io',
+}
+
+
+def resolve_cluster_app_url(host: str) -> Optional[str]:
+    """Return the web app URL of a known Qase cluster, or None for any other host."""
+    # Mirrors how a host fragment becomes the API base URL: `https://api-<host>`.
+    app_host = CLUSTER_APP_HOSTS.get(f'api-{host}'.lower())
+    return f'https://{app_host}' if app_host else None
+
+
+def get_web_app_url(host: str) -> str:
+    """Return the Qase web app base URL for the `testops.api.host` value."""
+    if host == DEFAULT_HOST:
+        return f'https://app.{DEFAULT_HOST}'
+    return resolve_cluster_app_url(host) or f'https://{host}'

{qase_python_commons-5.1.5 → qase_python_commons-5.1.6}/src/qase_python_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qase-python-commons
-Version: 5.1.5
+Version: 5.1.6
 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-5.1.5 → qase_python_commons-5.1.6}/src/qase_python_commons.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ src/qase/commons/reporters/testops_multi.py
 src/qase/commons/status_mapping/__init__.py
 src/qase/commons/status_mapping/status_mapping.py
 src/qase/commons/util/__init__.py
+src/qase/commons/util/api_host.py
 src/qase/commons/util/host_data.py
 src/qase/commons/util/token_masker.py
 src/qase/commons/validators/base.py