argus-alm 0.12.10__tar.gz → 0.13.1__tar.gz

{argus_alm-0.12.10 → argus_alm-0.13.1}/PKG-INFO

@@ -1,16 +1,14 @@
 Metadata-Version: 2.1
 Name: argus-alm
-Version: 0.12.10
+Version: 0.13.1
 Summary: Argus
 Home-page: https://github.com/scylladb/argus
 License: Apache-2.0
 Author: Alexey Kartashov
 Author-email: alexey.kartashov@scylladb.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: requests (>=2.26.0,<3.0.0)

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/base.py

@@ -6,7 +6,7 @@ from uuid import UUID
 
 import requests
 
-from argus.backend.util.enums import TestStatus
+from argus.common.enums import TestStatus
 from argus.client.generic_result import GenericResultTable
 from argus.client.sct.types import LogLink
 

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/driver_matrix_tests/cli.py

@@ -3,7 +3,7 @@ import json
 from pathlib import Path
 import click
 import logging
-from argus.backend.util.enums import TestStatus
+from argus.common.enums import TestStatus
 
 from argus.client.driver_matrix_tests.client import ArgusDriverMatrixClient
 
@@ -107,4 +107,4 @@ cli.add_command(finish_driver_matrix_run)
 
 
 if __name__ == "__main__":
-    cli()
+    cli()

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/driver_matrix_tests/client.py

@@ -1,5 +1,5 @@
 from uuid import UUID
-from argus.backend.util.enums import TestStatus
+from argus.common.enums import TestStatus
 from argus.client.base import ArgusClient
 
 

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/generic/cli.py

@@ -1,7 +1,9 @@
+import json
+from pathlib import Path
 import click
 import logging
-from argus.backend.util.enums import TestStatus
 
+from argus.client.base import TestStatus
 from argus.client.generic.client import ArgusGenericClient
 
 LOGGER = logging.getLogger(__name__)
