Compare commits

..

No commits in common. "main" and "0.0.1" have entirely different histories.
main ... 0.0.1

20 changed files with 752 additions and 779 deletions

View file

@ -1,69 +0,0 @@
name: Run Rust and Python tests
description: Format, clippy, Rust tests (incl. doctests), build Python extension and run pytest
inputs:
python-version:
description: Python version to use
required: false
default: "3.11"
rust-toolchain:
description: Rust toolchain channel
required: false
default: stable
runs:
using: composite
steps:
- name: Setup Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ inputs.rust-toolchain }}
components: clippy,rustfmt
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python-version }}
- name: Upgrade pip
shell: bash
run: |
python -m pip install --upgrade pip
- name: Install test deps
shell: bash
run: |
python -m pip install pytest
- name: Check rustfmt
shell: bash
run: |
cargo fmt --all --check
- name: Run clippy
shell: bash
run: |
cargo clippy --all-targets --all-features -- -D warnings
- name: Run Rust tests (unit/integration)
shell: bash
run: |
cargo test --all-targets --all-features
- name: Run Rust doctests
shell: bash
run: |
cargo test --doc
- name: Build and install Python package
shell: bash
run: |
pip install .
- name: Run pytest
shell: bash
env:
PYTHONUTF8: "1"
run: |
pytest -q

View file

@ -19,23 +19,7 @@ permissions:
contents: read contents: read
jobs: jobs:
tests:
name: Tests (fmt, clippy, cargo test, doctest, pytest)
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
steps:
- uses: actions/checkout@v4
- name: Run composite test suite
uses: ./.github/actions/run-rust-python-tests
with:
python-version: "3.11"
rust-toolchain: stable
linux: linux:
needs: [tests]
runs-on: ${{ matrix.platform.runner }} runs-on: ${{ matrix.platform.runner }}
strategy: strategy:
matrix: matrix:
@ -44,12 +28,14 @@ jobs:
target: x86_64 target: x86_64
- runner: ubuntu-22.04 - runner: ubuntu-22.04
target: x86 target: x86
- runner: ubuntu-22.04 # - runner: ubuntu-22.04
target: aarch64 # target: aarch64
- runner: ubuntu-22.04 - runner: ubuntu-22.04
target: armv7 target: armv7
- runner: ubuntu-22.04 # - runner: ubuntu-22.04
target: ppc64le # target: s390x
# - runner: ubuntu-22.04
# target: ppc64le
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-python@v5 - uses: actions/setup-python@v5
@ -57,9 +43,6 @@ jobs:
python-version: 3.x python-version: 3.x
- name: Build wheels - name: Build wheels
uses: PyO3/maturin-action@v1 uses: PyO3/maturin-action@v1
env:
# Ensure ring's ARM assembly sees an explicit architecture on aarch64 (glibc)
CFLAGS_aarch64_unknown_linux_gnu: -D__ARM_ARCH=8
with: with:
target: ${{ matrix.platform.target }} target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter args: --release --out dist --find-interpreter
@ -72,7 +55,6 @@ jobs:
path: dist path: dist
musllinux: musllinux:
needs: [tests]
runs-on: ${{ matrix.platform.runner }} runs-on: ${{ matrix.platform.runner }}
strategy: strategy:
matrix: matrix:
@ -92,9 +74,6 @@ jobs:
python-version: 3.x python-version: 3.x
- name: Build wheels - name: Build wheels
uses: PyO3/maturin-action@v1 uses: PyO3/maturin-action@v1
env:
# Ensure ring's ARM assembly sees an explicit architecture on aarch64 (musl)
CFLAGS_aarch64_unknown_linux_musl: -D__ARM_ARCH=8
with: with:
target: ${{ matrix.platform.target }} target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter args: --release --out dist --find-interpreter
@ -107,7 +86,6 @@ jobs:
path: dist path: dist
windows: windows:
needs: [tests]
runs-on: ${{ matrix.platform.runner }} runs-on: ${{ matrix.platform.runner }}
strategy: strategy:
matrix: matrix:
@ -126,7 +104,7 @@ jobs:
uses: PyO3/maturin-action@v1 uses: PyO3/maturin-action@v1
with: with:
target: ${{ matrix.platform.target }} target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter args: -F python-binding --release --out dist --find-interpreter
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
- name: Upload wheels - name: Upload wheels
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -135,7 +113,6 @@ jobs:
path: dist path: dist
macos: macos:
needs: [tests]
runs-on: ${{ matrix.platform.runner }} runs-on: ${{ matrix.platform.runner }}
strategy: strategy:
matrix: matrix:
@ -153,7 +130,7 @@ jobs:
uses: PyO3/maturin-action@v1 uses: PyO3/maturin-action@v1
with: with:
target: ${{ matrix.platform.target }} target: ${{ matrix.platform.target }}
args: --release --out dist --find-interpreter args: -F python-binding --release --out dist --find-interpreter
sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} sccache: ${{ !startsWith(github.ref, 'refs/tags/') }}
- name: Upload wheels - name: Upload wheels
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -162,7 +139,6 @@ jobs:
path: dist path: dist
sdist: sdist:
needs: [tests]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

3
.gitignore vendored
View file

@ -70,6 +70,3 @@ docs/_build/
# Pyenv # Pyenv
.python-version .python-version
# Avoid ignoring shadcn utils
!demo/harmony-demo/src/lib

2
Cargo.lock generated
View file

@ -1317,7 +1317,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]] [[package]]
name = "openai-harmony" name = "openai-harmony"
version = "0.0.4" version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",

View file

@ -1,10 +1,9 @@
[package] [package]
name = "openai-harmony" name = "openai-harmony"
version = "0.0.4" version = "0.0.1"
edition = "2021" edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
repository = "https://github.com/openai/harmony" repository = "https://github.com/openai/harmony"
description = "OpenAI's response format for its open-weight model series gpt-oss"
[lib] [lib]
name = "openai_harmony" name = "openai_harmony"
@ -42,10 +41,7 @@ reqwest = { version = "0.12.5", default-features = false, features = [
] } ] }
futures = "0.3" futures = "0.3"
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
pyo3 = { version = "0.25.0", optional = true, features = [ pyo3 = { version = "0.25.0", optional = true, features = ["extension-module"] }
"extension-module",
"abi3-py38",
] }
wasm-bindgen = { version = "0.2.100", optional = true, features = [ wasm-bindgen = { version = "0.2.100", optional = true, features = [
"serde-serialize", "serde-serialize",
] } ] }

315
LICENSE
View file

