Skip to content

Commit cac9dfc

Browse files
committed
More documentation updates
1 parent 099552a commit cac9dfc

11 files changed

Lines changed: 33 additions & 22 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
- Documentation: fixed internal link and config overview ordering; developer handbook grammar, `$var_name`
6+
explanation, and `default_embedding_model_source` key; pip install examples; RAG/config notes on
7+
`DEFAULT_*` vs `default_*` keys for `serverag` vs segments; minor README and workbench markdown fixes.
8+
59
- README: stronger opening (audience, fit, differentiation), badges and Python version note, shorter
610
architecture section, documentation map table, tightened Quick Start and config pointer, RAG “at a
711
glance” under Quick Start, per-example problem/result blurbs, and status note on what is stable;

docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# TalkPipe Documentation
22

3-
Welcome to the TalkPipe documentation! This directory contains comprehensive, API references, and examples for using TalkPipe effectively.
3+
Welcome to the TalkPipe documentation! This directory contains guides, API references, and examples for using TalkPipe effectively.
44

55
## Quick Navigation
66

@@ -19,10 +19,10 @@ Real-world usage examples and tutorials:
1919

2020
### 📚 [API Reference](api-reference/)
2121
Complete documentation for all TalkPipe commands and components:
22-
- [chatterlang_serve](api-reference/chatterlang-server.md) - Run a script as an API endpoint and with a customizable web interface
22+
- [chatterlang_serve](api-reference/chatterlang-server.md) - Run a script as an API endpoint with a customizable web interface
2323
- [ChatterLang Workbench](api-reference/chatterlang-workbench.md) - Interactive web interface for writing and testing scripts interactively
2424
- [ChatterLang Script Runner](api-reference/chatterlang-script.md) - Run a script from the command line
25-
- [Documentation Generator](api-reference/talkpipe-ref.md) - Generate reference documentations for Segments and Sources
25+
- [Documentation Generator](api-reference/talkpipe-ref.md) - Generate reference documentation for Segments and Sources
2626
- [Plugin Manager](api-reference/talkpipe-plugin-manager.md) - Manage and inspect TalkPipe plugins
2727

2828
### 🏗️ [Architecture](architecture/)

docs/api-reference/chatterlang-workbench.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ chatterlang_workbench --reload
132132

133133
---
134134

135-
*For conceptual information about ChatterLang, see [ChatterLang Architecture](../architecture/chatterlang.md).
135+
*For conceptual information about ChatterLang, see [ChatterLang Architecture](../architecture/chatterlang.md).*
136136

137137
---
138138
Last Reviewed: 20250814

docs/api-reference/lazy-loading.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,6 @@ print(f'Total: {len(seen)} unique names')
574574

