argus-alm 0.15.8__py3-none-any.whl → 0.15.10__py3-none-any.whl

argus/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.15.8'
-__version_tuple__ = version_tuple = (0, 15, 8)
+__version__ = version = '0.15.10'
+__version_tuple__ = version_tuple = (0, 15, 10)
 
 __commit_id__ = commit_id = None

argus/client/base.py

@@ -5,6 +5,8 @@ from typing import Any, Type
 from uuid import UUID
 
 import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
 
 from argus.common.enums import TestStatus
 from argus.client.generic_result import GenericResultTable
@@ -33,11 +35,30 @@ class ArgusClient:
         FETCH_RESULTS = "/testrun/$type/$id/fetch_results"
         FINALIZE = "/testrun/$type/$id/finalize"
 
-    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
+    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
         self._auth_token = auth_token
         self._base_url = base_url
         self._api_ver = api_version
+        self._timeout = timeout
         self.session = requests.Session()
+
+        # Configure retry strategy
+        retry_strategy = Retry(
+            total=max_retries,
+            connect=max_retries,
+            read=max_retries,
+            status=0,
+            backoff_factor=1,
+            status_forcelist=(),
+            allowed_methods=["GET"],
+        )
+
+        # Mount adapter with retry strategy for both http and https
+        adapter = HTTPAdapter(max_retries=retry_strategy)
+        self.session.mount("http://", adapter)
+        self.session.mount("https://", adapter)
+
         if extra_headers:
             self.session.headers.update(extra_headers)
 
@@ -101,7 +122,8 @@ class ArgusClient:
         response = self.session.get(
             url=url,
             params=params,
-            headers=self.request_headers
+            headers=self.request_headers,
+            timeout=self._timeout
         )
         LOGGER.debug("GET Response: %s %s", response.status_code, response.url)
 
@@ -124,6 +146,7 @@ class ArgusClient:
             params=params,
             json=body,
             headers=self.request_headers,
+            timeout=self._timeout
         )
         LOGGER.debug("POST Response: %s %s", response.status_code, response.url)
 

argus/client/driver_matrix_tests/client.py

@@ -12,8 +12,10 @@ class ArgusDriverMatrixClient(ArgusClient):
         SUBMIT_DRIVER_FAILURE = "/driver_matrix/result/fail"
         SUBMIT_ENV = "/driver_matrix/env/submit"
 
-    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
         self.run_id = run_id
 
     def submit_driver_matrix_run(self, job_name: str, job_url: str) -> None:

argus/client/generic/client.py

@@ -12,8 +12,10 @@ class ArgusGenericClient(ArgusClient):
     class Routes(ArgusClient.Routes):
         TRIGGER_JOBS = "/planning/plan/trigger"
 
-    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 180, max_retries: int = 3) -> None:
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
 
     def submit_generic_run(self, build_id: str, run_id: str, started_by: str, build_url: str, sub_type: str = None, scylla_version: str | None = None):
         request_body = {

argus/client/sct/client.py

@@ -28,10 +28,12 @@ class ArgusSCTClient(ArgusClient):
         SUBMIT_EVENTS = "/sct/$id/events/submit"
         SUBMIT_EVENT = "/sct/$id/event/submit"
         SUBMIT_JUNIT_REPORT = "/sct/$id/junit/submit"
-        SUBMIT_EMAIL = "/testrun/report"
+        SUBMIT_EMAIL = "/testrun/report/email"
 
-    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+    def __init__(self, run_id: UUID, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
         self.run_id = run_id
 
     def submit_sct_run(self, job_name: str, job_url: str, started_by: str, commit_id: str,

argus/client/sirenada/client.py

@@ -45,9 +45,11 @@ class ArgusSirenadaClient(ArgusClient):
         "skipped": "skipped"
     }
 
-    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None) -> None:
+    def __init__(self, auth_token: str, base_url: str, api_version="v1", extra_headers: dict | None = None,
+                 timeout: int = 60, max_retries: int = 3) -> None:
         self.results_path: Path | None = None
-        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers)
+        super().__init__(auth_token, base_url, api_version, extra_headers=extra_headers,
+                         timeout=timeout, max_retries=max_retries)
 
     def _verify_required_files_exist(self, results_path: Path):
         assert (results_path / self._junit_xml_filename).exists(), "Missing jUnit XML results file!"