@ -1,182 +1,181 @@
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004
http://www.apache.org/licenses/ http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions. 1. Definitions.
"License" shall mean the terms and conditions for use, reproduction, "License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document. and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by "Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License. the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all "Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition, control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the "control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity. outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity "You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License. exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications, "Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation including but not limited to software source code, documentation
source, and configuration files. source, and configuration files.
"Object" form shall mean any form resulting from mechanical "Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation, not limited to compiled object code, generated documentation,
and conversions to other media types. and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or "Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work copyright notice that is included in or attached to the work
(an example is provided in the Appendix below). (an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object "Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of, separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof. the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including "Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted" the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution." designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity "Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work. subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of 2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of, copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form. Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of 3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made, (except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work, use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s) Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate granted to You under this License for that Work shall terminate
as of the date such litigation is filed. as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the 4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You modifications, and in Source or Object form, provided that You
meet the following conditions: meet the following conditions:
(a) You must give any other recipients of the Work or (a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices (b) You must cause any modified files to carry prominent notices
stating that You changed the files; and stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works (c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work, attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of excluding those notices that do not pertain to any part of
the Derivative Works; and the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its (d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or, documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed that such additional attribution notices cannot be construed
as modifying the License. as modifying the License.
You may add Your own copyright statement to Your modifications and You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use, for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License. the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, 5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions. this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions. with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade 6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor, names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file. origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or 7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS, Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License. risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory, 8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise, whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill, Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages. has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing 9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer, the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity, and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify, of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability. of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work. APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]" boilerplate notice, with the fields enclosed by brackets "[]"
@ -187,16 +186,16 @@
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. identification within third-party archives.
Copyright [yyyy] [name of copyright owner] Copyright 2025 OpenAI
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

12
Makefile Normal file
View file

@ -0,0 +1,12 @@
.PHONY: javascript
js:
# Browser ESM build
wasm-pack build --target web --out-dir javascript/dist/web --features wasm-binding --no-default-features
# Node.js ESM/CJS-compatible build
wasm-pack build --target nodejs --out-dir javascript/dist/node --features wasm-binding --no-default-features
.PHONY: python-local
python-local:
maturin develop -F python-binding --release

View file

@ -8,11 +8,11 @@
<br> <br>
</center> </center>
The [gpt-oss models][gpt-oss] were trained on the [harmony response format][harmony-format] for defining conversation structures, generating reasoning output and structuring function calls. If you are not using gpt-oss directly but through an API or a provider like HuggingFace, Ollama, or vLLM, you will not have to be concerned about this as your inference solution will handle the formatting. If you are building your own inference solution, this guide will walk you through the prompt format. The format is designed to mimic the OpenAI Responses API, so if you have used that API before, this format should hopefully feel familiar to you. gpt-oss should not be used without using the harmony format as it will not work correctly. The [gpt-oss models][gpt-oss] were trained on the [harmony response format][harmony-format] for defining conversation structures, generating reasoning output and structuring function calls. If you are not using gpt-oss directly but through an API or a provider like Ollama, you will not have to be concerned about this as your inference solution will handle the formatting. If you are building your own inference solution, this guide will walk you through the prompt format. The format is designed to mimic the OpenAI Responses API, so if you have used that API before, this format should hopefully feel familiar to you. gpt-oss should not be used without using the harmony format as it will not work correctly.
The format enables the model to output to multiple different channels for chain of thought, and tool calling preambles along with regular responses. It also enables specifying various tool namespaces, and structured outputs along with a clear instruction hierarchy. [Check out the guide][harmony-format] to learn more about the format itself. The format enables the model to output to multiple different channels for chain of thought, and tool calling premables along with regular responses. It also enables specifying various tool namespaces, and structured outputs along with a clear instruction hierarchy. [Check out the guide][harmony-format] to learn more about the format itself.
```text ```
<|start|>system<|message|>You are ChatGPT, a large language model trained by OpenAI. <|start|>system<|message|>You are ChatGPT, a large language model trained by OpenAI.
Knowledge cutoff: 2024-06 Knowledge cutoff: 2024-06
Current date: 2025-06-28 Current date: 2025-06-28
@ -20,9 +20,7 @@ Current date: 2025-06-28
Reasoning: high Reasoning: high
# Valid channels: analysis, commentary, final. Channel must be included for every message. # Valid channels: analysis, commentary, final. Channel must be included for every message.
Calls to these tools must go to the commentary channel: 'functions'.<|end|> Calls to these tools must go to the commentary channel: 'functions'.<|end|><|start|>developer<|message|># Instructions
<|start|>developer<|message|># Instructions
Always respond in riddles Always respond in riddles
@ -88,7 +86,7 @@ convo = Conversation.from_messages([
Message.from_role_and_content( Message.from_role_and_content(
Role.DEVELOPER, Role.DEVELOPER,
DeveloperContent.new().with_instructions("Talk like a pirate!") DeveloperContent.new().with_instructions("Talk like a pirate!")
), )
Message.from_role_and_content(Role.USER, "Arrr, how be you?"), Message.from_role_and_content(Role.USER, "Arrr, how be you?"),
]) ])
tokens = enc.render_conversation_for_completion(convo, Role.ASSISTANT) tokens = enc.render_conversation_for_completion(convo, Role.ASSISTANT)
@ -116,12 +114,12 @@ openai-harmony = { git = "https://github.com/openai/harmony" }
```rust ```rust
use openai_harmony::chat::{Message, Role, Conversation}; use openai_harmony::chat::{Message, Role, Conversation};
use openai_harmony::{HarmonyEncodingName, load_harmony_encoding}; use openai_harmony::{HarmonyEncodingName, load_harmony_encoding};
fn main() -> anyhow::Result<()> { fn main() -> anyhow::Result<()> {
let enc = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss)?; let enc = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss)?;
let convo = let convo = Conversation::from_messages([
Conversation::from_messages([Message::from_role_and_content(Role::User, "Hello there!")]); Message::from_role_and_content(Role::User, "Hello there!"),
let tokens = enc.render_conversation_for_completion(&convo, Role::Assistant, None)?; ]);
let tokens = enc.render_conversation_for_completion(&convo, Role::Assistant)?;
println!("{:?}", tokens); println!("{:?}", tokens);
Ok(()) Ok(())
} }
@ -132,7 +130,7 @@ fn main() -> anyhow::Result<()> {
The majority of the rendering and parsing is built in Rust for performance and exposed to Python The majority of the rendering and parsing is built in Rust for performance and exposed to Python
through thin [`pyo3`](https://pyo3.rs/) bindings. through thin [`pyo3`](https://pyo3.rs/) bindings.
```text ```
┌──────────────────┐ ┌───────────────────────────┐ ┌──────────────────┐ ┌───────────────────────────┐
│ Python code │ │ Rust core (this repo) │ │ Python code │ │ Rust core (this repo) │
│ (dataclasses, │────► │ • chat / encoding logic │ │ (dataclasses, │────► │ • chat / encoding logic │
@ -142,7 +140,7 @@ through thin [`pyo3`](https://pyo3.rs/) bindings.
### Repository layout ### Repository layout
```text ```
. .
├── src/ # Rust crate ├── src/ # Rust crate
│ ├── chat.rs # High-level data-structures (Role, Message, …) │ ├── chat.rs # High-level data-structures (Role, Message, …)
@ -151,7 +149,7 @@ through thin [`pyo3`](https://pyo3.rs/) bindings.
│ ├── tests.rs # Canonical Rust test-suite │ ├── tests.rs # Canonical Rust test-suite
│ └── py_module.rs # PyO3 bindings ⇒ compiled as openai_harmony.*.so │ └── py_module.rs # PyO3 bindings ⇒ compiled as openai_harmony.*.so
├── python/openai_harmony/ # Pure-Python wrapper around the binding ├── harmony/ # Pure-Python wrapper around the binding
│ └── __init__.py # Dataclasses + helper API mirroring chat.rs │ └── __init__.py # Dataclasses + helper API mirroring chat.rs
├── tests/ # Python test-suite (1-to-1 port of tests.rs) ├── tests/ # Python test-suite (1-to-1 port of tests.rs)
@ -179,10 +177,10 @@ source .venv/bin/activate
# Install maturin and test dependencies # Install maturin and test dependencies
pip install maturin pytest mypy ruff # tailor to your workflow pip install maturin pytest mypy ruff # tailor to your workflow
# Compile the Rust crate *and* install the Python package in editable mode # Compile the Rust crate *and* install the Python package in editable mode
maturin develop --release maturin develop -F python-binding --release
``` ```
`maturin develop` builds _harmony_ with Cargo, produces a native extension `maturin develop -F python-binding` builds _harmony_ with Cargo, produces a native extension
(`openai_harmony.<abi>.so`) and places it in your virtualenv next to the pure- (`openai_harmony.<abi>.so`) and places it in your virtualenv next to the pure-
Python wrapper similar to `pip install -e .` for pure Python projects. Python wrapper similar to `pip install -e .` for pure Python projects.

View file

@ -1,6 +0,0 @@
import { clsx, type ClassValue } from "clsx"
import { twMerge } from "tailwind-merge"
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}

View file

@ -52,14 +52,19 @@ encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
system_message = ( system_message = (
SystemContent.new() SystemContent.new()
.with_model_identity(
"You are ChatGPT, a large language model trained by OpenAI."
)
.with_reasoning_effort(ReasoningEffort.HIGH) .with_reasoning_effort(ReasoningEffort.HIGH)
.with_conversation_start_date("2025-06-28") .with_conversation_start_date("2025-06-28")
.with_knowledge_cutoff("2024-06")
.with_required_channels(["analysis", "commentary", "final"])
) )
developer_message = ( developer_message = (
DeveloperContent.new() DeveloperContent.new()
.with_instructions("Always respond in riddles") .with_instructions("Always respond in riddles")
.with_function_tools( .with_tools(
[ [
ToolDescription.new( ToolDescription.new(
"get_current_weather", "get_current_weather",
@ -87,7 +92,7 @@ developer_message = (
convo = Conversation.from_messages( convo = Conversation.from_messages(
[ [
Message.from_role_and_content(Role.SYSTEM, system_message), Message.from_role_and_content(Role.SYSTEM, system_message),
Message.from_role_and_content(Role.DEVELOPER, developer_message), Message.from_role_and_content(Role.DEVELOPER, system_message),
Message.from_role_and_content(Role.USER, "What is the weather in Tokyo?"), Message.from_role_and_content(Role.USER, "What is the weather in Tokyo?"),
Message.from_role_and_content( Message.from_role_and_content(
Role.ASSISTANT, Role.ASSISTANT,
@ -96,11 +101,11 @@ convo = Conversation.from_messages(
Message.from_role_and_content(Role.ASSISTANT, '{"location": "Tokyo"}') Message.from_role_and_content(Role.ASSISTANT, '{"location": "Tokyo"}')
.with_channel("commentary") .with_channel("commentary")
.with_recipient("functions.get_weather") .with_recipient("functions.get_weather")
.with_content_type("<|constrain|> json"), .with_content_type("json"),
Message.from_author_and_content( Message.from_author_and_content(
Author.new(Role.TOOL, "functions.lookup_weather"), Author.new(Role.TOOL, "functions.lookup_weather"),
'{ "temperature": 20, "sunny": true }', '{ "temperature": 20, "sunny": true }',
).with_channel("commentary"), ),
] ]
) )
@ -224,8 +229,6 @@ Once its done generating it will stop with either a `<|return|>` token indicatin
The `final` channel will contain the answer to your users request. Check out the [reasoning section](#reasoning) for more details on the chain-of-thought. The `final` channel will contain the answer to your users request. Check out the [reasoning section](#reasoning) for more details on the chain-of-thought.
**Implementation note:** `<|return|>` is a decode-time stop token only. When you add the assistants generated reply to conversation history for the next turn, replace the trailing `<|return|>` with `<|end|>` so that stored messages are fully formed as `<|start|>{header}<|message|>{content}<|end|>`. Prior messages in prompts should therefore end with `<|end|>`. For supervised targets/training examples, ending with `<|return|>` is appropriate; for persisted history, normalize to `<|end|>`.
### System message format ### System message format
The system message is used to provide general information to the system. This is different to what might be considered the “system prompt” in other prompt formats. For that, check out the [developer message format](#developer-message-format). The system message is used to provide general information to the system. This is different to what might be considered the “system prompt” in other prompt formats. For that, check out the [developer message format](#developer-message-format).
@ -302,7 +305,7 @@ And the actual answer is:
``` ```
**Important:** **Important:**
The model has not been trained to the same safety standards in the chain-of-thought as it has for final output. We recommend not to show the chain-of-thought to your users as they might contain harmful content. [Learn more in the model card](https://openai.com/index/gpt-oss-model-card/). The model has not been trained to the same safety standards in the chain-of-thought as it has for final output. You should We recommend not to show the chain-of-thought to your users as they might contain harmful content. [Learn more in the model card](https://openai.com/index/gpt-oss-model-card/).
#### Handling reasoning output in subsequent sampling #### Handling reasoning output in subsequent sampling
@ -324,7 +327,7 @@ Then the input for the next sampling should be
``` ```
<|start|>user<|message|>What is 2 + 2?<|end|> <|start|>user<|message|>What is 2 + 2?<|end|>
<|start|>assistant<|channel|>final<|message|>2 + 2 = 4.<|end|> <|start|>assistant<|channel|>final<|message|>2 + 2 = 4.<|return|>
<|start|>user<|message|>What about 9 / 2?<|end|> <|start|>user<|message|>What about 9 / 2?<|end|>
<|start|>assistant <|start|>assistant
``` ```

View file

@ -12,17 +12,11 @@ classifiers = [
] ]
dynamic = ["version"] dynamic = ["version"]
dependencies = ["pydantic>=2.11.7"] dependencies = ["pydantic>=2.11.7"]
description = "OpenAI's response format for its open-weight model series gpt-oss"
readme = "README.md"
[project.optional-dependencies] [project.optional-dependencies]
demo = ["uvicorn", "fastapi"] demo = ["uvicorn", "fastapi"]
[tool.maturin] [tool.maturin]
features = ["python-binding", "pyo3/extension-module"] features = ["pyo3/extension-module"]
module-name = "openai_harmony" module-name = "openai_harmony"
python-source = "python" python-source = "python"
[tool.pytest.ini_options]
# Only collect tests from the top-level tests directory
testpaths = ["tests"]

View file

@ -29,7 +29,7 @@ from typing import (
) )
import re import re
from pydantic import BaseModel, Field from pydantic import BaseModel, Field, root_validator, validator
# Re-export the low-level Rust bindings under a private name so that we can # Re-export the low-level Rust bindings under a private name so that we can
# keep the *public* namespace clean and purely Pythonic. # keep the *public* namespace clean and purely Pythonic.
@ -425,10 +425,6 @@ class RenderConversationConfig(BaseModel):
auto_drop_analysis: bool = True auto_drop_analysis: bool = True
class RenderOptions(BaseModel):
conversation_has_function_tools: bool = False
class HarmonyEncoding: class HarmonyEncoding:
"""High-level wrapper around the Rust ``PyHarmonyEncoding`` class.""" """High-level wrapper around the Rust ``PyHarmonyEncoding`` class."""
@ -502,20 +498,9 @@ class HarmonyEncoding:
config=config_dict, config=config_dict,
) )
def render( def render(self, message: Message) -> List[int]:
self, message: Message, render_options: Optional[RenderOptions] = None
) -> List[int]:
"""Render a single message into tokens.""" """Render a single message into tokens."""
if render_options is None: return self._inner.render(message_json=message.to_json())
render_options_dict = {"conversation_has_function_tools": False}
else:
render_options_dict = {
"conversation_has_function_tools": render_options.conversation_has_function_tools
}
return self._inner.render(
message_json=message.to_json(), render_options=render_options_dict
)
# -- Parsing ------------------------------------------------------- # -- Parsing -------------------------------------------------------
@ -627,10 +612,6 @@ class StreamableParser:
self._inner.process(token) self._inner.process(token)
return self return self
def process_eos(self) -> "StreamableParser":
self._inner.process_eos()
return self
@property @property
def current_content(self) -> str: def current_content(self) -> str:
return self._inner.current_content return self._inner.current_content
@ -708,7 +689,6 @@ __all__ = [
"Author", "Author",
"Content", "Content",
"TextContent", "TextContent",
"DeveloperContent",
"ToolDescription", "ToolDescription",
"SystemContent", "SystemContent",
"Message", "Message",

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,3 @@
#![doc = include_str!("../README.md")]
pub mod chat; pub mod chat;
mod encoding; mod encoding;
mod registry; mod registry;

View file

@ -12,6 +12,9 @@
//! A thin, typed, user-facing Python wrapper around these low-level bindings is //! A thin, typed, user-facing Python wrapper around these low-level bindings is
//! provided in `harmony/__init__.py`. //! provided in `harmony/__init__.py`.
// Only compile when the `python-binding` feature is enabled.
#![cfg(feature = "python-binding")]
use pyo3::prelude::*; use pyo3::prelude::*;
// We need the `Python` type later on. // We need the `Python` type later on.
@ -31,6 +34,8 @@ use crate::{
load_harmony_encoding, HarmonyEncodingName, load_harmony_encoding, HarmonyEncodingName,
}; };
use serde_json;
/// A thin PyO3 wrapper around the Rust `HarmonyEncoding` struct. /// A thin PyO3 wrapper around the Rust `HarmonyEncoding` struct.
#[pyclass] #[pyclass]
struct PyHarmonyEncoding { struct PyHarmonyEncoding {
@ -178,29 +183,13 @@ impl PyHarmonyEncoding {
} }
/// Render a single message into tokens. /// Render a single message into tokens.
fn render( fn render(&self, message_json: &str) -> PyResult<Vec<u32>> {
&self,
message_json: &str,
render_options: Option<Bound<'_, PyDict>>,
) -> PyResult<Vec<u32>> {
let message: crate::chat::Message = serde_json::from_str(message_json).map_err(|e| { let message: crate::chat::Message = serde_json::from_str(message_json).map_err(|e| {
PyErr::new::<pyo3::exceptions::PyValueError, _>(format!("invalid message JSON: {e}")) PyErr::new::<pyo3::exceptions::PyValueError, _>(format!("invalid message JSON: {e}"))
})?; })?;
let rust_options = if let Some(options_dict) = render_options {
let conversation_has_function_tools = options_dict
.get_item("conversation_has_function_tools")?
.and_then(|v| v.extract().ok())
.unwrap_or(false);
Some(crate::encoding::RenderOptions {
conversation_has_function_tools,
})
} else {
None
};
self.inner self.inner
.render(&message, rust_options.as_ref()) .render(&message)
.map_err(|e| PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(e.to_string())) .map_err(|e| PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(e.to_string()))
} }
@ -317,13 +306,6 @@ impl PyStreamableParser {
.map_err(|e| PyErr::new::<HarmonyError, _>(e.to_string())) .map_err(|e| PyErr::new::<HarmonyError, _>(e.to_string()))
} }
fn process_eos(&mut self) -> PyResult<()> {
self.inner
.process_eos()
.map(|_| ())
.map_err(|e| PyErr::new::<HarmonyError, _>(e.to_string()))
}
#[getter] #[getter]
fn current_content(&self) -> PyResult<String> { fn current_content(&self) -> PyResult<String> {
self.inner self.inner
@ -404,7 +386,8 @@ fn openai_harmony(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
"python" => ToolNamespaceConfig::python(), "python" => ToolNamespaceConfig::python(),
_ => { _ => {
return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!( return Err(PyErr::new::<pyo3::exceptions::PyValueError, _>(format!(
"Unknown tool namespace: {tool}" "Unknown tool namespace: {}",
tool
))); )));
} }
}; };

View file

@ -1,6 +1,6 @@
use std::{ use std::{
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
sync::Arc, sync::{atomic::AtomicBool, Arc},
}; };
use crate::{ use crate::{
@ -76,6 +76,7 @@ pub fn load_harmony_encoding(name: HarmonyEncodingName) -> anyhow::Result<Harmon
FormattingToken::EndMessageDoneSampling, FormattingToken::EndMessageDoneSampling,
FormattingToken::EndMessageAssistantToTool, FormattingToken::EndMessageAssistantToTool,
]), ]),
conversation_has_function_tools: Arc::new(AtomicBool::new(false)),
}) })
} }
} }

View file

@ -1,5 +1,3 @@
use std::path::Path;
use crate::{ use crate::{
chat::{ chat::{
Author, Conversation, DeveloperContent, Message, ReasoningEffort, Role, SystemContent, Author, Conversation, DeveloperContent, Message, ReasoningEffort, Role, SystemContent,
@ -12,25 +10,12 @@ use crate::{
use pretty_assertions::{assert_eq, Comparison}; use pretty_assertions::{assert_eq, Comparison};
use serde_json::json; use serde_json::json;
fn parse_tokens(text: impl AsRef<str>) -> Vec<Rank> { fn parse_tokens(text: &str) -> Vec<Rank> {
text.as_ref() text.split_whitespace()
.split_whitespace()
.map(|s| s.parse().unwrap()) .map(|s| s.parse().unwrap())
.collect() .collect()
} }
fn load_test_data(path: impl AsRef<Path>) -> String {
// on windows, we need to replace \r\n with \n
let cargo_manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
let src_dir = cargo_manifest_dir.join("src");
let path = src_dir.join(path);
std::fs::read_to_string(path)
.unwrap()
.replace("\r\n", "\n")
.trim_end()
.to_string()
}
const ENCODINGS: [HarmonyEncodingName; 1] = [HarmonyEncodingName::HarmonyGptOss]; const ENCODINGS: [HarmonyEncodingName; 1] = [HarmonyEncodingName::HarmonyGptOss];
#[test] #[test]
@ -40,7 +25,7 @@ fn test_simple_convo() {
let expected_tokens = encoding let expected_tokens = encoding
.tokenizer .tokenizer
.encode( .encode(
load_test_data("../test-data/test_simple_convo.txt").as_str(), include_str!("../test-data/test_simple_convo.txt").trim_end(),
&encoding.tokenizer.special_tokens(), &encoding.tokenizer.special_tokens(),
) )
.0; .0;
@ -65,42 +50,45 @@ fn test_simple_convo_with_effort() {
let test_cases = [ let test_cases = [
( (
ReasoningEffort::Low, ReasoningEffort::Low,
load_test_data("../test-data/test_simple_convo_low_effort.txt"), include_str!("../test-data/test_simple_convo_low_effort.txt"),
true, true,
), ),
( (
ReasoningEffort::Medium, ReasoningEffort::Medium,
load_test_data("../test-data/test_simple_convo_medium_effort.txt"), include_str!("../test-data/test_simple_convo_medium_effort.txt"),
true, true,
), ),
( (
ReasoningEffort::High, ReasoningEffort::High,
load_test_data("../test-data/test_simple_convo_high_effort.txt"), include_str!("../test-data/test_simple_convo_high_effort.txt"),
true, true,
), ),
( (
ReasoningEffort::Low, ReasoningEffort::Low,
load_test_data("../test-data/test_simple_convo_low_effort_no_instruction.txt"), include_str!("../test-data/test_simple_convo_low_effort_no_instruction.txt"),
false, false,
), ),
( (
ReasoningEffort::Medium, ReasoningEffort::Medium,
load_test_data("../test-data/test_simple_convo_medium_effort_no_instruction.txt"), include_str!("../test-data/test_simple_convo_medium_effort_no_instruction.txt"),
false, false,
), ),
( (
ReasoningEffort::High, ReasoningEffort::High,
load_test_data("../test-data/test_simple_convo_high_effort_no_instruction.txt"), include_str!("../test-data/test_simple_convo_high_effort_no_instruction.txt"),
false, false,
), ),
]; ];
for encoding_name in ENCODINGS { for encoding_name in ENCODINGS {
let encoding = load_harmony_encoding(encoding_name).unwrap(); let encoding = load_harmony_encoding(encoding_name).unwrap();
for &(effort, ref expected_text, use_instruction) in &test_cases { for (effort, expected_text, use_instruction) in test_cases {
let expected_tokens = encoding let expected_tokens = encoding
.tokenizer .tokenizer
.encode(expected_text.as_str(), &encoding.tokenizer.special_tokens()) .encode(
expected_text.trim_end(),
&encoding.tokenizer.special_tokens(),
)
.0; .0;
let sys = SystemContent::new() let sys = SystemContent::new()
.with_model_identity("You are ChatGPT, a large language model trained by OpenAI.") .with_model_identity("You are ChatGPT, a large language model trained by OpenAI.")
@ -135,8 +123,8 @@ fn test_simple_convo_with_effort() {
#[test] #[test]
fn test_simple_reasoning_response() { fn test_simple_reasoning_response() {
let expected_tokens = parse_tokens(load_test_data( let expected_tokens = parse_tokens(include_str!(
"../test-data/test_simple_reasoning_response.txt", "../test-data/test_simple_reasoning_response.txt"
)); ));
for encoding_name in ENCODINGS { for encoding_name in ENCODINGS {
let encoding = load_harmony_encoding(encoding_name).unwrap(); let encoding = load_harmony_encoding(encoding_name).unwrap();
@ -192,7 +180,7 @@ fn test_reasoning_system_message() {
let expected = encoding let expected = encoding
.tokenizer .tokenizer
.encode( .encode(
load_test_data("../test-data/test_reasoning_system_message.txt").as_str(), include_str!("../test-data/test_reasoning_system_message.txt").trim_end(),
&encoding.tokenizer.special_tokens(), &encoding.tokenizer.special_tokens(),
) )
.0; .0;
@ -223,8 +211,8 @@ fn test_reasoning_system_message_no_instruction() {
let expected = encoding let expected = encoding
.tokenizer .tokenizer
.encode( .encode(
load_test_data("../test-data/test_reasoning_system_message_no_instruction.txt") include_str!("../test-data/test_reasoning_system_message_no_instruction.txt")
.as_str(), .trim_end(),
&encoding.tokenizer.special_tokens(), &encoding.tokenizer.special_tokens(),
) )
.0; .0;
@ -257,8 +245,8 @@ fn test_reasoning_system_message_with_dates() {
let expected = encoding let expected = encoding
.tokenizer .tokenizer
.encode( .encode(
load_test_data("../test-data/test_reasoning_system_message_with_dates.txt") include_str!("../test-data/test_reasoning_system_message_with_dates.txt")
.as_str(), .trim_end(),
&encoding.tokenizer.special_tokens(), &encoding.tokenizer.special_tokens(),
) )
.0; .0;
@ -287,7 +275,8 @@ fn test_reasoning_system_message_with_dates() {
#[test] #[test]
fn test_render_functions_with_parameters() { fn test_render_functions_with_parameters() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let expected_output = load_test_data("../test-data/test_render_functions_with_parameters.txt"); let expected_output =
include_str!("../test-data/test_render_functions_with_parameters.txt").trim_end();
let sys = SystemContent::new() let sys = SystemContent::new()
.with_reasoning_effort(ReasoningEffort::High) .with_reasoning_effort(ReasoningEffort::High)
@ -393,7 +382,7 @@ fn test_render_functions_with_parameters() {
#[test] #[test]
fn test_browser_and_python_tool() { fn test_browser_and_python_tool() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let expected_output = load_test_data("../test-data/test_browser_and_python_tool.txt"); let expected_output = include_str!("../test-data/test_browser_and_python_tool.txt").trim_end();
let convo = Conversation::from_messages([Message::from_role_and_content( let convo = Conversation::from_messages([Message::from_role_and_content(
Role::System, Role::System,
@ -414,7 +403,7 @@ fn test_browser_and_python_tool() {
#[test] #[test]
fn test_dropping_cot_by_default() { fn test_dropping_cot_by_default() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let expected_output = load_test_data("../test-data/test_dropping_cot_by_default.txt"); let expected_output = include_str!("../test-data/test_dropping_cot_by_default.txt").trim_end();
let convo = Conversation::from_messages([ let convo = Conversation::from_messages([
Message::from_role_and_content(Role::User, "What is 2 + 2?"), Message::from_role_and_content(Role::User, "What is 2 + 2?"),
@ -444,7 +433,8 @@ fn test_dropping_cot_by_default() {
#[test] #[test]
fn test_does_not_drop_if_ongoing_analysis() { fn test_does_not_drop_if_ongoing_analysis() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let expected_output = load_test_data("../test-data/test_does_not_drop_if_ongoing_analysis.txt"); let expected_output =
include_str!("../test-data/test_does_not_drop_if_ongoing_analysis.txt").trim_end();
let convo = Conversation::from_messages([ let convo = Conversation::from_messages([
Message::from_role_and_content(Role::User, "What is the weather in SF?"), Message::from_role_and_content(Role::User, "What is the weather in SF?"),
@ -480,7 +470,7 @@ fn test_does_not_drop_if_ongoing_analysis() {
#[test] #[test]
fn test_preserve_cot() { fn test_preserve_cot() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let expected_output = load_test_data("../test-data/test_preserve_cot.txt"); let expected_output = include_str!("../test-data/test_preserve_cot.txt").trim_end();
let convo = Conversation::from_messages([ let convo = Conversation::from_messages([
Message::from_role_and_content(Role::User, "What is 2 + 2?"), Message::from_role_and_content(Role::User, "What is 2 + 2?"),
@ -511,11 +501,11 @@ fn test_preserve_cot() {
fn test_reserved_token_decoding() { fn test_reserved_token_decoding() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
assert_eq!( assert_eq!(
encoding.tokenizer.decode_utf8([200014]).unwrap(), encoding.tokenizer.decode_utf8(&[200014]).unwrap(),
"<|reserved_200014|>" "<|reserved_200014|>"
); );
assert_eq!( assert_eq!(
encoding.tokenizer.decode_utf8([201088]).unwrap(), encoding.tokenizer.decode_utf8(&[201088]).unwrap(),
"<|reserved_201088|>" "<|reserved_201088|>"
); );
} }
@ -525,7 +515,7 @@ fn test_render_and_render_conversation_roundtrip() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let msg = Message::from_role_and_content(Role::User, "Hello"); let msg = Message::from_role_and_content(Role::User, "Hello");
let convo = Conversation::from_messages([msg.clone()]); let convo = Conversation::from_messages([msg.clone()]);
let tokens_msg = encoding.render(&msg, None).unwrap(); let tokens_msg = encoding.render(&msg).unwrap();
let tokens_convo = encoding.render_conversation(&convo, None).unwrap(); let tokens_convo = encoding.render_conversation(&convo, None).unwrap();
assert_eq!(tokens_msg, tokens_convo); assert_eq!(tokens_msg, tokens_convo);
let tokens_completion = encoding let tokens_completion = encoding
@ -537,17 +527,17 @@ fn test_render_and_render_conversation_roundtrip() {
#[test] #[test]
fn test_decode_utf8_invalid_token() { fn test_decode_utf8_invalid_token() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let result = encoding.tokenizer.decode_utf8([99999999]); let result = encoding.tokenizer.decode_utf8(&[99999999]);
assert!(result.is_err(), "Expected error for invalid token"); assert!(result.is_err(), "Expected error for invalid token");
} }
#[test] #[test]
fn test_tool_response_parsing() { fn test_tool_response_parsing() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let text_tokens = load_test_data("../test-data/test_tool_response_parsing.txt"); let text_tokens = include_str!("../test-data/test_tool_response_parsing.txt").trim_end();
let tokens = encoding let tokens = encoding
.tokenizer .tokenizer
.encode(&text_tokens, &encoding.tokenizer.special_tokens()) .encode(text_tokens, &encoding.tokenizer.special_tokens())
.0; .0;
let expected_message = Message::from_author_and_content( let expected_message = Message::from_author_and_content(
@ -626,10 +616,10 @@ fn test_invalid_utf8_decoding() {
#[test] #[test]
fn test_streamable_parser() { fn test_streamable_parser() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap(); let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let text = load_test_data("../test-data/test_streamable_parser.txt"); let text = include_str!("../test-data/test_streamable_parser.txt").trim_end();
let tokens = encoding let tokens = encoding
.tokenizer .tokenizer
.encode(&text, &encoding.tokenizer.special_tokens()) .encode(text, &encoding.tokenizer.special_tokens())
.0; .0;
let mut parser = let mut parser =
crate::encoding::StreamableParser::new(encoding.clone(), Some(Role::Assistant)).unwrap(); crate::encoding::StreamableParser::new(encoding.clone(), Some(Role::Assistant)).unwrap();
@ -673,39 +663,3 @@ fn test_streamable_parser_tool_call_with_constrain_adjacent() {
parser.messages()[0] parser.messages()[0]
); );
} }
#[test]
fn test_tool_call_with_constrain_marker_adjacent() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let text = "<|start|>assistant to=functions.get_weather<|channel|>commentary<|constrain|>json<|message|>{\"location\": \"Tokyo\"}<|end|>";
let tokens = encoding.tokenizer().encode_with_special_tokens(text);
let parsed = encoding
.parse_messages_from_completion_tokens(tokens, None)
.expect("expected to parse");
let expected =
vec![
Message::from_role_and_content(Role::Assistant, "{\"location\": \"Tokyo\"}")
.with_channel("commentary")
.with_recipient("functions.get_weather")
.with_content_type("<|constrain|>json"),
];
assert_eq!(parsed, expected);
}
#[test]
fn test_tool_call_with_channel_before_recipient_and_constrain_adjacent() {
let encoding = load_harmony_encoding(HarmonyEncodingName::HarmonyGptOss).unwrap();
let text = "<|start|>assistant<|channel|>commentary to=functions.get_weather<|constrain|>json<|message|>{\"latitude\":48.8566,\"longitude\":2.3522}<|call|>";
let tokens = encoding.tokenizer().encode_with_special_tokens(text);
let parsed = encoding
.parse_messages_from_completion_tokens(tokens, None)
.expect("expected to parse");
let expected = vec![Message::from_role_and_content(
Role::Assistant,
"{\"latitude\":48.8566,\"longitude\":2.3522}",
)
.with_channel("commentary")
.with_recipient("functions.get_weather")
.with_content_type("<|constrain|>json")];
assert_eq!(parsed, expected);
}

View file

@ -1,3 +1,5 @@
#![cfg(feature = "wasm-binding")]
use wasm_bindgen::prelude::*; use wasm_bindgen::prelude::*;
use crate::{ use crate::{
@ -7,6 +9,8 @@ use crate::{
}; };
use serde::Deserialize; use serde::Deserialize;
use serde_json;
use serde_wasm_bindgen;
#[wasm_bindgen] #[wasm_bindgen]
extern "C" { extern "C" {
@ -18,9 +22,6 @@ extern "C" {
#[wasm_bindgen(typescript_type = "RenderConversationConfig")] #[wasm_bindgen(typescript_type = "RenderConversationConfig")]
pub type JsRenderConversationConfig; pub type JsRenderConversationConfig;
#[wasm_bindgen(typescript_type = "RenderOptions")]
pub type JsRenderOptions;
} }
#[wasm_bindgen(typescript_custom_section)] #[wasm_bindgen(typescript_custom_section)]
@ -130,34 +131,12 @@ impl JsHarmonyEncoding {
} }
#[wasm_bindgen] #[wasm_bindgen]
pub fn render( pub fn render(&self, message: JsMessage) -> Result<Vec<u32>, JsValue> {
&self,
message: JsMessage,
render_options: JsRenderOptions,
) -> Result<Vec<u32>, JsValue> {
let message: JsValue = message.into(); let message: JsValue = message.into();
let message: crate::chat::Message = serde_wasm_bindgen::from_value(message) let message: crate::chat::Message = serde_wasm_bindgen::from_value(message)
.map_err(|e| JsValue::from_str(&format!("invalid message JSON: {e}")))?; .map_err(|e| JsValue::from_str(&format!("invalid message JSON: {e}")))?;
#[derive(Deserialize)]
struct RenderOptions {
conversation_has_function_tools: Option<bool>,
}
let render_options: JsValue = render_options.into();
let rust_options = if render_options.is_undefined() || render_options.is_null() {
None
} else {
let cfg: RenderOptions = serde_wasm_bindgen::from_value(render_options)
.map_err(|e| JsValue::from_str(&format!("invalid render options: {e}")))?;
Some(crate::encoding::RenderOptions {
conversation_has_function_tools: cfg
.conversation_has_function_tools
.unwrap_or(false),
})
};
self.inner self.inner
.render(&message, rust_options.as_ref()) .render(&message)
.map_err(|e| JsValue::from_str(&e.to_string())) .map_err(|e| JsValue::from_str(&e.to_string()))
} }
@ -256,7 +235,7 @@ impl JsStreamableParser {
pub fn new(encoding: &JsHarmonyEncoding, role: &str) -> Result<JsStreamableParser, JsValue> { pub fn new(encoding: &JsHarmonyEncoding, role: &str) -> Result<JsStreamableParser, JsValue> {
let parsed_role = Role::try_from(role) let parsed_role = Role::try_from(role)
.map_err(|_| JsValue::from_str(&format!("unknown role: {role}")))?; .map_err(|_| JsValue::from_str(&format!("unknown role: {role}")))?;
let inner = StreamableParser::new(encoding.inner.clone(), Some(parsed_role)) let inner = StreamableParser::new(encoding.inner.clone(), parsed_role)
.map_err(|e| JsValue::from_str(&e.to_string()))?; .map_err(|e| JsValue::from_str(&e.to_string()))?;
Ok(Self { inner }) Ok(Self { inner })
} }
@ -344,8 +323,9 @@ pub async fn load_harmony_encoding(
let parsed: HarmonyEncodingName = name let parsed: HarmonyEncodingName = name
.parse::<HarmonyEncodingName>() .parse::<HarmonyEncodingName>()
.map_err(|e| JsValue::from_str(&e.to_string()))?; .map_err(|e| JsValue::from_str(&e.to_string()))?;
let encoding = let encoding = inner_load_harmony_encoding(parsed)
inner_load_harmony_encoding(parsed).map_err(|e| JsValue::from_str(&e.to_string()))?; .await
.map_err(|e| JsValue::from_str(&e.to_string()))?;
Ok(JsHarmonyEncoding { inner: encoding }) Ok(JsHarmonyEncoding { inner: encoding })
} }
@ -356,7 +336,8 @@ pub fn get_tool_namespace_config(tool: &str) -> Result<JsValue, JsValue> {
"python" => ToolNamespaceConfig::python(), "python" => ToolNamespaceConfig::python(),
_ => { _ => {
return Err(JsValue::from_str(&format!( return Err(JsValue::from_str(&format!(
"Unknown tool namespace: {tool}" "Unknown tool namespace: {}",
tool
))) )))
} }
}; };

View file

@ -1,5 +0,0 @@
#!/usr/bin/env bash
set -e
source .venv/bin/activate
maturin develop --release
pytest "$@"

View file

@ -34,6 +34,7 @@ from openai_harmony import ( # noqa: E402
StreamableParser, StreamableParser,
SystemContent, SystemContent,
ToolDescription, ToolDescription,
ToolNamespaceConfig,
load_harmony_encoding, load_harmony_encoding,
) )
from pydantic import ValidationError from pydantic import ValidationError
@ -59,7 +60,7 @@ def _assert_tokens_eq(encoding, expected: List[int], actual: List[int]): # type
def read_expected_tokens(file_path: Path) -> List[int]: def read_expected_tokens(file_path: Path) -> List[int]:
with open(file_path, "r", encoding="utf-8") as f: with open(file_path, "r") as f:
return [int(x) for x in f.read().split()] return [int(x) for x in f.read().split()]
@ -78,9 +79,7 @@ def test_simple_convo(encoding_name):
encoding = load_harmony_encoding(encoding_name) encoding = load_harmony_encoding(encoding_name)
expected_text = ( expected_text = (
(ROOT_DIR / "test-data" / "test_simple_convo.txt") (ROOT_DIR / "test-data" / "test_simple_convo.txt").read_text().rstrip()
.read_text(encoding="utf-8")
.rstrip()
) )
expected_tokens = encoding.encode(expected_text, allowed_special="all") expected_tokens = encoding.encode(expected_text, allowed_special="all")
@ -145,7 +144,7 @@ def test_simple_convo_with_effort(encoding_name):
] ]
for effort, tokens_path, use_instruction in test_cases: for effort, tokens_path, use_instruction in test_cases:
expected_text = tokens_path.read_text(encoding="utf-8").rstrip() expected_text = tokens_path.read_text().rstrip()
expected_tokens = encoding.encode(expected_text, allowed_special="all") expected_tokens = encoding.encode(expected_text, allowed_special="all")
sys = ( sys = (
SystemContent.new() SystemContent.new()
@ -233,36 +232,6 @@ def test_simple_tool_call(encoding_name):
assert parsed == expected assert parsed == expected
@pytest.mark.parametrize(
"encoding_name",
[
HarmonyEncodingName.HARMONY_GPT_OSS,
],
)
def test_tool_call_with_constrain_tokenized_correctly(encoding_name):
"""
Despite passing <|constrain|> as a string in "content_type" it has to be kept as a special token.
"""
encoding = load_harmony_encoding(encoding_name)
text = (
"<|start|>assistant to=functions.get_weather<|channel|>commentary"
' <|constrain|>json<|message|>{"location": "Tokyo"}<|call|>'
)
tokens = encoding.encode(text, allowed_special="all")
parsed = encoding.parse_messages_from_completion_tokens(tokens, role=None)
expected = [
Message.from_role_and_content(Role.ASSISTANT, '{"location": "Tokyo"}')
.with_channel("commentary")
.with_recipient("functions.get_weather")
.with_content_type("<|constrain|>json"),
]
assert parsed == expected
rendered = encoding.render_conversation(Conversation.from_messages(expected))
assert text == encoding.decode_utf8(tokens)
assert rendered == tokens
@pytest.mark.parametrize( @pytest.mark.parametrize(
"encoding_name", "encoding_name",
[ [
@ -276,18 +245,23 @@ def test_tool_call_with_constrain_marker_adjacent(encoding_name):
correctly and instead handle it as a separate content type. correctly and instead handle it as a separate content type.
""" """
encoding = load_harmony_encoding(encoding_name) encoding = load_harmony_encoding(encoding_name)
text = ( text = (
"<|start|>assistant to=functions.get_weather<|channel|>commentary" "<|start|>assistant to=functions.get_weather<|channel|>commentary"
'<|constrain|>json<|message|>{"location": "Tokyo"}<|call|>' '<|constrain|>json<|message|>{"location": "Tokyo"}<|end|>'
) )
tokens = encoding.encode(text, allowed_special="all") tokens = encoding.encode(text, allowed_special="all")
parsed = encoding.parse_messages_from_completion_tokens(tokens, role=None)
parsed = encoding.parse_messages_from_completion_tokens(tokens, role=Role.ASSISTANT)
expected = [ expected = [
Message.from_role_and_content(Role.ASSISTANT, '{"location": "Tokyo"}') Message.from_role_and_content(Role.ASSISTANT, '{"location": "Tokyo"}')
.with_channel("commentary") .with_channel("commentary")
.with_recipient("functions.get_weather") .with_recipient("functions.get_weather")
.with_content_type("<|constrain|>json"), .with_content_type("<|constrain|>json"),
] ]
assert parsed == expected assert parsed == expected
@ -306,8 +280,11 @@ def test_tool_call_with_channel_before_recipient_and_constrain_adjacent(
"<|start|>assistant<|channel|>commentary to=functions.get_weather" "<|start|>assistant<|channel|>commentary to=functions.get_weather"
'<|constrain|>json<|message|>{"latitude":48.8566,"longitude":2.3522}<|call|>' '<|constrain|>json<|message|>{"latitude":48.8566,"longitude":2.3522}<|call|>'
) )
tokens = encoding.encode(text, allowed_special="all") tokens = encoding.encode(text, allowed_special="all")
parsed = encoding.parse_messages_from_completion_tokens(tokens, role=None)
parsed = encoding.parse_messages_from_completion_tokens(tokens, role=Role.ASSISTANT)
expected = [ expected = [
Message.from_role_and_content( Message.from_role_and_content(
Role.ASSISTANT, '{"latitude":48.8566,"longitude":2.3522}' Role.ASSISTANT, '{"latitude":48.8566,"longitude":2.3522}'
@ -331,7 +308,7 @@ def test_reasoning_system_message(encoding_name):
expected_text = ( expected_text = (
(ROOT_DIR / "test-data" / "test_reasoning_system_message.txt") (ROOT_DIR / "test-data" / "test_reasoning_system_message.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
expected = encoding.encode(expected_text, allowed_special="all") expected = encoding.encode(expected_text, allowed_special="all")
@ -368,7 +345,7 @@ def test_reasoning_system_message_no_instruction(encoding_name):
expected_text = ( expected_text = (
(ROOT_DIR / "test-data" / "test_reasoning_system_message_no_instruction.txt") (ROOT_DIR / "test-data" / "test_reasoning_system_message_no_instruction.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
expected = encoding.encode(expected_text, allowed_special="all") expected = encoding.encode(expected_text, allowed_special="all")
@ -408,7 +385,7 @@ def test_reasoning_system_message_with_dates(encoding_name):
expected_text = ( expected_text = (
(ROOT_DIR / "test-data" / "test_reasoning_system_message_with_dates.txt") (ROOT_DIR / "test-data" / "test_reasoning_system_message_with_dates.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
expected = encoding.encode(expected_text, allowed_special="all") expected = encoding.encode(expected_text, allowed_special="all")
@ -441,7 +418,7 @@ def test_render_functions_with_parameters():
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_render_functions_with_parameters.txt") (ROOT_DIR / "test-data" / "test_render_functions_with_parameters.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
@ -558,9 +535,7 @@ def test_render_functions_with_parameters():
def test_no_tools(): def test_no_tools():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_no_tools.txt") (ROOT_DIR / "test-data" / "test_no_tools.txt").read_text().rstrip()
.read_text(encoding="utf-8")
.rstrip()
) )
convo = Conversation.from_messages( convo = Conversation.from_messages(
@ -580,9 +555,7 @@ def test_no_tools():
def test_browser_tool_only(): def test_browser_tool_only():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_browser_tool_only.txt") (ROOT_DIR / "test-data" / "test_browser_tool_only.txt").read_text().rstrip()
.read_text(encoding="utf-8")
.rstrip()
) )
convo = Conversation.from_messages( convo = Conversation.from_messages(
@ -605,7 +578,7 @@ def test_browser_and_function_tool():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_browser_and_function_tool.txt") (ROOT_DIR / "test-data" / "test_browser_and_function_tool.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
@ -647,7 +620,7 @@ def test_browser_and_python_tool():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_browser_and_python_tool.txt") (ROOT_DIR / "test-data" / "test_browser_and_python_tool.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
@ -673,7 +646,7 @@ def test_dropping_cot_by_default():
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_dropping_cot_by_default.txt") (ROOT_DIR / "test-data" / "test_dropping_cot_by_default.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
@ -703,7 +676,7 @@ def test_does_not_drop_if_ongoing_analysis():
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_does_not_drop_if_ongoing_analysis.txt") (ROOT_DIR / "test-data" / "test_does_not_drop_if_ongoing_analysis.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
@ -732,17 +705,13 @@ def test_does_not_drop_if_ongoing_analysis():
) )
assert encoding.decode_utf8(tokens) == expected_output assert encoding.decode_utf8(tokens) == expected_output
# ensure that <|constrain|>json part is tokenized correctly as special tokens
assert encoding.encode(expected_output, allowed_special="all") == tokens
def test_preserve_cot(): def test_preserve_cot():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_preserve_cot.txt") (ROOT_DIR / "test-data" / "test_preserve_cot.txt").read_text().rstrip()
.read_text(encoding="utf-8")
.rstrip()
) )
convo = Conversation.from_messages( convo = Conversation.from_messages(
@ -778,7 +747,7 @@ def test_keep_analysis_between_final_messages():
expected_output = ( expected_output = (
(ROOT_DIR / "test-data" / "test_keep_analysis_between_finals.txt") (ROOT_DIR / "test-data" / "test_keep_analysis_between_finals.txt")
.read_text(encoding="utf-8") .read_text()
.rstrip() .rstrip()
) )
@ -920,9 +889,7 @@ def test_tool_response_parsing():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
text_tokens = ( text_tokens = (
(ROOT_DIR / "test-data" / "test_tool_response_parsing.txt") (ROOT_DIR / "test-data" / "test_tool_response_parsing.txt").read_text().rstrip()
.read_text(encoding="utf-8")
.rstrip()
) )
expected_message = ( expected_message = (
@ -946,9 +913,7 @@ def test_streamable_parser():
encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS)
text_tokens = ( text_tokens = (
(ROOT_DIR / "test-data" / "test_streamable_parser.txt") (ROOT_DIR / "test-data" / "test_streamable_parser.txt").read_text().rstrip()
.read_text(encoding="utf-8")
.rstrip()
) )
tokens = encoding.encode(text_tokens, allowed_special="all") tokens = encoding.encode(text_tokens, allowed_special="all")