primitive 0.1.92__py3-none-any.whl → 0.1.94__py3-none-any.whl

primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.1.92"
+__version__ = "0.1.94"

primitive/agent/actions.py

@@ -17,6 +17,13 @@ class Agent(BaseAction):
         self,
     ):
         logger.enable("primitive")
+        logger.remove()
+        logger.add(
+            sink=sys.stderr,
+            # catch=True,
+            backtrace=True,
+            diagnose=True,
+        )
         logger.info(" [*] primitive")
         logger.info(f" [*] Version: {__version__}")
 
@@ -34,8 +41,8 @@ class Agent(BaseAction):
             # setting is_available of the parent also effects the children,
             # which may have active reservations as well
             self.primitive.hardware.check_in_http(is_online=True)
-        except Exception as ex:
-            logger.error(f"Error checking in hardware: {ex}")
+        except Exception as exception:
+            logger.exception(f"Error checking in hardware: {exception}")
             sys.exit(1)
 
         try:
@@ -43,10 +50,14 @@ class Agent(BaseAction):
             active_reservation_pk = None
 
             while True:
+                logger.debug("Syncing children...")
+                self.primitive.hardware._sync_children()
+
                 logger.debug("Scanning for files to upload...")
                 uploader.scan()
 
                 hardware = self.primitive.hardware.get_own_hardware_details()
+
                 if hardware["activeReservation"]:
                     if (
                         hardware["activeReservation"]["id"] != active_reservation_id
@@ -125,14 +136,23 @@ class Agent(BaseAction):
                         )
                     )
 
-                    downloaded_git_repository_dir = (
-                        self.primitive.git.download_git_repository_at_ref(
-                            git_repo_full_name=git_repo_full_name,
-                            git_ref=git_ref,
-                            github_access_token=github_access_token,
-                            destination=cache_dir,
+                    try:
+                        downloaded_git_repository_dir = (
+                            self.primitive.git.download_git_repository_at_ref(
+                                git_repo_full_name=git_repo_full_name,
+                                git_ref=git_ref,
+                                github_access_token=github_access_token,
+                                destination=cache_dir,
+                            )
                         )
-                    )
+                    except Exception as exception:
+                        logger.error(
+                            f"Error downloading source: {exception}"
+                        )
+                        self.primitive.jobs.job_run_update(
+                            job_run["id"], status="request_completed", conclusion="failure"
+                        )
+                        continue
 
                     source_dir = downloaded_git_repository_dir.joinpath(
                         job_run["jobSettings"]["rootDirectory"]
@@ -146,9 +166,11 @@ class Agent(BaseAction):
                             job_run=job_run,
                             max_log_size=500 * 1024,
                         )
-                    except Exception as e:
+                    except Exception as exception:
                         # Log Error
-                        logger.error(f"Error initializing agent runner: {e}")
+                        logger.exception(
+                            f"Error initializing agent runner: {exception}"
+                        )
                     else:
                         # Execute job
                         runner.execute()

primitive/agent/runner.py

@@ -1,17 +1,18 @@
 import os
 import threading
 import typing
+from enum import IntEnum
 from pathlib import Path, PurePath
 from time import sleep
-from typing import Dict, Iterable, List, Optional, TypedDict, Callable
-from enum import IntEnum
+from typing import Callable, Dict, Iterable, List, Optional, TypedDict
 
 import yaml
 from loguru import logger
-from .process import Process
-from .provision import ProvisionPython
+
 from ..utils.cache import get_artifacts_cache, get_logs_cache
 from ..utils.files import find_files_for_extension
+from .process import Process
+from .provision import ProvisionPython
 
 try:
     from yaml import CLoader as Loader
@@ -74,6 +75,8 @@ class AgentRunner:
                 Path(get_logs_cache(self.job_id) / log_name),
                 rotation=self.max_log_size,
                 format=AgentRunner.log_serializer(),
+                backtrace=True,
+                diagnose=True,
             )
 
         logger.info(f"Scanning directory for job file {self.job_slug}")
@@ -165,8 +168,10 @@ class AgentRunner:
 
                 try:
                     proc.start()
