diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml index 36d50144..9cdbac20 100644 --- a/.github/workflows/IntegrationTest.yml +++ b/.github/workflows/IntegrationTest.yml @@ -5,9 +5,9 @@ name: Test on: push: - branches: [ "*" ] - pull_request: - branches: [ "*" ] + branches: [ "main", "dev" ] + pull_request_target: + branches: [ "main", "dev" ] workflow_dispatch: @@ -58,3 +58,13 @@ jobs: - name: Run unit tests run: | pytest test/scripts --ignore=test/scripts/data + - name: Run examples + env: + OPENAI_KEY: ${{ secrets.OPENAI_KEY }} + run: | + python examples/core/score.py + python examples/custom/sdk_custom_rule.py + python examples/llm_and_rule/llm_and_rule_mix.py + python examples/register/sdk_register_llm.py + python examples/register/sdk_register_prompt.py + python examples/register/sdk_register_rule.py diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 101c5a47..02578eba 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -24,19 +24,6 @@ jobs: python -m pip install --upgrade pip pip install build wheel==0.43.0 twine==6.0.1 packaging==24.1 pkginfo==1.12.0 - - name: Run examples - env: - OPENAI_KEY: ${{ secrets.OPENAI_KEY }} - run: | - python examples/core/score.py - python examples/custom/sdk_custom_rule.py - python examples/llm_and_rule/llm_and_rule_mix.py - python examples/register/sdk_register_llm.py - python examples/register/sdk_register_prompt.py - python examples/register/sdk_register_rule.py - python examples/multi_turn_dialogues/sdk_mtbench101_llm.py - python examples/multi_turn_dialogues/sdk_mtbench101_rule_all.py - - name: Build package run: python setup.py bdist_wheel diff --git a/examples/core/score.py b/examples/core/score.py index c886db58..79ce2d6b 100644 --- a/examples/core/score.py +++ b/examples/core/score.py @@ -8,6 +8,8 @@ OPENAI_MODEL = 'deepseek-chat' OPENAI_URL = 'https://api.deepseek.com/v1' OPENAI_KEY = os.getenv("OPENAI_KEY") +if not OPENAI_KEY: + raise ValueError('OPENAI_KEY is not set correctly.') def llm(): diff --git a/examples/custom/sdk_custom_llm.py b/examples/custom/sdk_custom_llm.py index a8e148c6..27f9df01 100644 --- a/examples/custom/sdk_custom_llm.py +++ b/examples/custom/sdk_custom_llm.py @@ -2,7 +2,7 @@ from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_jsonl.jsonl", + "input_path": "test/data/test_local_jsonl.jsonl", "dataset": { "source": "local", "format": "jsonl", diff --git a/examples/custom/sdk_custom_rule.py b/examples/custom/sdk_custom_rule.py index d1946e92..28f9259a 100644 --- a/examples/custom/sdk_custom_rule.py +++ b/examples/custom/sdk_custom_rule.py @@ -2,7 +2,7 @@ from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_json.json", + "input_path": "test/data/test_local_json.json", "dataset": { "source": "local", "format": "json", diff --git a/examples/llm_and_rule/llm_and_rule_mix.py b/examples/llm_and_rule/llm_and_rule_mix.py index 19ec1818..fbb441e7 100644 --- a/examples/llm_and_rule/llm_and_rule_mix.py +++ b/examples/llm_and_rule/llm_and_rule_mix.py @@ -6,9 +6,11 @@ OPENAI_MODEL = 'deepseek-chat' OPENAI_URL = 'https://api.deepseek.com/v1' OPENAI_KEY = os.getenv("OPENAI_KEY") +if not OPENAI_KEY: + raise ValueError('OPENAI_KEY is not set correctly.') input_data = { - "input_path": "../../test/data/test_local_jsonl.jsonl", + "input_path": "test/data/test_local_jsonl.jsonl", "dataset": { "source": "local", "format": "jsonl", diff --git a/examples/llm_and_rule/local_llm.py b/examples/llm_and_rule/local_llm.py index a3f36cd3..c1feaa0a 100644 --- a/examples/llm_and_rule/local_llm.py +++ b/examples/llm_and_rule/local_llm.py @@ -2,7 +2,7 @@ from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_jsonl.jsonl", + "input_path": "test/data/test_local_jsonl.jsonl", "dataset": { "source": "local", "format": "jsonl", diff --git a/examples/llm_and_rule/remote_llm.py b/examples/llm_and_rule/remote_llm.py index 5d1de918..e572f2a6 100644 --- a/examples/llm_and_rule/remote_llm.py +++ b/examples/llm_and_rule/remote_llm.py @@ -2,7 +2,7 @@ from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_jsonl.jsonl", + "input_path": "test/data/test_local_jsonl.jsonl", "dataset": { "source": "local", "format": "jsonl", diff --git a/examples/multi_turn_dialogues/sdk_mtbench101_llm.py b/examples/multi_turn_dialogues/sdk_mtbench101_llm.py index fcf41e57..c44f3429 100644 --- a/examples/multi_turn_dialogues/sdk_mtbench101_llm.py +++ b/examples/multi_turn_dialogues/sdk_mtbench101_llm.py @@ -8,7 +8,7 @@ OPENAI_KEY = os.getenv("OPENAI_KEY") input_data = { - "input_path": "../../test/data/test_mtbench101_jsonl.jsonl", + "input_path": "test/data/test_mtbench101_jsonl.jsonl", "dataset": { "source": "local", "format": "multi_turn_dialog", diff --git a/examples/multi_turn_dialogues/sdk_mtbench101_rule_all.py b/examples/multi_turn_dialogues/sdk_mtbench101_rule_all.py index d81ba63e..053ee3dd 100644 --- a/examples/multi_turn_dialogues/sdk_mtbench101_rule_all.py +++ b/examples/multi_turn_dialogues/sdk_mtbench101_rule_all.py @@ -2,7 +2,7 @@ from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_mtbench101_jsonl.jsonl", + "input_path": "test/data/test_mtbench101_jsonl.jsonl", "dataset": { "source": "local", "format": "multi_turn_dialog", diff --git a/examples/register/sdk_register_llm.py b/examples/register/sdk_register_llm.py index 0bbc807a..98db55c9 100644 --- a/examples/register/sdk_register_llm.py +++ b/examples/register/sdk_register_llm.py @@ -12,6 +12,8 @@ OPENAI_MODEL = 'deepseek-chat' OPENAI_URL = 'https://api.deepseek.com/v1' OPENAI_KEY = os.getenv("OPENAI_KEY") +if not OPENAI_KEY: + raise ValueError('OPENAI_KEY is not set correctly.') @Model.llm_register('LlmTextQualityRegister') @@ -54,7 +56,7 @@ def process_response(cls, response: str) -> ModelRes: from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_jsonl.jsonl", + "input_path": "test/data/test_local_jsonl.jsonl", "dataset": { "source": "local", "format": "jsonl", diff --git a/examples/register/sdk_register_prompt.py b/examples/register/sdk_register_prompt.py index 27e61677..cd23e4f1 100644 --- a/examples/register/sdk_register_prompt.py +++ b/examples/register/sdk_register_prompt.py @@ -6,6 +6,8 @@ OPENAI_MODEL = 'deepseek-chat' OPENAI_URL = 'https://api.deepseek.com/v1' OPENAI_KEY = os.getenv("OPENAI_KEY") +if not OPENAI_KEY: + raise ValueError('OPENAI_KEY is not set correctly.') @Model.prompt_register("QUALITY_BAD_SIMILARITY", []) @@ -24,7 +26,7 @@ class PromptRepeatDemo(BasePrompt): from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_jsonl.jsonl", + "input_path": "test/data/test_local_jsonl.jsonl", "dataset": { "source": "local", "format": "jsonl", diff --git a/examples/register/sdk_register_rule.py b/examples/register/sdk_register_rule.py index 8ad1113a..ab7640b0 100644 --- a/examples/register/sdk_register_rule.py +++ b/examples/register/sdk_register_rule.py @@ -29,7 +29,7 @@ def eval(cls, input_data: Data) -> ModelRes: from dingo.exec import Executor input_data = { - "input_path": "../../test/data/test_local_json.json", + "input_path": "test/data/test_local_json.json", "dataset": { "source": "local", "format": "json",