primitive 0.1.74__tar.gz → 0.1.76__tar.gz

{primitive-0.1.74 → primitive-0.1.76}/Makefile

@@ -8,32 +8,23 @@ SHELL := /opt/homebrew/bin/fish
 # .SHELLFLAGS += -e
 setup : ## Setup Environment
 	@make setup-git-hooks
-	uv venv
-	source .venv/bin/activate.fish
 	uv sync
-	uv pip install -e .
 
 setup-ci: ## Setup the environment for CI
-	uv venv
-	source .venv/bin/activate.fish
 	uv sync
-	uv pip install -e .
 
 test: ## test
 	@ENVIRONMENT=test python run pytest
 
 lint: ## Lint Python Files
-	@source .venv/bin/activate.fish
-	ruff check
+	uv run ruff check
 	# pyright
 
 format: ## Format Python Files
-	@source .venv/bin/activate.fish
-	ruff format
-	ruff check --fix
+	uv run ruff format
+	uv run ruff check --fix
 
 install: ## Install dependencies
-	@source .venv/bin/activate.fish
 	uv sync
 
 setup-git-hooks: ## Setup Git Hook

{primitive-0.1.74 → primitive-0.1.76}/PKG-INFO

@@ -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 → primitive-0.1.76}/src/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-0.1.74 → primitive-0.1.76}/src/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-0.1.74 → primitive-0.1.76}/src/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-0.1.74 → primitive-0.1.76}/src/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-0.1.74 → primitive-0.1.76}/src/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-0.1.74 → primitive-0.1.76}/src/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-0.1.74 → primitive-0.1.76}/src/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 → primitive-0.1.76}/uv.lock

@@ -319,7 +319,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/98/65/13d9e76ca19b0ba5603d71ac8424b5694415b348e719db277b5edc985ff5/cryptography-44.0.0-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:761817a3377ef15ac23cd7834715081791d4ec77f9297ee694ca1ee9c2c7e5eb", size = 3915420 },
     { url = "https://files.pythonhosted.org/packages/b1/07/40fe09ce96b91fc9276a9ad272832ead0fddedcba87f1190372af8e3039c/cryptography-44.0.0-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3c672a53c0fb4725a29c303be906d3c1fa99c32f58abe008a82705f9ee96f40b", size = 4154498 },
     { url = "https://files.pythonhosted.org/packages/75/ea/af65619c800ec0a7e4034207aec543acdf248d9bffba0533342d1bd435e1/cryptography-44.0.0-cp37-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:4ac4c9f37eba52cb6fbeaf5b59c152ea976726b865bd4cf87883a7e7006cc543", size = 3932569 },
-    { url = "https://files.pythonhosted.org/packages/4e/d5/9cc182bf24c86f542129565976c21301d4ac397e74bf5a16e48241aab8a6/cryptography-44.0.0-cp37-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:60eb32934076fa07e4316b7b2742fa52cbb190b42c2df2863dbc4230a0a9b385", size = 4164756 },
     { url = "https://files.pythonhosted.org/packages/c7/af/d1deb0c04d59612e3d5e54203159e284d3e7a6921e565bb0eeb6269bdd8a/cryptography-44.0.0-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ed3534eb1090483c96178fcb0f8893719d96d5274dfde98aa6add34614e97c8e", size = 4016721 },
     { url = "https://files.pythonhosted.org/packages/bd/69/7ca326c55698d0688db867795134bdfac87136b80ef373aaa42b225d6dd5/cryptography-44.0.0-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f3f6fdfa89ee2d9d496e2c087cebef9d4fcbb0ad63c40e821b39f74bf48d9c5e", size = 4240915 },
     { url = "https://files.pythonhosted.org/packages/ef/d4/cae11bf68c0f981e0413906c6dd03ae7fa864347ed5fac40021df1ef467c/cryptography-44.0.0-cp37-abi3-win32.whl", hash = "sha256:eb33480f1bad5b78233b0ad3e1b0be21e8ef1da745d8d2aecbb20671658b9053", size = 2757925 },
@@ -330,7 +329,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d0/c7/c656eb08fd22255d21bc3129625ed9cd5ee305f33752ef2278711b3fa98b/cryptography-44.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:c5eb858beed7835e5ad1faba59e865109f3e52b3783b9ac21e7e47dc5554e289", size = 3915417 },
     { url = "https://files.pythonhosted.org/packages/ef/82/72403624f197af0db6bac4e58153bc9ac0e6020e57234115db9596eee85d/cryptography-44.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f53c2c87e0fb4b0c00fa9571082a057e37690a8f12233306161c8f4b819960b7", size = 4155160 },
     { url = "https://files.pythonhosted.org/packages/a2/cd/2f3c440913d4329ade49b146d74f2e9766422e1732613f57097fea61f344/cryptography-44.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:9e6fc8a08e116fb7c7dd1f040074c9d7b51d74a8ea40d4df2fc7aa08b76b9e6c", size = 3932331 },
-    { url = "https://files.pythonhosted.org/packages/31/d9/90409720277f88eb3ab72f9a32bfa54acdd97e94225df699e7713e850bd4/cryptography-44.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:9abcc2e083cbe8dde89124a47e5e53ec38751f0d7dfd36801008f316a127d7ba", size = 4165207 },
     { url = "https://files.pythonhosted.org/packages/7f/df/8be88797f0a1cca6e255189a57bb49237402b1880d6e8721690c5603ac23/cryptography-44.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:d2436114e46b36d00f8b72ff57e598978b37399d2786fd39793c36c6d5cb1c64", size = 4017372 },
     { url = "https://files.pythonhosted.org/packages/af/36/5ccc376f025a834e72b8e52e18746b927f34e4520487098e283a719c205e/cryptography-44.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a01956ddfa0a6790d594f5b34fc1bfa6098aca434696a03cfdbe469b8ed79285", size = 4239657 },
     { url = "https://files.pythonhosted.org/packages/46/b0/f4f7d0d0bcfbc8dd6296c1449be326d04217c57afb8b2594f017eed95533/cryptography-44.0.0-cp39-abi3-win32.whl", hash = "sha256:eca27345e1214d1b9f9490d200f9db5a874479be914199194e746c893788d417", size = 2758672 },
@@ -693,7 +691,7 @@ wheels = [
 
 [[package]]
 name = "primitive"
-version = "0.1.68"
+version = "0.1.76"
 source = { editable = "." }
 dependencies = [
     { name = "click" },