diff --git a/.gitignore b/.gitignore index 677ed65..3931b53 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ Thumbs.db # Build output dist .svelte-kit +target +__pycache__ +*.pyc # Env .env diff --git a/Cargo.lock b/Cargo.lock index 22b1b1b..e3f2e4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - [[package]] name = "anyhow" version = "1.0.102" @@ -179,11 +170,10 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "nix-config-tools" -version = "0.1.0" +version = "0.1.1" dependencies = [ "console", "dialoguer", - "regex", ] [[package]] @@ -226,35 +216,6 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "regex" -version = "1.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - [[package]] name = "rustix" version = "1.1.4" diff --git a/packages/bismuth/src/global.d.ts b/packages/bismuth/src/global.d.ts new file mode 100644 index 0000000..176bbd9 --- /dev/null +++ b/packages/bismuth/src/global.d.ts @@ -0,0 +1,2 @@ +/** Injected by tsup at build time (see tsup.config.ts `define`). */ +declare const __BISMUTH_VERSION__: string; diff --git a/packages/llm-analyser/main.py b/packages/llm-analyser/main.py index cd1d115..3310e7b 100644 --- a/packages/llm-analyser/main.py +++ b/packages/llm-analyser/main.py @@ -37,6 +37,7 @@ def process_file(file_path_str: str, model_name: str) -> Dict: if not content['paragraphs']: essay_text = f"No readable content found in {file_path.name}" else: + tables_section = f"**Tables/Structured Data:**\n{content['tables']}" if content['tables'] else "" prompt = f""" Please write a comprehensive analytical essay about the document "{file_path.name}" with the following structure, formatted in Markdown: @@ -66,7 +67,7 @@ Summarise the document's significance and final thoughts. **Document Content Preview:** {content['paragraphs'][:500]}... -{f"**Tables/Structured Data:**\n{content['tables']}" if content['tables'] else ""} +{tables_section} """ response = client.generate(model=model_name, prompt=prompt) essay_text = response['response'] diff --git a/packages/nix-config-tools/Cargo.toml b/packages/nix-config-tools/Cargo.toml index 22991ee..9fa086c 100644 --- a/packages/nix-config-tools/Cargo.toml +++ b/packages/nix-config-tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nix-config-tools" -version = "0.1.0" +version = "0.1.1" edition = "2021" authors = ["Ewan Croft"] license = "MIT" @@ -8,7 +8,6 @@ license = "MIT" [dependencies] dialoguer = { version = "0.11", features = ["completion"] } console = { version = "0.15" } -regex = { version = "1" } [lib] name = "tools_common" diff --git a/packages/nix-config-tools/src/bin/server-config.rs b/packages/nix-config-tools/src/bin/server-config.rs index c072109..d126d6c 100644 --- a/packages/nix-config-tools/src/bin/server-config.rs +++ b/packages/nix-config-tools/src/bin/server-config.rs @@ -11,7 +11,6 @@ /// nix run .#server-config -- --show # print current config and exit use console::Style; use dialoguer::{theme::ColorfulTheme, Confirm, Input, MultiSelect, Select}; -use regex::Regex; use tools_common::*; // ── helpers ────────────────────────────────────────────────────────────────── @@ -162,17 +161,6 @@ fn resolve_u16( s.parse().unwrap_or(fallback) } -fn resolve_bool( - opts: &str, host: &str, - dotted_path: &str, - fallback: bool, -) -> bool { - if let Some(v) = host_get(host, dotted_path) { - return v.trim() == "true"; - } - fallback -} - // ── config structs ──────────────────────────────────────────────────────────── #[derive(Debug, Clone)] diff --git a/packages/noise-avatar/tsconfig.json b/packages/noise-avatar/tsconfig.json index 0218015..07efe21 100644 --- a/packages/noise-avatar/tsconfig.json +++ b/packages/noise-avatar/tsconfig.json @@ -1,12 +1,15 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "target": "ES2020", + "module": "ES2020", + "moduleResolution": "bundler", + "lib": ["ES2020", "DOM"], "rootDir": "src", "outDir": "dist", "declaration": true, "declarationMap": true, - "resolveJsonModule": false, - "moduleResolution": "bundler" + "resolveJsonModule": false }, "include": ["src"] } diff --git a/packages/noise/tsconfig.json b/packages/noise/tsconfig.json index 216f774..07efe21 100644 --- a/packages/noise/tsconfig.json +++ b/packages/noise/tsconfig.json @@ -1,6 +1,10 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "target": "ES2020", + "module": "ES2020", + "moduleResolution": "bundler", + "lib": ["ES2020", "DOM"], "rootDir": "src", "outDir": "dist", "declaration": true,