-                except Exception as e:
-                    logger.error(f"Error while attempting to run process {e}")
+                except Exception as exception:
+                    logger.exception(
+                        f"Error while attempting to run process {exception}"
+                    )
                     self.primitive.jobs.job_run_update(
                         self.job_id, status="request_completed", conclusion="failure"
                     )

primitive/hardware/actions.py

@@ -42,12 +42,7 @@ from primitive.utils.shell import does_executable_exist
 class Hardware(BaseAction):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
-        self.previous_state = {
-            "isHealthy": False,
-            "isQuarantined": False,
-            "isAvailable": False,
-            "isOnline": False,
-        }
+        self.status_cache = {}
         self.children = []
 
     def _get_darwin_system_profiler_values(self) -> Dict[str, str]:
@@ -81,7 +76,7 @@ class Hardware(BaseAction):
                 )
             except subprocess.CalledProcessError as exception:
                 message = f"Error running system_profiler: {exception}"
-                logger.error(message)
+                logger.exception(message)
                 return supported_metal_device
 
             try:
@@ -90,7 +85,7 @@ class Hardware(BaseAction):
                 )
             except json.JSONDecodeError as exception:
                 message = f"Error decoding JSON: {exception}"
-                logger.error(message)
+                logger.exception(message)
                 return supported_metal_device
 
             # Checks if any attached displays have metal support
@@ -121,7 +116,7 @@ class Hardware(BaseAction):
                 )
             except subprocess.CalledProcessError as exception:
                 message = f"Command {nvidia_smi_query_gpu_csv_command} failed with exception: {exception}"  # noqa
-                logger.error(message)
+                logger.exception(message)
                 raise exception
 
             try:
@@ -133,7 +128,7 @@ class Hardware(BaseAction):
                 )
             except UnicodeDecodeError as exception:
                 message = f"Error decoding: {exception}"
-                logger.error(message)
+                logger.exception(message)
                 raise exception
 
             nvidia_smi_query_gpu_csv_dict_reader = csv.DictReader(
@@ -164,7 +159,7 @@ class Hardware(BaseAction):
                     )
                 except subprocess.CalledProcessError as exception:
                     message = f"Error running {system_profiler_hardware_data_type_command}: {exception}"  # noqa
-                    logger.error(message)
+                    logger.exception(message)
                     raise exception
 
                 try:
@@ -173,7 +168,7 @@ class Hardware(BaseAction):
                     )
                 except json.JSONDecodeError as exception:
                     message = f"Error decoding JSON: {exception}"  # noqa
-                    logger.error(message)
+                    logger.exception(message)
                     raise exception
 
                 metal_device_json = system_profiler_hardware_data_type_json[
@@ -373,7 +368,7 @@ class Hardware(BaseAction):
             )
         except client_exceptions.ClientConnectorError as exception:
             message = " [*] Failed to update hardware system info! "
-            logger.error(message)
+            logger.exception(message)
             raise exception
 
         message = " [*] Updated hardware system info successfully! "
@@ -388,8 +383,11 @@ class Hardware(BaseAction):
         is_quarantined: bool = False,
         is_available: bool = False,
         is_online: bool = True,
+        fingerprint: Optional[str] = None,
     ):
