primitive 0.2.59__tar.gz → 0.2.60__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.59
+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

{primitive-0.2.59 → 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.59"
+__version__ = "0.2.60"

{primitive-0.2.59 → 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.59 → 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.59 → primitive-0.2.60}/src/primitive/hardware/actions.py

@@ -740,10 +740,11 @@ class Hardware(BaseAction):
             logger.exception(f"Error checking in children: {exception}")
 
     def push_metrics(self):
-        self.primitive.messaging.send_message(
-            message_type=MESSAGE_TYPES.METRICS,
-            message=self.get_metrics(),
-        )
+        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)

{primitive-0.2.59 → 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,

{primitive-0.2.59 → primitive-0.2.60}/src/primitive/monitor/actions.py

@@ -67,7 +67,7 @@ class Monitor(BaseAction):
                 # handles cleanup of old reservations
                 # obtains an active JobRun's ID
                 if not RUNNING_IN_CONTAINER:
-                    self.primitive.hardware.push_metrics()
+                    # self.primitive.hardware.push_metrics()
 
                     hardware = self.primitive.hardware.get_own_hardware_details()
                     # fetch the latest hardware and activeReservation details

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

@@ -1,43 +0,0 @@
-import json
-import typing
-from pathlib import Path
-
-import click
-
-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", "-k", 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.data)
-    except AttributeError:
-        message = "File Upload Failed"
-
-    print_result(message=message, context=context)