primitive 0.1.74__py3-none-any.whl → 0.1.76__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.74"
+__version__ = "0.1.76"

primitive/agent/runner.py

@@ -1,7 +1,6 @@
 import os
 import threading
 import typing
-import json
 from pathlib import Path, PurePath
 from time import sleep
 from typing import Dict, Iterable, List, Optional, TypedDict, Callable
@@ -109,18 +108,16 @@ class AgentRunner:
             if "step" in record["extra"]:
                 step = record["extra"]["step"]
 
-            log = {
-                "time": record["time"].strftime("%Y-%m-%d %H:%M:%S.%f"),
-                "utc": record["time"].strftime("%Y-%m-%d %H:%M:%S.%f%z"),
-                "level": record["level"].name,
-                "message": record["message"],
-                "name": record["name"],
-                "step": step,
-            }
-
-            record["extra"]["serialized"] = json.dumps(log)
+            log = (
+                "<green>{time:YYYY-MM-DD HH:mm:ss.SSS!UTC}</green> | "
+                "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
+                "<level>{level}</level> | "
+                f"{step} | "
+                "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - "
+                "<level>{message}</level>\n"
+            )
 
-            return "{extra[serialized]}\n"
+            return log
 
         return fmt
 

primitive/agent/uploader.py

@@ -47,7 +47,7 @@ class Uploader:
         for file in files:
             result = self.primitive.files.upload_file_direct(
                 path=file,
-                key_prefix=str(PurePath(file).relative_to(cache.parent).parent)
+                key_prefix=str(PurePath(file).relative_to(cache.parent).parent),
             )
             upload_id = result.data["fileUpdate"]["id"]
 

primitive/auth/commands.py

@@ -1,11 +1,12 @@
 import os
+import typing
 import webbrowser
+
 import click
-from .actions import Auth
+
 from ..utils.config import PRIMITIVE_CREDENTIALS_FILEPATH
 from ..utils.printer import print_result
-
-import typing
+from .actions import Auth
 
 if typing.TYPE_CHECKING:
     from ..client import Primitive

primitive/graphql/sdk.py

@@ -1,7 +1,9 @@
 from typing import Dict
+
+import requests
 from gql import Client
 from gql.transport.aiohttp import AIOHTTPTransport
-import requests
+
 from primitive.__about__ import __version__
 
 

primitive/utils/auth.py

@@ -1,9 +1,23 @@
 import sys
 
+import backoff
+from aiohttp.client_exceptions import ClientConnectorError
+from gql.transport.exceptions import TransportServerError
 from loguru import logger
 
 from ..graphql.sdk import create_session
 
+MAX_TIME_FOR_BACKOFF = 60 * 15  # 15 minutes
+
+
+def connection_backoff_handler(details):
+    logger.enable("primitive")
+    logger.error(
+        "Cannot connect to API. Waiting {wait:0.1f} seconds after {tries} tries.".format(
+            **details
+        )
+    )
+
 
 def create_new_session(primitive):
     token = primitive.host_config.get("token")
@@ -26,6 +40,15 @@ def create_new_session(primitive):
 
 
 def guard(func):
+    @backoff.on_exception(
+        backoff.expo,
+        (
+            ClientConnectorError,
+            TransportServerError,
+        ),
+        on_backoff=connection_backoff_handler,
+        max_time=MAX_TIME_FOR_BACKOFF,
+    )
     def wrapper(self, *args, **kwargs):
         if self.primitive.session is None:
             self.primitive.session = create_new_session(self.primitive)

primitive/utils/files.py

@@ -19,7 +19,7 @@ def find_files_for_extension(source: Path, extensions: Tuple[str]) -> List[Path]
         for filename in filenames:
             if filename.endswith(extensions):
                 matching_files.append(Path(dirpath).joinpath(filename))
-    
+
     logger.debug(
         f"Found {len(matching_files)} following files that match: {matching_files}"
     )

{primitive-0.1.74.dist-info → primitive-0.1.76.dist-info}/METADATA

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: primitive
-Version: 0.1.74
+Version: 0.1.76
 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
 Author-email: Dylan Stein <dylan@primitive.tech>, Chase Zimmerman <chase@primitive.tech>