-        fingerprint = self.primitive.host_config.get("fingerprint", None)
+        # if no fingerprint supplied from argument try from the host_config
+        if not fingerprint:
+            fingerprint = self.primitive.host_config.get("fingerprint", None)
 
         if not fingerprint:
             message = (
@@ -421,12 +419,22 @@ class Hardware(BaseAction):
                         logger.debug(message.get("message"))
 
             if checkin_success:
-                previous_state = self.previous_state
-                self.previous_state = new_state.copy()
-
-                message = " [*] Checked in successfully: "
+                if self.status_cache.get(fingerprint):
+                    previous_status = self.status_cache[fingerprint]
+                else:
+                    previous_status = {
+                        "isHealthy": False,
+                        "isQuarantined": False,
+                        "isAvailable": False,
+                        "isOnline": False,
+                    }
+                self.status_cache[fingerprint] = new_state.copy()
+
+                message = f" [*] Checked in successfully for {fingerprint}: "
+                is_new_status = False
                 for key, value in new_state.items():
-                    if value != previous_state.get(key, None):
+                    if value != previous_status.get(key, None):
+                        is_new_status = True
                         if value is True:
                             message = (
                                 message
@@ -441,6 +449,8 @@ class Hardware(BaseAction):
                                 + click.style("✅")
                                 + click.style(" ==> 💤 ", fg="yellow")
                             )
+                if is_new_status is False:
+                    message += "No changes."
                 logger.info(message)
             else:
                 message = "Failed to check in!"
@@ -448,7 +458,7 @@ class Hardware(BaseAction):
             return result
         except client_exceptions.ClientConnectorError as exception:
             message = " [*] Failed to check in! "
-            logger.error(message)
+            logger.exception(message)
             raise exception
 
     @guard
@@ -512,7 +522,8 @@ class Hardware(BaseAction):
 
     def get_own_hardware_details(self):
         hardware_list_result = self.get_hardware_list(
-            fingerprint=self.primitive.host_config.get("fingerprint")
+            fingerprint=self.primitive.host_config.get("fingerprint"),
+            nested_children=True,
         )
         hardware = (
             hardware_list_result.data.get("hardwareList").get("edges")[0].get("node")
@@ -582,4 +593,68 @@ class Hardware(BaseAction):
         # get the latest children from the node
         # compare the two and update the node with the latest children
         # remove any children from remote that are not in the latest children
-        pass
+        hardware = self.primitive.hardware.get_own_hardware_details()
+        remote_children = hardware.get("children", [])
+        local_children = self.primitive.hardware._list_local_children()
+
+        new_child_registered = False
+        # need to register new children that were not previously registered
+        if len(remote_children) < len(local_children):
+            logger.info("New children found.")
+            for local_child in local_children:
+                found = False
+                for remote_child in remote_children:
+                    if remote_child["slug"] == local_child.slug:
+                        found = True
+                        break
+                if not found:
+                    try:
+                        logger.info(f"Registering new child: {local_child.slug}")
+                        self.primitive.hardware.register_child(child=local_child)
+                        new_child_registered = True
+                    except Exception as exception:
+                        logger.exception(f"Error registering new children: {exception}")
+
+        # if a new child was registered, get the fresh state of the world
+        if new_child_registered:
+            hardware = self.primitive.hardware.get_own_hardware_details()
+            remote_children = hardware.get("children", [])
+
+        try:
+            # need to check in children that had been previously registered
+            # TODO: this is where, once you've got the local children you run a
+            # predefined health check. online != healthy
+            for remote_child in remote_children:
+                # if the remote_child is not in the local_children, then it is offline
+                found = False
+                for local_child in local_children:
+                    if remote_child["slug"] == local_child.slug:
+                        is_available = True
+                        if remote_child["activeReservation"] is not None:
+                            if (
+                                remote_child["activeReservation"]["id"]
+                                and remote_child["isAvailable"]
+                            ):
+                                is_available = False
+
+                        self.primitive.hardware.check_in_http(
+                            is_available=is_available,
+                            is_healthy=True,
+                            is_online=True,
+                            fingerprint=remote_child["fingerprint"],
+                        )
+                        found = True
+                        break
+                if not found:
+                    logger.info(
+                        f"Remote child {remote_child['slug']}, not found in local children. Setting offline."
+                    )
+                    self.primitive.hardware.check_in_http(
+                        is_available=False,
+                        is_healthy=False,
+                        is_online=False,
+                        fingerprint=remote_child["fingerprint"],
+                    )
+
+        except Exception as exception:
+            logger.exception(f"Error checking in children: {exception}")

primitive/hardware/android.py

@@ -2,9 +2,12 @@ from dataclasses import dataclass, field
 from subprocess import PIPE, Popen
 from typing import Dict
 
+from primitive.utils.text import slugify
+
 
 @dataclass
 class AndroidDevice:
+    slug: str
     serial: str
     usb: str
     product: str
@@ -47,7 +50,9 @@ def list_devices():
                 detail for detail in line.split(" ") if detail != ""
             ]
 
+            slug = slugify(device_details_array[0])
             android_device = AndroidDevice(
+                slug=slug,
                 serial=device_details_array[0],
                 usb=device_details_array[1],
                 product=device_details_array[2],

primitive/hardware/commands.py

@@ -87,26 +87,7 @@ def hardware_status_string(hardware):
         return "Available"
 
 
-@cli.command("list")
-@click.pass_context
-def list_command(context):
-    """List Hardware"""
-    primitive: Primitive = context.obj.get("PRIMITIVE")
-    get_hardware_list_result = primitive.hardware.get_hardware_list(
-        nested_children=True
-    )
-    message = get_hardware_list_result.data
-
-    hardware_list = [
-        hardware.get("node")
-        for hardware in get_hardware_list_result.data.get("hardwareList").get("edges")
-    ]
-
-    message = hardware_list
-    if context.obj["JSON"]:
-        print_result(message=message, context=context)
-        return
-
+def render_hardware_table(hardware_list):
     console = Console()
 
     table = Table(show_header=True, header_style="bold magenta")
@@ -153,3 +134,45 @@ def list_command(context):
                 )
 
     console.print(table)
+
+
+@cli.command("list")
+@click.pass_context
+def list_command(context):
+    """List Hardware"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+    get_hardware_list_result = primitive.hardware.get_hardware_list(
+        nested_children=True
+    )
+
+    hardware_list = [
+        hardware.get("node")
+        for hardware in get_hardware_list_result.data.get("hardwareList").get("edges")
+    ]
+
+    if context.obj["JSON"]:
+        print_result(message=hardware_list, context=context)
+        return
+    else:
+        render_hardware_table(hardware_list)
+
+
+@cli.command("get")
+@click.pass_context
+@click.argument(
+    "hardware_identifier",
+    type=str,
+    required=True,
+)
+def get_command(context, hardware_identifier: str) -> None:
+    """Get Hardware"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+    hardware = primitive.hardware.get_hardware_from_slug_or_id(
+        hardware_identifier=hardware_identifier
+    )
+
+    if context.obj["JSON"]:
+        print_result(message=hardware, context=context)
+        return
+    else:
+        render_hardware_table([hardware])

