Skip to content

Add comment line support to --api-key-file#23168

Merged
ngxson merged 1 commit into
ggml-org:masterfrom
kucharskim:comments-and-api-keys-kucharskim-p2
Jun 19, 2026
Merged

Add comment line support to --api-key-file#23168
ngxson merged 1 commit into
ggml-org:masterfrom
kucharskim:comments-and-api-keys-kucharskim-p2

Conversation

@kucharskim

Copy link
Copy Markdown
Contributor

@kucharskim
kucharskim requested a review from a team as a code owner May 16, 2026 23:00
@ggml-gh-bot

ggml-gh-bot Bot commented May 16, 2026

Copy link
Copy Markdown

Hi @kucharskim, thanks for your contribution!

Per our contribution guidelines, the automated PR checker found the following issue(s) that need your attention:

  • Multiple open PRs from a new contributor: We limit new contributors (those without a previously merged PR) to 1 open PR at a time. You currently have 2 open PRs.

Please note that maintainers reserve the right to make final decisions on PRs. If you believe there is a mistake, please comment below.

@kucharskim
kucharskim force-pushed the comments-and-api-keys-kucharskim-p2 branch from ec9967c to 7e65ae4 Compare May 16, 2026 23:14
@kucharskim
kucharskim requested a review from a team as a code owner May 16, 2026 23:14
@kucharskim
kucharskim force-pushed the comments-and-api-keys-kucharskim-p2 branch from 7e65ae4 to 6977ca8 Compare May 16, 2026 23:17
@kucharskim
kucharskim marked this pull request as draft May 16, 2026 23:19
@kucharskim

Copy link
Copy Markdown
Contributor Author

If you support only one pull request per person, then I would like first #23167 to be reviewed. This one can wait.

@kucharskim
kucharskim force-pushed the comments-and-api-keys-kucharskim-p2 branch from 6977ca8 to 359b6ea Compare May 28, 2026 16:32
@kucharskim
kucharskim marked this pull request as ready for review May 28, 2026 16:32
@kucharskim

Copy link
Copy Markdown
Contributor Author

This is ready for review.

@allozaur
allozaur requested a review from ngxson May 28, 2026 16:39
Comment thread tools/server/README.md
| `--rerank, --reranking` | enable reranking endpoint on server (default: disabled)<br/>(env: LLAMA_ARG_RERANKING) |
| `--api-key KEY` | API key to use for authentication, multiple keys can be provided as a comma-separated list (default: none)<br/>(env: LLAMA_API_KEY) |
| `--api-key-file FNAME` | path to file containing API keys, one per line (default: none)<br/>(env: LLAMA_ARG_API_KEY_FILE) |
| `--api-key-file FNAME` | path to file containing API keys, one per line; lines starting with a hash are treated as comments (default: none)<br/>(env: LLAMA_ARG_API_KEY_FILE) |

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this table is autogenerated, do not edit it directly

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. Can you give me quick pointer how to regenerate it and where is the source of truth for this table?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I edited it by hand, but I found the source of truth for the table. I hope it's okay as is.

@kucharskim
kucharskim force-pushed the comments-and-api-keys-kucharskim-p2 branch from 359b6ea to 3f5d5d3 Compare May 28, 2026 20:27
@kucharskim
kucharskim requested review from allozaur and ngxson May 28, 2026 20:27
@kucharskim
kucharskim force-pushed the comments-and-api-keys-kucharskim-p2 branch from 3f5d5d3 to 097e7cf Compare June 19, 2026 12:14
@kucharskim

Copy link
Copy Markdown
Contributor Author

Resolve conflicts.

@ngxson
ngxson merged commit fabde3b into ggml-org:master Jun 19, 2026
23 of 25 checks passed
jimbothigpen added a commit to jimbothigpen/llama.cpp that referenced this pull request Jun 20, 2026
Absorbs PRs ggml-org#24821 ggml-org#24796 ggml-org#24779 ggml-org#24817 ggml-org#23168 ggml-org#24787 ggml-org#24801 ggml-org#24794
ggml-webgpu F16 toggles, server router/agent refactor, cpp-httplib 0.48.0,
utf8 windows fix, docker UI build. No conflicts with our custom backends.
papamoose pushed a commit to papamoose/llama.cpp that referenced this pull request Jun 27, 2026
adrianhoehne pushed a commit to adrianhoehne/llama.cpp that referenced this pull request Jul 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants