primitive 0.2.58__tar.gz → 0.2.60__tar.gz

{primitive-0.2.58 → primitive-0.2.60}/.vscode/settings.json

@@ -1,14 +1,17 @@
 {
   "cSpell.words": [
     "ajob",
+    "cafile",
     "Checkin",
     "loguru",
     "machdep",
     "Mbit",
     "mbps",
+    "percpu",
     "pkey",
     "plutil",
     "procs",
+    "RABBITMQ",
     "sessionmaker",
     "testsuites",
     "untar",

{primitive-0.2.58 → primitive-0.2.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.58
+Version: 0.2.60
 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
@@ -22,6 +22,7 @@ Requires-Dist: click
 Requires-Dist: gql[all]
 Requires-Dist: loguru
 Requires-Dist: paramiko[invoke]
+Requires-Dist: pika>=1.3.2
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: rich>=13.9.4
 Requires-Dist: speedtest-cli

{primitive-0.2.58 → primitive-0.2.60}/pyproject.toml

@@ -35,6 +35,7 @@ dependencies = [
   "speedtest-cli",
   "rich>=13.9.4",
   "psutil>=7.0.0",
+  "pika>=1.3.2",
 ]
 
 [tool.uv]

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/__about__.py

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

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/client.py

@@ -5,6 +5,8 @@ from loguru import logger
 from rich.logging import RichHandler
 from rich.traceback import install
 
+from primitive.messaging.provider import MessagingProvider
+
 from .agent.actions import Agent
 from .auth.actions import Auth
 from .daemons.actions import Daemons
@@ -80,6 +82,8 @@ class Primitive:
         else:
             self.host_config = {"username": "", "token": token, "transport": transport}
 
+        self.messaging: MessagingProvider = MessagingProvider(self)
+
         self.auth: Auth = Auth(self)
         self.organizations: Organizations = Organizations(self)
         self.projects: Projects = Projects(self)

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/files/actions.py

@@ -124,15 +124,39 @@ class Files(BaseAction):
         return result
 
     @guard
-    def get_file(self, file_id: Optional[str] = None):
+    def files(
+        self,
+        file_id: Optional[str] = None,
+        file_name: Optional[str] = None,
+        organization_id: Optional[str] = None,
+        organization_slug: Optional[str] = None,
+    ):
         query = gql(files_list)
 
         filters = {}
+        if not organization_id and not organization_slug:
+            whoami_result = self.primitive.auth.whoami()
+            default_organization = whoami_result.data["whoami"]["defaultOrganization"]
+            organization_id = default_organization["id"]
+            logger.info(
+                f"Using default organization ID: {default_organization.get('slug')} ({organization_id})"
+            )
+        if organization_slug and not organization_id:
+            organization = self.primitive.organizations.get_organization(
+                slug=organization_slug
+            )
+            organization_id = organization.get("id")
+
+        if organization_id:
+            filters["organization"] = {"id": organization_id}
+
         if file_id:
-            filters["id"] = {"exact": file_id}
+            filters["id"] = file_id
+        if file_name:
+            filters["fileName"] = {"exact": file_name}
 
         variables = {
-            "first": 1,
+            "first": 25,
             "filters": filters,
         }
         result = self.primitive.session.execute(
@@ -242,9 +266,9 @@ class Files(BaseAction):
             file_id = pending_file_create.get("id")
             parts_details = pending_file_create.get("partsDetails")
         else:
-            get_file_result = self.get_file(file_id)
+            file_result = self.files(file_id=file_id)
             parts_details = (
-                get_file_result.data.get("files")
+                file_result.data.get("files")
                 .get("edges")[0]
                 .get("node")
                 .get("partsDetails")
@@ -340,14 +364,56 @@ class Files(BaseAction):
             "fileObject": (path.name, open(path, "rb")),
         }
 
-        session = create_requests_session(self.primitive.host_config)
+        session = create_requests_session(host_config=self.primitive.host_config)
         transport = self.primitive.host_config.get("transport")
         url = f"{transport}://{self.primitive.host}/"
         response = session.post(url, files=body)
         return response
 
-    def get_presigned_url(self, file_pk: str):
+    def get_presigned_url(self, file_pk: str) -> str:
         transport = self.primitive.host_config.get("transport")
         host = self.primitive.host_config.get("host")
         file_access_url = f"{transport}://{host}/files/{file_pk}/presigned-url/"
         return file_access_url
+
+    def download_file(
+        self,
+        file_name: str = "",
+        file_id: str = "",
+        organization_id: str = "",
+        organization_slug: str = "",
+        output_path: Path = Path().cwd(),
+    ) -> Path:
+        file_pk = None
+
+        files_result = self.primitive.files.files(
+            file_id=file_id,
+            file_name=file_name,
+            organization_id=organization_id,
+            organization_slug=organization_slug,
+        )
+        if files_data := files_result.data:
+            file = files_data["files"]["edges"][0]["node"]
+            file_pk = file["pk"]
+            file_name = file["fileName"]
+
+        if not file_pk:
+            raise Exception(
+                "File not found on remote server. Please check file name or file id"
+            )
+
+        session = create_requests_session(host_config=self.primitive.host_config)
+        transport = self.primitive.host_config.get("transport")
+        url = f"{transport}://{self.primitive.host}/files/{file_pk}/stream/"
+
+        downloaded_file = output_path / file_name
+
+        with session.get(url, stream=True) as response:
+            response.raise_for_status()
+            with open(downloaded_file, "wb") as partial_downloaded_file:
+                for chunk in response.iter_content(chunk_size=8192):
+                    if chunk:
+                        partial_downloaded_file.write(chunk)
+                        partial_downloaded_file.flush()
+
+        return downloaded_file

primitive-0.2.60/src/primitive/files/commands.py

@@ -0,0 +1,100 @@
+import json
+import typing
+from pathlib import Path
+
+import click
+
+from primitive.files.ui import render_files_table
+
+from ..utils.printer import print_result
+
+if typing.TYPE_CHECKING:
+    from ..client import Primitive
+
+
+@click.group("files")
+@click.pass_context
+def cli(context):
+    """Files"""
+    pass
+
+
+@cli.command("upload")
+@click.pass_context
+@click.argument("path", type=click.Path(exists=True))
+@click.option("--public", "-p", help="Is this a Public file", is_flag=True)
+@click.option("--key-prefix", "-k", help="Key Prefix", default="")
+@click.option("--direct", help="direct", is_flag=True)
+def file_upload_command(context, path, public, key_prefix, direct):
+    """File Upload"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+    path = Path(path)
+    if direct:
+        result = primitive.files.upload_file_direct(
+            path, is_public=public, key_prefix=key_prefix
+        )
+    else:
+        result = primitive.files.upload_file_via_api(
+            path, is_public=public, key_prefix=key_prefix
+        )
+    try:
+        message = json.dumps(result.json())
+    except AttributeError:
+        message = "File Upload Failed"
+
+    print_result(message=message, context=context)
+
+
+@cli.command("download")
+@click.pass_context
+@click.option("--file-id", help="File ID", required=False)
+@click.option("--file-name", help="File Name", required=False)
+@click.option("--output", help="Output Path", required=False, type=click.Path())
+@click.option("--organization-id", help="Organization ID", required=False)
+@click.option("--organization", help="Organization Slug", required=False)
+def file_download_command(
+    context,
+    file_id=None,
+    file_name=None,
+    output=None,
+    organization_id=None,
+    organization=None,
+):
+    """File Download"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+
+    if not file_id and not file_name:
+        raise click.UsageError("Either --id or --file-name must be provided.")
+
+    if not output:
+        output = Path().cwd()
+    else:
+        output = Path(output)
+
+    downloaded_file = primitive.files.download_file(
+        output_path=output,
+        file_id=file_id,
+        file_name=file_name,
+        organization_id=organization_id,
+        organization_slug=organization,
+    )
+    print_result(message=f"File downloaded to {downloaded_file}", context=context)
+
+
+@cli.command("list")
+@click.pass_context
+@click.option("--organization-id", help="Organization ID", required=False)
+@click.option("--organization", help="Organization Slug", required=False)
+def list_command(context, organization_id=None, organization=None):
+    """List Files"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+    files_result = primitive.files.files(
+        organization_id=organization_id, organization_slug=organization
+    )
+
+    files = [file.get("node") for file in files_result.data.get("files").get("edges")]
+
+    if context.obj["JSON"]:
+        print_result(message=files, context=context)
+    else:
+        render_files_table(files)

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/files/graphql/fragments.py

@@ -4,7 +4,11 @@ fragment FileFragment on File {
   pk
   createdAt
   updatedAt
-  createdBy
+  createdBy {
+    id
+    pk
+    username
+  }
   location
   fileName
   fileSize
@@ -13,6 +17,5 @@ fragment FileFragment on File {
   isComplete
   partsDetails
   humanReadableMemorySize
-  contents
 }
 """

primitive-0.2.60/src/primitive/files/ui.py

@@ -0,0 +1,37 @@
+from rich.console import Console
+from rich.table import Table
+
+
+def render_files_table(file_list) -> None:
+    console = Console()
+
+    table = Table(show_header=True, header_style="bold #FFA800")
+    table.add_column("File Name")
+    table.add_column("File ID")
+    table.add_column("File Size (bytes)", justify="right")
+
+    for file in file_list:
+        file_name = file.get("fileName")
+        file_id = file.get("id")
+        file_size = file.get("fileSize")
+
+        table.add_row(
+            file_name,
+            file_id,
+            file_size,
+        )
+
+    console.print(table)
+
+
+def file_status_string(file) -> str:
+    if file.get("isQuarantined"):
+        return "Quarantined"
+    if not file.get("isOnline"):
+        return "Offline"
+    if not file.get("isHealthy"):
+        return "Not healthy"
+    if not file.get("isAvailable"):
+        return "Not available"
+    else:
+        return "Available"

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/graphql/sdk.py

@@ -26,7 +26,7 @@ def create_session(
     if fingerprint:
         headers["x-primitive-fingerprint"] = fingerprint
 
-    transport = AIOHTTPTransport(url=url, headers=headers)
+    transport = AIOHTTPTransport(url=url, headers=headers, ssl=True)
     session = Client(
         transport=transport,
         fetch_schema_from_transport=fetch_schema_from_transport,

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/hardware/actions.py

@@ -4,15 +4,18 @@ import json
 import platform
 import subprocess
 import typing
+from dataclasses import dataclass
 from shutil import which
 from typing import Dict, List, Optional
 
 import click
+import psutil
 from aiohttp import client_exceptions
 from gql import gql
 from loguru import logger
 
 from primitive.graphql.relay import from_base64
+from primitive.messaging.provider import MESSAGE_TYPES
 from primitive.utils.memory_size import MemorySize
 
 from ..utils.auth import guard
@@ -24,6 +27,7 @@ from .graphql.mutations import (
     register_child_hardware_mutation,
     register_hardware_mutation,
     unregister_hardware_mutation,
+    hardware_certificate_create_mutation,
 )
 from .graphql.queries import (
     hardware_details,
@@ -31,6 +35,7 @@ from .graphql.queries import (
     nested_children_hardware_list,
 )
 
+
 if typing.TYPE_CHECKING:
     pass
 
@@ -40,6 +45,12 @@ from primitive.utils.actions import BaseAction
 from primitive.utils.shell import does_executable_exist
 
 
+@dataclass
+class CertificateCreateResult:
+    certificate_id: str
+    certificate_pem: str
+
+
 class Hardware(BaseAction):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
@@ -280,6 +291,48 @@ class Hardware(BaseAction):
         system_info["gpu_config"] = self._get_gpu_config()
         return system_info
 
+    @guard
+    def certificate_create(
+        self, hardware_id: str, csr_pem: str
+    ) -> CertificateCreateResult:
+        mutation = gql(hardware_certificate_create_mutation)
+        variables = {
+            "input": {
+                "hardwareId": hardware_id,
+                "csrPem": csr_pem,
+            }
+        }
+
+        if not self.primitive.session:
+            raise Exception("No active session available for certificate creation")
+
+        result = self.primitive.session.execute(
+            mutation,
+            variable_values=variables,
+            get_execution_result=True,
+        )
+
+        if result.errors:
+            message = " ".join([error.message for error in result.errors])
+            raise Exception(message)
+
+        if not result.data:
+            raise Exception(
+                "No data received from hardware certificate creation request"
+            )
+
+        hardware_certificate_create = result.data["hardwareCertificateCreate"]
+
+        if hardware_certificate_create["__typename"] == "OperationInfo":
+            messages = hardware_certificate_create["messages"]
+            message = " ".join([error["message"] for error in messages])
+            raise Exception(message)
+
+        return CertificateCreateResult(
+            certificate_id=hardware_certificate_create["id"],
+            certificate_pem=hardware_certificate_create["certificatePem"],
+        )
+
     @guard
     def register(self, organization_id: Optional[str] = None):
         system_info = self.get_system_info()
@@ -375,6 +428,24 @@ class Hardware(BaseAction):
 
         return result
 
+    def check_in(
+        self,
+        is_healthy: bool = True,
+        is_quarantined: bool = False,
+        is_available: bool = False,
+        is_online: bool = True,
+        stopping_agent: Optional[bool] = False,
+    ):
+        message = {
+            "is_healthy": is_healthy,
+            "is_quarantined": is_quarantined,
+            "is_available": is_available,
+            "is_online": is_online,
+        }
+        self.primitive.messaging.send_message(
+            message_type=MESSAGE_TYPES.CHECK_IN, message=message
+        )
+
     @guard
     def check_in_http(
         self,
@@ -667,3 +738,29 @@ class Hardware(BaseAction):
 
         except Exception as exception:
             logger.exception(f"Error checking in children: {exception}")
+
+    def push_metrics(self):
+        if self.primitive.messaging.ready:
+            self.primitive.messaging.send_message(
+                message_type=MESSAGE_TYPES.METRICS,
+                message=self.get_metrics(),
+            )
+
+    def get_metrics(self):
+        cpu_percent = psutil.cpu_percent(interval=1, percpu=False)
+        virtual_memory = psutil.virtual_memory()
+        disk_usage = psutil.disk_usage("/")
+
+        metrics = {
+            "cpu_percent": cpu_percent,
+            "memory_percent": virtual_memory.percent,
+            "memory_total": virtual_memory.total,
+            "memory_available": virtual_memory.available,
+            "memory_used": virtual_memory.used,
+            "memory_free": virtual_memory.free,
+            "disk_percent": disk_usage.percent,
+            "disk_total": disk_usage.total,
+            "disk_used": disk_usage.used,
+            "disk_free": disk_usage.free,
+        }
+        return metrics

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/hardware/commands.py

@@ -1,15 +1,18 @@
+from time import sleep
 from typing import TYPE_CHECKING, Optional
 
 import click
-
-from ..utils.printer import print_result
-from .ui import render_hardware_table
+from loguru import logger
+from primitive.utils.printer import print_result
+from primitive.hardware.ui import render_hardware_table
+from primitive.utils.x509 import (
+    generate_csr_pem,
+    write_certificate_pem,
+)
 
 if TYPE_CHECKING:
     from ..client import Primitive
 
-from loguru import logger
-
 
 @click.group()
 @click.pass_context
@@ -33,8 +36,17 @@ def systeminfo_command(context):
     type=str,
     help="Organization [slug] to register hardware with",
 )
+@click.option(
+    "--issue-certificate",
+    is_flag=True,
+    show_default=True,
+    default=False,
+    help="Issue certificate.",
+)
 @click.pass_context
-def register_command(context, organization: Optional[str] = None):
+def register_command(
+    context, organization: Optional[str] = None, issue_certificate: bool = False
+):
     """Register Hardware with Primitive"""
     primitive: Primitive = context.obj.get("PRIMITIVE")
 
@@ -47,14 +59,30 @@ def register_command(context, organization: Optional[str] = None):
         logger.info("Registering hardware with the default organization.")
 
     result = primitive.hardware.register(organization_id=organization_id)
-    color = "green" if result else "red"
-    if result.data.get("registerHardware"):
-        message = "Hardware registered successfully"
-    else:
-        message = (
-            "There was an error registering this device. Please review the above logs."
+    hardware = result.data.get("registerHardware")
+
+    if not hardware:
+        print_result(
+            fg="red",
+            context=context,
+            message="There was an error registering this device. Please review the above logs.",
         )
-    print_result(message=message, context=context, fg=color)
+        return
+
+    if issue_certificate:
+        certificate = primitive.hardware.certificate_create(
+            hardware_id=hardware["id"],
+            csr_pem=generate_csr_pem(
+                hardware_id=hardware["pk"],
+            ),
+        )
+        write_certificate_pem(certificate.certificate_pem)
+
+    print_result(
+        fg="green",
+        context=context,
+        message="Hardware registered successfully.",
+    )
 
 
 @cli.command("unregister")
@@ -77,12 +105,7 @@ def unregister_command(context):
 def checkin_command(context):
     """Checkin Hardware with Primitive"""
     primitive: Primitive = context.obj.get("PRIMITIVE")
-    check_in_http_result = primitive.hardware.check_in_http()
-    if messages := check_in_http_result.data.get("checkIn").get("messages"):
-        print_result(message=messages, context=context, fg="yellow")
-    else:
-        message = "Hardware checked in successfully"
-        print_result(message=message, context=context, fg="green")
+    primitive.hardware.check_in()
 
 
 @cli.command("list")
@@ -125,3 +148,17 @@ def get_command(context, hardware_identifier: str) -> None:
         return
     else:
         render_hardware_table([hardware])
+
+
+@cli.command("metrics")
+@click.pass_context
+@click.option("--watch", is_flag=True, help="Watch hardware metrics")
+def metrics_command(context, watch: bool = False) -> None:
+    """Get Hardware Metrics"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+    if watch:
+        while True:
+            print_result(message=primitive.hardware.get_metrics(), context=context)
+            sleep(1)
+    else:
+        print_result(message=primitive.hardware.get_metrics(), context=context)

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/hardware/graphql/mutations.py

@@ -1,11 +1,29 @@
 from primitive.graphql.utility_fragments import operation_info_fragment
 
+hardware_certificate_create_mutation = (
+    operation_info_fragment
+    + """
+mutation hardwareCertificateCreate($input: HardwareCertificateCreateInput!) {
+    hardwareCertificateCreate(input: $input) {
+        __typename
+        ... on HardwareCertificate {
+            id
+            certificatePem
+        }
+        ...OperationInfoFragment
+    }
+}
+"""
+)
+
 register_hardware_mutation = (
     operation_info_fragment
     + """
 mutation registerHardware($input: RegisterHardwareInput!) {
     registerHardware(input: $input) {
         ... on Hardware {
+            id
+            pk
             fingerprint
         }
         ...OperationInfoFragment

{primitive-0.2.58 → primitive-0.2.60}/src/primitive/jobs/actions.py

@@ -54,6 +54,7 @@ class Jobs(BaseAction):
         jobs = [edge["node"] for edge in result.data["jobs"]["edges"]]
         return jobs
 
+    @guard
     def get_job_runs(
         self,
         organization_id: Optional[str] = None,