primitive/hardware/graphql/queries.py

@@ -55,6 +55,7 @@ query hardwareList(
         ...HardwareFragment
         children {
           ...HardwareFragment
+          fingerprint
         }
       }
     }
@@ -88,6 +89,7 @@ query hardwareDetails(
         ...HardwareFragment
         children {
           ...HardwareFragment
+          fingerprint
         }
       }
     }

primitive/utils/text.py

@@ -0,0 +1,24 @@
+import re
+import unicodedata
+
+
+# from Django for consistency
+# https://github.com/django/django/blob/stable/5.1.x/django/utils/text.py#L452
+def slugify(value, allow_unicode=False):
+    """
+    Convert to ASCII if 'allow_unicode' is False. Convert spaces or repeated
+    dashes to single dashes. Remove characters that aren't alphanumerics,
+    underscores, or hyphens. Convert to lowercase. Also strip leading and
+    trailing whitespace, dashes, and underscores.
+    """
+    value = str(value)
+    if allow_unicode:
+        value = unicodedata.normalize("NFKC", value)
+    else:
+        value = (
+            unicodedata.normalize("NFKD", value)
+            .encode("ascii", "ignore")
+            .decode("ascii")
+        )
+    value = re.sub(r"[^\w\s-]", "", value.lower())
+    return re.sub(r"[-\s]+", "-", value).strip("-_")

