asp-studio 0.2.2__tar.gz → 0.2.4__tar.gz

{asp_studio-0.2.2/src/asp_studio.egg-info → asp_studio-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asp-studio
-Version: 0.2.2
+Version: 0.2.4
 Summary: Answer sets, a graph and a step-by-step animator for Answer Set Programming, in Jupyter, VS Code notebooks and the command line.
 Author: yakupbulbul
 License: MIT
@@ -29,9 +29,15 @@ Dynamic: license-file
 
 # ASP Studio for Python
 
+[![PyPI](https://img.shields.io/pypi/v/asp-studio?color=0a0a0a)](https://pypi.org/project/asp-studio/)
+[![Python](https://img.shields.io/pypi/pyversions/asp-studio?color=0a0a0a)](https://pypi.org/project/asp-studio/)
+[![License: MIT](https://img.shields.io/badge/license-MIT-0a0a0a)](https://github.com/yakupbulbul/asp-vscode/blob/main/LICENSE)
+
 ASP Studio shows the answer sets of an [Answer Set Programming](https://potassco.org/) program, draws them as a graph, and steps through how a recursive program reaches its result. It works in Jupyter, in VS Code notebooks and from the command line. It uses the clingo Python API and shares its visualizer with the [ASP Studio VS Code extension](https://github.com/yakupbulbul/asp-vscode).
 
-Website and live demo: <https://yakupbulbul.github.io/asp-vscode/>
+[Playground](https://yakupbulbul.github.io/asp-vscode/playground.html) · [Documentation](https://yakupbulbul.github.io/asp-vscode/docs.html) · [Source](https://github.com/yakupbulbul/asp-vscode) · [Issues](https://github.com/yakupbulbul/asp-vscode/issues)
+
+![The ASP Studio visualizer](https://raw.githubusercontent.com/yakupbulbul/asp-vscode/main/docs/assets/screenshot-light.png)
 
 ```bash
 pip install "asp-studio[notebook]"      # Python 3.9 or newer
@@ -59,7 +65,7 @@ Cell options:
 | Option | Meaning |
 |---|---|
 | `-n 5`, `--models 5` | At most 5 answer sets (0 means all). |
-| `-o "--opt-mode=optN -c n=6"` | Extra clingo options. |
+| `-o "--opt-mode=optN -c n=6"` | Extra clingo options. A value that starts with a dash is fine. |
 | `-t 20` | Timeout in seconds. The default is 10. |
 | `--tab answers` | First tab to show: `animator`, `answers`, `graph` or `console`. |
 | `--theme dark` | `auto` (default), `light` or `dark`. Inside VS Code the editor theme is used. |
@@ -79,17 +85,37 @@ res                 # as the last line of a cell: shows the visualizer
 asp.show(res, tab="graph")
 ```
 
-`solve` takes ASP text, a `pathlib.Path`, or a list of those, which are joined in order. A broken program does not raise: check `res.ok` and `res.error`. With `#minimize` or `#maximize` and a finished search, only the optimal models are kept, and their costs are in `res.costs`.
+`solve` takes ASP text, a `pathlib.Path`, a `(name, text)` pair, or a list of those, which are joined in order. A broken program does not raise: check `res.ok` and `res.error`. Diagnostics carry the name of the file they came from. With `#minimize` or `#maximize` and a finished search, only the optimal models are kept, and their costs are in `res.costs`.
+
+| Attribute | Meaning |
+|---|---|
+| `res.ok`, `res.error` | Whether the program ran, and why not. |
+| `res.result` | `SATISFIABLE`, `UNSATISFIABLE`, `OPTIMUM FOUND` or `UNKNOWN`. |
+| `res.models`, `res.costs` | The answer sets as lists of atom strings, and their costs. |
+| `res.more` | True if you limited the models and more exist. |
+| `res.diagnostics` | `Diagnostic(file, line, col, severity, message)` entries. |
+| `res.ms`, `res.time` | Wall-clock milliseconds, and clingo's own total time. |
 
 ## Command line
 
 ```bash
 asp-studio program.lp --open                # writes program.html and opens it
 asp-studio instance.lp encoding.lp -n 3     # several files are joined in order
-python -m asp_studio program.lp             # the same, without the script on PATH
+cat program.lp | asp-studio - --out report.html   # read standard input
+asp-studio program.lp -o --opt-mode=optN    # extra clingo options
+asp-studio --version
 ```
 
-The exit code is 0 when the program ran, 1 when it has an error (positions print as `file:line:col`) and 2 for bad arguments or unreadable input.
+| Option | Meaning |
+|---|---|
+| `-n`, `--models` | At most this many answer sets (0 means all). |
+| `-o`, `--options` | Extra clingo options. |
+| `-t`, `--timeout` | Timeout in seconds. The default is 10. |
+| `--out` | Output file, or a directory. The default is `<first file>.html`. |
+| `--tab`, `--theme` | First tab and color theme of the report. |
+| `--open` | Open the report in your browser. |
+
+The exit code is 0 when the program ran, 1 when it has an error (positions print as `file:line:col`) and 2 for bad arguments or unreadable input. `python -m asp_studio` does the same without the script on `PATH`.
 
 ## Notes
 

{asp_studio-0.2.2 → asp_studio-0.2.4}/README.md

@@ -1,8 +1,14 @@
 # ASP Studio for Python
 
+[![PyPI](https://img.shields.io/pypi/v/asp-studio?color=0a0a0a)](https://pypi.org/project/asp-studio/)
+[![Python](https://img.shields.io/pypi/pyversions/asp-studio?color=0a0a0a)](https://pypi.org/project/asp-studio/)
+[![License: MIT](https://img.shields.io/badge/license-MIT-0a0a0a)](https://github.com/yakupbulbul/asp-vscode/blob/main/LICENSE)
+
 ASP Studio shows the answer sets of an [Answer Set Programming](https://potassco.org/) program, draws them as a graph, and steps through how a recursive program reaches its result. It works in Jupyter, in VS Code notebooks and from the command line. It uses the clingo Python API and shares its visualizer with the [ASP Studio VS Code extension](https://github.com/yakupbulbul/asp-vscode).
 
-Website and live demo: <https://yakupbulbul.github.io/asp-vscode/>
+[Playground](https://yakupbulbul.github.io/asp-vscode/playground.html) · [Documentation](https://yakupbulbul.github.io/asp-vscode/docs.html) · [Source](https://github.com/yakupbulbul/asp-vscode) · [Issues](https://github.com/yakupbulbul/asp-vscode/issues)
+
+![The ASP Studio visualizer](https://raw.githubusercontent.com/yakupbulbul/asp-vscode/main/docs/assets/screenshot-light.png)
 
 ```bash
 pip install "asp-studio[notebook]"      # Python 3.9 or newer
@@ -30,7 +36,7 @@ Cell options:
 | Option | Meaning |
 |---|---|
 | `-n 5`, `--models 5` | At most 5 answer sets (0 means all). |
-| `-o "--opt-mode=optN -c n=6"` | Extra clingo options. |
+| `-o "--opt-mode=optN -c n=6"` | Extra clingo options. A value that starts with a dash is fine. |
 | `-t 20` | Timeout in seconds. The default is 10. |
 | `--tab answers` | First tab to show: `animator`, `answers`, `graph` or `console`. |
 | `--theme dark` | `auto` (default), `light` or `dark`. Inside VS Code the editor theme is used. |
@@ -50,17 +56,37 @@ res                 # as the last line of a cell: shows the visualizer
 asp.show(res, tab="graph")
 ```
 
-`solve` takes ASP text, a `pathlib.Path`, or a list of those, which are joined in order. A broken program does not raise: check `res.ok` and `res.error`. With `#minimize` or `#maximize` and a finished search, only the optimal models are kept, and their costs are in `res.costs`.
+`solve` takes ASP text, a `pathlib.Path`, a `(name, text)` pair, or a list of those, which are joined in order. A broken program does not raise: check `res.ok` and `res.error`. Diagnostics carry the name of the file they came from. With `#minimize` or `#maximize` and a finished search, only the optimal models are kept, and their costs are in `res.costs`.
+
+| Attribute | Meaning |
+|---|---|
+| `res.ok`, `res.error` | Whether the program ran, and why not. |
+| `res.result` | `SATISFIABLE`, `UNSATISFIABLE`, `OPTIMUM FOUND` or `UNKNOWN`. |
+| `res.models`, `res.costs` | The answer sets as lists of atom strings, and their costs. |
+| `res.more` | True if you limited the models and more exist. |
+| `res.diagnostics` | `Diagnostic(file, line, col, severity, message)` entries. |
+| `res.ms`, `res.time` | Wall-clock milliseconds, and clingo's own total time. |
 
 ## Command line
 
 ```bash
 asp-studio program.lp --open                # writes program.html and opens it
 asp-studio instance.lp encoding.lp -n 3     # several files are joined in order
-python -m asp_studio program.lp             # the same, without the script on PATH
+cat program.lp | asp-studio - --out report.html   # read standard input
+asp-studio program.lp -o --opt-mode=optN    # extra clingo options
+asp-studio --version
 ```
 
-The exit code is 0 when the program ran, 1 when it has an error (positions print as `file:line:col`) and 2 for bad arguments or unreadable input.
+| Option | Meaning |
+|---|---|
+| `-n`, `--models` | At most this many answer sets (0 means all). |
+| `-o`, `--options` | Extra clingo options. |
+| `-t`, `--timeout` | Timeout in seconds. The default is 10. |
+| `--out` | Output file, or a directory. The default is `<first file>.html`. |
+| `--tab`, `--theme` | First tab and color theme of the report. |
+| `--open` | Open the report in your browser. |
+
+The exit code is 0 when the program ran, 1 when it has an error (positions print as `file:line:col`) and 2 for bad arguments or unreadable input. `python -m asp_studio` does the same without the script on `PATH`.
 
 ## Notes
 

{asp_studio-0.2.2 → asp_studio-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "asp-studio"
-version = "0.2.2"
+version = "0.2.4"
 description = "Answer sets, a graph and a step-by-step animator for Answer Set Programming, in Jupyter, VS Code notebooks and the command line."
 readme = "README.md"
 license = { text = "MIT" }

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio/__init__.py

@@ -9,7 +9,7 @@ In a notebook: ``%load_ext asp_studio`` and start a cell with ``%%asp``.
 from .solver import Diagnostic, Result, solve
 from .render import iframe, page, show
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 __all__ = ["solve", "show", "Result", "Diagnostic", "page", "iframe", "load_ipython_extension", "__version__"]
 
 

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio/__main__.py

@@ -7,6 +7,10 @@ import sys
 import webbrowser
 from typing import List, Optional
 
+import clingo
+
+from . import __version__
+from ._args import join_option_values
 from .render import page
 from .solver import solve
 
@@ -18,7 +22,8 @@ def _fail(message: str, code: int = 2) -> int:
 
 def main(argv: Optional[List[str]] = None) -> int:
     ap = argparse.ArgumentParser(prog="asp-studio", description="Solve ASP files and write an interactive HTML report.")
-    ap.add_argument("files", nargs="+", type=pathlib.Path, help=".lp files (joined in order)")
+    ap.add_argument("--version", action="version", version=f"asp-studio {__version__} (clingo {clingo.__version__})")
+    ap.add_argument("files", nargs="+", type=pathlib.Path, help=".lp files (joined in order), or - to read the program from standard input")
     ap.add_argument("-n", "--models", type=int, default=0, help="max answer sets (0 = all)")
     ap.add_argument("-o", "--options", default="", help='extra clingo options, e.g. "--opt-mode=optN"')
     ap.add_argument("-t", "--timeout", type=float, default=10.0, help="seconds (default 10)")
@@ -26,13 +31,17 @@ def main(argv: Optional[List[str]] = None) -> int:
     ap.add_argument("--tab", default="animator", choices=["animator", "answers", "graph", "console"])
     ap.add_argument("--theme", default="auto", choices=["auto", "light", "dark"])
     ap.add_argument("--open", action="store_true", help="open the report in the browser")
-    a = ap.parse_args(argv)
+    a = ap.parse_args(join_option_values(sys.argv[1:] if argv is None else list(argv)))
 
     if a.models < 0:
         return _fail("--models must be 0 or greater")
     if a.timeout <= 0:
         return _fail("--timeout must be greater than 0")
+    programs: list = []
     for f in a.files:
+        if str(f) == "-":
+            programs.append(("stdin", sys.stdin.read()))
+            continue
         if f.is_dir():
             return _fail(f"{f} is a directory, not a file")
         if not f.is_file():
@@ -43,12 +52,17 @@ def main(argv: Optional[List[str]] = None) -> int:
             return _fail(f"{f} is not UTF-8 text ({e.reason} at byte {e.start}); is it an ASP file?")
         except OSError as e:
             return _fail(f"cannot read {f}: {e.strerror or e}")
-    res = solve(list(a.files), models=a.models, options=a.options, timeout=a.timeout)
+        programs.append(f)
+    res = solve(programs, models=a.models, options=a.options, timeout=a.timeout)
 
-    out = a.out or a.files[0].with_suffix(".html")
+    first = a.files[0]
+    default = pathlib.Path("asp-studio.html") if str(first) == "-" else first.with_suffix(".html")
+    out = a.out or default
+    if out.is_dir():
+        out = out / default.name
     try:
         out.parent.mkdir(parents=True, exist_ok=True)
-        out.write_text(page(res, tab=a.tab, theme=a.theme, max_height=100000, title=a.files[0].name), encoding="utf-8")
+        out.write_text(page(res, tab=a.tab, theme=a.theme, max_height=100000, title="stdin" if str(first) == "-" else first.name), encoding="utf-8")
     except OSError as e:
         return _fail(f"cannot write {out}: {e.strerror or e}", 1)
 

asp_studio-0.2.4/src/asp_studio/_args.py

@@ -0,0 +1,26 @@
+"""Small helper shared by the command line and the %%asp magic."""
+from __future__ import annotations
+
+from typing import List, Sequence
+
+# Flags of both parsers. A value that looks like one of these is never taken as the argument of -o.
+_KNOWN = {"-n", "--models", "-t", "--timeout", "--out", "--tab", "--theme", "--height", "--open", "--version", "-h", "--help", "-o", "--options"}
+
+
+def join_option_values(argv: Sequence[str]) -> List[str]:
+    """Let ``-o --opt-mode=optN`` work: argparse refuses a value that starts with a dash.
+
+    ``-o VALUE`` and ``--options VALUE`` become ``--options=VALUE`` unless VALUE is one of our own flags.
+    """
+    out: List[str] = []
+    i = 0
+    while i < len(argv):
+        a = argv[i]
+        nxt = argv[i + 1] if i + 1 < len(argv) else None
+        if a in ("-o", "--options") and nxt is not None and nxt.startswith("-") and nxt.split("=", 1)[0] not in _KNOWN:
+            out.append("--options=" + nxt)
+            i += 2
+            continue
+        out.append(a)
+        i += 1
+    return out

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio/magic.py

@@ -7,6 +7,7 @@ from typing import Any
 
 from IPython.core.magic import Magics, cell_magic, magics_class
 
+from ._args import join_option_values
 from .render import show
 from .solver import solve
 
@@ -33,7 +34,7 @@ class AspMagics(Magics):
               [--theme auto|light|dark] [--height PX] [--out NAME]
         """
         try:
-            a = _parser().parse_args(shlex.split(line))
+            a = _parser().parse_args(join_option_values(shlex.split(line)))
         except SystemExit:
             print(self.asp.__doc__)
             return None

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio/solver.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple, Union
 
 import clingo
 
-Program = Union[str, Path]
+Program = Union[str, Path, Tuple[str, str]]
 
 _DIAG = re.compile(
     r"^(?:<block>|<string>|-):(\d+):(\d+)(?:-(\d+))?(?::(\d+)(?:-(\d+))?)?: (error|warning|info): (.*)$"
@@ -103,13 +103,18 @@ class Result:
 
 def _read(programs: Union[Program, Sequence[Program]]) -> Tuple[str, List[Tuple[str, int]]]:
     """Join the programs; also return (name, line count) per part so messages can be mapped back to their file."""
-    items: Iterable[Program] = [programs] if isinstance(programs, (str, Path)) else programs
+    items: Iterable[Program] = [programs] if isinstance(programs, (str, Path, tuple)) else programs
     parts: List[str] = []
     sources: List[Tuple[str, int]] = []
     for p in items:
-        text = p.read_text(encoding="utf-8") if isinstance(p, Path) else p
+        if isinstance(p, tuple):                                  # (name, text)
+            name, text = p
+        elif isinstance(p, Path):
+            name, text = p.name, p.read_text(encoding="utf-8")
+        else:
+            name, text = "program", p
         parts.append(text)
-        sources.append((p.name if isinstance(p, Path) else "program", len(text.split("\n"))))
+        sources.append((name, len(text.split("\n"))))
     return "\n".join(parts) + "\n", sources
 
 
@@ -152,7 +157,7 @@ def solve(
 ) -> Result:
     """Solve ``program`` and return a :class:`Result`.
 
-    ``program`` is ASP text, a :class:`pathlib.Path`, or a list of those (joined in order).
+    ``program`` is ASP text, a :class:`pathlib.Path`, a ``(name, text)`` pair, or a list of those (joined in order).
     ``models`` limits the number of answer sets (0 = all). ``options`` are extra clingo options,
     either a list or one string such as ``"--opt-mode=optN -c n=6"``. ``timeout`` is in seconds.
     With optimisation statements and a finished search only the optimal models are kept.

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio/static/engine.js

@@ -174,7 +174,7 @@
     try {
       const rules = parseProgram(text), rounds = evaluate(rules);
       return {
-        rules: rules.map(r => ({ text: r.text, file, line: r.line + 1, fact: !r.body.length })),
+        rules: rules.map(r => ({ text: r.text, file, line: r.line + 1, endLine: r.endLine + 1, fact: !r.body.length })),
         rounds: rounds.map(rd => rd.map(f => ({ pred: f.atom.pred, args: f.atom.args, atom: key(f.atom), rule: f.rule, subst: f.subst }))),
         incomplete: rules.incomplete || "",
       };

asp_studio-0.2.4/src/asp_studio/static/themes.css

@@ -0,0 +1,49 @@
+/* Fallback theme for hosts that do not provide --vscode-* variables (Jupyter, browsers). Black and white only.
+   Inside VS Code the real variables are used instead. Choose with <html data-theme="light|dark">; default follows the OS. */
+:root, :root[data-theme="light"] {
+  --vscode-foreground: #1a1a1a;
+  --vscode-descriptionForeground: #5c5c5c;
+  --vscode-editor-background: #ffffff;
+  --vscode-editorWidget-background: #f7f7f7;
+  --vscode-widget-border: #e2e2e2;
+  --vscode-dropdown-background: #ffffff;
+  --vscode-dropdown-foreground: #1a1a1a;
+  --vscode-dropdown-border: #d4d4d4;
+  --vscode-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  --vscode-font-size: 13px;
+  --vscode-editor-font-family: ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+  --vscode-editor-font-size: 12px;
+  color-scheme: light;
+}
+@media (prefers-color-scheme: dark) {
+  :root:not([data-theme="light"]) {
+    --vscode-foreground: #e8e8e8;
+    --vscode-descriptionForeground: #a0a0a0;
+    --vscode-editor-background: #0a0a0a;
+    --vscode-editorWidget-background: #121212;
+    --vscode-widget-border: #272727;
+    --vscode-dropdown-background: #151515;
+    --vscode-dropdown-foreground: #e8e8e8;
+    --vscode-dropdown-border: #2f2f2f;
+    --vscode-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    --vscode-font-size: 13px;
+    --vscode-editor-font-family: ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+    --vscode-editor-font-size: 12px;
+    color-scheme: dark;
+  }
+}
+:root[data-theme="dark"] {
+  --vscode-foreground: #e8e8e8;
+  --vscode-descriptionForeground: #a0a0a0;
+  --vscode-editor-background: #0a0a0a;
+  --vscode-editorWidget-background: #121212;
+  --vscode-widget-border: #272727;
+  --vscode-dropdown-background: #151515;
+  --vscode-dropdown-foreground: #e8e8e8;
+  --vscode-dropdown-border: #2f2f2f;
+  --vscode-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+  --vscode-font-size: 13px;
+  --vscode-editor-font-family: ui-monospace, "SF Mono", Menlo, Consolas, monospace;
+  --vscode-editor-font-size: 12px;
+  color-scheme: dark;
+}

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio/static/webview.css

@@ -5,27 +5,27 @@
   --card: var(--vscode-editorWidget-background, var(--vscode-sideBar-background, #252526));
   --soft: color-mix(in srgb, var(--fg) 7%, transparent);
   --border: var(--vscode-widget-border, var(--vscode-panel-border, color-mix(in srgb, var(--fg) 18%, transparent)));
-  --accent: var(--vscode-focusBorder, #3794ff);
-  --ok: var(--vscode-testing-iconPassed, #3fb950);
-  --bad: var(--vscode-testing-iconFailed, #f14c4c);
-  --warn: var(--vscode-editorWarning-foreground, #cca700);
-  --new: var(--vscode-charts-blue, #3794ff);
+  --accent: var(--fg);
+  --ok: color-mix(in srgb, var(--fg) 62%, var(--bg));
+  --bad: var(--fg);
+  --warn: color-mix(in srgb, var(--fg) 72%, var(--bg));
+  --new: var(--fg);
   --base: color-mix(in srgb, var(--fg) 40%, transparent);
   --mono: var(--vscode-editor-font-family, ui-monospace, Menlo, Consolas, monospace);
-  --c0: var(--vscode-charts-blue, #3794ff);
-  --c1: var(--vscode-charts-orange, #d18616);
-  --c2: var(--vscode-charts-green, #3fb950);
-  --c3: var(--vscode-charts-purple, #b180d7);
-  --c4: var(--vscode-charts-red, #f14c4c);
-  --c5: var(--vscode-charts-yellow, #cca700);
+  --c0: var(--fg);
+  --c1: color-mix(in srgb, var(--fg) 58%, var(--bg));
+  --c2: color-mix(in srgb, var(--fg) 80%, var(--bg));
+  --c3: color-mix(in srgb, var(--fg) 40%, var(--bg));
+  --c4: color-mix(in srgb, var(--fg) 68%, var(--bg));
+  --c5: color-mix(in srgb, var(--fg) 50%, var(--bg));
   --radius: 6px;
 }
 * { box-sizing: border-box; }
 html, body { margin: 0; height: 100%; }
 body { font-family: var(--vscode-font-family, system-ui, sans-serif); font-size: var(--vscode-font-size, 13px); color: var(--fg); background: var(--bg); line-height: 1.45; }
 button, select, input { font: inherit; color: inherit; }
-a { color: var(--vscode-textLink-foreground, #3794ff); }
-a:hover { color: var(--vscode-textLink-activeForeground, #3794ff); }
+a { color: var(--fg); text-underline-offset: 2px; }
+a:hover { text-decoration-thickness: 2px; }
 code, pre, .mono { font-family: var(--mono); font-size: calc(var(--vscode-editor-font-size, 13px) - 0.5px); }
 :focus-visible { outline: 1px solid var(--accent); outline-offset: 1px; }
 
@@ -39,17 +39,18 @@ code, pre, .mono { font-family: var(--mono); font-size: calc(var(--vscode-editor
 .chip, .pill { display: inline-flex; align-items: center; gap: 5px; border-radius: 10px; padding: 1px 8px; font-size: 11.5px; line-height: 18px; white-space: nowrap; }
 .chip { background: var(--soft); color: var(--muted); }
 .chip.link { cursor: pointer; text-decoration: underline dotted; }
-.pill { font-weight: 600; color: #fff; background: var(--muted); }
-.pill.sat { background: color-mix(in srgb, var(--ok) 85%, #000); }
-.pill.unsat, .pill.err { background: color-mix(in srgb, var(--bad) 85%, #000); }
-.pill.unk, .pill.busy { background: color-mix(in srgb, var(--warn) 85%, #000); }
+.pill { font-weight: 600; color: var(--bg); background: var(--muted); }
+.pill.sat { background: var(--ok); }
+.pill.unsat { background: transparent; color: var(--fg); box-shadow: inset 0 0 0 1.5px var(--fg); }
+.pill.err { background: var(--fg); }
+.pill.unk, .pill.busy { background: color-mix(in srgb, var(--fg) 35%, var(--bg)); color: var(--fg); }
 .spacer { flex: 1; }
 
-.btn { display: inline-flex; align-items: center; gap: 6px; border: 1px solid var(--vscode-button-border, transparent); border-radius: 3px; padding: 3px 11px; cursor: pointer;
-       background: var(--vscode-button-secondaryBackground, var(--soft)); color: var(--vscode-button-secondaryForeground, var(--fg)); }
-.btn:hover:not(:disabled) { background: var(--vscode-button-secondaryHoverBackground, var(--soft)); }
-.btn.primary { background: var(--vscode-button-background, var(--accent)); color: var(--vscode-button-foreground, #fff); }
-.btn.primary:hover:not(:disabled) { background: var(--vscode-button-hoverBackground, var(--accent)); }
+.btn { display: inline-flex; align-items: center; gap: 6px; border: 1px solid var(--border); border-radius: 3px; padding: 3px 11px; cursor: pointer;
+       background: var(--soft); color: var(--fg); }
+.btn:hover:not(:disabled) { background: color-mix(in srgb, var(--fg) 14%, transparent); }
+.btn.primary { background: var(--fg); border-color: var(--fg); color: var(--bg); }
+.btn.primary:hover:not(:disabled) { background: color-mix(in srgb, var(--fg) 85%, var(--bg)); }
 .btn:disabled { opacity: .45; cursor: default; }
 .icon-btn { display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; border: 0; border-radius: 4px; background: transparent; cursor: pointer; color: var(--fg); }
 .icon-btn:hover:not(:disabled) { background: var(--vscode-toolbar-hoverBackground, var(--soft)); }
@@ -62,7 +63,7 @@ svg.i { width: 16px; height: 16px; fill: currentColor; flex: none; }
 .tab { border: 0; background: transparent; padding: 7px 12px; cursor: pointer; color: var(--muted); border-bottom: 2px solid transparent; white-space: nowrap; display: inline-flex; gap: 6px; align-items: center; }
 .tab:hover { color: var(--fg); }
 .tab[aria-selected=true] { color: var(--fg); border-bottom-color: var(--accent); }
-.count { background: var(--vscode-badge-background, var(--soft)); color: var(--vscode-badge-foreground, var(--fg)); border-radius: 9px; padding: 0 6px; font-size: 11px; line-height: 16px; }
+.count { background: color-mix(in srgb, var(--fg) 18%, transparent); color: var(--fg); border-radius: 9px; padding: 0 6px; font-size: 11px; line-height: 16px; }
 
 /* ---------- content ---------- */
 main { padding: 16px; flex: 1; }
@@ -89,8 +90,8 @@ main { padding: 16px; flex: 1; }
 .ticks span.cur { color: var(--fg); font-weight: 600; }
 .transport select { background: var(--vscode-dropdown-background, var(--card)); color: var(--vscode-dropdown-foreground, var(--fg)); border: 1px solid var(--vscode-dropdown-border, var(--border)); border-radius: 3px; padding: 2px 4px; }
 .status-line { display: flex; align-items: center; gap: 8px; padding: 10px 12px; font-weight: 600; flex-wrap: wrap; }
-.tag { font-size: 11px; font-weight: 600; background: var(--new); color: #fff; border-radius: 9px; padding: 0 8px; line-height: 18px; }
-.tag.done { background: color-mix(in srgb, var(--ok) 85%, #000); }
+.tag { font-size: 11px; font-weight: 600; background: var(--fg); color: var(--bg); border-radius: 9px; padding: 0 8px; line-height: 18px; }
+.tag.done { background: var(--ok); }
 .fix { color: var(--ok); font-weight: 500; }
 
 /* ---------- rules list ---------- */
@@ -115,7 +116,7 @@ main { padding: 16px; flex: 1; }
 .predgroup .dot { width: 8px; height: 8px; border-radius: 50%; background: var(--pc); flex: none; }
 .predgroup .pname { font: 600 12px var(--mono); color: var(--fg); }
 .predgroup .parity { font: 12px var(--mono); color: var(--muted); margin-left: -4px; }
-.predgroup .pcount { margin-left: 4px; background: var(--vscode-badge-background, var(--soft)); color: var(--vscode-badge-foreground, var(--fg)); border-radius: 9px; padding: 0 7px; font-size: 11px; line-height: 16px; }
+.predgroup .pcount { margin-left: 4px; background: color-mix(in srgb, var(--fg) 18%, transparent); color: var(--fg); border-radius: 9px; padding: 0 7px; font-size: 11px; line-height: 16px; }
 .chips { display: flex; flex-wrap: wrap; gap: 6px; }
 .dot { width: 9px; height: 9px; border-radius: 50%; display: inline-block; }
 .atom-chip { display: inline-flex; align-items: baseline; font: 12px/20px var(--mono); border: 1px solid color-mix(in srgb, var(--pc, var(--accent)) 38%, transparent);

{asp_studio-0.2.2 → asp_studio-0.2.4/src/asp_studio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asp-studio
-Version: 0.2.2
+Version: 0.2.4
 Summary: Answer sets, a graph and a step-by-step animator for Answer Set Programming, in Jupyter, VS Code notebooks and the command line.
 Author: yakupbulbul
 License: MIT
@@ -29,9 +29,15 @@ Dynamic: license-file
 
 # ASP Studio for Python
 
+[![PyPI](https://img.shields.io/pypi/v/asp-studio?color=0a0a0a)](https://pypi.org/project/asp-studio/)
+[![Python](https://img.shields.io/pypi/pyversions/asp-studio?color=0a0a0a)](https://pypi.org/project/asp-studio/)
+[![License: MIT](https://img.shields.io/badge/license-MIT-0a0a0a)](https://github.com/yakupbulbul/asp-vscode/blob/main/LICENSE)
+
 ASP Studio shows the answer sets of an [Answer Set Programming](https://potassco.org/) program, draws them as a graph, and steps through how a recursive program reaches its result. It works in Jupyter, in VS Code notebooks and from the command line. It uses the clingo Python API and shares its visualizer with the [ASP Studio VS Code extension](https://github.com/yakupbulbul/asp-vscode).
 
-Website and live demo: <https://yakupbulbul.github.io/asp-vscode/>
+[Playground](https://yakupbulbul.github.io/asp-vscode/playground.html) · [Documentation](https://yakupbulbul.github.io/asp-vscode/docs.html) · [Source](https://github.com/yakupbulbul/asp-vscode) · [Issues](https://github.com/yakupbulbul/asp-vscode/issues)
+
+![The ASP Studio visualizer](https://raw.githubusercontent.com/yakupbulbul/asp-vscode/main/docs/assets/screenshot-light.png)
 
 ```bash
 pip install "asp-studio[notebook]"      # Python 3.9 or newer
@@ -59,7 +65,7 @@ Cell options:
 | Option | Meaning |
 |---|---|
 | `-n 5`, `--models 5` | At most 5 answer sets (0 means all). |
-| `-o "--opt-mode=optN -c n=6"` | Extra clingo options. |
+| `-o "--opt-mode=optN -c n=6"` | Extra clingo options. A value that starts with a dash is fine. |
 | `-t 20` | Timeout in seconds. The default is 10. |
 | `--tab answers` | First tab to show: `animator`, `answers`, `graph` or `console`. |
 | `--theme dark` | `auto` (default), `light` or `dark`. Inside VS Code the editor theme is used. |
@@ -79,17 +85,37 @@ res                 # as the last line of a cell: shows the visualizer
 asp.show(res, tab="graph")
 ```
 
-`solve` takes ASP text, a `pathlib.Path`, or a list of those, which are joined in order. A broken program does not raise: check `res.ok` and `res.error`. With `#minimize` or `#maximize` and a finished search, only the optimal models are kept, and their costs are in `res.costs`.
+`solve` takes ASP text, a `pathlib.Path`, a `(name, text)` pair, or a list of those, which are joined in order. A broken program does not raise: check `res.ok` and `res.error`. Diagnostics carry the name of the file they came from. With `#minimize` or `#maximize` and a finished search, only the optimal models are kept, and their costs are in `res.costs`.
+
+| Attribute | Meaning |
+|---|---|
+| `res.ok`, `res.error` | Whether the program ran, and why not. |
+| `res.result` | `SATISFIABLE`, `UNSATISFIABLE`, `OPTIMUM FOUND` or `UNKNOWN`. |
+| `res.models`, `res.costs` | The answer sets as lists of atom strings, and their costs. |
+| `res.more` | True if you limited the models and more exist. |
+| `res.diagnostics` | `Diagnostic(file, line, col, severity, message)` entries. |
+| `res.ms`, `res.time` | Wall-clock milliseconds, and clingo's own total time. |
 
 ## Command line
 
 ```bash
 asp-studio program.lp --open                # writes program.html and opens it
 asp-studio instance.lp encoding.lp -n 3     # several files are joined in order
-python -m asp_studio program.lp             # the same, without the script on PATH
+cat program.lp | asp-studio - --out report.html   # read standard input
+asp-studio program.lp -o --opt-mode=optN    # extra clingo options
+asp-studio --version
 ```
 
-The exit code is 0 when the program ran, 1 when it has an error (positions print as `file:line:col`) and 2 for bad arguments or unreadable input.
+| Option | Meaning |
+|---|---|
+| `-n`, `--models` | At most this many answer sets (0 means all). |
+| `-o`, `--options` | Extra clingo options. |
+| `-t`, `--timeout` | Timeout in seconds. The default is 10. |
+| `--out` | Output file, or a directory. The default is `<first file>.html`. |
+| `--tab`, `--theme` | First tab and color theme of the report. |
+| `--open` | Open the report in your browser. |
+
+The exit code is 0 when the program ran, 1 when it has an error (positions print as `file:line:col`) and 2 for bad arguments or unreadable input. `python -m asp_studio` does the same without the script on `PATH`.
 
 ## Notes
 

{asp_studio-0.2.2 → asp_studio-0.2.4}/src/asp_studio.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 src/asp_studio/__init__.py
 src/asp_studio/__main__.py
+src/asp_studio/_args.py
 src/asp_studio/magic.py
 src/asp_studio/render.py
 src/asp_studio/solver.py

{asp_studio-0.2.2 → asp_studio-0.2.4}/tests/test_cli.py

@@ -54,3 +54,45 @@ def test_cli_unwritable_output(tmp_path, capsys):
     blocker.write_text("x")
     assert main([str(lp), "--out", str(blocker / "o.html")]) == 1
     assert "cannot write" in capsys.readouterr().err
+
+
+def test_cli_option_value_may_start_with_dashes(tmp_path):
+    lp = tmp_path / "p.lp"
+    lp.write_text("{a}.\n#minimize { 1,a : a }.\n")
+    assert main([str(lp), "-o", "--opt-mode=optN", "-n", "1"]) == 0
+    assert main([str(lp), "--options", "--opt-mode=optN"]) == 0
+    assert main([str(lp), "-o", "--opt-mode=optN -c n=2"]) == 0
+
+
+def test_cli_version(capsys):
+    import pytest
+    with pytest.raises(SystemExit) as e:
+        main(["--version"])
+    assert e.value.code == 0
+    assert "asp-studio" in capsys.readouterr().out
+
+
+def test_cli_reads_standard_input(tmp_path, monkeypatch, capsys):
+    import io
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", io.StringIO("a :- not b.\nb :- not a.\n"))
+    assert main(["-"]) == 0
+    assert (tmp_path / "asp-studio.html").exists()
+    assert "2 model" in capsys.readouterr().out
+
+
+def test_cli_reports_errors_in_stdin_by_name(monkeypatch, tmp_path, capsys):
+    import io
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.stdin", io.StringIO("b :- c(.\n"))
+    assert main(["-"]) == 1
+    assert "stdin:1:" in capsys.readouterr().err
+
+
+def test_cli_out_may_be_a_directory(tmp_path):
+    lp = tmp_path / "p.lp"
+    lp.write_text("a.")
+    out = tmp_path / "reports"
+    out.mkdir()
+    assert main([str(lp), "--out", str(out)]) == 0
+    assert (out / "p.html").exists()

{asp_studio-0.2.2 → asp_studio-0.2.4}/tests/test_magic.py

@@ -29,3 +29,10 @@ def test_cell_magic_reports_errors_inside_the_visualizer(ip):
 def test_bad_arguments_print_usage(ip, capsys):
     ip.run_cell_magic("asp", "--no-such-flag", "a.")
     assert "%%asp" in capsys.readouterr().out
+
+
+def test_magic_option_value_may_start_with_dashes(ip):
+    with capture_output() as cap:
+        ip.run_cell_magic("asp", '-o "--opt-mode=optN" --out opt', "{a}.\n#minimize { 1,a : a }.")
+    assert "<iframe" in cap.outputs[0].data["text/html"]
+    assert ip.user_ns["opt"].ok

{asp_studio-0.2.2 → asp_studio-0.2.4}/tests/test_solver.py

@@ -87,3 +87,9 @@ def test_multi_file_diagnostics_point_at_the_right_file(tmp_path):
     d = r.diagnostics[0]
     assert (d.file, d.line, d.severity) == ("encoding.lp", 3, "error")
     assert r.to_state()["diagnostics"][0]["file"] == "encoding.lp"
+
+
+def test_name_text_pairs_name_their_diagnostics():
+    r = asp.solve([("instance.lp", "a.\n"), ("encoding.lp", "b :- c(.\n")])
+    assert (r.diagnostics[0].file, r.diagnostics[0].line) == ("encoding.lp", 1)
+    assert asp.solve(("one.lp", "a.")).ok

asp_studio-0.2.2/src/asp_studio/static/themes.css

@@ -1,100 +0,0 @@
-/* Fallback theme for hosts that do not provide --vscode-* variables (Jupyter, browsers).
-   Inside VS Code the real variables are used instead. Choose with <html data-theme="light|dark">; default follows the OS. */
-:root, :root[data-theme="light"] {
-  --vscode-foreground:#3b3b3b;
-  --vscode-descriptionForeground:#717171;
-  --vscode-editor-background:#ffffff;
-  --vscode-editorWidget-background:#f8f8f8;
-  --vscode-widget-border:#c8c8c8;
-  --vscode-focusBorder:#005fb8;
-  --vscode-button-background:#005fb8;
-  --vscode-button-foreground:#fff;
-  --vscode-button-hoverBackground:#0258a8;
-  --vscode-button-secondaryBackground:#e5e5e5;
-  --vscode-button-secondaryForeground:#3b3b3b;
-  --vscode-badge-background:#cccccc;
-  --vscode-badge-foreground:#3b3b3b;
-  --vscode-charts-blue:#1a85ff;
-  --vscode-charts-orange:#d18616;
-  --vscode-charts-green:#388a34;
-  --vscode-charts-purple:#652d90;
-  --vscode-charts-red:#e51400;
-  --vscode-charts-yellow:#bf8803;
-  --vscode-testing-iconPassed:#388a34;
-  --vscode-testing-iconFailed:#f14c4c;
-  --vscode-editorWarning-foreground:#bf8803;
-  --vscode-dropdown-background:#fff;
-  --vscode-dropdown-foreground:#3b3b3b;
-  --vscode-dropdown-border:#cecece;
-  --vscode-font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;
-  --vscode-font-size:13px;
-  --vscode-editor-font-family:Menlo,Monaco,monospace;
-  --vscode-editor-font-size:12px;
-  color-scheme: light;
-}
-@media (prefers-color-scheme: dark) {
-  :root:not([data-theme="light"]) {
-    --vscode-foreground:#cccccc;
-    --vscode-descriptionForeground:#9d9d9d;
-    --vscode-editor-background:#1f1f1f;
-    --vscode-editorWidget-background:#202020;
-    --vscode-widget-border:#2b2b2b;
-    --vscode-focusBorder:#0078d4;
-    --vscode-button-background:#0078d4;
-    --vscode-button-foreground:#fff;
-    --vscode-button-hoverBackground:#026ec1;
-    --vscode-button-secondaryBackground:#313131;
-    --vscode-button-secondaryForeground:#cccccc;
-    --vscode-badge-background:#616161;
-    --vscode-badge-foreground:#f8f8f8;
-    --vscode-charts-blue:#3794ff;
-    --vscode-charts-orange:#d18616;
-    --vscode-charts-green:#89d185;
-    --vscode-charts-purple:#b180d7;
-    --vscode-charts-red:#f14c4c;
-    --vscode-charts-yellow:#cca700;
-    --vscode-testing-iconPassed:#73c991;
-    --vscode-testing-iconFailed:#f14c4c;
-    --vscode-editorWarning-foreground:#cca700;
-    --vscode-dropdown-background:#313131;
-    --vscode-dropdown-foreground:#ccc;
-    --vscode-dropdown-border:#3c3c3c;
-    --vscode-font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;
-    --vscode-font-size:13px;
-    --vscode-editor-font-family:Menlo,Monaco,monospace;
-    --vscode-editor-font-size:12px;
-    color-scheme: dark;
-  }
-}
-:root[data-theme="dark"] {
-  --vscode-foreground:#cccccc;
-  --vscode-descriptionForeground:#9d9d9d;
-  --vscode-editor-background:#1f1f1f;
-  --vscode-editorWidget-background:#202020;
-  --vscode-widget-border:#2b2b2b;
-  --vscode-focusBorder:#0078d4;
-  --vscode-button-background:#0078d4;
-  --vscode-button-foreground:#fff;
-  --vscode-button-hoverBackground:#026ec1;
-  --vscode-button-secondaryBackground:#313131;
-  --vscode-button-secondaryForeground:#cccccc;
-  --vscode-badge-background:#616161;
-  --vscode-badge-foreground:#f8f8f8;
-  --vscode-charts-blue:#3794ff;
-  --vscode-charts-orange:#d18616;
-  --vscode-charts-green:#89d185;
-  --vscode-charts-purple:#b180d7;
-  --vscode-charts-red:#f14c4c;
-  --vscode-charts-yellow:#cca700;
-  --vscode-testing-iconPassed:#73c991;
-  --vscode-testing-iconFailed:#f14c4c;
-  --vscode-editorWarning-foreground:#cca700;
-  --vscode-dropdown-background:#313131;
-  --vscode-dropdown-foreground:#ccc;
-  --vscode-dropdown-border:#3c3c3c;
-  --vscode-font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;
-  --vscode-font-size:13px;
-  --vscode-editor-font-family:Menlo,Monaco,monospace;
-  --vscode-editor-font-size:12px;
-  color-scheme: dark;
-}