primitive 0.1.62__tar.gz → 0.1.64__tar.gz

{primitive-0.1.62 → primitive-0.1.64}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.62
+Version: 0.1.64
 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-Expression: MIT
-License-File: LICENSE.txt
+License: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -21,7 +20,7 @@ Requires-Python: >=3.11
 Requires-Dist: click
 Requires-Dist: gql[all]
 Requires-Dist: loguru
-Requires-Dist: paramiko[all]
+Requires-Dist: paramiko[invoke]
 Requires-Dist: primitive-pal==0.1.4
 Requires-Dist: pyyaml
 Description-Content-Type: text/markdown

{primitive-0.1.62 → primitive-0.1.64}/linux setup.md

@@ -17,10 +17,11 @@ echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
 # FOR UBUNTU
 sudo apt update; sudo apt install build-essential libssl-dev zlib1g-dev \
 libbz2-dev libreadline-dev libsqlite3-dev curl git \
-libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
+libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \ libkrb5-dev
 
 pyenv install 3.12.5
 pyenv global 3.12.5
 pip install --upgrade pip
 
+curl -LsSf https://astral.sh/uv/install.sh | sh
 ```

{primitive-0.1.62 → primitive-0.1.64}/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
   "loguru",
   "pyyaml",
   "primitive-pal == 0.1.4",
-  "paramiko[all]"
+  "paramiko[invoke]"
 ]
 
 [tool.uv]

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/__about__.py

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

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/agent/actions.py

@@ -20,7 +20,7 @@ class Agent(BaseAction):
         logger.info(" [*] primitive")
         logger.info(f" [*] Version: {__version__}")
 
-        # Create cache dir if it doesnt exist
+        # Create cache dir if it doesn't exist
         cache_dir = get_sources_cache()
 
         # Create uploader
@@ -53,6 +53,11 @@ class Agent(BaseAction):
                         logger.debug("Active Reservation:")
                         logger.debug(f"Node ID: {active_reservation_id}")
                         logger.debug(f"PK: {active_reservation_pk}")
+
+                        logger.debug("Running pre provisioning steps for reservation.")
+                        self.primitive.provisioning.add_reservation_authorized_keys(
+                            reservation_id=active_reservation_id
+                        )
                 else:
                     if (
                         hardware["activeReservation"] is None
@@ -62,6 +67,12 @@ class Agent(BaseAction):
                         logger.debug("Previous Reservation is Complete:")
                         logger.debug(f"Node ID: {active_reservation_id}")
                         logger.debug(f"PK: {active_reservation_pk}")
+                        logger.debug(
+                            "Running cleanup provisioning steps for reservation."
+                        )
+                        self.primitive.provisioning.remove_reservation_authorized_keys(
+                            reservation_id=active_reservation_id
+                        )
                         active_reservation_id = None
                         active_reservation_pk = None
 

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/client.py

@@ -1,20 +1,22 @@
 import sys
+
+from loguru import logger
+
+from .agent.actions import Agent
 from .auth.actions import Auth
-from .projects.actions import Projects
-from .utils.config import read_config_file
+from .daemons.actions import Daemons
+from .exec.actions import Exec
 from .files.actions import Files
-from .sim.actions import Sim
-from .hardware.actions import Hardware
-from .lint.actions import Lint
-from .agent.actions import Agent
 from .git.actions import Git
-from .daemons.actions import Daemons
+from .hardware.actions import Hardware
 from .jobs.actions import Jobs
+from .lint.actions import Lint
 from .organizations.actions import Organizations
-from .exec.actions import Exec
+from .projects.actions import Projects
+from .provisioning.actions import Provisioning
 from .reservations.actions import Reservations
-
-from loguru import logger
+from .sim.actions import Sim
+from .utils.config import read_config_file
 
 logger.disable("primitive")
 
@@ -67,6 +69,7 @@ class Primitive:
         self.git: Git = Git(self)
         self.daemons: Daemons = Daemons(self)
         self.exec: Exec = Exec(self)
+        self.provisioning: Provisioning = Provisioning(self)
 
     def get_host_config(self):
         self.full_config = read_config_file()

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/exec/actions.py

@@ -1,4 +1,3 @@
-import tempfile
 import typing
 
 from primitive.exec.interactive import interactive_shell
@@ -46,34 +45,16 @@ class Exec(BaseAction):
             reservation_id=reservation["id"], desired_status="in_progress"
         )
 
-        ssh_credentials = self.primitive.hardware.get_hardware_ssh_credentials(
-            hardware_id=hardware["id"]
-        )
-
-        ssh_hostname = ssh_credentials["ssh_hostname"]
-        ssh_username = ssh_credentials["ssh_username"]
-        ssh_password = ssh_credentials["ssh_password"]
-        ssh_private_key = ssh_credentials["ssh_private_key"]
+        ssh_hostname = hardware["hostname"]
+        ssh_username = hardware["ssh_username"]
 
         ssh_client = SSHClient()
         ssh_client.load_system_host_keys()
-        keyfile = None
-        if ssh_private_key:
-            keyfile = tempfile.NamedTemporaryFile()
-            keyfile.write(ssh_private_key.encode())
-            keyfile.flush()
-            ssh_client.connect(
-                hostname=ssh_hostname,
-                username=ssh_username,
-                key_filename=keyfile.name,
-            )
-        else:
-            ssh_client.connect(
-                hostname=ssh_hostname,
-                username=ssh_username,
-                pkey=ssh_private_key,
-                password=ssh_password,
-            )
+
+        ssh_client.connect(
+            hostname=ssh_hostname,
+            username=ssh_username,
+        )
 
         if command:
             formatted_command = " ".join(command)
@@ -86,8 +67,6 @@ class Exec(BaseAction):
             channel.invoke_shell()
             interactive_shell(channel)
             ssh_client.close()
-            if keyfile:
-                keyfile.close()
 
         if created_reservation_on_behalf_of_user:
             print("Cleaning up reservation.")

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/hardware/actions.py

@@ -22,7 +22,7 @@ from .graphql.mutations import (
     hardware_update_mutation,
     register_hardware_mutation,
 )
-from .graphql.queries import hardware_list, hardware_ssh_credentials
+from .graphql.queries import hardware_list
 
 if typing.TYPE_CHECKING:
     pass
@@ -303,7 +303,7 @@ class Hardware(BaseAction):
         # and headers are set correctly
         self.primitive.get_host_config()
         self.check_in_http(is_healthy=True)
-        return True
+        return result
 
     @guard
     def update_hardware_system_info(self):
@@ -479,16 +479,3 @@ class Hardware(BaseAction):
                 raise Exception(f"No hardware found with slug {hardware_identifier}")
 
         return hardware
-
-    @guard
-    def get_hardware_ssh_credentials(self, hardware_id: str):
-        query = gql(hardware_ssh_credentials)
-
-        variables = {
-            "id": hardware_id,
-        }
-        result = self.primitive.session.execute(
-            query, variable_values=variables, get_execution_result=True
-        )
-        ssh_credentials = result.data.get("hardware").get("sshCredentials")
-        return ssh_credentials

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/hardware/graphql/fragments.py

@@ -10,6 +10,8 @@ fragment HardwareFragment on Hardware {
   isOnline
   isQuarantined
   isHealthy
+  hostname
+  sshUsername
   capabilities {
     id
     pk

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/hardware/graphql/queries.py

@@ -29,13 +29,3 @@ query hardwareList(
 }
 """
 )
-
-hardware_ssh_credentials = """
-query hardwareSSHCredentials($id: GlobalID!) {
-  hardware(id: $id) {
-    id
-    pk
-    sshCredentials
-  }
-}
-"""

primitive-0.1.64/src/primitive/provisioning/actions.py

@@ -0,0 +1,62 @@
+from pathlib import Path
+
+from gql import gql
+
+from primitive.utils.actions import BaseAction
+
+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")
+
+
+class Provisioning(BaseAction):
+    @guard
+    def get_authorized_keys(self, reservation_id: str) -> str:
+        variables = {
+            "reservationId": reservation_id,
+        }
+        query = gql(authorized_keys_query)
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
+        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}"
+        )
+
+        if AUTHORIZED_KEYS_FILEPATH.exists():
+            AUTHORIZED_KEYS_BACKUP_FILEPATH.write_text(
+                AUTHORIZED_KEYS_FILEPATH.read_text()
+            )
+        else:
+            AUTHORIZED_KEYS_FILEPATH.touch()
+
+        authorized_keys = self.get_authorized_keys(reservation_id=reservation_id)
+
+        AUTHORIZED_KEYS_FILEPATH.write_text(
+            AUTHORIZED_KEYS_FILEPATH.read_text()
+            + f"\n## START PRIMITIVE SSH PUBLIC KEYS FOR RESERVATION ID {reservation_id}\n"
+            + authorized_keys
+            + f"\n## END PRIMITIVE SSH PUBLIC KEYS FOR RESERVATION ID {reservation_id}\n"
+        )
+
+        # 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}"
+        )
+
+        if AUTHORIZED_KEYS_BACKUP_FILEPATH.exists():
+            AUTHORIZED_KEYS_FILEPATH.write_text(
+                AUTHORIZED_KEYS_BACKUP_FILEPATH.read_text()
+            )
+            AUTHORIZED_KEYS_BACKUP_FILEPATH.unlink()
+        else:
+            AUTHORIZED_KEYS_FILEPATH.unlink()
+
+        # self.primitive.sshd.reload()

primitive-0.1.64/src/primitive/provisioning/graphql/queries.py

@@ -0,0 +1,5 @@
+authorized_keys_query = """
+query authorizedKeys($reservationId: GlobalID!) {
+    authorizedKeys(reservationId: $reservationId)
+}
+"""

{primitive-0.1.62 → primitive-0.1.64}/src/primitive/reservations/graphql/fragments.py

@@ -32,7 +32,7 @@ fragment ReservationFragment on Reservation {
   reason
   startedAt
   endedAt
-  elapsedTime
+  # elapsedTime
   status
   conclusion
   conclusionMessage

{primitive-0.1.62 → primitive-0.1.64}/uv.lock

@@ -434,29 +434,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e3/dc/078bd6b304de790618ebb95e2aedaadb78f4527ac43a9ad8815f006636b6/graphql_core-3.2.5-py3-none-any.whl", hash = "sha256:2f150d5096448aa4f8ab26268567bbfeef823769893b39c1a2e1409590939c8a", size = 203189 },
 ]
 
-[[distribution]]
-name = "gssapi"
-version = "1.9.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "decorator" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/04/2f/fcffb772a00e658f608e657791484e3111a19a722b464e893fef35f35097/gssapi-1.9.0.tar.gz", hash = "sha256:f468fac8f3f5fca8f4d1ca19e3cd4d2e10bd91074e7285464b22715d13548afe", size = 94285 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d1/14/39d320ac0c8c8ab05f4b48322d38aacb1572f7a51b2c5b908e51f141e367/gssapi-1.9.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:67d9be5e34403e47fb5749d5a1ad4e5a85b568e6a9add1695edb4a5b879f7560", size = 707912 },
-    { url = "https://files.pythonhosted.org/packages/cc/04/5d46c5b37b96f87a8efb320ab347e876db2493e1aedaa29068936b063097/gssapi-1.9.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:11e9b92cef11da547fc8c210fa720528fd854038504103c1b15ae2a89dce5fcd", size = 683779 },
-    { url = "https://files.pythonhosted.org/packages/05/29/b673b4ed994796e133e3e7eeec0d8991b7dcbed6b0b4bfc95ac0fe3871ff/gssapi-1.9.0-cp311-cp311-win32.whl", hash = "sha256:6c5f8a549abd187687440ec0b72e5b679d043d620442b3637d31aa2766b27cbe", size = 776532 },
-    { url = "https://files.pythonhosted.org/packages/31/07/3bb8521da3ca89e202b50f8de46a9e8e793be7f24318a4f7aaaa022d15d1/gssapi-1.9.0-cp311-cp311-win_amd64.whl", hash = "sha256:59e1a1a9a6c5dc430dc6edfcf497f5ca00cf417015f781c9fac2e85652cd738f", size = 874225 },
-    { url = "https://files.pythonhosted.org/packages/98/f1/76477c66aa9f2abc9ab53f936e9085402d6697db93834437e5ee651e5106/gssapi-1.9.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b66a98827fbd2864bf8993677a039d7ba4a127ca0d2d9ed73e0ef4f1baa7fd7f", size = 698148 },
-    { url = "https://files.pythonhosted.org/packages/96/34/b737e2a46efc63c6a6ad3baf0f3a8484d7698e673874b060a7d52abfa7b4/gssapi-1.9.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2bddd1cc0c9859c5e0fd96d4d88eb67bd498fdbba45b14cdccfe10bfd329479f", size = 681597 },
-    { url = "https://files.pythonhosted.org/packages/71/4b/4cbb8b6bc34ed02591e05af48bd4722facb99b10defc321e3b177114dbeb/gssapi-1.9.0-cp312-cp312-win32.whl", hash = "sha256:10134db0cf01bd7d162acb445762dbcc58b5c772a613e17c46cf8ad956c4dfec", size = 770295 },
-    { url = "https://files.pythonhosted.org/packages/c1/73/33a65e9d6c5ea43cdb1ee184b201678adaf3a7bbb4f7a1c7a80195c884ac/gssapi-1.9.0-cp312-cp312-win_amd64.whl", hash = "sha256:e28c7d45da68b7e36ed3fb3326744bfe39649f16e8eecd7b003b082206039c76", size = 867625 },
-    { url = "https://files.pythonhosted.org/packages/bc/bb/6fbbeff852b6502e1d33858865822ab2e0efd84764caad1ce9e3ed182b53/gssapi-1.9.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:cea344246935b5337e6f8a69bb6cc45619ab3a8d74a29fcb0a39fd1e5843c89c", size = 686934 },
-    { url = "https://files.pythonhosted.org/packages/c9/72/89eeb28a2cebe8ec3a560be79e89092913d6cf9dc68b32eb4774e8bac785/gssapi-1.9.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1a5786bd9fcf435bd0c87dc95ae99ad68cefcc2bcc80c71fef4cb0ccdfb40f1e", size = 672249 },
-    { url = "https://files.pythonhosted.org/packages/5f/f7/3d9d4a198e34b844dc4acb25891e2405f8dca069a8f346f51127196436bc/gssapi-1.9.0-cp313-cp313-win32.whl", hash = "sha256:c99959a9dd62358e370482f1691e936cb09adf9a69e3e10d4f6a097240e9fd28", size = 755372 },
-    { url = "https://files.pythonhosted.org/packages/67/00/f4be5211d5dd8e9ca551ded3071b1433880729006768123e1ee7b744b1d8/gssapi-1.9.0-cp313-cp313-win_amd64.whl", hash = "sha256:a2e43f50450e81fe855888c53df70cdd385ada979db79463b38031710a12acd9", size = 845005 },
-]
-
 [[distribution]]
 name = "h11"
 version = "0.14.0"
@@ -680,11 +657,8 @@ wheels = [
 ]
 
 [distribution.optional-dependencies]
-all = [
-    { name = "gssapi", marker = "platform_system != 'Windows'" },
+invoke = [
     { name = "invoke" },
-    { name = "pyasn1" },
-    { name = "pywin32", marker = "platform_system == 'Windows'" },
 ]
 
 [[distribution]]
@@ -710,13 +684,13 @@ wheels = [
 
 [[distribution]]
 name = "primitive"
-version = "0.1.60"
+version = "0.1.62"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
     { name = "gql", extra = ["all"] },
     { name = "loguru" },
-    { name = "paramiko", extra = ["all"] },
+    { name = "paramiko", extra = ["invoke"] },
     { name = "primitive-pal" },
     { name = "pyyaml" },
 ]
@@ -848,15 +822,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8e/37/efad0257dc6e593a18957422533ff0f87ede7c9c6ea010a2177d738fb82f/pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0", size = 11842 },
 ]
 
-[[distribution]]
-name = "pyasn1"
-version = "0.6.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ba/e9/01f1a64245b89f039897cb0130016d79f77d52669aae6ee7b159a6c4c018/pyasn1-0.6.1.tar.gz", hash = "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034", size = 145322 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/c8/f1/d6a797abb14f6283c0ddff96bbdd46937f64122b8c925cab503dd37f8214/pyasn1-0.6.1-py3-none-any.whl", hash = "sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629", size = 83135 },
-]
-
 [[distribution]]
 name = "pycparser"
 version = "2.22"
@@ -920,22 +885,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892 },
 ]
 
-[[distribution]]
-name = "pywin32"
-version = "308"
-source = { registry = "https://pypi.org/simple" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/eb/e2/02652007469263fe1466e98439831d65d4ca80ea1a2df29abecedf7e47b7/pywin32-308-cp311-cp311-win32.whl", hash = "sha256:5d8c8015b24a7d6855b1550d8e660d8daa09983c80e5daf89a273e5c6fb5095a", size = 5928156 },
-    { url = "https://files.pythonhosted.org/packages/48/ef/f4fb45e2196bc7ffe09cad0542d9aff66b0e33f6c0954b43e49c33cad7bd/pywin32-308-cp311-cp311-win_amd64.whl", hash = "sha256:575621b90f0dc2695fec346b2d6302faebd4f0f45c05ea29404cefe35d89442b", size = 6559559 },
-    { url = "https://files.pythonhosted.org/packages/79/ef/68bb6aa865c5c9b11a35771329e95917b5559845bd75b65549407f9fc6b4/pywin32-308-cp311-cp311-win_arm64.whl", hash = "sha256:100a5442b7332070983c4cd03f2e906a5648a5104b8a7f50175f7906efd16bb6", size = 7972495 },
-    { url = "https://files.pythonhosted.org/packages/00/7c/d00d6bdd96de4344e06c4afbf218bc86b54436a94c01c71a8701f613aa56/pywin32-308-cp312-cp312-win32.whl", hash = "sha256:587f3e19696f4bf96fde9d8a57cec74a57021ad5f204c9e627e15c33ff568897", size = 5939729 },
-    { url = "https://files.pythonhosted.org/packages/21/27/0c8811fbc3ca188f93b5354e7c286eb91f80a53afa4e11007ef661afa746/pywin32-308-cp312-cp312-win_amd64.whl", hash = "sha256:00b3e11ef09ede56c6a43c71f2d31857cf7c54b0ab6e78ac659497abd2834f47", size = 6543015 },
-    { url = "https://files.pythonhosted.org/packages/9d/0f/d40f8373608caed2255781a3ad9a51d03a594a1248cd632d6a298daca693/pywin32-308-cp312-cp312-win_arm64.whl", hash = "sha256:9b4de86c8d909aed15b7011182c8cab38c8850de36e6afb1f0db22b8959e3091", size = 7976033 },
-    { url = "https://files.pythonhosted.org/packages/a9/a4/aa562d8935e3df5e49c161b427a3a2efad2ed4e9cf81c3de636f1fdddfd0/pywin32-308-cp313-cp313-win32.whl", hash = "sha256:1c44539a37a5b7b21d02ab34e6a4d314e0788f1690d65b48e9b0b89f31abbbed", size = 5938579 },
-    { url = "https://files.pythonhosted.org/packages/c7/50/b0efb8bb66210da67a53ab95fd7a98826a97ee21f1d22949863e6d588b22/pywin32-308-cp313-cp313-win_amd64.whl", hash = "sha256:fd380990e792eaf6827fcb7e187b2b4b1cede0585e3d0c9e84201ec27b9905e4", size = 6542056 },
-    { url = "https://files.pythonhosted.org/packages/26/df/2b63e3e4f2df0224f8aaf6d131f54fe4e8c96400eb9df563e2aae2e1a1f9/pywin32-308-cp313-cp313-win_arm64.whl", hash = "sha256:ef313c46d4c18dfb82a2431e3051ac8f112ccee1a34f29c263c583c568db63cd", size = 7974986 },
-]
-
 [[distribution]]
 name = "pyyaml"
 version = "6.0.2"