{argus_alm-0.15.8.dist-info → argus_alm-0.15.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argus-alm
-Version: 0.15.8
+Version: 0.15.10
 Summary: Argus
 Author-email: Alexey Kartashov <alexey.kartashov@scylladb.com>, Łukasz Sójka <lukasz.sojka@scylladb.com>
 License-Expression: Apache-2.0
@@ -24,6 +24,7 @@ Requires-Dist: python-jenkins>=1.7.0; extra == "web-backend"
 Requires-Dist: python-slugify~=6.1.1; extra == "web-backend"
 Requires-Dist: pygithub>=2.6.1; extra == "web-backend"
 Requires-Dist: boto3~=1.38.9; extra == "web-backend"
+Requires-Dist: jira>=3.10.5; extra == "web-backend"
 Requires-Dist: prometheus-flask-exporter>=0.23.2; extra == "web-backend"
 Provides-Extra: docker-image
 Requires-Dist: supervisor~=4.2.4; extra == "docker-image"

argus_alm-0.15.10.dist-info/RECORD

@@ -0,0 +1,23 @@
+argus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+argus/_version.py,sha256=4uVtcREcPon7-Lck4ArrQWHqvO4Y03ptuPD8QKqRhSM,708
+argus/client/__init__.py,sha256=bO9_j5_jK5kvTHR46KEZ0Y-p0li7CBW8QSd-K5Ez4vA,42
+argus/client/base.py,sha256=M39ShKHcyIlpnFkvHgzpyUUBAf5BTTocYR8qOVg0pHA,9178
+argus/client/generic_result.py,sha256=9D0zrpfEDiIL7PjL12TZnqk5Mi_1T1UvesF5wWeMfz0,6264
+argus/client/driver_matrix_tests/cli.py,sha256=JpI0v1hzRQr9KkrxO7D4hEbkzumexFFC_iRM8558zHU,8375
+argus/client/driver_matrix_tests/client.py,sha256=6wRRDO8tyM_1c3cP0vD-I4xkI8wKczb6-NPE-yvqy1g,2931
+argus/client/generic/cli.py,sha256=jsdSwzwzefX1POyrZ4lFTRcjWPmTauuXBGjceM54Zk4,4707
+argus/client/generic/client.py,sha256=-OLeLyXN5BBrv-QouDYH3IL3W17BhywiUrLEBA-CJzw,2097
+argus/client/sct/client.py,sha256=oKm-tdH-HS6wrK0kcYzKfLYnhhwJW7J89lk3Hsj5sOw,12997
+argus/client/sct/types.py,sha256=VLgVe7qPmJtCLqtPnuX8N8kMKZq-iY3SKz68nvU6nJ4,371
+argus/client/sirenada/client.py,sha256=RGgx4uSGI3LN55gJC4-DbCamVidA8IE2CQmU3-P9tx8,6446
+argus/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+argus/common/email.py,sha256=YUgin4yA3-1bH6HbtXIh09SLAzYSzSJPKM9sIvroAMA,842
+argus/common/enums.py,sha256=FM308aseXxsaeOqoiyM-NIDWKHpbceLysd-sLDh7TkI,1287
+argus/common/sct_types.py,sha256=GX0S1_eH3eBOO17WqBVtsDKzz86vgL2VUM7gi9Cjrmc,1649
+argus/common/sirenada_types.py,sha256=CZH2JXA1KYUj29eXYe8rIAAWdN1XPqOsDPAXvM25bVQ,698
+argus_alm-0.15.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+argus_alm-0.15.10.dist-info/METADATA,sha256=YT8S9y6TQ5eAjT3ovSyLWGsRUrTORZlxgb9EhsPip8I,5151
+argus_alm-0.15.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+argus_alm-0.15.10.dist-info/entry_points.txt,sha256=5mSBLLPndhFHKY5M9SCF8WhDBAArrj-S2IL-uoiaJiE,140
+argus_alm-0.15.10.dist-info/top_level.txt,sha256=Pea173vTU-Et8xmNCctS34REW4cH0Xmjyiztu0HuM0c,6
+argus_alm-0.15.10.dist-info/RECORD,,

argus_alm-0.15.8.dist-info/RECORD

@@ -1,23 +0,0 @@
-argus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/_version.py,sha256=OZz2ObefAkpiEMaFTa9SJuKISgl89HYDOVrF-rvuYh8,706
-argus/client/__init__.py,sha256=bO9_j5_jK5kvTHR46KEZ0Y-p0li7CBW8QSd-K5Ez4vA,42
-argus/client/base.py,sha256=FZ9-quDXwViWbz892XnuZlWJiAmzpnTgvkRXV9i8HlE,8423
-argus/client/generic_result.py,sha256=9D0zrpfEDiIL7PjL12TZnqk5Mi_1T1UvesF5wWeMfz0,6264
-argus/client/driver_matrix_tests/cli.py,sha256=JpI0v1hzRQr9KkrxO7D4hEbkzumexFFC_iRM8558zHU,8375
-argus/client/driver_matrix_tests/client.py,sha256=fFucqwog6WnDnje1xB-4ERfwHXblXP4upmtt9RtOkls,2806
-argus/client/generic/cli.py,sha256=jsdSwzwzefX1POyrZ4lFTRcjWPmTauuXBGjceM54Zk4,4707
-argus/client/generic/client.py,sha256=3MONtLIcF7rZ5x5OaAQKi4YGHCHb3-9ooCUhWtKs4C4,1971
-argus/client/sct/client.py,sha256=3qn_2ioFEleg8XzZWXFvythTIpCwMPvLzXMBxf57fR8,12866
-argus/client/sct/types.py,sha256=VLgVe7qPmJtCLqtPnuX8N8kMKZq-iY3SKz68nvU6nJ4,371
-argus/client/sirenada/client.py,sha256=lzhmBFAUnvPSAJfCjeQ0L5nbp50Q0YLHwIondO9rvt4,6321
-argus/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argus/common/email.py,sha256=YUgin4yA3-1bH6HbtXIh09SLAzYSzSJPKM9sIvroAMA,842
-argus/common/enums.py,sha256=FM308aseXxsaeOqoiyM-NIDWKHpbceLysd-sLDh7TkI,1287
-argus/common/sct_types.py,sha256=GX0S1_eH3eBOO17WqBVtsDKzz86vgL2VUM7gi9Cjrmc,1649
-argus/common/sirenada_types.py,sha256=CZH2JXA1KYUj29eXYe8rIAAWdN1XPqOsDPAXvM25bVQ,698
-argus_alm-0.15.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-argus_alm-0.15.8.dist-info/METADATA,sha256=fn-TaUp-ZELmGImVprz5aQxhcvm-vTPd9o9I9ZYF1bI,5098
-argus_alm-0.15.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-argus_alm-0.15.8.dist-info/entry_points.txt,sha256=5mSBLLPndhFHKY5M9SCF8WhDBAArrj-S2IL-uoiaJiE,140
-argus_alm-0.15.8.dist-info/top_level.txt,sha256=Pea173vTU-Et8xmNCctS34REW4cH0Xmjyiztu0HuM0c,6
-argus_alm-0.15.8.dist-info/RECORD,,