-License: MIT
+License-Expression: MIT
+License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{primitive-0.1.74.dist-info → primitive-0.1.76.dist-info}/RECORD

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=Go7WynpBy9qsIOOr_3_MJJ2qN_kItwtlsLepU_nYvk0,130
+primitive/__about__.py,sha256=EYbYfJTot30aqVJWBENADheY8VcBhNRZTzkewjATzNc,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=CiI60bG3UZyNFuLTpchr0KeJRG5SALj455Ob11CegGE,2412
 primitive/client.py,sha256=PPyIQRvKKSqCF9RRF5mJJ4Vqqolpzy1YXqffNLKIvAA,2390
@@ -7,11 +7,11 @@ primitive/agent/actions.py,sha256=Hosy2o2FntfBtcNqqHuMFq9dm99EVfySy0v2JGeufvc,64
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/agent/process.py,sha256=7o8axjJ1OauKaFBL0jbZL9tGlZdZbDCXAdT5F-S_XQ8,2541
 primitive/agent/provision.py,sha256=rmwnro1K5F8mwtd45XAq7RVQmpDWnbBCQ8X_qgWhm3M,1546
-primitive/agent/runner.py,sha256=WHmlfSRHngY6mNwpykIe90LxYGoIMTBB-F2h5KVV-VE,8504
-primitive/agent/uploader.py,sha256=CRy928vI4z22PcJ-i8BOwAZnvut-jit64XM741xbDxM,2947
+primitive/agent/runner.py,sha256=b2Rdm44-w_1_uMwODjrfMvb75n8vVmCTDsvaiiU7-d8,8442
+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
-primitive/auth/commands.py,sha256=JahUq0E2e7Xa-FX1WEUv7TgM6ieDvNH4VwRRtxAW7HE,2340
+primitive/auth/commands.py,sha256=2z5u5xX64n0yILucx9emtWh3uQXLvs2QQQQIldZGr94,2341
 primitive/auth/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/graphql/queries.py,sha256=jhrr_VFzHIn8vcVprMIzUx7V4kkWYdR6CKMKPoVFv60,180
 primitive/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,7 +37,7 @@ primitive/git/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 primitive/git/graphql/queries.py,sha256=I1HGlqBb1lHIAWVSsC8tVY9JdsQ8DJVqs4nqSTcL30M,98
 primitive/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/graphql/relay.py,sha256=bmij2AjdpURQ6GGVCxwWhauF-r_SxuAU2oJ4sDbLxpI,726
-primitive/graphql/sdk.py,sha256=BhCGmDtc4sNnH8CxbQSJyFwOZ-ZSqMtjsxMB3JRBhPw,1456
+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=jtthNgRyeRD8txt4WqEZskPtsDWU2Yg2gJZLSrEx1io,18603
@@ -80,18 +80,18 @@ 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=kKvLjBCQXTo3k92RKhQj90B5clOIMBp6ocgaBqkGQBg,867
+primitive/utils/auth.py,sha256=_BJ_25ACq-GVzLvF4eHFJ1Q_gk2A_HkDg52geNzxIAc,1495
 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/files.py,sha256=M-7GTOYH6wd768Wwvawl2I7G8lXv7TzgTq3JXdcdtrI,756
+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
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=j7E1YwgNWw57dFHVfEbqRNVcPHX0xDefX2vFSNgeI_8,1648
 primitive/utils/verible.py,sha256=Zb5NUISvcaIgEvgCDBWr-GCoceMa79Tcwvr5Wl9lfnA,2252
-primitive-0.1.74.dist-info/METADATA,sha256=xj8DmtSlT8iVZfQvnvY_J8V-sbIOKmAlxdu1pfCYm04,3806
-primitive-0.1.74.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-primitive-0.1.74.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.74.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.74.dist-info/RECORD,,
+primitive-0.1.76.dist-info/METADATA,sha256=zXs0TSPKi3K2exL-kdRFHNEWv1YVWd8MLg-xNLC4wxY,3843
+primitive-0.1.76.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.1.76.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.76.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.76.dist-info/RECORD,,

{primitive-0.1.74.dist-info → primitive-0.1.76.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any