575575
**See Also:**
576576
- [Plugin Manager](talkpipe-plugin-manager.md) for managing external plugins
577-
- [ChatterLang Compiler](../architecture/compiler.md) for how components are resolved during compilation
577+
- [ChatterLang compiler layer](../architecture/chatterlang.md#2-compiler-layer) for how components are resolved during compilation
578578

579579
Last Reviewed: 20251025

docs/architecture/configuration.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ This document describes how TalkPipe manages configuration across different envi
66

77
TalkPipe uses a layered configuration system that supports multiple sources with clear precedence rules. Configuration can come from:
88

9-
3. **Command-line arguments** (including unknown arguments that get added to the configuration)
9+
1. **Command-line arguments** (including unknown arguments that get added to the configuration)
1010
2. **Environment variables** (with `TALKPIPE_` prefix)
11-
1. **Configuration files** (TOML format)
11+
3. **Configuration files** (TOML format)
1212
4. **Default values** (hard-coded in the application)
1313

1414
## Configuration File Formats
@@ -146,6 +146,15 @@ For application settings (logging, server ports, etc.):
146146
3. **Configuration file values** (`~/.talkpipe.toml`)
147147
4. **Application defaults** (hard-coded values)
148148

149+
### Embedding and LLM defaults: `serverag` vs segment keys
150+
151+
Several components resolve embedding and chat model defaults from `get_config()`. Two naming patterns appear in configuration:
152+
153+
- **Segment defaults**`LLMEmbed` and `LLMPrompt` fall back to these keys when `model` / `source` arguments are omitted: `default_embedding_model_name`, `default_embedding_model_source`, `default_model_name`, and `default_model_source` (see `talkpipe.util.constants`).
154+
- **`serverag` defaults** — When you omit `--embedding_model`, `--embedding_source`, `--completion_model`, and `--completion_source`, `serverag` reads `DEFAULT_EMBEDDING_MODEL`, `DEFAULT_EMBEDDING_SOURCE`, `DEFAULT_LLM_MODEL`, and `DEFAULT_LLM_SOURCE` from the merged config. If those keys are unset, `serverag` passes `None` into the RAG pipeline, and the segments above apply their `default_*` fallbacks.
155+
156+
Use **`default_*`** in `~/.talkpipe.toml` for one consistent set of defaults across pipelines. Use **`DEFAULT_*`** when you want values applied at the `serverag` CLI layer (still overridable per invocation). Environment variables use the usual `TALKPIPE_` prefix and map to the exact key name after the prefix (for example, `TALKPIPE_default_model_name` or `TALKPIPE_DEFAULT_LLM_MODEL`).
157+
149158
### ChatterLang Script Variable Access
150159

151160
**Configuration Variables** (accessed with `$key` syntax in scripts):

docs/contributing/developer-handbook.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Contributor-oriented reference: glossary, repository conventions, parameter sema
44

55
## Glossary
66

7-
* **Unit** - A component in a pipeline that either produces or processes data. There are two types of units, Source, and Segments.
7+
* **Unit** - A component in a pipeline that either produces or processes data. There are two types of units: Sources and Segments.
88
* **Segment** - A unit that reads from another Unit and may or may not yield data of its own. All units that
9-
are not at the start of a pipeline is a Segment.
9+
are not at the start of a pipeline are Segments.
1010
* **Source** - A unit that takes nothing as input and yields data items. These Units are used in the
1111
"INPUT FROM..." portion of a pipeline.
1212

@@ -24,9 +24,9 @@ The following are the main breakdown of the codebase. These should be considered
2424
* Example: chatterlang_script
2525
* **talkpipe.operations** - Contains general algorithm implementations. Associated segments and sources can be included next to the algorithm implementations, but the algorithms themselves should also work stand-alone.
2626
* Example: bloom filters
27-
* **talkpipe.data** - Contain components having to do with complex, type-specific data manipulation.
27+
* **talkpipe.data** - Contains components having to do with complex, type-specific data manipulation.
2828
* Example: extracting text from files.
29-
* **talkpipe.llm** - Contain the abstract classes and implementations for accessing LLMs, both code for accessing specific LLMs and code for doing prompting.
29+
* **talkpipe.llm** - Contains the abstract classes and implementations for accessing LLMs, both code for accessing specific LLMs and code for doing prompting.
3030
* Example: Code for talking with Ollama or OpenAI
3131
* **talkpipe.pipe** - Code that implements the core classes and decorators for the pipe api as well and misc implementations of helper segments and sources.
3232
* Example: echo and the definition of the @segment decorator
@@ -58,7 +58,7 @@ These parameter names should behave consistently across all units:
5858
If used, any processed output is attached to the original data using bracket notation. The original item is then emitted.
5959

6060
- **fail_on_error**
61-
If True, an operation the exception should be raised, likely aborting the pipeline. If False, the operation should continue
61+
If True, the exception should be raised, likely aborting the pipeline. If False, the operation should continue
6262
and either None should be yielded or nothing, depending on the segment or source. A warning message should be logged.
6363

6464
- **field**
@@ -68,7 +68,7 @@ These parameter names should behave consistently across all units:
6868
- **field_list**
6969
Specifies that a list of fields can or should be provided, with each field separated
7070
by a comma. In some cases, each field needs to be mapped to some other name. In
71-
those case, the field and name should be separated by a colon. In field_lists,
71+
those cases, the field and name should be separated by a colon. In field_lists,
7272
the underscore (_) refers to the item as a whole.
7373
- For example, "X.2.0:SomeName,X.1:SomeOtherName". If no "name" is provided,
7474
the fieldname itself is used. Where only a list of fields is needed and no names,
@@ -88,11 +88,9 @@ After talkpipe is installed, a script called "chatterlang_reference_browser" is
8888

8989
### Standard Configuration File Items
9090

91-
Configuration constants can be defined either in ~/.talkpipe.toml or in environment variables. Any constant defined in an environment variable needs to be prefixed with TALKPIPE_. So email_password, stored in an environment variable, needs to be TALKPIPE_email_password. Note that in Chatterlang, any variable stored in the format
92-
can be specified as a parameter using $var_name. This will get dereferenced to
93-
the environment variable TALKPIPE_var_name or var_name in talkpipe.toml.
91+
Configuration constants can be defined either in ~/.talkpipe.toml or in environment variables. Any constant defined in an environment variable needs to be prefixed with TALKPIPE_. So email_password, stored in an environment variable, needs to be TALKPIPE_email_password. Note that in ChatterLang, any key defined in ~/.talkpipe.toml or set via a TALKPIPE_* environment variable can be referenced in scripts as a parameter using $var_name. That reference resolves to the environment variable TALKPIPE_var_name or to var_name in talkpipe.toml.
9492

95-
* **default_embedding_source** - The default source (e.g. ollama) to be used for creating sentence embeddings.
93+
* **default_embedding_model_source** - The default source (e.g. ollama) to be used for creating sentence embeddings.
9694
* **default_embedding_model_name** - The name of the LLM model to be used for creating sentence embeddings.
9795
* **default_model_name** - The default name of a LLM model to be used in chat
9896
* **default_model_source** - The default source (e.g. ollama) to be used in chat

docs/guides/makevectordatabase-and-serverag.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Together they form a minimal path from raw documents to a queryable RAG interfac
1919

2020
## Prerequisites
2121

22-
- **TalkPipe** with LLM support: `pip install talkpipe[ollama]` or `talkpipe[all]`
22+
- **TalkPipe** with LLM support: `pip install talkpipe[ollama]` or `pip install talkpipe[all]`
2323
- **Embedding model**: Ollama with an embedding model (e.g. `ollama pull mxbai-embed-large`)
2424
- **Completion model** (for serverag): Ollama with an LLM (e.g. `ollama pull llama3.2`)
2525
- **Configuration**: Set `DEFAULT_EMBEDDING_MODEL`, `DEFAULT_EMBEDDING_SOURCE`, `DEFAULT_LLM_MODEL`, and `DEFAULT_LLM_SOURCE` in `~/.talkpipe.toml` or pass them on the command line

docs/tutorials/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Each tutorial builds on the previous. Tutorial 1's index feeds Tutorial 2; Tutor
1616

1717
## Get Started in 5 Minutes
1818

19-
1. **Install**: See [Getting Started](../quickstart.md) for installation. For tutorials: `pip install talkpipe[ollama]` or `talkpipe[all]`
19+
1. **Install**: See [Getting Started](../quickstart.md) for installation. For tutorials: `pip install talkpipe[ollama]` or `pip install talkpipe[all]`
2020
2. **Run Tutorial 1** (from `docs/tutorials/Tutorial_1-Document_Indexing`):
2121
- `./Step_1_CreateSyntheticData.sh` — creates `stories.json` (~5–10 min)
2222
- `./Step_2_IndexStories.sh` — builds search index (~5 sec)

docs/tutorials/Tutorial_1-Document_Indexing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TalkPipe lets you prototype searchable document systems without external databas
2727

2828
## Prerequisites
2929

30-
- **TalkPipe** installed: See [Getting Started](../../quickstart.md) for installation. For this tutorial: `pip install talkpipe[ollama]` or `talkpipe[all]`
30+
- **TalkPipe** installed: See [Getting Started](../../quickstart.md) for installation. For this tutorial: `pip install talkpipe[ollama]` or `pip install talkpipe[all]`
3131
- **Step 1 only**: Ollama installed locally with the `llama3.2` model (or adjust the script to use another model)
3232

3333
> **Tip:** If you skip Step 1, you can use the included `stories.json` and go straight to Step 2.

docs/tutorials/Tutorial_2-Search_by_Example_and_RAG/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Keyword search breaks when users ask "find documents similar to this" or "show m
2828
## Prerequisites
2929

3030
- **Tutorial 1 completed**: `stories.json` must exist at `../Tutorial_1-Document_Indexing/stories.json`
31-
- **TalkPipe** installed: See [Getting Started](../../quickstart.md). For this tutorial: `pip install talkpipe[ollama]` or `talkpipe[all]`
31+
- **TalkPipe** installed: See [Getting Started](../../quickstart.md). For this tutorial: `pip install talkpipe[ollama]` or `pip install talkpipe[all]`
3232
- **Ollama** with these models:
3333
- `mxbai-embed-large` (embeddings): `ollama pull mxbai-embed-large`
3434
- `llama3.2` (Step 3 only): `ollama pull llama3.2`

0 commit comments

Comments
 (0)