primitive 0.2.59__py3-none-any.whl → 0.2.61__py3-none-any.whl

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.61"

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/files/commands.py

@@ -4,6 +4,8 @@ from pathlib import Path
 
 import click
 
+from primitive.files.ui import render_files_table
+
 from ..utils.printer import print_result
 
 if typing.TYPE_CHECKING:
@@ -22,7 +24,7 @@ def cli(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)
+@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")
@@ -36,8 +38,63 @@ def file_upload_command(context, path, public, key_prefix, direct):
             path, is_public=public, key_prefix=key_prefix
         )
     try:
-        message = json.dumps(result.data)
+        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/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/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/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/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/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/provisioning/actions.py

@@ -8,7 +8,8 @@ from ..utils.auth import guard
 from .graphql.queries import authorized_keys_query
 
 HOME_DIRECTORY = Path.home()
-AUTHORIZED_KEYS_FILEPATH = Path(HOME_DIRECTORY / ".ssh" / "authorized_keys")
+SSH_DIR = Path(HOME_DIRECTORY / ".ssh")
+AUTHORIZED_KEYS_FILEPATH = SSH_DIR.joinpath("authorized_keys")
 
 
 class Provisioning(BaseAction):
@@ -24,8 +25,9 @@ class Provisioning(BaseAction):
         return result.data["authorizedKeys"]
 
     def add_reservation_authorized_keys(self, reservation_id: str) -> None:
-        AUTHORIZED_KEYS_BACKUP_FILEPATH = Path(
-            HOME_DIRECTORY / ".ssh" / f"authorized_keys.bak-{reservation_id}"
+        SSH_DIR.mkdir(parents=True, exist_ok=True)
+        AUTHORIZED_KEYS_BACKUP_FILEPATH = SSH_DIR.joinpath(
+            f"authorized_keys.bak-{reservation_id}"
         )
 
         if AUTHORIZED_KEYS_FILEPATH.exists():
@@ -47,8 +49,8 @@ class Provisioning(BaseAction):
         # self.primitive.sshd.reload()
 
     def remove_reservation_authorized_keys(self, reservation_id: str) -> None:
-        AUTHORIZED_KEYS_BACKUP_FILEPATH = Path(
-            HOME_DIRECTORY / ".ssh" / f"authorized_keys.bak-{reservation_id}"
+        AUTHORIZED_KEYS_BACKUP_FILEPATH = SSH_DIR.joinpath(
+            f"authorized_keys.bak-{reservation_id}"
         )
 
         if AUTHORIZED_KEYS_BACKUP_FILEPATH.exists():

{primitive-0.2.59.dist-info → primitive-0.2.61.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=DQFleay9CHBMqSyleA7yap__uZps7tWqIeLhtV6rCvw,130
+primitive/__about__.py,sha256=44bjP-EhQtVr_s6llvOiTQ56lIx7zqJ9wHAGO3s_eCw,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=gyZIj61qMtOi_s8y0WG3gDehGT-Ms3BtbDP2J_2lajU,3753
@@ -23,10 +23,11 @@ primitive/exec/actions.py,sha256=4d_TCjNDcVFoZ9Zw7ZuBa6hKMv2Xzm7_UX_8wcX1aSk,412
 primitive/exec/commands.py,sha256=66LO2kkJC-ynNZQpUCXv4Ol15QoacdSZAHblePDcmLo,510
 primitive/exec/interactive.py,sha256=TscY6s2ZysijidKPheq6y-fCErUVLS0zcdTW8XyFWGI,2435
 primitive/files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/files/actions.py,sha256=jvsBivYBmPeqb6Ge7gECm_x20AFUL7UYPGJJFmoCeOM,12409
-primitive/files/commands.py,sha256=ZNW4y8JZF1li7P5ej1r-Xcqu0iGpRRlMYvthuZOLLbQ,1163
+primitive/files/actions.py,sha256=tuf5PXgNrcxegfzC-CZ6r3iWBkQV9gxZpALU-hjyGpY,14865
+primitive/files/commands.py,sha256=-U0ArpZXDWltmkELG2SYIOLbaiMC6Zv24X9zZ29aqCE,3021
+primitive/files/ui.py,sha256=lYnfu6gnZ5f-C28wps_egVDz8tdjL5P4361uxpSyfvY,919
 primitive/files/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/files/graphql/fragments.py,sha256=II6WHZjzSqX4IELwdiWokqHTKvDq6mMHF5gp3rLnj3U,231
+primitive/files/graphql/fragments.py,sha256=h_Gfi1a3o1_tTJfvW_HUvWmeo3VSSMcj38ObcUv7X7c,253
 primitive/files/graphql/mutations.py,sha256=Da_e6WSp-fsCYVE9A6SGkIQy9WDzjeQycNyHEn7vJqE,935
 primitive/files/graphql/queries.py,sha256=_ky-IRz928sKeSJuqaggTPxV4CGgmho3OyaAFu1z7nw,397
 primitive/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -39,7 +40,7 @@ primitive/graphql/relay.py,sha256=bmij2AjdpURQ6GGVCxwWhauF-r_SxuAU2oJ4sDbLxpI,72
 primitive/graphql/sdk.py,sha256=dE4TD8KiTKw3Y0uiw5XrIcuZGqexE47eSlPaPD6jDGo,1545
 primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_6zRq91zqs,303
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/hardware/actions.py,sha256=qDbwd8W6zMlEfp1IfxTWiyAFqV5iYomDisGVXTRfy8Y,29145
+primitive/hardware/actions.py,sha256=4xswcLaHk4IhEwRK5Pw_rpEgn6XciT5K2apnHi8_cI4,29204
 primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
 primitive/hardware/commands.py,sha256=lwO-cm3doGtuGvR30fib-nALJyNCScdCTXOVVbYVpkY,4604
 primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
@@ -48,7 +49,7 @@ primitive/hardware/graphql/fragments.py,sha256=H315uv-ujOsZEbQR5tmstbRU_9OCa5SEr
 primitive/hardware/graphql/mutations.py,sha256=wOKNJN-1x_DGxvdHt2Bm3AUqyW8P1lNPkxLIQThbXUg,1874
 primitive/hardware/graphql/queries.py,sha256=I86uLuOSjHSph11Y5MVCYko5Js7hoiEZ-cEoPTc4J-k,1392
 primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/jobs/actions.py,sha256=Fej-rpdfIiHjs0SEFY2ZcMn64AWHn6kD90RC5wtRM3Q,6531
+primitive/jobs/actions.py,sha256=-IRNO7KM63cPAbGRNQycyFsugW9hAyg-TDuK0g5AiSw,6542
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
 primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/jobs/graphql/fragments.py,sha256=rWZWxZs9ZWjWal0eiY_XPWUS7i7f3fwSM_w8ZvDs2JQ,614
@@ -56,7 +57,7 @@ primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J
 primitive/jobs/graphql/queries.py,sha256=ZxNmm-WovytbggNuKRnwa0kc26T34_0yhqkoqx-2uj0,1736
 primitive/messaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/messaging/provider.py,sha256=NCgl1KiV4Ow49Laz2grNGsP7Ij4vUUeorUjkhAKF1H4,4182
-primitive/monitor/actions.py,sha256=vdjfA-3v1j4g-S-gs6mziE3pDf3eR6dtYtgEVRnSfBQ,9641
+primitive/monitor/actions.py,sha256=AZOoNzASorvye5309h6BJbsup_jR8YunQ19EiG5SAQg,9643
 primitive/monitor/commands.py,sha256=VDlEL_Qpm_ysHxug7VpI0cVAZ0ny6AS91Y58D7F1zkU,409
 primitive/organizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/organizations/actions.py,sha256=kVHOhG1oS2sI5p8uldSo5L-RUZsnG36eaulVuKLyZ-M,1863
@@ -73,7 +74,7 @@ primitive/projects/graphql/fragments.py,sha256=02F5nyI8i-ML_bV5FFHUgFWM5bBBfjmz_
 primitive/projects/graphql/mutations.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/projects/graphql/queries.py,sha256=nFaVf6YOHA2L_FTgIUdRK-80hYTmv1a1X5ac7QPMp1k,646
 primitive/provisioning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/provisioning/actions.py,sha256=IYZYAbtomtZtlkqDaBxx4e7PFKGkRNqek_tABH6q_zY,2116
+primitive/provisioning/actions.py,sha256=oM19p1JyqwPhfJtyy23RqhuIKinorTo78yOYWVLC98c,2165
 primitive/provisioning/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/provisioning/graphql/queries.py,sha256=cBtuKa6shoatYZfKSnQoPJP6B8g8y3QhFqJ_pkvMcG0,134
 primitive/reservations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -98,8 +99,8 @@ primitive/utils/psutil.py,sha256=xa7ef435UL37jyjmUPbEqCO2ayQMpCs0HCrxVEvLcuM,763
 primitive/utils/shell.py,sha256=Z4zxmOaSyGCrS0D6I436iQci-ewHLt4UxVg1CD9Serc,2171
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
 primitive/utils/x509.py,sha256=HwHRPqakTHWd40ny-9O_yNknSL1Cxo50O0UCjXHFq04,3796
-primitive-0.2.59.dist-info/METADATA,sha256=TK2BJRsrYXbcffM-S0oA9sBT03PjeiLEeDBwlaH1m6s,3540
-primitive-0.2.59.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.59.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.59.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.59.dist-info/RECORD,,
+primitive-0.2.61.dist-info/METADATA,sha256=VMscEolFKYI028E5OFCQY8wouk_Zw0eBzU1vXSCjwBA,3540
+primitive-0.2.61.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.61.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.61.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.61.dist-info/RECORD,,