trefoil-cli 0.3.0__tar.gz → 0.4.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/PKG-INFO +1 -1
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/package.py +89 -8
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/pyproject.toml +1 -1
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/trefoil_cli.egg-info/PKG-INFO +1 -1
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/setup.cfg +0 -0
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/trefoil_cli.egg-info/SOURCES.txt +0 -0
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/trefoil_cli.egg-info/dependency_links.txt +0 -0
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/trefoil_cli.egg-info/entry_points.txt +0 -0
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/trefoil_cli.egg-info/requires.txt +0 -0
- {trefoil_cli-0.3.0 → trefoil_cli-0.4.0}/trefoil_cli.egg-info/top_level.txt +0 -0
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"""Bundle a trefoil config.yml into a single JSON file.
|
|
3
3
|
|
|
4
4
|
Resolves:
|
|
5
|
-
- `!
|
|
5
|
+
- `!include file://path` and `!include https://url` tags
|
|
6
6
|
- bare `file://path` strings (bare https:// strings are left as-is)
|
|
7
7
|
|
|
8
8
|
Referenced .yml/.yaml/.json files are parsed and resolved recursively;
|
|
@@ -14,6 +14,9 @@ directory of the file that references them.
|
|
|
14
14
|
Usage: trefoil <domain> <command> [args]
|
|
15
15
|
|
|
16
16
|
trefoil init [DIR] [--example=NAME]
|
|
17
|
+
trefoil update
|
|
18
|
+
trefoil engine start [--settings=backend.yml] [--port=8080] [-d]
|
|
19
|
+
trefoil engine stop
|
|
17
20
|
trefoil config package path/to/config.yml [-o bundle.json]
|
|
18
21
|
trefoil config sync [path/to/config.yml] [--server URL]
|
|
19
22
|
trefoil agents list
|
|
@@ -30,8 +33,11 @@ import argparse
|
|
|
30
33
|
import base64
|
|
31
34
|
import getpass
|
|
32
35
|
import importlib.metadata
|
|
36
|
+
import importlib.util
|
|
33
37
|
import json
|
|
34
38
|
import os
|
|
39
|
+
import shutil
|
|
40
|
+
import subprocess
|
|
35
41
|
import sys
|
|
36
42
|
import time
|
|
37
43
|
import urllib.error
|
|
@@ -54,7 +60,8 @@ class Loader(yaml.SafeLoader):
|
|
|
54
60
|
pass
|
|
55
61
|
|
|
56
62
|
|
|
57
|
-
|
|
63
|
+
for _tag in ("!include", "!Ref"): # !Ref is the old name, still accepted
|
|
64
|
+
Loader.add_constructor(_tag, lambda loader, node: Ref(loader.construct_scalar(node)))
|
|
58
65
|
|
|
59
66
|
|
|
60
67
|
class Packager:
|
|
@@ -111,7 +118,7 @@ class Packager:
|
|
|
111
118
|
|
|
112
119
|
def read_folder(root):
|
|
113
120
|
"""Every file under root as {relative path: text}, skipping hidden files
|
|
114
|
-
and __pycache__, like shared
|
|
121
|
+
and __pycache__, like shared modules on the server."""
|
|
115
122
|
files = {}
|
|
116
123
|
for path in sorted(root.rglob("*")):
|
|
117
124
|
rel = path.relative_to(root)
|
|
@@ -178,6 +185,61 @@ def cmd_init(args):
|
|
|
178
185
|
print(f"next: cd {dest} && trefoil config sync")
|
|
179
186
|
|
|
180
187
|
|
|
188
|
+
def cmd_update(args):
|
|
189
|
+
# An editable install runs straight from a checkout; reinstalling from PyPI would replace it.
|
|
190
|
+
if Path(__file__).with_name("pyproject.toml").exists():
|
|
191
|
+
sys.exit(f"trefoil: running from a source checkout ({Path(__file__).parent}); "
|
|
192
|
+
"pull and run `make cli` instead")
|
|
193
|
+
# uv-created environments (uv tool install, uv venv) have no pip of their own.
|
|
194
|
+
if importlib.util.find_spec("pip"):
|
|
195
|
+
cmd = [sys.executable, "-m", "pip", "install", "--upgrade", "--force-reinstall", "trefoil-cli"]
|
|
196
|
+
elif shutil.which("uv"):
|
|
197
|
+
cmd = ["uv", "pip", "install", "--python", sys.executable, "--upgrade", "--reinstall", "trefoil-cli"]
|
|
198
|
+
else:
|
|
199
|
+
sys.exit("trefoil: neither pip nor uv is available to reinstall trefoil-cli")
|
|
200
|
+
print(f"trefoil {cli_version()}: {' '.join(cmd)}", file=sys.stderr)
|
|
201
|
+
sys.exit(subprocess.run(cmd).returncode)
|
|
202
|
+
|
|
203
|
+
|
|
204
|
+
def cmd_engine_start(args):
|
|
205
|
+
if not shutil.which("docker"):
|
|
206
|
+
sys.exit("trefoil: docker is not installed or not on PATH")
|
|
207
|
+
cmd = ["docker", "run", "--rm", "--name", args.name, "-p", f"{args.port}:8080",
|
|
208
|
+
"-v", "/var/run/docker.sock:/var/run/docker.sock", "-v", f"{args.volume}:/data"]
|
|
209
|
+
if args.settings:
|
|
210
|
+
path = args.settings.resolve()
|
|
211
|
+
if not path.is_file():
|
|
212
|
+
sys.exit(f"trefoil: {args.settings} is not a file")
|
|
213
|
+
mount = f"/trefoil/settings/{path.name}"
|
|
214
|
+
cmd += ["-v", f"{path}:{mount}:ro", "-e", f"TREFOIL_SETTINGS={mount}"]
|
|
215
|
+
# The server resolves env_file against the settings file and fails if
|
|
216
|
+
# it's missing, so mount it where it will look.
|
|
217
|
+
try:
|
|
218
|
+
env_file = (yaml.safe_load(path.read_text()) or {}).get("env_file")
|
|
219
|
+
except (yaml.YAMLError, AttributeError) as e:
|
|
220
|
+
sys.exit(f"trefoil: {args.settings}: {e}")
|
|
221
|
+
if env_file:
|
|
222
|
+
host = (path.parent / env_file).resolve()
|
|
223
|
+
if not host.is_file():
|
|
224
|
+
sys.exit(f"trefoil: env_file {host} (from {args.settings}) not found")
|
|
225
|
+
target = env_file if os.path.isabs(env_file) else os.path.normpath(f"/trefoil/settings/{env_file}")
|
|
226
|
+
cmd += ["-v", f"{host}:{target}:ro"]
|
|
227
|
+
if args.detach:
|
|
228
|
+
cmd.append("-d")
|
|
229
|
+
cmd.append(args.image)
|
|
230
|
+
print(f"trefoil: {' '.join(cmd)}", file=sys.stderr)
|
|
231
|
+
sys.exit(subprocess.run(cmd).returncode)
|
|
232
|
+
|
|
233
|
+
|
|
234
|
+
def cmd_engine_stop(args):
|
|
235
|
+
if not shutil.which("docker"):
|
|
236
|
+
sys.exit("trefoil: docker is not installed or not on PATH")
|
|
237
|
+
# started with --rm, so stopping also removes the container
|
|
238
|
+
cmd = ["docker", "stop", args.name]
|
|
239
|
+
print(f"trefoil: {' '.join(cmd)}", file=sys.stderr)
|
|
240
|
+
sys.exit(subprocess.run(cmd, stdout=subprocess.DEVNULL).returncode)
|
|
241
|
+
|
|
242
|
+
|
|
181
243
|
def api_request(server, method, path, body=None, timeout=30, raw=False):
|
|
182
244
|
"""Calls the API and returns the decoded JSON, or the bytes with raw=True."""
|
|
183
245
|
req = urllib.request.Request(server.rstrip("/") + path, data=body, method=method)
|
|
@@ -446,12 +508,12 @@ def cmd_agents_list(args):
|
|
|
446
508
|
agents = api_request(args.server, "GET", "/agents")
|
|
447
509
|
|
|
448
510
|
rows = [
|
|
449
|
-
(a["name"], a.get("model") or "(default)", a.get("provider") or "anthropic", ", ".join(a["
|
|
511
|
+
(a["name"], a.get("model") or "(default)", a.get("provider") or "anthropic", ", ".join(a["modules"]),
|
|
450
512
|
format_input_schema(a.get("input_schema")), format_fields(a.get("outputs")), str(a["prompts"]),
|
|
451
513
|
"yes" if a["built"] else "no")
|
|
452
514
|
for a in agents
|
|
453
515
|
]
|
|
454
|
-
print_table(("NAME", "MODEL", "PROVIDER", "
|
|
516
|
+
print_table(("NAME", "MODEL", "PROVIDER", "MODULES", "INPUT", "OUTPUTS", "PROMPTS", "BUILT"), rows,
|
|
455
517
|
empty="no agents")
|
|
456
518
|
|
|
457
519
|
|
|
@@ -506,10 +568,29 @@ def main():
|
|
|
506
568
|
|
|
507
569
|
init = domains.add_parser("init", help="scaffold a project from an example config")
|
|
508
570
|
init.add_argument("dir", type=Path, nargs="?", help="directory to create (default: the example's name)")
|
|
509
|
-
init.add_argument("--example", default="
|
|
510
|
-
help="example under examples/ in github.com/alto-se/trefoil (default:
|
|
571
|
+
init.add_argument("--example", default="starter", metavar="NAME",
|
|
572
|
+
help="example under examples/ in github.com/alto-se/trefoil (default: starter)")
|
|
511
573
|
init.set_defaults(func=cmd_init)
|
|
512
574
|
|
|
575
|
+
update = domains.add_parser("update", help="reinstall the latest trefoil-cli from PyPI")
|
|
576
|
+
update.set_defaults(func=cmd_update)
|
|
577
|
+
|
|
578
|
+
engine = domain("engine", "run the trefoil API server locally with docker")
|
|
579
|
+
engine_start = engine.add_parser("start", help="run the trefoil API server image")
|
|
580
|
+
engine_start.add_argument("--settings", type=Path, metavar="FILE",
|
|
581
|
+
help="backend settings file (backend.yml) to mount into the container")
|
|
582
|
+
engine_start.add_argument("--port", type=int, default=8080, help="host port to publish (default: 8080)")
|
|
583
|
+
engine_start.add_argument("--image", default="ghcr.io/alto-se/trefoil-api:latest",
|
|
584
|
+
help="API image (default: ghcr.io/alto-se/trefoil-api:latest)")
|
|
585
|
+
engine_start.add_argument("--name", default="trefoil-api", help="container name (default: trefoil-api)")
|
|
586
|
+
engine_start.add_argument("--volume", default="trefoil-data",
|
|
587
|
+
help="docker volume (or host path) for the data dir (default: trefoil-data)")
|
|
588
|
+
engine_start.add_argument("-d", "--detach", action="store_true", help="run in the background")
|
|
589
|
+
engine_start.set_defaults(func=cmd_engine_start)
|
|
590
|
+
engine_stop = engine.add_parser("stop", help="stop the running API server container")
|
|
591
|
+
engine_stop.add_argument("--name", default="trefoil-api", help="container name (default: trefoil-api)")
|
|
592
|
+
engine_stop.set_defaults(func=cmd_engine_stop)
|
|
593
|
+
|
|
513
594
|
config = domain("config", "package and upload agent configs")
|
|
514
595
|
package = config.add_parser("package", help=__doc__.splitlines()[0])
|
|
515
596
|
package.add_argument("config", type=Path, help="path to config.yml")
|
|
@@ -561,7 +642,7 @@ def main():
|
|
|
561
642
|
sub.add_argument("-o", "--output", type=Path, metavar="DIR",
|
|
562
643
|
help="download every artifact into DIR instead of listing them")
|
|
563
644
|
|
|
564
|
-
secrets = domain("secrets", "provide secrets that agents'
|
|
645
|
+
secrets = domain("secrets", "provide secrets that agents' modules require")
|
|
565
646
|
secrets_set = secrets.add_parser("set", parents=[server],
|
|
566
647
|
help="store a secret on the server (value from a prompt or stdin)")
|
|
567
648
|
secrets_set.add_argument("--name", required=True, metavar="NAME", help="secret name, e.g. github_token")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|