* feat: add config for optional parameters in a chat message * chore: cleanup * chore: fix nits and add light docs * docs: update docs/dataset-formats/conversation.qmd Co-authored-by: NanoCode012 <kevinvong@rocketmail.com> * feat: configurable message mappings, jinja template analyzer * chore: handle bradley terry * docs: update docs * refactor: change order of mappings, improve message transform * refactor: make chat awware of property mappings * chore: remove .python-version * chore: revert change * chore: add dataset validation to tests where appropriate * chore: add dataset validation to tests where appropriate * chore: clean up handling of ds_cfg * chore: recursively serialize config * make sure to use the return value from validate_config * DefaultDict pickle/unpickle fix * fix super call for override * refactor: message fields * chore: empty commit * tests: validate config before using * chore: add config validation to all e2e tests * chore: add unneeded logging * chore: add missed config validation * chore: pass field_messages to prompter * test: fix borked test * chore: remove uninteded file * chore: add deprecation warning and update chat_datasets script * chore: lint * refactor: message fields * feat: update axolotlinputconfig and test_models - add configdict import in axolotl/utils/config/models/input/v0_4_1/__init__.py - remove unnecessary line breaks in sftdataset, dpodataset, ktodataset, stepwisesuperviseddataset classes - update model_dump method in axolotlinputconfig to exclude none values - correct typo in test_models.py comment * feat: simplify dpodataset and ktodataset classes in config models removed several optional fields from dpodataset and ktodataset classes in axolotl/utils/config/models/input/v0_4_1. this simplifies the configuration subsets for these datasets. * feat: improve readability and structure in dataset configuration models this commit enhances the readability and structure of the dataset configuration models in the `axolotl/utils/config/models/input/v0_4_1` module. it removes unused `configdict` import and adds line breaks to separate class definitions for better clarity. additionally, a minor documentation fix is included to ensure a newline at the end of the `stepwise_supervised.qmd` file. * feat: change log level from info to debug in chattemplatestrategy * feat(prompt_strategies): refactor chattemplateprompter and chattemplatestrategy - Make `chat_template` a required parameter in `ChatTemplatePrompter` constructor - Add default value for `message_property_mappings` in `ChatTemplatePrompter` constructor - Add `messages_array_name` property to `ChatTemplatePrompter` - Change `processor` type to Optional in `ChatTemplatePrompter` - Add TypeError check for `processor` in `ChatTemplatePrompter.build_prompt` - Remove `_messages` property from `ChatTemplateStrategy` - Make `prompter` a required parameter and add type hint in `ChatTemplateStrategy` constructor - Remove `messages` getter and setter from `ChatTemplateStrategy` - Use `prompter.messages_array_name` in `ChatTemplateStrategy.get_conversation_thread` - Remove condition to set `messages` field in `load` function * feat(tests/utils): ignore type check in load_model call in test_models.py * feat: improve type handling and test structure in chat templates - Add return type hint for `get_chat_template` function in `chat_templates.py` - Remove unnecessary assignment of `strategy.messages` in several test cases - Add `messages_array_name` parameter to various test configurations in `test_chat_templates.py` and `test_chat_templates_advanced.py` - Remove redundant `strategy.messages` assignment in `test_chat_templates_advanced.py` * feat(axolotl): enhance chat strategy with datasetconfig support This commit introduces support for DatasetConfig in the ChatTemplateStrategy. It also refines the strategy loader to handle different types of ds_cfg inputs and improves the clarity of the code by formatting and reordering. The key changes include: - Importing Union from typing and BaseModel from pydantic. - Adding DatasetConfig as an optional type for ds_cfg in StrategyLoader. - Adjusting the handling of ds_cfg in StrategyLoader to account for BaseModel instances. - Refactoring the prompter_params and strategy_params for better readability. - Changing the reference from prompt[self.messages] to prompt[self.prompter.messages_array_name] in the is_prompt_batched method. * feat: update message handling in btchattemplatestrategy * Replace `self.messages` with direct string references to "chosen_messages" and "rejected_messages" * Append system, user, and assistant content directly to "chosen_messages" and "rejected_messages" * Add a new attribute "messages_array_name" to the `load` function parameters * Remove the conditional attribute assignment for "field_messages" in the `load` function * feat: add config validation in test_kd.py - Import `validate_config` from `axolotl.utils.config` - Validate the configuration in `test_llama_kd` and another function in `TestKnowledgeDistillation` class * feat: enhance config validation and capabilities handling * Import `EnvCapabilities` and `GPUCapabilities` from `axolotl.utils.config.models.internals` * Update `validate_config` function to create `KTODataset` and `SFTDataset` instances using `dict(ds_cfg)` * Replace `capabilities` and `env_capabilities` with instances of `GPUCapabilities` and `EnvCapabilities` respectively in `AxolotlConfigWCapabilities` model dump * feat: update config validation in axolotl utils - Remove import of `EnvCapabilities` and `GPUCapabilities` from `axolotl.utils.config.models.internals` - Update `validate_config` function to use `capabilities` and `env_capabilities` directly instead of creating new instances of `GPUCapabilities` and `EnvCapabilities` * feat: refactor strategyloader in chat_template.py - Extracted the creation of strategy parameters into a separate function, `_get_strategy_params(cfg, dataset_config)` - Created a new function, `_get_strategy_cls()`, to obtain the strategy class - Replaced `ChatTemplateStrategy` with `strategy_cls` for strategy instantiation * trigger CI * chore: revert dataset config changes for kto/dpo * subject: refactor: rename 'messages_array_name' to 'field_messages' Body: - Renamed 'messages_array_name' to 'field_messages' in 'ChatTemplatePrompter' class and its usages in 'chat_template.py' - Updated 'load' function in 'bradley_terry/chat_template.py' to reflect the change - Adjusted 'get_chat_template_msg_variables' and 'get_message_vars' methods in 'jinja_template_analyzer.py' to use the new variable name - Modified 'StrategyLoader' in 'chat_template.py' to use 'field_messages' - Updated tests in 'test_chat_templates.py' and 'test_chat_templates_advanced.py' to use 'field_messages' instead of 'messages_array_name' * feat: refactor prompt strategies and update config models * Remove redundant 'return None' in `axolotl/prompt_strategies/__init__.py` * Simplify message handling in `axolotl/prompt_strategies/bradley_terry/chat_template.py` by using a single 'messages' list instead of separate 'chosen_messages' and 'rejected_messages' lists * Update default 'message_property_mappings' in `axolotl/prompt_strategies/bradley_terry/chat_template.py` * Add 'field_messages' field to `axolotl/utils/config/models/input/v0_4_1/__init__.py` configuration model * chore: remove unused input * chore: remove redundant type ignore * fix: remove old configs and update examples * fix: type check * fix: remove loading old config in ChatMessage * fix: update faq with potential new undefinederror * fix: add debug if property mapped is not found * chore: improve explanation for unmapped properties * fix: update docs with new config * chore: add note for deprecation config and del old config from dict --------- Co-authored-by: NanoCode012 <kevinvong@rocketmail.com> Co-authored-by: Wing Lian <wing@axolotl.ai> Co-authored-by: NanoCode012 <nano@axolotl.ai>
160 lines
5.8 KiB
Python
160 lines
5.8 KiB
Python
"""
|
|
tests for jinja_template_analyzer
|
|
"""
|
|
import logging
|
|
|
|
import pytest
|
|
|
|
from axolotl.prompt_strategies.jinja_template_analyzer import JinjaTemplateAnalyzer
|
|
|
|
logging.basicConfig(level=logging.DEBUG)
|
|
LOG = logging.getLogger("axolotl")
|
|
|
|
|
|
class TestJinjaTemplateAnalyzer:
|
|
"""
|
|
tests for jinja_template_analyzer
|
|
"""
|
|
|
|
def test_basic_variable_extraction(self, basic_jinja_template_analyzer):
|
|
"""Test that all top-level variables are correctly extracted."""
|
|
LOG.info("Testing with train_on_inputs=True")
|
|
|
|
variables = basic_jinja_template_analyzer.get_template_variables()
|
|
expected_vars = {"messages", "add_generation_prompt", "eos_token", "message"}
|
|
assert set(variables.keys()) == expected_vars
|
|
|
|
def test_mixtral_variable_extraction(self, mistral_jinja_template_analyzer):
|
|
"""Test that all top-level variables are correctly extracted."""
|
|
LOG.info("Testing with train_on_inputs=True")
|
|
|
|
variables = mistral_jinja_template_analyzer.get_template_variables()
|
|
expected_vars = {
|
|
"messages",
|
|
"content",
|
|
"eos_token",
|
|
"message",
|
|
"tools",
|
|
"system_message",
|
|
"loop_messages",
|
|
"ns",
|
|
"tool_call",
|
|
"tool",
|
|
"loop",
|
|
"bos_token",
|
|
"raise_exception",
|
|
}
|
|
assert set(variables.keys()) == expected_vars
|
|
message_vars = variables["message"]
|
|
assert message_vars == {"role", "content", "tool_calls", "tool_call_id"}
|
|
|
|
def test_message_property_access(self, basic_jinja_template_analyzer):
|
|
"""Test that properties accessed on 'message' variable are correctly identified."""
|
|
LOG.info("Testing message property access")
|
|
|
|
variables = basic_jinja_template_analyzer.get_template_variables()
|
|
assert "messages" in variables
|
|
assert "message" in variables
|
|
assert "role" in variables["message"]
|
|
assert "content" in variables["message"]
|
|
|
|
def test_detailed_analysis(self, basic_jinja_template_analyzer):
|
|
"""Test the detailed analysis of variable usage."""
|
|
LOG.info("Testing detailed analysis")
|
|
|
|
analysis = basic_jinja_template_analyzer.analyze_template()
|
|
|
|
assert analysis["messages"]["is_iterated"] is True
|
|
assert "role" in analysis["message"]["accessed_properties"]
|
|
assert "content" in analysis["message"]["accessed_properties"]
|
|
|
|
assert analysis["add_generation_prompt"]["is_conditional"] is True
|
|
assert len(analysis["add_generation_prompt"]["accessed_properties"]) == 0
|
|
|
|
assert not analysis["eos_token"]["is_iterated"]
|
|
assert len(analysis["eos_token"]["accessed_properties"]) == 0
|
|
|
|
def test_nested_property_access(self):
|
|
"""Test handling of nested property access."""
|
|
LOG.info("Testing nested property access")
|
|
|
|
template = """{{ user.profile.name }}{{ user.settings['preference'] }}"""
|
|
analyzer = JinjaTemplateAnalyzer(template)
|
|
variables = analyzer.get_template_variables()
|
|
|
|
assert "user" in variables
|
|
assert "profile" in variables["user"]
|
|
assert "settings" in variables["user"]
|
|
|
|
def test_loop_variable_handling(self):
|
|
"""Test handling of loop variables and their properties."""
|
|
LOG.info("Testing loop variable handling")
|
|
|
|
template = """
|
|
{% for item in items %}
|
|
{{ item.name }}
|
|
{% for subitem in item.subitems %}
|
|
{{ subitem.value }}
|
|
{% endfor %}
|
|
{% endfor %}
|
|
"""
|
|
analyzer = JinjaTemplateAnalyzer(template)
|
|
analysis = analyzer.analyze_template()
|
|
|
|
assert analysis["items"]["is_iterated"]
|
|
assert "name" in analysis["item"]["accessed_properties"]
|
|
assert "subitems" in analysis["item"]["accessed_properties"]
|
|
|
|
def test_conditional_variable_usage(self):
|
|
"""Test detection of variables used in conditional statements."""
|
|
LOG.info("Testing conditional variable usage")
|
|
|
|
template = """
|
|
{% if user.is_admin and config.debug_mode %}
|
|
{{ debug_info }}
|
|
{% endif %}
|
|
"""
|
|
analyzer = JinjaTemplateAnalyzer(template)
|
|
analysis = analyzer.analyze_template()
|
|
|
|
assert analysis["user"]["is_conditional"]
|
|
assert analysis["config"]["is_conditional"]
|
|
assert "is_admin" in analysis["user"]["accessed_properties"]
|
|
assert "debug_mode" in analysis["config"]["accessed_properties"]
|
|
|
|
def test_complex_expressions(self):
|
|
"""Test handling of complex expressions and filters."""
|
|
LOG.info("Testing complex expressions and filters")
|
|
|
|
template = """
|
|
{{ user.name | upper }}
|
|
{{ messages | length > 0 and messages[0].content }}
|
|
{{ data['key'].nested['value'] }}
|
|
"""
|
|
analyzer = JinjaTemplateAnalyzer(template)
|
|
variables = analyzer.get_template_variables()
|
|
|
|
assert "user" in variables
|
|
assert "name" in variables["user"]
|
|
assert "messages" in variables
|
|
assert "content" in variables["messages"]
|
|
assert "data" in variables
|
|
|
|
def test_basic_msg_vars(self, basic_jinja_template_analyzer):
|
|
"""Test that the basic message variables are correctly identified."""
|
|
LOG.info("Testing basic message variables")
|
|
|
|
variables = basic_jinja_template_analyzer.get_message_vars()
|
|
assert variables == {"role", "content"}
|
|
|
|
def test_mixtral_msg_vars(self, mistral_jinja_template_analyzer):
|
|
"""Test that the mixtral message variables are correctly identified."""
|
|
LOG.info("Testing mixtral message variables")
|
|
|
|
variables = mistral_jinja_template_analyzer.get_message_vars()
|
|
assert variables == {"role", "content", "tool_calls", "tool_call_id"}
|
|
|
|
|
|
if __name__ == "__main__":
|
|
pytest.main([__file__])
|