{primitive-0.1.92.dist-info → primitive-0.1.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.1.92
+Version: 0.1.94
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli

{primitive-0.1.92.dist-info → primitive-0.1.94.dist-info}/RECORD

@@ -1,13 +1,13 @@
-primitive/__about__.py,sha256=zAovHlidIiOORWtwXziyiE6_7Yij_H9sOCJqsVE2txc,130
+primitive/__about__.py,sha256=KXegEIne06p7p51yURPxgSDL9t-28iyLfXrBT-skS_Q,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=CiI60bG3UZyNFuLTpchr0KeJRG5SALj455Ob11CegGE,2412
 primitive/client.py,sha256=PPyIQRvKKSqCF9RRF5mJJ4Vqqolpzy1YXqffNLKIvAA,2390
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/agent/actions.py,sha256=Ay76qUwMYNERndA0lAvwK8zjVOrR8nMmSi-NeSwIlA8,6817
+primitive/agent/actions.py,sha256=s9hOVKsgjwt7iXnpGOpoR5Ctxh9g7g-g1xu5QjtvPbc,7636
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/agent/process.py,sha256=32eoj0W1-LG-9xxeHia-jk9jTah1cnmjCYnvczgXYGU,3538
 primitive/agent/provision.py,sha256=rmwnro1K5F8mwtd45XAq7RVQmpDWnbBCQ8X_qgWhm3M,1546
-primitive/agent/runner.py,sha256=B_M0BOeCy7gO7Mp6nfxv-FJ-9yBbujGVNoZziAMcDjc,9357
+primitive/agent/runner.py,sha256=gVr-IWizw7UiP-9vgDviGzmrJBi5jLMXMw-0aVusPIs,9487
 primitive/agent/uploader.py,sha256=OkgwXhWKoECOJnW_ZmpzmUS_cpb-orC_uebNcmf5byw,2948
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=MPsG9LcKcOPwA7gZ9Ewk0PZJhTQvIrGfODdz4GxSzgA,999
@@ -40,13 +40,13 @@ primitive/graphql/relay.py,sha256=bmij2AjdpURQ6GGVCxwWhauF-r_SxuAU2oJ4sDbLxpI,72
 primitive/graphql/sdk.py,sha256=DBFH8vw8FAGvRy8_FZc9WcjnwaQDlXmI8fiYmhCg-b0,1458
 primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_6zRq91zqs,303
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/hardware/actions.py,sha256=6dnPUN_hjXy4DIVoKWneiqgdF6UWfwDN82GczAqRykw,22018
-primitive/hardware/android.py,sha256=NcvbDb9ZLl5PCeHII84yLxZo0V48Vn5K75AzkIsg9is,2623
-primitive/hardware/commands.py,sha256=sU9xES9UK3JO1RxZMeC0412pcWIwXWXwr8rmMzz1VGQ,5088
+primitive/hardware/actions.py,sha256=tmsr50UPz_xFXPdeSa89e7NgDlw9vMwqWUUXlFGzmQs,25775
+primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
+primitive/hardware/commands.py,sha256=cWl8j0XtkXQtPHtpO_C6Gh0-dnAEysOFryf3VnDOTOo,5650
 primitive/hardware/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/hardware/graphql/fragments.py,sha256=kI6qnTNjaEaUr-C6eD55COphtueVYbYOWZwN5EW_3qw,350
 primitive/hardware/graphql/mutations.py,sha256=_4Hkbfik9Ron4T-meulu6T-9FR_BZjyPNwn745MPksU,1484
-primitive/hardware/graphql/queries.py,sha256=2k-ZMaSDDO8YsbYNV54pw0yHnsPco6Y9ZfKBOEnQCsw,1348
+primitive/hardware/graphql/queries.py,sha256=I86uLuOSjHSph11Y5MVCYko5Js7hoiEZ-cEoPTc4J-k,1392
 primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/jobs/actions.py,sha256=CtyO-Z9614TgIoXJJX1QGsoll0fgpBIjG9PJH5JwCQs,4901
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
@@ -90,9 +90,10 @@ primitive/utils/git.py,sha256=1qNOu8X-33CavmrD580BmrFhD_WVO9PGWHUUboXJR_g,663
 primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIUk,3058
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=vpjr2Y7UQGYOvPGa6_RYXPPjqScfa9k7kT3tugF9h4Y,1837
+primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
 primitive/utils/verible.py,sha256=Zb5NUISvcaIgEvgCDBWr-GCoceMa79Tcwvr5Wl9lfnA,2252
-primitive-0.1.92.dist-info/METADATA,sha256=zFeFQOxPZQ24o1jc-GLNXTy4jK97IhPIspA2NKTX4Y4,3670
-primitive-0.1.92.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.1.92.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.92.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.92.dist-info/RECORD,,
+primitive-0.1.94.dist-info/METADATA,sha256=jF78rkKKUBDKv-30b--nmW4RsQfUIPdzOkWVoD7HUpE,3670
+primitive-0.1.94.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.1.94.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.94.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.94.dist-info/RECORD,,