primitive 0.2.21__py3-none-any.whl → 0.2.25__py3-none-any.whl

primitive/__about__.py

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

primitive/auth/actions.py

@@ -18,14 +18,12 @@ class Auth(BaseAction):
 
     def setup_config(
         self,
-        username: str,
         token: str,
         host: str = "api.primitive.tech",
         transport: str = "https",
     ):
         full_config = read_config_file()
         new_host_config = {
-            "username": username,
             "token": token,
             "transport": transport,
         }

primitive/auth/commands.py

@@ -1,6 +1,6 @@
 import os
-import typing
 import webbrowser
+from typing import TYPE_CHECKING, Optional
 
 import click
 
@@ -8,7 +8,7 @@ from ..utils.config import PRIMITIVE_CREDENTIALS_FILEPATH
 from ..utils.printer import print_result
 from .actions import Auth
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from ..client import Primitive
 
 
@@ -34,13 +34,6 @@ def whoami_command(context):
 
 @cli.command("config")
 @click.pass_context
-@click.option(
-    "--username",
-    prompt=True,
-    default=lambda: os.environ.get("PRIMITIVE_USER", ""),
-    show_default="current user",
-    help="Username for Primitive API",
-)
 @click.option(
     "--transport",
     required=False,
@@ -48,9 +41,16 @@ def whoami_command(context):
     show_default="https",
     help="Transport protocol for Primitive API",
 )
-def config_command(context, username: str, transport: str):
+@click.option(
+    "--auth-token",
+    prompt=True,
+    default=lambda: os.environ.get("PRIMITIVE_TOKEN", ""),
+    hide_input=True,
+    help="Authentication token for Primitive API",
+)
+def config_command(context, transport: str, auth_token: Optional[str] = None):
     """Configure the CLI"""
-    token = os.environ.get("PRIMITIVE_TOKEN", "")
+    token = os.environ.get("PRIMITIVE_TOKEN", auth_token)
     if not token and context.obj.get("YES"):
         raise click.ClickException(
             "PRIMITIVE_TOKEN environment variable is required for non-interactive mode"
@@ -73,6 +73,6 @@ def config_command(context, username: str, transport: str):
         )
 
     auth = Auth(primitive=None)
-    auth.setup_config(username=username, token=token, host=host, transport=transport)
-    message = f"Config created at '{PRIMITIVE_CREDENTIALS_FILEPATH}' for user '{username}' on host '{host}'"  # noqa
+    auth.setup_config(token=token, host=host, transport=transport)
+    message = f"Config created at '{PRIMITIVE_CREDENTIALS_FILEPATH}' on host '{host}'"  # noqa
     print_result(message=message, context=context, fg="green")

primitive/hardware/commands.py

@@ -1,13 +1,15 @@
-import typing
+from typing import TYPE_CHECKING, Optional
 
 import click
 
 from ..utils.printer import print_result
 from .ui import render_hardware_table
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from ..client import Primitive
 
+from loguru import logger
+
 
 @click.group()
 @click.pass_context
@@ -26,11 +28,25 @@ def systeminfo_command(context):
 
 
 @cli.command("register")
+@click.option(
+    "--organization",
+    type=str,
+    help="Organization [slug] to register hardware with",
+)
 @click.pass_context
-def register_command(context):
+def register_command(context, organization: Optional[str] = None):
     """Register Hardware with Primitive"""
     primitive: Primitive = context.obj.get("PRIMITIVE")
-    result = primitive.hardware.register()
+
+    organization_id = None
+    if organization:
+        organization_data = primitive.organizations.get_organization(slug=organization)
+        organization_id = organization_data.get("id")
+
+    if not organization_id:
+        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"

primitive/organizations/actions.py

@@ -39,3 +39,31 @@ class Organizations(BaseAction):
         )
         organizations = [edge["node"] for edge in result.data["organizations"]["edges"]]
         return organizations
+
+    @guard
+    def get_organization(
+        self,
+        organization_id: Optional[str] = None,
+        slug: Optional[str] = None,
+    ):
+        query = gql(organizations_query)
+
+        filters = {}
+        if organization_id:
+            filters["organization"] = {"id": organization_id}
+        if slug:
+            filters["slug"] = {"exact": slug}
+
+        variables = {
+            "first": 1,
+            "filters": filters,
+            "order": {
+                "createdAt": "DESC",
+            },
+        }
+
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
+        organizations = [edge["node"] for edge in result.data["organizations"]["edges"]]
+        return organizations[0]

