primitive 0.1.95__py3-none-any.whl → 0.1.97__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.95"
+__version__ = "0.1.97"

primitive/agent/actions.py

@@ -8,6 +8,7 @@ from primitive.__about__ import __version__
 from primitive.utils.actions import BaseAction
 
 from ..utils.cache import get_sources_cache
+from ..utils.exceptions import P_CLI_100
 from .runner import AgentRunner
 from .uploader import Uploader
 
@@ -146,11 +147,11 @@ class Agent(BaseAction):
                             )
                         )
                     except Exception as exception:
-                        logger.error(
-                            f"Error downloading source: {exception}"
-                        )
+                        logger.error(f"Error downloading source: {exception}")
                         self.primitive.jobs.job_run_update(
-                            job_run["id"], status="request_completed", conclusion="failure"
+                            job_run["id"],
+                            status="request_completed",
+                            conclusion="failure",
                         )
                         continue
 
@@ -181,5 +182,11 @@ class Agent(BaseAction):
                 sleep(5)
         except KeyboardInterrupt:
             logger.info(" [*] Stopping primitive...")
-            self.primitive.hardware.check_in_http(is_available=False, is_online=False)
+            try:
+                self.primitive.hardware.check_in_http(
+                    is_available=False, is_online=False, stopping_agent=True
+                )
+            except P_CLI_100 as exception:
+                logger.error(" [*] Error stopping primitive.")
+                logger.error(str(exception))
             sys.exit()

primitive/agent/runner.py

@@ -140,6 +140,10 @@ class AgentRunner:
 
         # Initialize the environment with the system
         environment = os.environ
+
+        # Add local variables
+        environment["PRIMITIVE_GIT_SHA"] = str(self.job_run["gitCommit"]["sha"])
+
         if "provision" in self.job:
             logger.info(f"Provisioning for {self.job['provision']} environment")
             environment = self.provision()

primitive/hardware/actions.py

@@ -17,6 +17,7 @@ from primitive.utils.memory_size import MemorySize
 
 from ..utils.auth import guard
 from ..utils.config import update_config_file
+from ..utils.exceptions import P_CLI_100
 from .graphql.mutations import (
     hardware_checkin_mutation,
     hardware_update_mutation,
@@ -384,6 +385,7 @@ class Hardware(BaseAction):
         is_available: bool = False,
         is_online: bool = True,
         fingerprint: Optional[str] = None,
+        stopping_agent: Optional[bool] = False,
     ):
         # if no fingerprint supplied from argument try from the host_config
         if not fingerprint:
@@ -419,7 +421,7 @@ class Hardware(BaseAction):
                         logger.debug(message.get("message"))
 
             if checkin_success:
-                if self.status_cache.get(fingerprint):
+                if fingerprint in self.status_cache:
                     previous_status = self.status_cache[fingerprint]
                 else:
                     previous_status = {
@@ -457,9 +459,12 @@ class Hardware(BaseAction):
                 raise Exception(message)
             return result
         except client_exceptions.ClientConnectorError as exception:
-            message = " [*] Failed to check in! "
-            logger.exception(message)
-            raise exception
+            if not stopping_agent:
+                message = " [*] Failed to check in! "
+                logger.error(message)
+                raise exception
+            else:
+                raise P_CLI_100
 
     @guard
     def get_hardware_list(

primitive/utils/auth.py

@@ -43,6 +43,7 @@ def guard(func):
     @backoff.on_exception(
         backoff.expo,
         (
+            ConnectionRefusedError,
             ClientConnectorError,
             TransportServerError,
         ),

primitive/utils/exceptions.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class P_CLI_100(Exception):
+    """Check In Connection Failure while Stopping Agent"""
+
+    codename: str = "P_CLI_100"
+    message: str = "Check In Connection Failure while Stopping Agent"
+
+    def __str__(self):
+        return f"{self.codename}: {self.message}"

{primitive-0.1.95.dist-info → primitive-0.1.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.1.95
+Version: 0.1.97
 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.95.dist-info → primitive-0.1.97.dist-info}/RECORD

@@ -1,13 +1,13 @@
-primitive/__about__.py,sha256=ouSBabAcgPjZIDVCBckH88mjsRPM8LpwffKy_EhIcvc,130
+primitive/__about__.py,sha256=VlPlizaJ28NM3NAQfHbIEgioaK258vAJovVqUbc4ahY,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=s9hOVKsgjwt7iXnpGOpoR5Ctxh9g7g-g1xu5QjtvPbc,7636
+primitive/agent/actions.py,sha256=v7-KZQWmpAyavjv2P06rx6i7oULZcUriTr66P8j90-o,7911
 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=gVr-IWizw7UiP-9vgDviGzmrJBi5jLMXMw-0aVusPIs,9487
+primitive/agent/runner.py,sha256=v_c5DtyQNCOQzgtvHfHv3DXQcHbo-EPJaILas6xAxTA,9600
 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,7 +40,7 @@ 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=tmsr50UPz_xFXPdeSa89e7NgDlw9vMwqWUUXlFGzmQs,25775
+primitive/hardware/actions.py,sha256=6tZCAqSYl6YuZ0u52MIkON77_RX-BR38TXuOMq2NKEI,25955
 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
@@ -81,10 +81,11 @@ primitive/reservations/graphql/mutations.py,sha256=IqzwQL7OclN7RpIcidrTQo9cGYofY
 primitive/reservations/graphql/queries.py,sha256=x31wTRelskX2fc0fx2qrY7XT1q74nvzLv_Xef3o9weg,746
 primitive/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/utils/actions.py,sha256=HOFrmM3-0A_A3NS84MqrZ6JmQEiiPSoDqEeuu6b_qfQ,196
-primitive/utils/auth.py,sha256=_BJ_25ACq-GVzLvF4eHFJ1Q_gk2A_HkDg52geNzxIAc,1495
+primitive/utils/auth.py,sha256=mfO4CwWZtiRZhF498d6v9qeUnLJxi_3jTViuIZI7ijs,1531
 primitive/utils/cache.py,sha256=FHGmVWYLJFQOazpXXcEwI0YJEZbdkgG39nOLdOv6VNk,1575
 primitive/utils/chunk_size.py,sha256=PAuVuirUTA9oRXyjo1c6MWxo31WVBRkWMuWw-AS58Bw,2914
 primitive/utils/config.py,sha256=DlFM5Nglo22WPtbpZSVtH7NX-PTMaKYlcrUE7GPRG4c,1058
+primitive/utils/exceptions.py,sha256=DrYHTcCAJGC7cCUwOx_FmdlVLWRdpzvDvpLb82heppE,311
 primitive/utils/files.py,sha256=QUa7c4t2PNvKOtyndLAxQMGvDM4cBftSeFh28xprVbM,752
 primitive/utils/git.py,sha256=1qNOu8X-33CavmrD580BmrFhD_WVO9PGWHUUboXJR_g,663
 primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIUk,3058
@@ -92,8 +93,8 @@ primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,37
 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.95.dist-info/METADATA,sha256=o67ITMkiWAPBHvnyaICfDEsrwyQqm0VyRPfKzwGJRPo,3670
-primitive-0.1.95.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.1.95.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.95.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.95.dist-info/RECORD,,
+primitive-0.1.97.dist-info/METADATA,sha256=Bc_2IjZVv-zJZBIfw-_Csk-kD46whiyTU5TIBcehyjQ,3670
+primitive-0.1.97.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.1.97.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.97.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.97.dist-info/RECORD,,