lcode-cli 0.36.0__py3-none-any.whl → 0.38.0__py3-none-any.whl
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.
- lcode/__init__.py +1 -1
- lcode/agent.py +35 -6
- lcode/checks.py +95 -17
- lcode/cli.py +8 -0
- lcode/cloud.py +46 -0
- lcode/escalate.py +14 -2
- lcode/ollama.py +6 -0
- lcode/repeats.py +11 -2
- lcode/repl.py +8 -0
- lcode/residency.py +3 -0
- lcode/screenshots.py +237 -10
- lcode/tools.py +15 -1
- {lcode_cli-0.36.0.dist-info → lcode_cli-0.38.0.dist-info}/METADATA +1 -1
- {lcode_cli-0.36.0.dist-info → lcode_cli-0.38.0.dist-info}/RECORD +17 -16
- {lcode_cli-0.36.0.dist-info → lcode_cli-0.38.0.dist-info}/WHEEL +0 -0
- {lcode_cli-0.36.0.dist-info → lcode_cli-0.38.0.dist-info}/entry_points.txt +0 -0
- {lcode_cli-0.36.0.dist-info → lcode_cli-0.38.0.dist-info}/licenses/LICENSE +0 -0
lcode/__init__.py
CHANGED
lcode/agent.py
CHANGED
|
@@ -45,6 +45,7 @@ from lcode import (
|
|
|
45
45
|
from lcode import context as context_tools
|
|
46
46
|
from lcode import memory as memory_notes
|
|
47
47
|
from lcode.checkpoints import Checkpoints
|
|
48
|
+
from lcode.cloud import is_cloud
|
|
48
49
|
from lcode.config import format_tokens
|
|
49
50
|
from lcode.jobs import Jobs
|
|
50
51
|
from lcode.mcp import McpManager
|
|
@@ -98,7 +99,9 @@ def stall_note(trouble: str) -> str:
|
|
|
98
99
|
}[trouble]
|
|
99
100
|
return (
|
|
100
101
|
f"[lcode] {first} Don't deliberate at length now. Either make your next tool call, or, if you're stuck, "
|
|
101
|
-
"tell the user in a few lines what you did, what fails, and what they could do."
|
|
102
|
+
"tell the user in a few lines what you did, what fails, and what they could do. If you were about to check "
|
|
103
|
+
"something by running it, run it now instead of reasoning about it: for a window, take a screenshot (with "
|
|
104
|
+
"actions for clicks or keys)."
|
|
102
105
|
)
|
|
103
106
|
|
|
104
107
|
|
|
@@ -960,6 +963,12 @@ class Agent:
|
|
|
960
963
|
return []
|
|
961
964
|
return checks.unrun_scripts(project_root_or_cwd(self.cwd), list(self.tools.before), commands)
|
|
962
965
|
|
|
966
|
+
def unseen_windows(self, tools_used: set[str]) -> dict[str, str]:
|
|
967
|
+
"""Window code the model changed in this request and never looked at (only where the checks would run)."""
|
|
968
|
+
if self.allowed_tools is not None or self.planning() or self.no_changes or self.settings.checks == "off":
|
|
969
|
+
return {}
|
|
970
|
+
return checks.unseen_windows(project_root_or_cwd(self.cwd), list(self.tools.before), tools_used)
|
|
971
|
+
|
|
963
972
|
def project_check(self) -> checks.Check | None:
|
|
964
973
|
"""The project's check command, for the main agent outside plan mode and reviews (None otherwise)."""
|
|
965
974
|
if self.allowed_tools is not None or self.planning() or self.no_changes or self.settings.checks == "off":
|
|
@@ -1011,8 +1020,8 @@ class Agent:
|
|
|
1011
1020
|
def before_request(self, progress: Progress) -> residency.LoadWatch | None:
|
|
1012
1021
|
"""Set the status line for what comes before the first token: loading the model if it isn't in memory
|
|
1013
1022
|
(watched until it is), then reading the prompt. Returns the watch while the model loads."""
|
|
1014
|
-
if getattr(self.ollama, "kind", "ollama") != "ollama":
|
|
1015
|
-
return None
|
|
1023
|
+
if getattr(self.ollama, "kind", "ollama") != "ollama" or is_cloud(self.settings.model):
|
|
1024
|
+
return None # another server loads models itself; an Ollama cloud model isn't loaded here at all
|
|
1016
1025
|
model, context = self.settings.model, self.settings.context
|
|
1017
1026
|
fresh = max(0, conversation_chars(self.messages) - self.sent_chars) // 3
|
|
1018
1027
|
where = residency.placement(self.ollama, model)
|
|
@@ -1163,6 +1172,8 @@ class Agent:
|
|
|
1163
1172
|
stalls = 0 # replies that went round in circles or ended without a word
|
|
1164
1173
|
commands: list[str] = [] # shell commands run in this request
|
|
1165
1174
|
scripts_noted = False # the model was told about scripts it wrote and never ran
|
|
1175
|
+
tools_used: set[str] = set() # tools called in this request
|
|
1176
|
+
windows_noted = False # the model was told about windows it changed and never looked at
|
|
1166
1177
|
for step in range(self.max_steps):
|
|
1167
1178
|
if self.cancel is not None and self.cancel.is_set():
|
|
1168
1179
|
raise KeyboardInterrupt
|
|
@@ -1214,10 +1225,11 @@ class Agent:
|
|
|
1214
1225
|
continue
|
|
1215
1226
|
if not calls and (self.reply_trouble == "circles" or not (reply.get("content") or "").strip()):
|
|
1216
1227
|
stalls += 1
|
|
1217
|
-
self.messages.pop() #
|
|
1228
|
+
dropped = self.messages.pop() # no answer, and circles would only fill the context
|
|
1229
|
+
kept = self.keep_dropped(dropped)
|
|
1218
1230
|
if stalls < MAX_STALLS:
|
|
1219
1231
|
self.console.print(
|
|
1220
|
-
Text(f" ⎿ {STALLED[self.reply_trouble]}: asking for a short answer", style="yellow")
|
|
1232
|
+
Text(f" ⎿ {STALLED[self.reply_trouble]}: asking for a short answer{kept}", style="yellow")
|
|
1221
1233
|
)
|
|
1222
1234
|
self.messages.append({"role": "user", "content": stall_note(self.reply_trouble)})
|
|
1223
1235
|
continue
|
|
@@ -1233,7 +1245,7 @@ class Agent:
|
|
|
1233
1245
|
self.console.print(
|
|
1234
1246
|
Text(
|
|
1235
1247
|
"Stopped: the model's replies went round in circles or ended without an answer, twice in "
|
|
1236
|
-
"this request. Try again with a smaller step, or tell it what to do differently.",
|
|
1248
|
+
f"this request{kept}. Try again with a smaller step, or tell it what to do differently.",
|
|
1237
1249
|
style="yellow",
|
|
1238
1250
|
)
|
|
1239
1251
|
)
|
|
@@ -1252,6 +1264,14 @@ class Agent:
|
|
|
1252
1264
|
self.console.print(Text(f" ⎿ never ran {', '.join(unrun)}: asking the model to", style="yellow"))
|
|
1253
1265
|
self.messages.append({"role": "user", "content": checks.unrun_note(unrun)})
|
|
1254
1266
|
continue
|
|
1267
|
+
unseen = {} if windows_noted else self.unseen_windows(tools_used)
|
|
1268
|
+
if unseen:
|
|
1269
|
+
windows_noted = True
|
|
1270
|
+
self.console.print(
|
|
1271
|
+
Text(f" ⎿ never looked at {', '.join(unseen)}: asking the model to", style="yellow")
|
|
1272
|
+
)
|
|
1273
|
+
self.messages.append({"role": "user", "content": checks.unseen_note(unseen)})
|
|
1274
|
+
continue
|
|
1255
1275
|
check = self.project_check() if changed and not verified else None
|
|
1256
1276
|
if check is not None and check_rounds < checks.MAX_ROUNDS:
|
|
1257
1277
|
check_rounds += 1
|
|
@@ -1344,6 +1364,7 @@ class Agent:
|
|
|
1344
1364
|
)
|
|
1345
1365
|
if out_of_reach.stop:
|
|
1346
1366
|
blocked = out_of_reach
|
|
1367
|
+
tools_used.add(name)
|
|
1347
1368
|
if name == "bash":
|
|
1348
1369
|
commands.append(str(args.get("command", "")))
|
|
1349
1370
|
if name in ("edit_file", "write_file", "apply_patch") and not result.startswith(REFUSED):
|
|
@@ -1411,6 +1432,14 @@ class Agent:
|
|
|
1411
1432
|
self.turn_status = "success"
|
|
1412
1433
|
self.print_stats()
|
|
1413
1434
|
|
|
1435
|
+
def keep_dropped(self, reply: dict) -> str:
|
|
1436
|
+
"""Save a reply lcode dropped (its thinking too), so the user can see what went round in circles."""
|
|
1437
|
+
text = "\n\n".join(part for part in (reply.get("thinking"), reply.get("content")) if part)
|
|
1438
|
+
if not text.strip():
|
|
1439
|
+
return ""
|
|
1440
|
+
path = context_tools.save_output(text, "dropped reply")
|
|
1441
|
+
return f" (the dropped reply is in {path})" if path else ""
|
|
1442
|
+
|
|
1414
1443
|
def can_escalate(self) -> bool:
|
|
1415
1444
|
"""Whether a stronger model may be asked here: one is set, and this isn't a subagent or plan mode."""
|
|
1416
1445
|
model = (self.settings.escalate_model or "").strip().lower()
|
lcode/checks.py
CHANGED
|
@@ -50,10 +50,28 @@ def find(root: Path, setting: str, trusted: bool) -> Check | None:
|
|
|
50
50
|
return detect(root)
|
|
51
51
|
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
VENVS = (".venv", "venv", "env")
|
|
54
|
+
PYTEST_USE = re.compile(r"^\s*(?:import pytest\b|from pytest\b)|^\s*@pytest\.", re.M)
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def python(root: Path | None = None) -> str:
|
|
58
|
+
"""The project's own Python (its .venv, venv or env), where its dependencies are; else the one on PATH."""
|
|
59
|
+
if root is not None:
|
|
60
|
+
for env in VENVS:
|
|
61
|
+
for exe in ("bin/python", "Scripts/python.exe"):
|
|
62
|
+
if (root / env / exe).is_file():
|
|
63
|
+
return f"{env}/{exe}" # the checks run in the project's root
|
|
54
64
|
return "python" if shutil.which("python") else "python3"
|
|
55
65
|
|
|
56
66
|
|
|
67
|
+
def uses_pytest(root: Path) -> bool:
|
|
68
|
+
"""Whether the tests are written for pytest (they import it), or the requirements list it, without a config."""
|
|
69
|
+
for name in ("requirements.txt", "requirements-dev.txt", "requirements_dev.txt", "dev-requirements.txt"):
|
|
70
|
+
if re.search(r"^\s*pytest\b", text(root / name), re.M | re.I):
|
|
71
|
+
return True
|
|
72
|
+
return any(PYTEST_USE.search(text(path)[:20000]) for path in test_files(root)[:50])
|
|
73
|
+
|
|
74
|
+
|
|
57
75
|
def text(path: Path) -> str:
|
|
58
76
|
try:
|
|
59
77
|
return path.read_text(errors="replace") if path.is_file() else ""
|
|
@@ -61,38 +79,49 @@ def text(path: Path) -> str:
|
|
|
61
79
|
return ""
|
|
62
80
|
|
|
63
81
|
|
|
64
|
-
def
|
|
65
|
-
"""
|
|
82
|
+
def test_files(root: Path, limit: int = 200) -> list[Path]:
|
|
83
|
+
"""The project's Python test files, a few levels deep, outside environments and caches."""
|
|
66
84
|
from lcode.tools import IGNORE_DIRS
|
|
67
85
|
|
|
68
|
-
|
|
86
|
+
found: list[Path] = []
|
|
87
|
+
|
|
88
|
+
def walk(folder: Path, depth: int) -> None:
|
|
69
89
|
try:
|
|
70
|
-
entries =
|
|
90
|
+
entries = sorted(folder.iterdir())
|
|
71
91
|
except OSError:
|
|
72
|
-
return
|
|
73
|
-
if
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
92
|
+
return
|
|
93
|
+
found.extend(e for e in entries if e.is_file() and re.fullmatch(r"test_.*\.py|.*_test\.py", e.name))
|
|
94
|
+
if depth > 0:
|
|
95
|
+
for e in entries:
|
|
96
|
+
if len(found) >= limit:
|
|
97
|
+
return
|
|
98
|
+
if e.is_dir() and e.name not in IGNORE_DIRS and e.name not in VENVS and not e.name.startswith("."):
|
|
99
|
+
walk(e, depth - 1)
|
|
80
100
|
|
|
81
|
-
|
|
101
|
+
walk(root, 3)
|
|
102
|
+
return found[:limit]
|
|
103
|
+
|
|
104
|
+
|
|
105
|
+
def python_tests(root: Path) -> bool:
|
|
106
|
+
"""Whether the project has Python test files (a few levels deep, outside environments and caches)."""
|
|
107
|
+
return bool(test_files(root, limit=1))
|
|
82
108
|
|
|
83
109
|
|
|
84
110
|
def detect(root: Path) -> Check | None:
|
|
85
111
|
"""A check command from what the project looks like. Python checks need test files: pytest configured in a
|
|
86
112
|
project without tests "fails" with nothing to run."""
|
|
87
113
|
if python_tests(root):
|
|
114
|
+
py = python(root)
|
|
88
115
|
configs = text(root / "pyproject.toml") + text(root / "setup.cfg") + text(root / "tox.ini")
|
|
89
116
|
if "pytest" in configs or any((root / name).is_file() for name in ("pytest.ini", "conftest.py")):
|
|
90
|
-
runner = "uv run pytest -q" if (root / "uv.lock").is_file() else f"{
|
|
117
|
+
runner = "uv run pytest -q" if (root / "uv.lock").is_file() else f"{py} -m pytest -q"
|
|
91
118
|
return Check(runner, "pytest in the project's configuration")
|
|
119
|
+
if uses_pytest(root):
|
|
120
|
+
return Check(f"{py} -m pytest -q", "tests written for pytest")
|
|
92
121
|
if list(root.glob("test_*.py")) or list(root.glob("*_test.py")):
|
|
93
|
-
return Check(f"{
|
|
122
|
+
return Check(f"{py} -m unittest", "test files")
|
|
94
123
|
if (root / "tests").is_dir():
|
|
95
|
-
return Check(f"{
|
|
124
|
+
return Check(f"{py} -m unittest discover -s tests -t .", "tests/")
|
|
96
125
|
package = text(root / "package.json")
|
|
97
126
|
if package:
|
|
98
127
|
try:
|
|
@@ -229,3 +258,52 @@ def unrun_note(scripts: list[str]) -> str:
|
|
|
229
258
|
f"deploy, delete data) or needs something you don't have, don't: tell the user plainly that {it} is untested "
|
|
230
259
|
"and why."
|
|
231
260
|
)
|
|
261
|
+
|
|
262
|
+
|
|
263
|
+
# ----------------------------------------------------------------------------- windows it never looked at
|
|
264
|
+
|
|
265
|
+
GUI_IMPORT = re.compile(r"^\s*(?:from|import)\s+(PyQt[56]|PySide[26]|tkinter|kivy|wx|gi\.repository)\b", re.M)
|
|
266
|
+
LOOKED = frozenset({"screenshot", "view_image"})
|
|
267
|
+
|
|
268
|
+
|
|
269
|
+
def unseen_windows(root: Path, changed: list[str], tools_used: set[str]) -> dict[str, str]:
|
|
270
|
+
"""Python files that draw a window (they import a GUI toolkit), changed in this request when the model never
|
|
271
|
+
looked at one: file -> toolkit.
|
|
272
|
+
|
|
273
|
+
A small model checks a window change by importing the module and running unrelated tests, then calls it done;
|
|
274
|
+
the user finds a blank window. Tests and imports don't show what's on the screen; a screenshot does.
|
|
275
|
+
"""
|
|
276
|
+
if tools_used & LOOKED:
|
|
277
|
+
return {}
|
|
278
|
+
found = {}
|
|
279
|
+
for rel in changed:
|
|
280
|
+
path = root / rel
|
|
281
|
+
if path.suffix != ".py" or not path.is_file():
|
|
282
|
+
continue
|
|
283
|
+
try:
|
|
284
|
+
text = path.read_text(errors="replace")[:200_000]
|
|
285
|
+
except OSError:
|
|
286
|
+
continue
|
|
287
|
+
match = GUI_IMPORT.search(text)
|
|
288
|
+
if match:
|
|
289
|
+
found[rel] = match.group(1)
|
|
290
|
+
return found
|
|
291
|
+
|
|
292
|
+
|
|
293
|
+
def unseen_note(found: dict[str, str]) -> str:
|
|
294
|
+
names = ", ".join(found)
|
|
295
|
+
kits = sorted(set(found.values()))
|
|
296
|
+
qt = any(kit.startswith(("PyQt", "PySide")) for kit in kits)
|
|
297
|
+
how = (
|
|
298
|
+
"take a screenshot with the screenshot tool: it runs the program without a screen and shows what it draws, "
|
|
299
|
+
"and what the program printed (Qt names layout mistakes there). For something that only shows after a click "
|
|
300
|
+
'or a key, give actions, e.g. actions=["double_click Camera 1"]'
|
|
301
|
+
if qt
|
|
302
|
+
else "take a screenshot with the screenshot tool: it runs the program on a virtual display and shows what it "
|
|
303
|
+
"draws"
|
|
304
|
+
)
|
|
305
|
+
return (
|
|
306
|
+
f"[lcode] You changed {names}, which draws a window ({', '.join(kits)}), but never looked at it: tests and "
|
|
307
|
+
f"imports don't show what's on the screen. Before you say it works, {how}. Check the picture against what the "
|
|
308
|
+
"user asked for. If the program can't run here, tell the user plainly that you haven't seen it working."
|
|
309
|
+
)
|
lcode/cli.py
CHANGED
|
@@ -21,6 +21,7 @@ from rich.table import Table
|
|
|
21
21
|
from lcode import __version__, backends, catalog, config, limits, web
|
|
22
22
|
from lcode.agent import Settings
|
|
23
23
|
from lcode.catalog import ModelSpec
|
|
24
|
+
from lcode.cloud import is_cloud, signin_command
|
|
24
25
|
from lcode.config import ConfigError, format_tokens, parse_context
|
|
25
26
|
from lcode.hardware import Hardware, detect
|
|
26
27
|
from lcode.ollama import MIN_VERSION, Ollama, OllamaError, redact, version_tuple
|
|
@@ -384,6 +385,13 @@ def cmd_doctor(args) -> None:
|
|
|
384
385
|
try:
|
|
385
386
|
model, spec = resolve_model(ollama, cfg["model"])
|
|
386
387
|
line("Model", f"{cfg['model']} → {model}", True)
|
|
388
|
+
if is_cloud(model):
|
|
389
|
+
line(
|
|
390
|
+
"",
|
|
391
|
+
"runs in Ollama's cloud: what lcode sends goes to ollama.com, billed per token, and this Ollama "
|
|
392
|
+
f"must be signed in once: {signin_command(ollama.host)}",
|
|
393
|
+
None,
|
|
394
|
+
)
|
|
387
395
|
ctx, note = choose_context(ollama, model, spec, cfg["context"], hw)
|
|
388
396
|
if spec:
|
|
389
397
|
from lcode.subagents import parallel_slots
|
lcode/cloud.py
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"""Ollama's cloud models: tags like `minimax-m3.1-flash:cloud` run on ollama.com, through the local Ollama.
|
|
2
|
+
|
|
3
|
+
They look like any installed model to lcode (Ollama lists them, and they chat and call tools), but nothing about
|
|
4
|
+
them is local: what lcode sends goes to ollama.com, it's billed per token, and it needs the Ollama signed in to an
|
|
5
|
+
ollama.com account (`ollama signin`). So lcode says so where it matters (`lcode doctor`, the start of a session, the
|
|
6
|
+
stronger-model panel), skips what only makes sense for a local model (loading it into memory, GPU fit), and turns
|
|
7
|
+
Ollama's bare `Unauthorized` into the command that fixes it.
|
|
8
|
+
"""
|
|
9
|
+
|
|
10
|
+
from __future__ import annotations
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
def is_cloud(model: str | None) -> bool:
|
|
14
|
+
"""Whether an Ollama model name is one of Ollama's cloud models: its tag is `cloud` or ends with `-cloud`."""
|
|
15
|
+
name = (model or "").strip().lower()
|
|
16
|
+
if ":" not in name:
|
|
17
|
+
return False
|
|
18
|
+
tag = name.rsplit(":", 1)[1]
|
|
19
|
+
return tag == "cloud" or tag.endswith("-cloud")
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
def signin_command(host: str) -> str:
|
|
23
|
+
"""How to sign the Ollama at `host` in to ollama.com: inside its container when it runs in Docker."""
|
|
24
|
+
try:
|
|
25
|
+
from lcode import update
|
|
26
|
+
|
|
27
|
+
container = update.find_container(host) if update.docker_available() else None
|
|
28
|
+
except Exception: # Docker missing, or not answering: the plain command is still right for most installs
|
|
29
|
+
container = None
|
|
30
|
+
return f"docker exec -it {container.name} ollama signin" if container else "ollama signin"
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
def unauthorized(model: str, host: str) -> str:
|
|
34
|
+
"""The error for a cloud model that Ollama refused: what it means and the command to run."""
|
|
35
|
+
return (
|
|
36
|
+
f"{model} runs in Ollama's cloud (ollama.com), and this Ollama isn't signed in to an ollama.com account. "
|
|
37
|
+
f"Sign it in with `{signin_command(host)}`, then try again."
|
|
38
|
+
)
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
def notice(model: str) -> str:
|
|
42
|
+
"""What to know when a cloud model is lcode's main model."""
|
|
43
|
+
return (
|
|
44
|
+
f"{model} runs in Ollama's cloud: what lcode sends (your requests and the files it reads) goes to "
|
|
45
|
+
"ollama.com, and Ollama bills it per token."
|
|
46
|
+
)
|
lcode/escalate.py
CHANGED
|
@@ -23,6 +23,7 @@ from rich.panel import Panel
|
|
|
23
23
|
from rich.text import Text
|
|
24
24
|
|
|
25
25
|
from lcode import context as context_tools
|
|
26
|
+
from lcode.cloud import is_cloud
|
|
26
27
|
from lcode.ollama import Ollama, OllamaError, redact
|
|
27
28
|
|
|
28
29
|
if TYPE_CHECKING:
|
|
@@ -76,14 +77,23 @@ class Target:
|
|
|
76
77
|
@property
|
|
77
78
|
def cloud(self) -> bool:
|
|
78
79
|
"""Paid per token: a cloud provider, or an OpenAI-compatible API elsewhere."""
|
|
79
|
-
return
|
|
80
|
+
return (
|
|
81
|
+
self.provider in ("openai", "anthropic", "xai")
|
|
82
|
+
or (self.provider == "custom" and not self.local)
|
|
83
|
+
or (self.provider == "ollama" and is_cloud(self.model)) # an Ollama cloud model runs on ollama.com
|
|
84
|
+
)
|
|
80
85
|
|
|
81
86
|
@property
|
|
82
87
|
def where(self) -> str:
|
|
88
|
+
if self.provider == "ollama" and is_cloud(self.model):
|
|
89
|
+
return "ollama.com, through " + ("this machine's Ollama" if self.local else self._host())
|
|
83
90
|
if self.url:
|
|
84
|
-
return
|
|
91
|
+
return self._host()
|
|
85
92
|
return "this machine"
|
|
86
93
|
|
|
94
|
+
def _host(self) -> str:
|
|
95
|
+
return re.sub(r"^https?://", "", redact(self.url)).split("/")[0]
|
|
96
|
+
|
|
87
97
|
|
|
88
98
|
def target(setting: str | None, url: str | None = None) -> Target | None:
|
|
89
99
|
"""The stronger model from the settings (None: escalation is off). Raises EscalateError for a bad setting."""
|
|
@@ -105,6 +115,8 @@ def target(setting: str | None, url: str | None = None) -> Target | None:
|
|
|
105
115
|
raise EscalateError(f"escalate_model {setting!r} names no model")
|
|
106
116
|
if provider == "custom" and not url:
|
|
107
117
|
raise EscalateError("a custom/… escalate_model needs escalate_url, the server's OpenAI-compatible address")
|
|
118
|
+
if provider == "ollama" and is_cloud(model):
|
|
119
|
+
name = "Ollama cloud"
|
|
108
120
|
return Target(provider, model.strip(), (url or base).rstrip("/"), key_env, f"{model.strip()} ({name})")
|
|
109
121
|
|
|
110
122
|
|
lcode/ollama.py
CHANGED
|
@@ -9,6 +9,8 @@ from urllib.parse import urlsplit, urlunsplit
|
|
|
9
9
|
|
|
10
10
|
import requests
|
|
11
11
|
|
|
12
|
+
from lcode.cloud import is_cloud, unauthorized
|
|
13
|
+
|
|
12
14
|
MIN_VERSION = (0, 30, 0) # first release that runs the Qwen3.5/3.6 hybrid-attention architecture
|
|
13
15
|
|
|
14
16
|
|
|
@@ -49,6 +51,8 @@ class Ollama:
|
|
|
49
51
|
r = requests.post(self._url(path), json=payload, timeout=timeout)
|
|
50
52
|
except requests.RequestException as e:
|
|
51
53
|
raise OllamaError(f"cannot reach Ollama at {redact(self.host)}: {e}") from e
|
|
54
|
+
if r.status_code == 401 and is_cloud(payload.get("model")):
|
|
55
|
+
raise OllamaError(unauthorized(payload["model"], self.host))
|
|
52
56
|
if r.status_code != 200:
|
|
53
57
|
raise OllamaError(f"Ollama {path} failed ({r.status_code}): {r.text[:300]}")
|
|
54
58
|
return r.json()
|
|
@@ -164,6 +168,8 @@ class Ollama:
|
|
|
164
168
|
if on_open:
|
|
165
169
|
on_open(r)
|
|
166
170
|
with r:
|
|
171
|
+
if r.status_code == 401 and is_cloud(payload.get("model")):
|
|
172
|
+
raise OllamaError(unauthorized(payload["model"], self.host))
|
|
167
173
|
if r.status_code != 200:
|
|
168
174
|
raise OllamaError(f"Ollama error {r.status_code}: {r.text[:500]}")
|
|
169
175
|
for line in r.iter_lines():
|
lcode/repeats.py
CHANGED
|
@@ -6,7 +6,8 @@ one exactly: the same tool, the same arguments and the same result. At the `limi
|
|
|
6
6
|
failed: one sooner) the result gets a note that tells the model so, and if it still goes on, lcode ends the
|
|
7
7
|
request.
|
|
8
8
|
|
|
9
|
-
Results that change aren't repeats: a test run again after a fix, a background job read while it runs.
|
|
9
|
+
Results that change aren't repeats: a test run again after a fix, a background job read while it runs. Timings
|
|
10
|
+
don't count as a change, though: `75 passed in 0.12s` and then `in 0.14s` is the same result. And
|
|
10
11
|
a call that may have changed something (a file edit, a shell command that isn't read-only) starts the count
|
|
11
12
|
again for every other call, so checking a build after each edit never adds up. Its own repeats still count:
|
|
12
13
|
running the same failing command over and over is a loop.
|
|
@@ -23,6 +24,9 @@ from dataclasses import dataclass
|
|
|
23
24
|
from lcode.permissions import is_read_only
|
|
24
25
|
|
|
25
26
|
STOP_AFTER_NOTE = 2 # repeats after the note before the request ends
|
|
27
|
+
TIMING = re.compile(
|
|
28
|
+
r"\b\d+(?:\.\d+)?\s?(?:ms|µs|us|s|secs?|seconds?|mins?|minutes?)\b|\b\d{1,2}:\d{2}:\d{2}(?:[.,]\d+)?\b", re.I
|
|
29
|
+
)
|
|
26
30
|
FAILED = ("Error:", "A deny rule", "The user denied", "This needs the user's permission")
|
|
27
31
|
UNCHANGING = frozenset(
|
|
28
32
|
{
|
|
@@ -64,7 +68,7 @@ class Repeats:
|
|
|
64
68
|
"""Count this call and its result."""
|
|
65
69
|
if self.limit <= 0:
|
|
66
70
|
return Verdict(1)
|
|
67
|
-
key = hashlib.sha256(json.dumps([name, args, result], sort_keys=True, default=str).encode()).hexdigest()
|
|
71
|
+
key = hashlib.sha256(json.dumps([name, args, steady(result)], sort_keys=True, default=str).encode()).hexdigest()
|
|
68
72
|
count = self.seen.get(key, 0) + 1
|
|
69
73
|
if changes_things(name, args, result):
|
|
70
74
|
self.seen.clear()
|
|
@@ -95,6 +99,11 @@ class Repeats:
|
|
|
95
99
|
)
|
|
96
100
|
|
|
97
101
|
|
|
102
|
+
def steady(result: str) -> str:
|
|
103
|
+
"""The result without its timings and clock times, which change on every run of the same command."""
|
|
104
|
+
return TIMING.sub("#", result)
|
|
105
|
+
|
|
106
|
+
|
|
98
107
|
def changes_things(name: str, args: dict, result: str) -> bool:
|
|
99
108
|
"""Whether the call may have changed files (or anything else a later call could see)."""
|
|
100
109
|
if name in UNCHANGING:
|
lcode/repl.py
CHANGED
|
@@ -45,6 +45,8 @@ from lcode import memory as memory_notes
|
|
|
45
45
|
from lcode.agent import AUTO_COMPACT_RATIO, INIT_PROMPT, Agent
|
|
46
46
|
from lcode.catalog import MIN_USEFUL_CONTEXT
|
|
47
47
|
from lcode.checkpoints import Checkpoint, CheckpointError, Restore
|
|
48
|
+
from lcode.cloud import is_cloud
|
|
49
|
+
from lcode.cloud import notice as cloud_notice
|
|
48
50
|
from lcode.config import PERMISSION_MODES, STATE_DIR, ConfigError, format_tokens, parse_context
|
|
49
51
|
from lcode.hardware import Hardware
|
|
50
52
|
from lcode.ollama import OllamaError
|
|
@@ -876,6 +878,8 @@ def switch_model(agent: Agent, wanted: str, hardware: Hardware) -> None:
|
|
|
876
878
|
agent._vision = False # the model that looks at images goes with the model: decide again
|
|
877
879
|
agent.messages[0]["content"] = agent.system_prompt()
|
|
878
880
|
c.print(f"[green]Switched to {name}[/] (context {format_tokens(s.context)}).")
|
|
881
|
+
if is_cloud(name):
|
|
882
|
+
agent.say(cloud_notice(name))
|
|
879
883
|
warning = residency.dense_warning(agent.ollama, name, s.context, hardware)
|
|
880
884
|
if warning:
|
|
881
885
|
agent.say(warning, warning=True)
|
|
@@ -1256,6 +1260,8 @@ def repl(agent: Agent, prompt: str | None, hardware: Hardware, cont: bool = Fals
|
|
|
1256
1260
|
run_safely(agent, prompt)
|
|
1257
1261
|
return
|
|
1258
1262
|
banner(agent)
|
|
1263
|
+
if is_cloud(agent.settings.model):
|
|
1264
|
+
agent.say(cloud_notice(agent.settings.model))
|
|
1259
1265
|
warning = residency.dense_warning(agent.ollama, agent.settings.model, agent.settings.context, hardware)
|
|
1260
1266
|
if warning:
|
|
1261
1267
|
agent.say(warning, warning=True)
|
|
@@ -1286,6 +1292,8 @@ def repl(agent: Agent, prompt: str | None, hardware: Hardware, cont: bool = Fals
|
|
|
1286
1292
|
|
|
1287
1293
|
def preload(agent: Agent, session: PromptSession | None = None) -> None:
|
|
1288
1294
|
"""Start loading the model in the background so the first answer comes sooner; the status bar says so."""
|
|
1295
|
+
if is_cloud(agent.settings.model):
|
|
1296
|
+
return # it runs on ollama.com: there's nothing to load here
|
|
1289
1297
|
where = residency.placement(agent.ollama, agent.settings.model)
|
|
1290
1298
|
if where is not None and (not where.context or where.context == agent.settings.context):
|
|
1291
1299
|
return # already in memory
|
lcode/residency.py
CHANGED
|
@@ -15,6 +15,7 @@ import time
|
|
|
15
15
|
from dataclasses import dataclass
|
|
16
16
|
|
|
17
17
|
from lcode import catalog
|
|
18
|
+
from lcode.cloud import is_cloud
|
|
18
19
|
from lcode.ollama import OllamaError
|
|
19
20
|
|
|
20
21
|
GB = 1e9
|
|
@@ -97,6 +98,8 @@ def expected_share(model: str, context: int, hardware) -> float | None:
|
|
|
97
98
|
|
|
98
99
|
def dense_warning(ollama, model: str, context: int, hardware) -> str:
|
|
99
100
|
"""For a dense model that won't fit on the GPU: what that means and what to do. Empty otherwise."""
|
|
101
|
+
if is_cloud(model):
|
|
102
|
+
return "" # it runs on ollama.com
|
|
100
103
|
if hardware is None or hardware.unified or is_moe(ollama, model) is not False:
|
|
101
104
|
return ""
|
|
102
105
|
spec = catalog.find(model)
|
lcode/screenshots.py
CHANGED
|
@@ -6,7 +6,9 @@ returns what the model can't otherwise see: a picture (described by the vision m
|
|
|
6
6
|
|
|
7
7
|
- A Python Qt program (PyQt5/6, PySide2/6) runs on Qt's "offscreen" platform, with a screen of the asked size. A
|
|
8
8
|
small startup hook (a sitecustomize module on PYTHONPATH) waits for the program's event loop, then grabs its
|
|
9
|
-
windows, measures them and their widgets, and quits it.
|
|
9
|
+
windows, measures them and their widgets, and quits it. First it can take `actions`, the way a user would: click
|
|
10
|
+
or double-click a point or a widget by its text, press a key, type, wait. Bugs that only show after a click need
|
|
11
|
+
that, and Qt's warnings (in what the program printed) often name the cause.
|
|
10
12
|
- Other desktop programs run on a virtual X display (Xvfb, Linux), captured with ImageMagick's `import` or `xwd`.
|
|
11
13
|
The Qt hook still measures a Python Qt program there.
|
|
12
14
|
- A web page, or a local server started with `command`, opens in headless Chrome (or Chromium, Edge), driven
|
|
@@ -43,6 +45,14 @@ from pathlib import Path
|
|
|
43
45
|
DEFAULT_SCREEN = (1920, 1080)
|
|
44
46
|
DEFAULT_WAIT = 3 # seconds for a program or page to start and draw
|
|
45
47
|
MAX_WAIT = 60
|
|
48
|
+
MAX_ACTIONS = 20
|
|
49
|
+
ACTION_PAUSE = 0.4 # seconds after each action, for the program to react and redraw
|
|
50
|
+
MOUSE_ACTIONS = ("click", "double_click", "right_click")
|
|
51
|
+
KEY_NAMES = {"enter": "Return", "return": "Return", "esc": "Escape", "escape": "Escape", "space": "Space",
|
|
52
|
+
"tab": "Tab", "backspace": "Backspace", "delete": "Delete", "del": "Delete", "home": "Home", "end": "End",
|
|
53
|
+
"pageup": "PageUp", "pagedown": "PageDown", "up": "Up", "down": "Down", "left": "Left",
|
|
54
|
+
"right": "Right"} # fmt: skip
|
|
55
|
+
MODIFIERS = ("ctrl", "shift", "alt", "meta")
|
|
46
56
|
SERVER_TIMEOUT = 60 # seconds for a server started with `command` to answer at `url`
|
|
47
57
|
GRACE = 25 # seconds beyond `wait` before a program that never showed a window is stopped
|
|
48
58
|
QT_BINDINGS = ("PyQt6", "PyQt5", "PySide6", "PySide2")
|
|
@@ -169,15 +179,19 @@ def _lcode_shot():
|
|
|
169
179
|
out = _os.environ.get("LCODE_SHOT_OUT")
|
|
170
180
|
wait_ms = int(float(_os.environ.get("LCODE_SHOT_WAIT", "3")) * 1000)
|
|
171
181
|
quit_after = _os.environ.get("LCODE_SHOT_QUIT", "1") == "1"
|
|
182
|
+
actions = json.loads(_os.environ.get("LCODE_SHOT_ACTIONS") or "[]")
|
|
183
|
+
pause_ms = int(float(_os.environ.get("LCODE_SHOT_PAUSE", "0.4")) * 1000)
|
|
172
184
|
bindings = ("PyQt6", "PyQt5", "PySide6", "PySide2")
|
|
173
185
|
state = {"scheduled": False}
|
|
174
186
|
|
|
175
|
-
def capture(binding):
|
|
187
|
+
def capture(binding, steps=None):
|
|
176
188
|
QtCore = _sys.modules[binding + ".QtCore"]
|
|
177
189
|
QtGui = _sys.modules[binding + ".QtGui"]
|
|
178
190
|
QtWidgets = _sys.modules.get(binding + ".QtWidgets")
|
|
179
191
|
app = QtGui.QGuiApplication.instance()
|
|
180
192
|
result = {"binding": binding, "windows": [], "screen": None, "platform": app.platformName()}
|
|
193
|
+
if steps is not None:
|
|
194
|
+
result["actions"] = steps
|
|
181
195
|
screen = app.primaryScreen()
|
|
182
196
|
if screen is not None:
|
|
183
197
|
g, a = screen.geometry(), screen.availableGeometry()
|
|
@@ -257,6 +271,100 @@ def _lcode_shot():
|
|
|
257
271
|
app.quit()
|
|
258
272
|
QtCore.QTimer.singleShot(3000, lambda: _os._exit(0))
|
|
259
273
|
|
|
274
|
+
def text_of(widget):
|
|
275
|
+
for getter in ("text", "windowTitle", "title", "placeholderText"):
|
|
276
|
+
fn = getattr(widget, getter, None)
|
|
277
|
+
if callable(fn):
|
|
278
|
+
try:
|
|
279
|
+
text = str(fn() or "")
|
|
280
|
+
except Exception:
|
|
281
|
+
text = ""
|
|
282
|
+
if text:
|
|
283
|
+
return text
|
|
284
|
+
return ""
|
|
285
|
+
|
|
286
|
+
def act(binding, then):
|
|
287
|
+
"""Take the steps one by one, pausing after each so the program reacts, then call then(log)."""
|
|
288
|
+
QtCore = _sys.modules[binding + ".QtCore"]
|
|
289
|
+
QtWidgets = _sys.modules[binding + ".QtWidgets"]
|
|
290
|
+
Qt = QtCore.Qt
|
|
291
|
+
try:
|
|
292
|
+
QTest = importlib.import_module(binding + ".QtTest").QTest
|
|
293
|
+
except Exception as e:
|
|
294
|
+
then([{"step": s["raw"], "error": "Qt's QtTest module isn't available (%s)" % e} for s in actions])
|
|
295
|
+
return
|
|
296
|
+
app = QtWidgets.QApplication.instance()
|
|
297
|
+
|
|
298
|
+
def enum(group, name): # scoped enums (PyQt6, PySide6), or flat ones (PyQt5, PySide2)
|
|
299
|
+
scope = getattr(Qt, group, None)
|
|
300
|
+
if scope is not None and hasattr(scope, name):
|
|
301
|
+
return getattr(scope, name)
|
|
302
|
+
return getattr(Qt, name)
|
|
303
|
+
|
|
304
|
+
def window():
|
|
305
|
+
tops = [w for w in app.topLevelWidgets() if w.isVisible() and w.width() > 1 and w.height() > 1]
|
|
306
|
+
active = app.activeWindow()
|
|
307
|
+
return active if active in tops else (tops[0] if tops else None)
|
|
308
|
+
|
|
309
|
+
def describe(widget):
|
|
310
|
+
text = text_of(widget)[:40]
|
|
311
|
+
return type(widget).__name__ + (' "%s"' % text if text else "")
|
|
312
|
+
|
|
313
|
+
def by_text(top, wanted):
|
|
314
|
+
wanted = wanted.casefold()
|
|
315
|
+
found = [c for c in top.findChildren(QtWidgets.QWidget)
|
|
316
|
+
if c.isVisible() and wanted in text_of(c).casefold()] # fmt: skip
|
|
317
|
+
return min(found, key=lambda c: c.width() * c.height()) if found else None
|
|
318
|
+
|
|
319
|
+
log = []
|
|
320
|
+
|
|
321
|
+
def step(i):
|
|
322
|
+
if i >= len(actions):
|
|
323
|
+
then(log)
|
|
324
|
+
return
|
|
325
|
+
s, note, pause = actions[i], {"step": actions[i]["raw"]}, pause_ms
|
|
326
|
+
try:
|
|
327
|
+
top = window()
|
|
328
|
+
if s["do"] == "wait":
|
|
329
|
+
pause = int(s["seconds"] * 1000)
|
|
330
|
+
elif top is None:
|
|
331
|
+
note["error"] = "no window to act on"
|
|
332
|
+
elif s["do"] in ("click", "double_click", "right_click"):
|
|
333
|
+
if "text" in s:
|
|
334
|
+
target = by_text(top, s["text"])
|
|
335
|
+
pos = target.rect().center() if target is not None else None
|
|
336
|
+
else:
|
|
337
|
+
point = QtCore.QPoint(s["x"], s["y"])
|
|
338
|
+
target = top.childAt(point) or top
|
|
339
|
+
pos = target.mapFrom(top, point)
|
|
340
|
+
if target is None:
|
|
341
|
+
note["error"] = 'no visible widget shows "%s"' % s["text"]
|
|
342
|
+
else:
|
|
343
|
+
button = enum("MouseButton", "RightButton" if s["do"] == "right_click" else "LeftButton")
|
|
344
|
+
none = enum("KeyboardModifier", "NoModifier")
|
|
345
|
+
at = target.mapTo(top, pos) # before the click moves things around
|
|
346
|
+
note["target"] = "%s at (%d, %d)" % (describe(target), at.x(), at.y())
|
|
347
|
+
click = QTest.mouseDClick if s["do"] == "double_click" else QTest.mouseClick
|
|
348
|
+
click(target, button, none, pos)
|
|
349
|
+
else:
|
|
350
|
+
target = app.focusWidget() or top
|
|
351
|
+
if s["do"] == "key":
|
|
352
|
+
mods = enum("KeyboardModifier", "NoModifier")
|
|
353
|
+
names = {"ctrl": "ControlModifier", "shift": "ShiftModifier", "alt": "AltModifier",
|
|
354
|
+
"meta": "MetaModifier"} # fmt: skip
|
|
355
|
+
for m in s["mods"]:
|
|
356
|
+
mods = mods | enum("KeyboardModifier", names[m])
|
|
357
|
+
QTest.keyClick(target, enum("Key", "Key_" + s["key"]), mods)
|
|
358
|
+
else:
|
|
359
|
+
QTest.keyClicks(target, s["text"])
|
|
360
|
+
note["target"] = describe(target)
|
|
361
|
+
except Exception as e: # one step failing doesn't stop the picture
|
|
362
|
+
note["error"] = "%s: %s" % (type(e).__name__, e)
|
|
363
|
+
log.append(note)
|
|
364
|
+
QtCore.QTimer.singleShot(pause, lambda: step(i + 1))
|
|
365
|
+
|
|
366
|
+
step(0)
|
|
367
|
+
|
|
260
368
|
def patch(binding):
|
|
261
369
|
"""Wrap exec() of the application classes loaded so far (QtWidgets may come after QtGui)."""
|
|
262
370
|
QtCore = _sys.modules.get(binding + ".QtCore")
|
|
@@ -275,14 +383,23 @@ def _lcode_shot():
|
|
|
275
383
|
state["scheduled"] = True
|
|
276
384
|
open(_os.path.join(out, "started"), "w").close() # the event loop runs: a capture is coming
|
|
277
385
|
|
|
278
|
-
def run():
|
|
386
|
+
def run(steps=None):
|
|
279
387
|
try:
|
|
280
|
-
capture(binding)
|
|
388
|
+
capture(binding, steps)
|
|
281
389
|
except Exception as e: # the program goes on; lcode reports what went wrong
|
|
282
390
|
with open(_os.path.join(out, "qt.json"), "w") as f:
|
|
283
391
|
json.dump({"error": "%s: %s" % (type(e).__name__, e)}, f)
|
|
284
392
|
|
|
285
|
-
|
|
393
|
+
def start():
|
|
394
|
+
if not actions:
|
|
395
|
+
run()
|
|
396
|
+
return
|
|
397
|
+
try:
|
|
398
|
+
act(binding, run)
|
|
399
|
+
except Exception as e:
|
|
400
|
+
run([{"step": "actions", "error": "%s: %s" % (type(e).__name__, e)}])
|
|
401
|
+
|
|
402
|
+
QtCore.QTimer.singleShot(wait_ms, start)
|
|
286
403
|
|
|
287
404
|
class Wrapped:
|
|
288
405
|
"""In place of exec(): schedules the capture, then runs the original, static or not."""
|
|
@@ -372,6 +489,69 @@ def hook_dir(tmp: Path) -> Path:
|
|
|
372
489
|
# --------------------------------------------------------------------------------------------- running a program
|
|
373
490
|
|
|
374
491
|
|
|
492
|
+
def parse_actions(actions) -> list[dict]:
|
|
493
|
+
"""The steps to take before the picture, from the tool's `actions` (a list, or one string split on ; and lines).
|
|
494
|
+
|
|
495
|
+
`click X,Y`, `double_click X,Y`, `right_click X,Y` (a point in the window), or the same with a widget's text
|
|
496
|
+
(`double_click "Camera 1"`); `key Escape` or `key ctrl+s`; `type some text`; `wait 2` (seconds).
|
|
497
|
+
"""
|
|
498
|
+
if not actions:
|
|
499
|
+
return []
|
|
500
|
+
if isinstance(actions, str):
|
|
501
|
+
actions = [part for line in actions.splitlines() for part in line.split(";")]
|
|
502
|
+
steps = []
|
|
503
|
+
for raw in actions:
|
|
504
|
+
raw = str(raw).strip()
|
|
505
|
+
if not raw:
|
|
506
|
+
continue
|
|
507
|
+
verb, _, rest = raw.partition(" ")
|
|
508
|
+
verb, rest = verb.lower().replace("-", "_"), rest.strip()
|
|
509
|
+
if verb == "doubleclick":
|
|
510
|
+
verb = "double_click"
|
|
511
|
+
step: dict = {"do": verb, "raw": raw}
|
|
512
|
+
if verb in MOUSE_ACTIONS:
|
|
513
|
+
point = re.fullmatch(r"\(?\s*(-?\d+)\s*[, ]\s*(-?\d+)\s*\)?", rest)
|
|
514
|
+
if point:
|
|
515
|
+
step["x"], step["y"] = int(point.group(1)), int(point.group(2))
|
|
516
|
+
elif rest.strip("\"'"):
|
|
517
|
+
step["text"] = rest.strip("\"'")
|
|
518
|
+
else:
|
|
519
|
+
raise ShotError(f"{raw!r}: say where, as X,Y in the window or the widget's text, e.g. {verb} 200,150")
|
|
520
|
+
elif verb == "key":
|
|
521
|
+
parts = [p for p in re.split(r"[+\s]+", rest.lower()) if p]
|
|
522
|
+
if not parts:
|
|
523
|
+
raise ShotError(f"{raw!r}: name the key, e.g. key Escape or key ctrl+s")
|
|
524
|
+
*mods, key = parts
|
|
525
|
+
if any(m not in MODIFIERS for m in mods):
|
|
526
|
+
raise ShotError(f"{raw!r}: modifiers are {', '.join(MODIFIERS)}")
|
|
527
|
+
if key in KEY_NAMES:
|
|
528
|
+
key = KEY_NAMES[key]
|
|
529
|
+
elif re.fullmatch(r"f([1-9]|1[0-2])", key) or (len(key) == 1 and key.isalnum()):
|
|
530
|
+
key = key.upper()
|
|
531
|
+
else:
|
|
532
|
+
raise ShotError(f"{raw!r}: unknown key {key!r} (Escape, Return, Tab, Space, arrows, F1-F12, a letter)")
|
|
533
|
+
step["key"], step["mods"] = key, mods
|
|
534
|
+
elif verb == "type":
|
|
535
|
+
if not rest:
|
|
536
|
+
raise ShotError(f"{raw!r}: give the text to type")
|
|
537
|
+
step["text"] = rest
|
|
538
|
+
elif verb == "wait":
|
|
539
|
+
try:
|
|
540
|
+
step["seconds"] = max(0.0, min(float(rest or 1), 10.0))
|
|
541
|
+
except ValueError as e:
|
|
542
|
+
raise ShotError(f"{raw!r}: wait takes seconds, e.g. wait 2") from e
|
|
543
|
+
else:
|
|
544
|
+
raise ShotError(f"{raw!r}: actions are click, double_click, right_click, key, type and wait")
|
|
545
|
+
steps.append(step)
|
|
546
|
+
if len(steps) > MAX_ACTIONS:
|
|
547
|
+
raise ShotError(f"at most {MAX_ACTIONS} actions in one screenshot")
|
|
548
|
+
return steps
|
|
549
|
+
|
|
550
|
+
|
|
551
|
+
def actions_time(steps: list[dict]) -> float:
|
|
552
|
+
return sum(s.get("seconds", 0) for s in steps) + ACTION_PAUSE * len(steps)
|
|
553
|
+
|
|
554
|
+
|
|
375
555
|
def run_program(command: str, cwd: Path, env: dict[str, str], log: Path) -> subprocess.Popen:
|
|
376
556
|
out = log.open("wb")
|
|
377
557
|
try:
|
|
@@ -405,6 +585,27 @@ def stop(proc: subprocess.Popen | None) -> None:
|
|
|
405
585
|
proc.wait(timeout=3)
|
|
406
586
|
|
|
407
587
|
|
|
588
|
+
QT_WARNING = re.compile(r"^(?:Q[A-Za-z0-9]+::\w+|qt\.[\w.]+:|QML |Qt[: ])")
|
|
589
|
+
NOT_A_PROBLEM = re.compile(
|
|
590
|
+
r"propagateSizeHints|QFont::|This plugin does not support|qt\.qpa\.fonts"
|
|
591
|
+
) # offscreen platform noise
|
|
592
|
+
MAX_WARNINGS = 6
|
|
593
|
+
|
|
594
|
+
|
|
595
|
+
def qt_warnings(log: Path) -> list[str]:
|
|
596
|
+
"""Qt's own warnings in everything the program printed (not just the end that's shown), without repeats."""
|
|
597
|
+
try:
|
|
598
|
+
text = log.read_bytes().decode(errors="replace")
|
|
599
|
+
except OSError:
|
|
600
|
+
return []
|
|
601
|
+
found: list[str] = []
|
|
602
|
+
for line in text.splitlines():
|
|
603
|
+
line = line.strip()
|
|
604
|
+
if QT_WARNING.match(line) and not NOT_A_PROBLEM.search(line) and line[:300] not in found:
|
|
605
|
+
found.append(line[:300])
|
|
606
|
+
return found[:MAX_WARNINGS]
|
|
607
|
+
|
|
608
|
+
|
|
408
609
|
def printed(log: Path) -> str:
|
|
409
610
|
try:
|
|
410
611
|
text = log.read_bytes().decode(errors="replace")
|
|
@@ -423,7 +624,9 @@ def base_env(hook: Path) -> dict[str, str]:
|
|
|
423
624
|
return env
|
|
424
625
|
|
|
425
626
|
|
|
426
|
-
def qt_offscreen(
|
|
627
|
+
def qt_offscreen(
|
|
628
|
+
command: str, cwd: Path, screen: tuple[int, int], wait: int, tmp: Path, cancel=None, actions: list | None = None
|
|
629
|
+
) -> Shot:
|
|
427
630
|
"""Run a Python Qt program on Qt's offscreen platform and capture its windows."""
|
|
428
631
|
config = tmp / "screens.json"
|
|
429
632
|
w, h = screen
|
|
@@ -453,12 +656,14 @@ def qt_offscreen(command: str, cwd: Path, screen: tuple[int, int], wait: int, tm
|
|
|
453
656
|
LCODE_SHOT_OUT=str(out),
|
|
454
657
|
LCODE_SHOT_WAIT=str(wait),
|
|
455
658
|
LCODE_SHOT_QUIT="1",
|
|
659
|
+
LCODE_SHOT_ACTIONS=json.dumps(actions or []),
|
|
660
|
+
LCODE_SHOT_PAUSE=str(ACTION_PAUSE),
|
|
456
661
|
)
|
|
457
662
|
env.pop("DISPLAY", None)
|
|
458
663
|
log = tmp / "output.txt"
|
|
459
664
|
proc = run_program(command, cwd, env, log)
|
|
460
665
|
try:
|
|
461
|
-
deadline = time.time() + wait + GRACE
|
|
666
|
+
deadline = time.time() + wait + actions_time(actions or []) + GRACE
|
|
462
667
|
while time.time() < deadline and proc.poll() is None and not (out / "qt.json").exists():
|
|
463
668
|
if cancel is not None and cancel():
|
|
464
669
|
raise KeyboardInterrupt
|
|
@@ -482,6 +687,9 @@ def qt_offscreen(command: str, cwd: Path, screen: tuple[int, int], wait: int, tm
|
|
|
482
687
|
if image is None and not windows:
|
|
483
688
|
raise ShotError("the program started Qt but showed no window")
|
|
484
689
|
report = qt_report(data)
|
|
690
|
+
warnings = qt_warnings(log)
|
|
691
|
+
if warnings:
|
|
692
|
+
report[:0] = ["Qt printed warnings (they often name the cause):", *[f"- {line}" for line in warnings]]
|
|
485
693
|
if shot_screen != screen: # Qt 5's offscreen platform has a fixed screen
|
|
486
694
|
report.append(
|
|
487
695
|
f"(Qt used a {shot_screen[0]}x{shot_screen[1]} screen offscreen, not the {screen[0]}x{screen[1]} asked "
|
|
@@ -509,8 +717,17 @@ def qt_report(data: dict) -> list[str]:
|
|
|
509
717
|
screen = data.get("screen") or [0, 0]
|
|
510
718
|
sw, sh = screen
|
|
511
719
|
windows = data.get("windows") or []
|
|
720
|
+
if data.get("actions"):
|
|
721
|
+
lines.append("Steps, before the picture:")
|
|
722
|
+
for note in data["actions"]:
|
|
723
|
+
done = (
|
|
724
|
+
f"couldn't: {note['error']}"
|
|
725
|
+
if note.get("error")
|
|
726
|
+
else (f"on {note['target']}" if note.get("target") else "done")
|
|
727
|
+
)
|
|
728
|
+
lines.append(f"- {note['step']}: {done}")
|
|
512
729
|
if not windows:
|
|
513
|
-
return ["No visible Qt window."]
|
|
730
|
+
return [*lines, "No visible Qt window."]
|
|
514
731
|
for win in windows:
|
|
515
732
|
title = f'"{win["title"]}" ' if win.get("title") else ""
|
|
516
733
|
x, y, w, h = win["x"], win["y"], win["width"], win["height"]
|
|
@@ -1059,12 +1276,15 @@ def take(
|
|
|
1059
1276
|
full_page: bool = False,
|
|
1060
1277
|
mode: str = "auto",
|
|
1061
1278
|
cancel=None,
|
|
1279
|
+
actions: list | None = None,
|
|
1062
1280
|
) -> Shot:
|
|
1063
|
-
"""Take the screenshot. `cancel` is checked while waiting (return True to stop)."""
|
|
1281
|
+
"""Take the screenshot. `cancel` is checked while waiting (return True to stop); `actions` come first."""
|
|
1064
1282
|
wait = max(0, min(int(wait), MAX_WAIT))
|
|
1065
1283
|
path = new_path(folder, label_for(command, url))
|
|
1066
1284
|
with tempfile.TemporaryDirectory(prefix="lcode-shot-") as name:
|
|
1067
1285
|
tmp = Path(name)
|
|
1286
|
+
if actions and url:
|
|
1287
|
+
raise ShotError("actions work for Python Qt programs (PyQt, PySide), not web pages yet")
|
|
1068
1288
|
if url:
|
|
1069
1289
|
url = normalize_url(url, cwd)
|
|
1070
1290
|
server = None
|
|
@@ -1086,7 +1306,14 @@ def take(
|
|
|
1086
1306
|
raise ShotError("give a command that starts the program, or a url")
|
|
1087
1307
|
if mode == "auto":
|
|
1088
1308
|
mode = "qt" if looks_like_qt(command, cwd) or not xvfb_available() else "xvfb"
|
|
1089
|
-
|
|
1309
|
+
if actions and mode != "qt":
|
|
1310
|
+
raise ShotError(
|
|
1311
|
+
"actions work for Python Qt programs (PyQt, PySide) only: take this one's screenshot without them"
|
|
1312
|
+
)
|
|
1313
|
+
if mode == "qt":
|
|
1314
|
+
shot = qt_offscreen(command, cwd, screen, wait, tmp, cancel, actions)
|
|
1315
|
+
else:
|
|
1316
|
+
shot = virtual_display(command, cwd, screen, wait, tmp, cancel)
|
|
1090
1317
|
shutil.copyfile(shot.image, path)
|
|
1091
1318
|
kept = []
|
|
1092
1319
|
for i, window in enumerate(shot.windows):
|
lcode/tools.py
CHANGED
|
@@ -192,7 +192,8 @@ SCHEMAS = [
|
|
|
192
192
|
"widgets (Qt) or of the page, and the browser's console errors. Use it to check GUI and layout work instead "
|
|
193
193
|
"of guessing. Python Qt programs run offscreen; other desktop programs on a virtual display (Linux); web pages "
|
|
194
194
|
"in a headless browser. For a web app, give the command that starts its server and the url (lcode starts and "
|
|
195
|
-
"stops it); if a server is already running, or for an .html file, give only the url."
|
|
195
|
+
"stops it); if a server is already running, or for an .html file, give only the url. For something that "
|
|
196
|
+
"only shows after a click or a key (a Python Qt program), give `actions`: they run first, then the picture.",
|
|
196
197
|
{
|
|
197
198
|
"command": {"type": "string", "description": "Command that starts the program, or the web server"},
|
|
198
199
|
"url": {"type": "string", "description": "Page to open: a URL, localhost:PORT/path or an .html file"},
|
|
@@ -203,6 +204,14 @@ SCHEMAS = [
|
|
|
203
204
|
"screen": {"type": "string", "description": "Screen (or browser window) size, WxH (default 1920x1080)"},
|
|
204
205
|
"wait": {"type": "integer", "description": "Seconds to let it start and draw first (default 3)"},
|
|
205
206
|
"full_page": {"type": "boolean", "description": "Web pages: the whole page, not just the window"},
|
|
207
|
+
"actions": {
|
|
208
|
+
"type": "array",
|
|
209
|
+
"items": {"type": "string"},
|
|
210
|
+
"description": "Python Qt programs: steps to take before the picture, as a user would: "
|
|
211
|
+
'"click X,Y", "double_click X,Y", "right_click X,Y" (a point in the window, as the sizes show), '
|
|
212
|
+
'or with the widget\'s text: "double_click Camera 1"; "key Escape", "key ctrl+s"; "type some text"; '
|
|
213
|
+
'"wait 2". The result says what each step hit.',
|
|
214
|
+
},
|
|
206
215
|
"mode": {
|
|
207
216
|
"type": "string",
|
|
208
217
|
"enum": ["auto", "qt", "xvfb"],
|
|
@@ -698,6 +707,7 @@ class Toolbox:
|
|
|
698
707
|
wait: int = screenshots.DEFAULT_WAIT,
|
|
699
708
|
full_page: bool = False,
|
|
700
709
|
mode: str = "auto",
|
|
710
|
+
actions: list | str | None = None,
|
|
701
711
|
) -> str:
|
|
702
712
|
command, url = (command or "").strip(), (url or "").strip()
|
|
703
713
|
if not command and not url:
|
|
@@ -708,6 +718,7 @@ class Toolbox:
|
|
|
708
718
|
size = screenshots.parse_screen(screen)
|
|
709
719
|
if url:
|
|
710
720
|
url = screenshots.normalize_url(url, self.agent.cwd)
|
|
721
|
+
steps = screenshots.parse_actions(actions)
|
|
711
722
|
except screenshots.ShotError as e:
|
|
712
723
|
raise ToolError(str(e)) from e
|
|
713
724
|
if command:
|
|
@@ -748,6 +759,7 @@ class Toolbox:
|
|
|
748
759
|
full_page=full_page,
|
|
749
760
|
mode=mode,
|
|
750
761
|
cancel=cancelled,
|
|
762
|
+
actions=steps,
|
|
751
763
|
)
|
|
752
764
|
except screenshots.ShotError as e:
|
|
753
765
|
raise ToolError(f"no screenshot: {e}") from e
|
|
@@ -762,6 +774,8 @@ class Toolbox:
|
|
|
762
774
|
lines.append(f"What the {'server' if url else 'program'} printed:\n{shot.output}")
|
|
763
775
|
if self.agent.vision_model():
|
|
764
776
|
what = f"the page {url}" if url else f"the program `{command}` on a {w}x{h} screen"
|
|
777
|
+
if steps:
|
|
778
|
+
what += ", after these steps: " + "; ".join(s["raw"] for s in steps)
|
|
765
779
|
ask = f"This is a screenshot of {what}." + (f" {question.strip()}" if question.strip() else "")
|
|
766
780
|
try:
|
|
767
781
|
seen = self.agent.look(shot.image, ask)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: lcode-cli
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.38.0
|
|
4
4
|
Summary: A local-first terminal coding agent powered by open-weight models on your own GPU or Mac, via Ollama.
|
|
5
5
|
Project-URL: Homepage, https://nasser1941.github.io/lcode/
|
|
6
6
|
Project-URL: Documentation, https://nasser1941.github.io/lcode/
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
lcode/__init__.py,sha256=
|
|
1
|
+
lcode/__init__.py,sha256=TsW2cvGFfg21bkCrYKlSelvpwqk5kcoGy9fkV40Sr0Q,473
|
|
2
2
|
lcode/__main__.py,sha256=s5N5pryX2FAu93GGZ3FxUrIXHWGzxz66lKUoaV_h8Ws,35
|
|
3
3
|
lcode/acp.py,sha256=d97VV3sbqXdWKhPQQNbYRaDTm8WrUk0mGbDLiOyX7jE,29058
|
|
4
4
|
lcode/action.py,sha256=wuT5F9EJCdEligPeytzmEi8FpahWBhXer528tpuTj_k,16711
|
|
5
|
-
lcode/agent.py,sha256=
|
|
5
|
+
lcode/agent.py,sha256=4vujxmltW3OdDIoQeJXZ74NV6bgyfN0_9s7VO257jZg,86511
|
|
6
6
|
lcode/api.py,sha256=mIfmiN3jDv8jg-HOJtqfr-MQ3cOI8nfFmlYYRZR1r1Y,16164
|
|
7
7
|
lcode/backends.py,sha256=343alwyDZin-bEhb5-Es4f8ek1oBQUzEvV6RFWR1VZo,21160
|
|
8
8
|
lcode/bench.py,sha256=HxeUfy9Kv_0Rug1HAlDLyHYfYd9dw2bMgbXsvUy9nd4,43096
|
|
@@ -10,13 +10,14 @@ lcode/bench_backend.py,sha256=X2fo-zRX92Xp3KMxSsFlWioc2vRupBTtowj5kLME8mw,14287
|
|
|
10
10
|
lcode/bench_runtime.py,sha256=EjzNgIvUkdbT8cbSy1TpmlyeIk6e-ipjlDFpM7Dnqx0,6835
|
|
11
11
|
lcode/catalog.py,sha256=pZ1azX9OH2r4JE2c6E5OfwywpgS39-W2oXzoCHJhmtM,4141
|
|
12
12
|
lcode/checkpoints.py,sha256=eqPtmPe44-aweWqc2H21ROogwzIt3NpvcUobsaCHoGY,18354
|
|
13
|
-
lcode/checks.py,sha256=
|
|
14
|
-
lcode/cli.py,sha256=
|
|
13
|
+
lcode/checks.py,sha256=haYYIPhadKavGYEhh8YWAaWrPMcfzrpT2i6638f4xjQ,12933
|
|
14
|
+
lcode/cli.py,sha256=mJBM3Loqs9kOE94IRe00d1A1izW5caAjSR7ITUxC27I,45042
|
|
15
15
|
lcode/clipboard.py,sha256=nTSdJyCXPdtjH947RjvB3QvRqnL5HZsS9KB8EkC42cc,5138
|
|
16
|
+
lcode/cloud.py,sha256=q5Dl5GuqWvKzBCIso-eh6yomvEOsnQ0LW8ZgaAGwBxc,2131
|
|
16
17
|
lcode/codesearch.py,sha256=Io8leN1nb_Y-Dvlm9xaGtwUWYXX-ooswuznJV6dGU1s,10766
|
|
17
18
|
lcode/config.py,sha256=hAjuHg7plRxwFgdD4gOGnDH8-FwyT7NRV0YI5grd0qE,12604
|
|
18
19
|
lcode/context.py,sha256=wgK16ZcNNnq4ngHx0EmtyKHDFTImciGEmtC5NP8tKJQ,20435
|
|
19
|
-
lcode/escalate.py,sha256=
|
|
20
|
+
lcode/escalate.py,sha256=f-_6_moPaHi2kLuJw2JtkzvTkCl6DoBQgYBOCYLhunM,15120
|
|
20
21
|
lcode/extensions.py,sha256=W0HFDl0BvROzr7i_qtabHdIbacBgP5o5qIJLzoM2oNE,16806
|
|
21
22
|
lcode/frontmatter.py,sha256=Bx0n4vLPhp7ZCWx-g7xqzqNy5VoKBxyeeikh5UFB_gA,2441
|
|
22
23
|
lcode/gitflow.py,sha256=6j_nnCBZXkX1qhTI7K4CyZ5D0NAZLpH96weFEo64AkQ,27913
|
|
@@ -29,22 +30,22 @@ lcode/matching.py,sha256=2N3_qwKJ5gd8el2m_y_egKkFM9rsF1eUhYJcRCVIp98,14015
|
|
|
29
30
|
lcode/memory.py,sha256=WZEHTp-lVxAwS-yyLQR2xB3TMZ9sejmX2Ivg7T-tl3w,21949
|
|
30
31
|
lcode/models.toml,sha256=lt2G64zzo_Ryxv2ISRSNZoVD_JqCqYqsM01n8WoXGs8,4098
|
|
31
32
|
lcode/notify.py,sha256=uieDeXe7XwuVHjOk4tqVyZEW_85XWkoWQmFOWEf77oc,1538
|
|
32
|
-
lcode/ollama.py,sha256=
|
|
33
|
+
lcode/ollama.py,sha256=xFHU2XW47ANJ34-1aeSMQVj28GhqcWiFi6zASH9FiYY,8053
|
|
33
34
|
lcode/permissions.py,sha256=q7CjDsc_Xrblw7t3_BbxA5LUjxFSswGs1RiJmtMi0po,12288
|
|
34
35
|
lcode/planning.py,sha256=Q2upaoZPnXDMQT2F-ETxX1lk_wDntTzhSKNVYIQSoQA,6540
|
|
35
36
|
lcode/render.py,sha256=gMvf4W3qkLUJ4Vot3az_hP_zRDAItJC9pP-68dHFkfA,1375
|
|
36
|
-
lcode/repeats.py,sha256=
|
|
37
|
-
lcode/repl.py,sha256=
|
|
37
|
+
lcode/repeats.py,sha256=OTrPdb6BKArDLQEgHaXmJZ-tIFsY_1bk4P0wzzANKLY,5964
|
|
38
|
+
lcode/repl.py,sha256=elnJeSQYt0oEtE14UzW2k-fkDHVFr_Lf2L6XWFo0ne0,56891
|
|
38
39
|
lcode/repomap.py,sha256=1GRJgEUjBl9XHSXsF7tSGXBCEgsY-3CzwMohaTudZ_M,13969
|
|
39
|
-
lcode/residency.py,sha256=
|
|
40
|
+
lcode/residency.py,sha256=B9pwqG6yx5aQD2M5xyQ-bMnYmhD7fv3wCVw_X6VIeAo,7012
|
|
40
41
|
lcode/review.py,sha256=0QBIS-R1B2b3zqx5TcC1qZptpKBbrDhYvMKSNCaDAUo,4686
|
|
41
42
|
lcode/sandbox.py,sha256=u_pkrVRXhCGhh-wFDPwuZ3jGG7UeXxXRAeBNsm37ZvE,8608
|
|
42
|
-
lcode/screenshots.py,sha256=
|
|
43
|
+
lcode/screenshots.py,sha256=pmrw_tp8eXzNyCZa5uot5rTgsxqsi3AdmkGn-XF9saY,57056
|
|
43
44
|
lcode/secretscan.py,sha256=6Euvfk2gCtK7lZbuQD84zgWuSECi6OnSw8V5rFu1tfU,13575
|
|
44
45
|
lcode/sessions.py,sha256=ojkpP453JyIll8_iFeJgW4BG4Zz2FKMRsLiij6spiTo,4185
|
|
45
46
|
lcode/steer.py,sha256=0vaqLxgRKgC0yGp8xoQfV1f9VEOzH3U4rCIb74eFnZ8,12127
|
|
46
47
|
lcode/subagents.py,sha256=thR2ZzFZ1DeoAf0Ctr_oeKjYajhvd3uRs2kGdw6LlJM,29349
|
|
47
|
-
lcode/tools.py,sha256=
|
|
48
|
+
lcode/tools.py,sha256=lpCIlaabydbmutaXWuOZWS4X-Z_7aIsyNUQdHJzkSC4,68902
|
|
48
49
|
lcode/unreachable.py,sha256=TXrv41ljwX_amxdcf4CY6qGF2YkWetORvPUSvwceJXI,8685
|
|
49
50
|
lcode/update.py,sha256=i92bnW252VneYh0vD6djxmXsDOa5MXP20bjlLZUue_c,25236
|
|
50
51
|
lcode/vision.py,sha256=w33QPmdGwP33wM4mvmAH4amFDZ1xzeXhEsSLJ-STSHY,4243
|
|
@@ -65,8 +66,8 @@ lcode/servers/__init__.py,sha256=qrIhxEodEB8cjKEQ4Cicc0GsQhE2OH-9qlVHzr3-tq8,77
|
|
|
65
66
|
lcode/servers/encord.py,sha256=WSauawL1UKYZCUAG1oalcKL_An3DVof-JM6xIgFyQSE,12769
|
|
66
67
|
lcode/servers/valohai.py,sha256=e5xZGIoa4cja4f5i85q1GpL9c7cglUjV8jN2co1CFMY,14430
|
|
67
68
|
lcode/servers/xai.py,sha256=h2emAvHSnkuB9WmJInlynsDhvxJwNVD2AHFX7vqMXNc,13627
|
|
68
|
-
lcode_cli-0.
|
|
69
|
-
lcode_cli-0.
|
|
70
|
-
lcode_cli-0.
|
|
71
|
-
lcode_cli-0.
|
|
72
|
-
lcode_cli-0.
|
|
69
|
+
lcode_cli-0.38.0.dist-info/METADATA,sha256=xLaLc5ISpBKTUGO-4sL99E3iSmTBj_pPqo5E1FyTXk8,13141
|
|
70
|
+
lcode_cli-0.38.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
|
|
71
|
+
lcode_cli-0.38.0.dist-info/entry_points.txt,sha256=Hxsn_itbnbgft3U0FwxWdmEt0yoAV2LB-nJDnL9WT20,172
|
|
72
|
+
lcode_cli-0.38.0.dist-info/licenses/LICENSE,sha256=JWjmoL7nNIC1XUa-dZm2hwLUgjUQMFo6k8APb0idNzs,1074
|
|
73
|
+
lcode_cli-0.38.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|