{primitive-0.2.21.dist-info → primitive-0.2.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.21
+Version: 0.2.25
 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,7 +22,6 @@ Requires-Dist: click
 Requires-Dist: gql[all]
 Requires-Dist: loguru
 Requires-Dist: paramiko[invoke]
-Requires-Dist: primitive-pal==0.1.4
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pyyaml
 Requires-Dist: rich>=13.9.4
@@ -127,10 +126,9 @@ source .venv/bin/activate
 source .venv/bin/activate.fish
 
 primitive --host localhost:8000 config --transport http
-Username []: <username> # find this on the frontend app at [http://localhost:3000](http://localhost:3000)
 You can find or create a Primitive API token at http://localhost:3000/account/tokens
 Please enter your Primitive API token: # create a token and copy the value here
-Config created at '/Users/<user>/.config/primitive/credentials.json' for user '<username>' on host 'localhost:8000'
+Config created at '/Users/<user>/.config/primitive/credentials.json' on host 'localhost:8000'
 
 # verify the configuration worked via
 primitive --host localhost:8000 whoami

{primitive-0.2.21.dist-info → primitive-0.2.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=2U8gKYr-8TF1aRgcwIlbm8S-74abcoIdCcPB08CEO3w,130
+primitive/__about__.py,sha256=emMCm4cHzvmdYDOL83iUzQz3eDl0L-1JkrP95MpoyT8,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=h8WZVnQylVe0vbpuyC8YZHl2JyITSPC-1HbUcmrE5pc,3623
@@ -8,8 +8,8 @@ primitive/agent/commands.py,sha256=cK7d3OcN5Z65gQWVZFQ-Y9ddw9Pes4f9OVBpeMsj5sE,2
 primitive/agent/runner.py,sha256=CoRyReO3jPV8B7vILVWdszFD4GVop7HsVEUo1hoRXjo,14556
 primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/auth/actions.py,sha256=MPsG9LcKcOPwA7gZ9Ewk0PZJhTQvIrGfODdz4GxSzgA,999
-primitive/auth/commands.py,sha256=2z5u5xX64n0yILucx9emtWh3uQXLvs2QQQQIldZGr94,2341
+primitive/auth/actions.py,sha256=9NIEXJ1BNJutJs6AMMSjMN_ziONUAUhY_xHwojYJCLA,942
+primitive/auth/commands.py,sha256=Krm38ioduDJZw0OIrIcb6eR2X6iECiWX0JPAI-2HNxY,2352
 primitive/auth/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/graphql/queries.py,sha256=jhrr_VFzHIn8vcVprMIzUx7V4kkWYdR6CKMKPoVFv60,180
 primitive/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/hardware/actions.py,sha256=d5KwuSsceOhDH9rgOL7YTCpQPhqT2inRTiZnROtiDic,26076
 primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
-primitive/hardware/commands.py,sha256=ixMPhDOpsU-eONxmimqKVynus-Eaq2XPKEK017WM_rM,3229
+primitive/hardware/commands.py,sha256=NMliVHBZDl4UAvhmNEjrvN9KWPuqn87-d7eVb0ZqEYA,3752
 primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
 primitive/hardware/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/hardware/graphql/fragments.py,sha256=kI6qnTNjaEaUr-C6eD55COphtueVYbYOWZwN5EW_3qw,350
@@ -60,7 +60,7 @@ primitive/jobs/graphql/queries.py,sha256=BrU_GnLjK0bTAmWsLSmGEUea7EM8MqTKxN1Qp6s
 primitive/monitor/actions.py,sha256=GUQrwuan82pOJ5gI2FvQYzgDoP4fs28PdcI_fg_aXRs,8692
 primitive/monitor/commands.py,sha256=dZsD8WKGU4OYO_AlKawfeRNVTMN0xJ-DFRkmKTS464s,258
 primitive/organizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/organizations/actions.py,sha256=Tgp_rox0jcvfhQ-LmcWc9vkPdeJu5Bk6U1rNuT9oDnw,1088
+primitive/organizations/actions.py,sha256=kVHOhG1oS2sI5p8uldSo5L-RUZsnG36eaulVuKLyZ-M,1863
 primitive/organizations/commands.py,sha256=_dwgVEJCqMa5VgB_7P1wLPFc0AuT1p9dtyR9JRr4kpw,487
 primitive/organizations/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/organizations/graphql/fragments.py,sha256=a1qKq4FZB5qze0XTo1fOUeGAscIasjn_Ig4gA2_vStY,142
@@ -96,8 +96,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=jWzb7ky7p987dJas6ZvarK3IJNZ5cwBXcryRWb9Uh6U,2072
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.21.dist-info/METADATA,sha256=MW7arn8ApaoBDQg0KJ494Yo4R5_uhUN4B5h-XdHNF-w,3733
-primitive-0.2.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.21.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.21.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.21.dist-info/RECORD,,
+primitive-0.2.25.dist-info/METADATA,sha256=KzAEz2pPIFN5lBO7_7jERQ7oIL1trv05Jjqdp8icC9w,3569
+primitive-0.2.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.25.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.25.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.25.dist-info/RECORD,,