@@ -39,9 +41,27 @@ def finish_run(api_key: str, base_url: str, id: str, status: str, scylla_version
     client.finalize_generic_run(run_id=id, status=status, scylla_version=scylla_version)
 
 
+@click.command("trigger-jobs")
+@click.option("--api-key", help="Argus API key for authorization", required=True)
+@click.option("--base-url", default="https://argus.scylladb.com", help="Base URL for argus instance")
+@click.option("--version", help="Scylla version to filter plans by", default=None, required=False)
+@click.option("--plan-id", help="Specific plan id for filtering", default=None, required=False)
+@click.option("--release", help="Release name to filter plans by", default=None, required=False)
+@click.option("--job-info-file", required=True, help="JSON file with trigger information (see detailed docs)")
+def trigger_jobs(api_key: str, base_url: str, job_info_file: str, version: str, plan_id: str, release: str):
+    client = ArgusGenericClient(auth_token=api_key, base_url=base_url)
+    path = Path(job_info_file)
+    if not path.exists():
+        LOGGER.error("File not found: %s", job_info_file)
+        exit(128)
+    payload = json.load(path.open("rt", encoding="utf-8"))
+    client.trigger_jobs({ "release": release, "version": version, "plan_id": plan_id, **payload })
+
+
 cli.add_command(submit_run)
 cli.add_command(finish_run)
+cli.add_command(trigger_jobs)
 
 
 if __name__ == "__main__":
-    cli()
+    cli()

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/generic/client.py

@@ -7,6 +7,10 @@ LOGGER = logging.getLogger(__name__)
 class ArgusGenericClient(ArgusClient):
     test_type = "generic"
     schema_version: None = "v1"
+
+    class Routes(ArgusClient.Routes):
+        TRIGGER_JOBS = "/planning/plan/trigger"
+
     def __init__(self, auth_token: str, base_url: str, api_version="v1") -> None:
         super().__init__(auth_token, base_url, api_version)
 
@@ -22,6 +26,24 @@ class ArgusGenericClient(ArgusClient):
         response = self.submit_run(run_type=self.test_type, run_body=request_body)
         self.check_response(response)
 
+    def trigger_jobs(self, common_params: dict[str, str], params: list[dict[str, str]], version: str = None, release: str = None, plan_id: str = None):
+        request_body = {
+            "common_params": common_params,
+            "params": params,
+            "version": version,
+            "release": release,
+            "plan_id": plan_id,
+        }
+        response = self.post(
+            endpoint=self.Routes.TRIGGER_JOBS,
+            location_params={},
+            body={
+                **self.generic_body,
+                **request_body,
+            }
+        )
+        self.check_response(response)
+        return response.json()
 
     def finalize_generic_run(self, run_id: str, status: str, scylla_version: str | None = None):
         response = self.finalize_run(run_type=self.test_type, run_id=run_id, body={

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/generic_result.py

@@ -62,6 +62,7 @@ class ResultTableMeta(type):
             cls_instance.description = meta.description
             cls_instance.columns = meta.Columns
             cls_instance.column_types = {column.name: column.type for column in cls_instance.columns}
+            cls_instance.sut_package_name = getattr(meta, 'sut_package_name', '')
             cls_instance.rows = []
             validation_rules = getattr(meta, 'ValidationRules', {})
             for col_name, rule in validation_rules.items():
@@ -98,7 +99,6 @@ class GenericResultTable(metaclass=ResultTableMeta):
     Base class for all Generic Result Tables in Argus. Use it as a base class for your result table.
     """
     sut_timestamp: int = 0  # automatic timestamp based on SUT version. Works only with SCT and refers to Scylla version.
-    sut_details: str = ""
     results: list[Cell] = field(default_factory=list)
 
     def as_dict(self) -> dict:
@@ -112,12 +112,12 @@ class GenericResultTable(metaclass=ResultTableMeta):
             "description": self.description,
             "columns_meta": [column.as_dict() for column in self.columns],
             "rows_meta": rows,
-            "validation_rules": {k: v.as_dict() for k, v in self.validation_rules.items()}
+            "validation_rules": {k: v.as_dict() for k, v in self.validation_rules.items()},
+            "sut_package_name": self.sut_package_name,
         }
         return {
             "meta": meta_info,
             "sut_timestamp": self.sut_timestamp,
-            "sut_details": self.sut_details,
             "results": [result.as_dict() for result in self.results]
         }
 

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/sct/client.py

@@ -2,8 +2,8 @@ import base64
 from typing import Any
 from uuid import UUID
 from dataclasses import asdict
-from argus.backend.plugins.sct.types import GeminiResultsRequest, PerformanceResultsRequest
-from argus.backend.util.enums import ResourceState, TestStatus
+from argus.common.sct_types import GeminiResultsRequest, PerformanceResultsRequest
+from argus.common.enums import ResourceState, TestStatus
 from argus.client.base import ArgusClient
 from argus.client.sct.types import EventsInfo, LogLink, Package
 
@@ -56,7 +56,7 @@ class ArgusSCTClient(ArgusClient):
         response = super().set_status(run_type=self.test_type, run_id=self.run_id, new_status=new_status)
         self.check_response(response)
 
-    def set_sct_runner(self, public_ip: str, private_ip: str, region: str, backend: str) -> None:
+    def set_sct_runner(self, public_ip: str, private_ip: str, region: str, backend: str, name: str = None) -> None:
         """
             Sets runner information for an SCT run.
         """
@@ -69,6 +69,7 @@ class ArgusSCTClient(ArgusClient):
                 "private_ip": private_ip,
                 "region": region,
                 "backend": backend,
+                "name": name,
             }
         )
         self.check_response(response)
@@ -298,4 +299,4 @@ class ArgusSCTClient(ArgusClient):
                 "file_name": file_name,
                 "content": str(base64.encodebytes(bytes(raw_content, encoding="utf-8")), encoding="utf-8")
             }
-        )
+        )

{argus_alm-0.12.10 → argus_alm-0.13.1}/argus/client/sirenada/client.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import TypedDict
 from xml.etree import ElementTree
 
-from argus.backend.plugins.sirenada.types import RawSirenadaRequest, RawSirenadaTestCase
+from argus.common.sirenada_types import RawSirenadaRequest, RawSirenadaTestCase
 
 from argus.client.base import ArgusClient
 

{argus_alm-0.12.10 → argus_alm-0.13.1}/pyproject.toml

@@ -1,12 +1,17 @@
 [tool.poetry]
 name = "argus-alm"
-version = "0.12.10"
+version = "0.13.1"
 description = "Argus"
 authors = ["Alexey Kartashov <alexey.kartashov@scylladb.com>", "Łukasz Sójka <lukasz.sojka@scylladb.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/scylladb/argus"
 readme = "README.md"
-packages = [{include = "argus"}]
+packages = [
+    { include = "argus/client" },
+    { include = "argus/common" },
+    { include = "argus/__init__.py" },
+]
+exclude = ["argus/client/tests"]
 
 [tool.poetry.group.web-backend]
 optional = true
@@ -16,7 +21,7 @@ optional = true
 
 [tool.poetry.dependencies]
 requests = "^2.26.0"
-python = "^3.10"
+python = "^3.12"
 click = "^8.1.3"
 
 [tool.poetry.scripts]
@@ -39,8 +44,9 @@ python-slugify = "^6.1.1"
 supervisor = "^4.2.4"
 
 [tool.poetry.dev-dependencies]
+black = "^24.10.0"
 coverage = "5.5"
-docker = "4.4.4"
+docker = "7.1.0"
 pytest = "6.2.5"
 ipython = "^8.1"
 pylint = "^2.12.0"
@@ -49,3 +55,7 @@ pre-commit = "^1.14.0"
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.black]
+line-length = 110
+target-version = ["py312"]

argus_alm-0.12.10/argus/backend/cli.py

@@ -1,41 +0,0 @@
-import logging
-import click
-from flask import Blueprint
-from flask.cli import with_appcontext
-from cassandra.cqlengine.management import sync_table, sync_type
-from argus.backend.db import ScyllaCluster
-from argus.backend.plugins.loader import all_plugin_models, all_plugin_types
-from argus.backend.service.build_system_monitor import JenkinsMonitor
-
-cli_bp = Blueprint("cli", __name__)
-LOGGER = logging.getLogger(__name__)
-
-
-@cli_bp.cli.add_command
-@click.command('sync-models')
-@with_appcontext
-def sync_models_command():
-    sync_models()
-
-def sync_models():
-    cluster = ScyllaCluster.get()
-    cluster.sync_core_tables()
-    LOGGER.info("Synchronizing plugin types...")
-    for user_type in all_plugin_types():
-        LOGGER.info("Synchronizing plugin type %s...", user_type.__name__)
-        sync_type(ks_name=cluster.config["SCYLLA_KEYSPACE_NAME"], type_model=user_type)
-    LOGGER.info("Synchronizing plugin models...")
-    for model in all_plugin_models(True):
-        LOGGER.info("Synchronizing plugin model %s...", model.__name__)
-        sync_table(model=model, keyspaces=[cluster.config["SCYLLA_KEYSPACE_NAME"]])
-
-    LOGGER.info("Plugins ready.")
-    click.echo("All models synchronized.")
-
-@cli_bp.cli.add_command
-@click.command('scan-jenkins')
-@with_appcontext
-def scan_jenkins_command():
-    monitor = JenkinsMonitor()
-    monitor.collect()
-    click.echo("Done.")

argus_alm-0.12.10/argus/backend/controller/admin.py

@@ -1,20 +0,0 @@
-import logging
-from flask import (
-    Blueprint,
-    render_template,
-)
-from argus.backend.controller.admin_api import bp as admin_api_bp
-from argus.backend.service.user import login_required, check_roles
-from argus.backend.models.web import UserRoles
-
-bp = Blueprint('admin', __name__, url_prefix='/admin')
-bp.register_blueprint(admin_api_bp)
-LOGGER = logging.getLogger(__name__)
-
-
-@bp.route("/")
-@bp.route("/<string:path>")
-@check_roles(UserRoles.Admin)
-@login_required
-def index(path: str = "index"):
-    return render_template("admin/index.html.j2", current_route=path)

argus_alm-0.12.10/argus/backend/controller/admin_api.py

@@ -1,354 +0,0 @@
-import logging
-from uuid import UUID
-from flask import (
-    Blueprint,
-    request,
-    Request,
-)
-from argus.backend.error_handlers import handle_api_exception
-from argus.backend.service.release_manager import ReleaseEditPayload, ReleaseManagerService
-from argus.backend.service.user import UserService, api_login_required, check_roles
-from argus.backend.models.web import User, UserRoles
-
-bp = Blueprint('admin_api', __name__, url_prefix='/api/v1')
-LOGGER = logging.getLogger(__name__)
-bp.register_error_handler(Exception, handle_api_exception)
-
-
-def get_payload(client_request: Request):
-    if not client_request.is_json:
-        raise Exception(
-            "Content-Type mismatch, expected application/json, got:", client_request.content_type)
-    request_payload = client_request.get_json()
-
-    return request_payload
-
-
-@bp.route("/", methods=["GET"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def index():
-    return {
-        "version": "v1"
-    }
-
-
-@bp.route("/release/create", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def create_release():
-    payload = get_payload(request)
-    release = ReleaseManagerService().create_release(**payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "new_release": release
-        }
-    }
-
-
-@bp.route("/release/set_perpetual", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def set_release_perpetual():
-    payload = get_payload(request)
-    result = ReleaseManagerService().set_release_perpetuality(**payload)
-    return {
-        "status": "ok",
-        "response": {
-            "updated": result
-        }
-    }
-
-
-@bp.route("/release/set_state", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def set_release_state():
-    payload = get_payload(request)
-    result = ReleaseManagerService().set_release_state(**payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "updated": result
-        }
-    }
-
-
-@bp.route("/release/set_dormant", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def set_release_dormancy():
-    payload = get_payload(request)
-    result = ReleaseManagerService().set_release_dormancy(**payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "updated": result
-        }
-    }
-
-
-@bp.route("/release/edit", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def edit_release():
-    payload: ReleaseEditPayload = get_payload(request)
-    result = ReleaseManagerService().edit_release(payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "updated": result
-        }
-    }
-
-
-@bp.route("/release/delete", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def delete_release():
-    payload = get_payload(request)
-    result = ReleaseManagerService().delete_release(release_id=payload["releaseId"])
-
-    return {
-        "status": "ok",
-        "response": {
-            "deleted": result
-        }
-    }
-
-
-@bp.route("/group/create", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def create_group():
-    payload = get_payload(request)
-    group = ReleaseManagerService().create_group(**payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "new_group": group
-        }
-    }
-
-
-@bp.route("/group/update", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def update_group():
-    payload = get_payload(request)
-    result = ReleaseManagerService().update_group(**payload)
-    return {
-        "status": "ok",
-        "response": {
-            "updated": result
-        }
-    }
-
-
-@bp.route("/group/delete", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def delete_group():
-    payload = get_payload(request)
-    result = ReleaseManagerService().delete_group(**payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "deleted": result
-        }
-    }
-
-
-@bp.route("/test/create", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def create_test():
-    payload = get_payload(request)
-    test = ReleaseManagerService().create_test(**payload)
-    return {
-        "status": "ok",
-        "response": {
-            "new_test": test
-        }
-    }
-
-
-@bp.route("/test/update", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def update_test():
-    payload = get_payload(request)
-    result = ReleaseManagerService().update_test(**payload)
-    return {
-        "status": "ok",
-        "response": {
-            "updated": result
-        }
-    }
-
-
-@bp.route("/test/batch_move", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def batch_move_tests():
-    payload = get_payload(request)
-    result = ReleaseManagerService().batch_move_tests(**payload)
-    return {
-        "status": "ok",
-        "response": {
-            "moved": result
-        }
-    }
-
-
-@bp.route("/test/delete", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def delete_test():
-    payload = get_payload(request)
-    result = ReleaseManagerService().delete_test(**payload)
-
-    return {
-        "status": "ok",
-        "response": {
-            "deleted": result
-        }
-    }
-
-
-@bp.route("/releases/get", methods=["GET"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def get_releases():
-    releases = ReleaseManagerService().get_releases()
-    return {
-        "status": "ok",
-        "response": releases
-    }
-
-
-@bp.route("/groups/get", methods=["GET"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def get_groups_for_release():
-    release_id = request.args.get("releaseId")
-    if not release_id:
-        raise Exception("ReleaseId not provided in the request")
-    groups = ReleaseManagerService().get_groups(release_id=UUID(release_id))
-
-    return {
-        "status": "ok",
-        "response": groups
-    }
-
-
-@bp.route("/tests/get", methods=["GET"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def get_tests_for_group():
-    group_id = request.args.get("groupId")
-    if not group_id:
-        raise Exception("GroupId not provided in the request")
-    tests = ReleaseManagerService().get_tests(group_id=UUID(group_id))
-    return {
-        "status": "ok",
-        "response": tests
-    }
-
-
-@bp.route("/release/test/state/toggle", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def quick_toggle_test_enabled():
-    
-    payload = get_payload(request)
-    res = ReleaseManagerService().toggle_test_enabled(test_id=payload["entityId"], new_state=payload["state"])
-    return {
-        "status": "ok",
-        "response": res
-    }
-
-
-@bp.route("/release/group/state/toggle", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def quick_toggle_group_enabled():
-    
-    payload = get_payload(request)
-    res = ReleaseManagerService().toggle_group_enabled(group_id=payload["entityId"], new_state=payload["state"])
-    return {
-        "status": "ok",
-        "response": res
-    }
-
-
-@bp.route("/users", methods=["GET"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def user_info():
-    result = UserService().get_users_privileged()
-
-    return {
-        "status": "ok",
-        "response": result
-    }
-
-
-@bp.route("/user/<string:user_id>/email/set", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def user_change_email(user_id: str):
-    payload = get_payload(request)
-
-    user = User.get(id=user_id)
-    result = UserService().update_email(user=user, new_email=payload["newEmail"])
-
-    return {
-        "status": "ok",
-        "response": result
-    }
-
-
-@bp.route("/user/<string:user_id>/delete", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def user_delete(user_id: str):
-    result = UserService().delete_user(user_id=user_id)
-
-    return {
-        "status": "ok",
-        "response": result
-    }
-
-
-@bp.route("/user/<string:user_id>/password/set", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def user_change_password(user_id: str):
-    payload = get_payload(request)
-
-    user = User.get(id=user_id)
-    result = UserService().update_password(user=user, old_password="", new_password=payload["newPassword"], force=True)
-
-    return {
-        "status": "ok",
-        "response": result
-    }
-
-@bp.route("/user/<string:user_id>/admin/toggle", methods=["POST"])
-@check_roles(UserRoles.Admin)
-@api_login_required
-def user_toggle_admin(user_id: str):
-    result = UserService().toggle_admin(user_id=user_id)
-
-    return {
-        "status": "ok",
-        "response": result
-    }