Feature/agents #1

monoxgas · 2024-10-24T15:02:00Z

This merges in an early take on agent management used for demos. Figure we can work through elements of the refactor and make sure I didn't over-simplify the auth core.

Added some user information like email, username, and api-key to the config. I wonder if this is excessive state to store - I worry about keeping it in sync.
Reworked authentication slightly to use just cookies and let the server refresh for us.
- Re-used that great onexit register to pull the latest cookies back out every time we exit (Feels pretty messy to me right now, might need some work)
- Not doing any opportunistic/manual refreshes -> currently thinking of the refresh command as refreshing user information
- I did leave in the JWT parsing so we can check a refresh token before we use it and avoid causing a 401 anyways - but missing one request isn't the worst thing.
- If we ever get a 401 and we were sending cookies, we can assume we need to login again
Added a decorator to wrap all the cli functions, catch errors, and print them cleanly - just pulling out logic that was explicit everywhere into one place
I started adding some models to type out the api functions, but this feels like a weak step towards the final outcome of just generating them. It helps with code sanity (type hinting), but doesn't help with stability because they could get out of sync just as easily
I'm "kind-of?" liking the format.py strategy for the agent where formatting all objects is abstracted somewhere central - loving rich btw - but maybe we should pull this out closer to a dedicated "Schemas" section when we have it. Essentially you are defining for each schema model, how it would be rendered.
Move to YAML BABY YEAH! (should we support both here? I have no idea how to do that)

…working on agent flows

pyproject.toml

dreadnode_cli/utils.py

dreadnode_cli/api.py

monoxgas · 2024-10-24T15:11:34Z

dreadnode_cli/cli.py

-        env_server = os.getenv("DREADNODE_SERVER")
-        if env_server:
-            server = env_server
+    if not server:


Would love a double check on this logic - want to make sure we're properly handling all the cases for "is their an existing profile?" "did the user give us a server?" "do we know about a server already?"

@monoxgas i had a doubt while reading the multi profile logic initially: what's the advantage of this approach versus, say, having just a unified --profile path/to/dreadnode.json argument? isn't manually switching via dreadnode CLI just more complex and less intuitive than simply using a different profile if needed and defaulting to ~/.dreadnode/config.json? that'd allow us to get rid of the complexity and all edge cases (really not a fan of UserConfig._update_active)

Let me sleep on this, It's a good point. I think there is something to be said about how other command line tools carry context (AWS, Kubectl). The former just asks for a profile argument to switch, the other does carry the idea of an active context at any given moment.

Also worth considering that carrying context for multiple servers is extremely rare for standard users ATM.

evilsocket · 2024-10-24T15:20:10Z

README.md

@@ -5,7 +5,7 @@ Dreadnode command line interface.
 ### With Poetry:

 ```bash
-poetry install 
+poetry install


@monoxgas is there anything we can add here to have the dreadnode CLI in $PATH even outside the poetry shell? not very familiar with poetry but it seems that huggingface_hub is using a setup.py for this

evilsocket · 2024-10-24T15:29:14Z

dreadnode_cli/agent/docker.py

+client = docker.from_env()
+
+
+# TODO: Poor form having a fixed list of registries IMO


we could just check for any dev- or staging- prefixes in config.url and prepend whatever we find to the registry.dreadnode.io ... not great but would make things a bit neater.

evilsocket · 2024-10-24T15:33:33Z

dreadnode_cli/agent/docker.py

+
+def build(directory: str | pathlib.Path) -> Image:
+    id: str | None = None
+    for item in client.api.build(path=str(directory), platform="linux/amd64", decode=True):


if using the local registry, this will probably fail if ARM and buildx is not installed on the host

evilsocket · 2024-10-24T15:38:22Z

dreadnode_cli/agent/templates/rigging/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM amd64/python:3.10-slim


we should not force architectures in Dockerfiles

Done. Let me align this with the other architecture considerations above as well.

evilsocket · 2024-10-24T15:40:00Z

dreadnode_cli/agent/templates/rigging/agent.py.j2

+    print("Chat:", chat.conversation)
+
+    try:
+        response = httpx.get("http://web")


missing import httpx?

dreadnode_cli/api.py

evilsocket · 2024-10-24T16:06:08Z

dreadnode_cli/challenge/cli.py

@@ -23,38 +22,33 @@ def format_difficulty(difficulty: str) -> str:

 # TODO: add sorting and filtering


@monoxgas do we actually care for the CLI?

evilsocket · 2024-10-24T16:10:30Z

dreadnode_cli/challenge/cli.py


-        challenges = asyncio.run(client.list_challenges())
+    table = Table(box=box.ROUNDED)


i kind of like the "format_" approach, very MVC, can I move this there?

evilsocket · 2024-10-24T16:19:10Z

dreadnode_cli/cli.py

-        env_server = os.getenv("DREADNODE_SERVER")
-        if env_server:
-            server = env_server
+    if not server:


@monoxgas i had a doubt while reading the multi profile logic initially: what's the advantage of this approach versus, say, having just a unified --profile path/to/dreadnode.json argument? isn't manually switching via dreadnode CLI just more complex and less intuitive than simply using a different profile if needed and defaulting to ~/.dreadnode/config.json? that'd allow us to get rid of the complexity and all edge cases (really not a fan of UserConfig._update_active)

evilsocket · 2024-10-24T16:20:52Z

dreadnode_cli/cli.py

-        print(":white_check_mark: authentication successful")
-    except Exception as e:
-        print(f":cross_mark: {e}")
+    webbrowser.open(verification_url)


can raise and interrupt the authentication flow

monoxgas and others added 8 commits October 19, 2024 19:01

Refactor auth to simplify. Some api types. Validation testing. Start …

6465725

…working on agent flows

Early working version of agent pushing and deployments

7cd162f

accommodates server urls that have forward slash

6fe76a4

adds explicit platform prefix to docker template

4d2c927

Working agent flows

24018ef

Fix server spec in login

302fb50

updates cli models to reflect agent changes

475ec5a

Post demo - Prepping for merge

c4408b9

monoxgas commented Oct 24, 2024

View reviewed changes

monoxgas requested review from evilsocket and removed request for evilsocket October 24, 2024 15:13

monoxgas marked this pull request as draft October 24, 2024 15:19

monoxgas marked this pull request as ready for review October 24, 2024 15:20

evilsocket reviewed Oct 24, 2024

View reviewed changes

monoxgas added 2 commits October 28, 2024 22:57

Rename client() to create_client()

69ded69

Remove explicit platform from dockerfile

76f07f6

evilsocket merged commit ba76053 into main Nov 4, 2024
3 checks passed

evilsocket deleted the feature/agents branch November 4, 2024 10:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/agents #1

Feature/agents #1

monoxgas commented Oct 24, 2024 •

edited

Loading

monoxgas Oct 24, 2024

evilsocket Oct 24, 2024

monoxgas Oct 29, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

monoxgas Oct 29, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

evilsocket Oct 24, 2024

		client = docker.from_env()


		# TODO: Poor form having a fixed list of registries IMO

		@@ -1,4 +1,4 @@
		FROM python:3.10-slim
		FROM amd64/python:3.10-slim

		@@ -23,38 +22,33 @@ def format_difficulty(difficulty: str) -> str:

		# TODO: add sorting and filtering


		challenges = asyncio.run(client.list_challenges())
		table = Table(box=box.ROUNDED)

Feature/agents #1

Feature/agents #1

Conversation

monoxgas commented Oct 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

monoxgas commented Oct 24, 2024 •

edited

Loading