qalita 2.3.0__tar.gz → 2.3.1__tar.gz

{qalita-2.3.0 → qalita-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qalita
-Version: 2.3.0
+Version: 2.3.1
 Summary: QALITA Platform Command Line Interface
 License-File: LICENSE
 Author: QALITA SAS

{qalita-2.3.0 → qalita-2.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qalita"
-version = "2.3.0"
+version = "2.3.1"
 description = "QALITA Platform Command Line Interface"
 authors = ["QALITA SAS <contact@qalita.io>"]
 readme = "docs/README.md"

{qalita-2.3.0 → qalita-2.3.1}/qalita/commands/agent.py

@@ -465,6 +465,9 @@ def run(
                 # check routines before checking jobs
                 check_routines(config, agent_start_datetime)
 
+                # try to claim one pending unassigned job compatible with this agent
+                claim_unassigned_jobs(config)
+
                 check_job = send_api_request(
                     request=f'/api/v1/agents/{agent_conf["context"]["remote"]["id"]}/jobs/next',
                     mode="get",
@@ -1066,7 +1069,6 @@ def create_scheduled_job(routine, agent_conf):
         request=f"/api/v2/jobs/create",
         mode="post",
         data={
-            "agent_id": agent_conf["context"]["remote"]["id"],
             "source_id": routine["source"]["id"],
             "target_id": routine["target"]["id"] if routine.get("target") else None,
             "pack_id": routine["pack"]["id"],
@@ -1238,3 +1240,89 @@ def check_routines(config, agent_start_datetime):
                             ROUTINE_LAST_SCHEDULED_UTC[routine.get("id")] = datetime.now(timezone.utc)
     else:
         logger.warning("Can't fetch routines or jobs from the platform")
+
+
+def claim_unassigned_jobs(config):
+    """Claim one pending unassigned job that this agent can execute.
+
+    Strategy:
+    - Fetch all jobs (v2)
+    - Select first job with status == pending and no agent assigned
+    - Check local capability: source (and target if provided) must exist locally
+    - PUT to assign agent_id to this agent; on success, run job
+    - On contention (another agent already claimed), ignore and return
+    """
+    try:
+        source_conf = config.load_source_config(verbose=False)
+        agent_conf = config.load_agent_config()
+        local_source_ids = [s["id"] for s in source_conf["sources"] if "id" in s]
+
+        r = send_api_request(
+            request=f"/api/v2/jobs",
+            mode="get",
+        )
+        if r.status_code not in [200, 204]:
+            return
+        jobs = r.json()
+        if not isinstance(jobs, list):
+            return
+
+        def extract_id(maybe_obj, fallback_key):
+            if isinstance(maybe_obj, dict):
+                return maybe_obj.get("id")
+            return maybe_obj if isinstance(maybe_obj, int) else None
+
+        for job in jobs:
+            try:
+                if job.get("status") != "pending":
+                    continue
+                # unassigned: support either agent_id field or nested agent object
+                is_unassigned = (
+                    (job.get("agent_id") is None or job.get("agent_id") == 0)
+                    and not job.get("agent")
+                )
+                if not is_unassigned:
+                    continue
+
+                src_id = extract_id(job.get("source"), "source_id") or job.get("source_id")
+                if src_id not in local_source_ids:
+                    continue
+                tgt_id = extract_id(job.get("target"), "target_id") or job.get("target_id")
+                if tgt_id is not None and tgt_id not in local_source_ids:
+                    continue
+
+                # attempt to claim
+                claim_resp = send_api_request(
+                    request=f"/api/v2/jobs/{job['id']}",
+                    mode="put",
+                    data={
+                        "agent_id": agent_conf["context"]["remote"]["id"],
+                    },
+                )
+                if claim_resp.status_code != 200:
+                    # likely contention: someone else claimed
+                    continue
+
+                # extract version ids if present
+                src_ver_id = extract_id(job.get("source_version"), "source_version_id") or job.get("source_version_id")
+                tgt_ver_id = extract_id(job.get("target_version"), "target_version_id") or job.get("target_version_id")
+                pack_id = extract_id(job.get("pack"), "pack_id") or job.get("pack_id")
+                pack_ver_id = extract_id(job.get("pack_version"), "pack_version_id") or job.get("pack_version_id")
+
+                logger.info(f"Claimed unassigned job {job['id']} for source {src_id} pack {pack_id}")
+                job_run(
+                    src_id,
+                    src_ver_id,
+                    tgt_id,
+                    tgt_ver_id,
+                    pack_id,
+                    pack_ver_id,
+                    job=job,
+                )
+                # claim and run only one per loop
+                return
+            except Exception as _:
+                # Be resilient; don't break the worker loop on any unexpected job shape
+                continue
+    except Exception as _:
+        return

{qalita-2.3.0 → qalita-2.3.1}/qalita/commands/pack.py

@@ -586,20 +586,37 @@ def publish_new_pack_version(api_url, pack_id, pack_version, registry_id, pack_n
         source_dir=source_dir,
         config=config,
     )
-    # Best-effort: also update compatibility metadata if provided in properties.yaml
+    # Best-effort: also update metadata (avatar, description, url, visibility, config, readme)
+    # and compatibility if provided in properties.yaml so the new version push also refreshes pack details.
     try:
         pack_dir = source_dir or f"./{pack_name}_pack"
         props = load_pack_properties(pack_dir) or {}
+        pack_icon = load_base64_encoded_image(os.path.join(pack_dir, "icon.png"))
+        readme = load_base64_encoded_text(os.path.join(pack_dir, "README.md"))
+        pack_config = load_json_config(os.path.join(pack_dir, "pack_conf.json"))
+        pack_type = props.get("type", "")
+        pack_description = props.get("description", "")
+        pack_url = props.get("url", "")
+        pack_visibility = props.get("visibility", "private")
         compat = props.get("compatible_sources")
-        if isinstance(compat, builtins.list) and all(isinstance(x, str) for x in compat):
-            _request_with_optional_config(
-                config,
-                api_url,
-                f"/api/v2/packs/{pack_id}",
-                "put",
-                data={"compatible_sources": compat},
-            )
+
+        # Update full metadata
+        update_pack_metadata(
+            api_url,
+            pack_id,
+            pack_icon,
+            pack_config,
+            pack_type,
+            pack_description,
+            pack_url,
+            pack_version,
+            pack_visibility,
+            readme,
+            compatible_sources=compat,
+            config=config,
+        )
     except Exception:
+        # Non-fatal if metadata refresh fails; continue to publish version
         pass
     publish_response = _request_with_optional_config(
         config,
@@ -689,6 +706,84 @@ def handle_version_matching(existing_versions, new_version):
     return None
 
 
+def _push_with_context(agent_conf, pack_properties, pack_directory, config):
+    """Shared push routine used by CLI and Web UI.
+
+    Expects absolute or relative `pack_directory` and a loaded `pack_properties` dict.
+    """
+    # Extract pack details
+    pack_name = pack_properties.get("name")
+    pack_version = pack_properties.get("version")
+    pack_description = pack_properties.get("description", "")
+    pack_url = pack_properties.get("url", "")
+    pack_type = pack_properties.get("type", "")
+    pack_visibility = pack_properties.get("visibility", "private")
+
+    # Handle pack icon and README/config
+    pack_icon = load_base64_encoded_image(os.path.join(pack_directory, "icon.png"))
+    readme = load_base64_encoded_text(os.path.join(pack_directory, "README.md"))
+    pack_config = load_json_config(os.path.join(pack_directory, "pack_conf.json"))
+
+    # Check existing packs and versions
+    pack_id, existing_versions = find_existing_pack(
+        agent_conf["context"]["local"]["url"], pack_name, config=config
+    )
+
+    if pack_id:
+        new_version_entry = handle_version_matching(existing_versions, pack_version)
+        if not new_version_entry:
+            # Try to load compatible_sources from properties.yaml (optional)
+            compat = (
+                pack_properties.get("compatible_sources")
+                if isinstance(pack_properties, dict)
+                else None
+            )
+            update_pack_metadata(
+                agent_conf["context"]["local"]["url"],
+                pack_id,
+                pack_icon,
+                pack_config,
+                pack_type,
+                pack_description,
+                pack_url,
+                pack_version,
+                pack_visibility,
+                readme,
+                compatible_sources=compat,
+                config=config,
+            )
+            logger.success(
+                "Pack metadata updated successfully ! \nIf you wanted to upload a new pack version, you must change the pack [version] attribute in properties.yaml"
+            )
+        else:
+            publish_new_pack_version(
+                agent_conf["context"]["local"]["url"],
+                pack_id,
+                pack_version,
+                agent_conf["registries"][0]["id"],
+                pack_name,
+                source_dir=pack_directory,
+                config=config,
+            )
+    else:
+        create_new_pack(
+            agent_conf["context"]["local"]["url"],
+            agent_conf["registries"][0]["id"],
+            pack_name,
+            pack_icon,
+            pack_config,
+            pack_type,
+            pack_description,
+            pack_url,
+            pack_version,
+            pack_visibility,
+            readme,
+            source_dir=pack_directory,
+            config=config,
+        )
+        logger.success("New pack created successfully!")
+
+
 @pack.command()
 @click.option("-n", "--name", help="Name of the package", envvar="QALITA_PACK_NAME")
 @pass_config
@@ -725,78 +820,14 @@ def push(config, name):
             logger.error("Failed to load agent configuration.")
             return
 
-        # Extract pack details
-        pack_name = pack_properties.get("name")
-        pack_version = pack_properties.get("version")
-        pack_description = pack_properties.get("description", "")
-        pack_url = pack_properties.get("url", "")
-        pack_type = pack_properties.get("type", "")
-        pack_visibility = pack_properties.get("visibility", "private")
-
-        # Handle pack icon
-        pack_icon = load_base64_encoded_image(f"{pack_directory}/icon.png")
-
-        # Handle README file
-        readme = load_base64_encoded_text(f"{pack_directory}/README.md")
-
-        # Load pack config
-        pack_config = load_json_config(f"{pack_directory}/pack_conf.json")
-
-        # Check existing packs and versions
-        pack_id, existing_versions = find_existing_pack(
-            agent_conf["context"]["local"]["url"], pack_name, config=config
+        # Shared push routine
+        _push_with_context(
+            agent_conf,
+            pack_properties,
+            os.path.abspath(pack_directory),
+            config,
         )
 
-        if pack_id:
-            # Handle version matching and decide whether to add a new asset or update metadata
-            new_version_entry = handle_version_matching(existing_versions, pack_version)
-
-            if not new_version_entry:
-                # Try to load compatible_sources from properties.yaml (optional)
-                compat = pack_properties.get("compatible_sources") if isinstance(pack_properties, dict) else None
-                update_pack_metadata(
-                    agent_conf["context"]["local"]["url"],
-                    pack_id,
-                    pack_icon,
-                    pack_config,
-                    pack_type,
-                    pack_description,
-                    pack_url,
-                    pack_version,
-                    pack_visibility,
-                    readme,
-                    compatible_sources=compat,
-                    config=config,
-                )
-                logger.success("Pack metadata updated successfully ! \nIf you wanted to upload a new pack version, you must change the pack [version] attribute in properties.yaml")
-            else:
-                publish_new_pack_version(
-                    agent_conf["context"]["local"]["url"],
-                    pack_id,
-                    pack_version,
-                    agent_conf["registries"][0]["id"],
-                    pack_name,
-                    source_dir=os.path.abspath(pack_directory),
-                    config=config,
-                )
-        else:
-            create_new_pack(
-                agent_conf["context"]["local"]["url"],
-                agent_conf["registries"][0]["id"],
-                pack_name,
-                pack_icon,
-                pack_config,
-                pack_type,
-                pack_description,
-                pack_url,
-                pack_version,
-                pack_visibility,
-                readme,
-                source_dir=os.path.abspath(pack_directory),
-                config=config,
-            )
-            logger.success("New pack created successfully!")
-
         logger.info("Pack pushed successfully.")
 
     except Exception as e:
@@ -842,72 +873,14 @@ def push_from_directory(config, pack_directory):
             logger.error(msg)
             return False, msg
 
-        # Extract pack details
-        pack_name = pack_properties.get("name")
-        pack_version = pack_properties.get("version")
-        pack_description = pack_properties.get("description", "")
-        pack_url = pack_properties.get("url", "")
-        pack_type = pack_properties.get("type", "")
-        pack_visibility = pack_properties.get("visibility", "private")
-
-        # Handle pack icon and README
-        pack_icon = load_base64_encoded_image(os.path.join(pack_directory, "icon.png"))
-        readme = load_base64_encoded_text(os.path.join(pack_directory, "README.md"))
-        pack_config = load_json_config(os.path.join(pack_directory, "pack_conf.json"))
-
-        # Check existing packs and versions
-        pack_id, existing_versions = find_existing_pack(
-            agent_conf["context"]["local"]["url"], pack_name, config=config
+        # Shared push routine
+        _push_with_context(
+            agent_conf,
+            pack_properties,
+            pack_directory,
+            config,
         )
 
-        if pack_id:
-            new_version_entry = handle_version_matching(existing_versions, pack_version)
-            if not new_version_entry:
-                # Try to load compatible_sources from properties.yaml (optional)
-                compat = pack_properties.get("compatible_sources") if isinstance(pack_properties, dict) else None
-                update_pack_metadata(
-                    agent_conf["context"]["local"]["url"],
-                    pack_id,
-                    pack_icon,
-                    pack_config,
-                    pack_type,
-                    pack_description,
-                    pack_url,
-                    pack_version,
-                    pack_visibility,
-                    readme,
-                    compatible_sources=compat,
-                    config=config,
-                )
-                logger.success("Pack metadata updated successfully ! \nIf you wanted to upload a new pack version, you must change the pack [version] attribute in properties.yaml")
-            else:
-                publish_new_pack_version(
-                    agent_conf["context"]["local"]["url"],
-                    pack_id,
-                    pack_version,
-                    agent_conf["registries"][0]["id"],
-                    pack_name,
-                    source_dir=pack_directory,
-                    config=config,
-                )
-        else:
-            create_new_pack(
-                agent_conf["context"]["local"]["url"],
-                agent_conf["registries"][0]["id"],
-                pack_name,
-                pack_icon,
-                pack_config,
-                pack_type,
-                pack_description,
-                pack_url,
-                pack_version,
-                pack_visibility,
-                readme,
-                source_dir=pack_directory,
-                config=config,
-            )
-            logger.success("New pack created successfully!")
-
         logger.info("Pack pushed successfully.")
         return True, "Pack pushed successfully."
     except Exception as e:

{qalita-2.3.0 → qalita-2.3.1}/qalita/internal/utils.py

@@ -14,7 +14,7 @@ logger = init_logging()
 
 
 def get_version():
-    return "2.3.0"
+    return "2.3.1"
 
 
 def make_tarfile(output_filename, source_dir):