Mirrors/kleinanzeigen-bot
1
0
Fork 0
mirror of https://github.com/Second-Hand-Friends/kleinanzeigen-bot.git synced 2026-07-09 12:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(publish): prioritize mapped condition values (#1025)

Browse Source 
## ℹ️ Description
Fixes the legacy condition probe order from issue #1002 by trying the
mapped/API value first and keeping the legacy value as fallback.

## 📋 Changes Summary
- Reorder `__set_condition()` candidate probing so the mapped API value
is tried before the configured legacy value.
- Keep the minimal regression coverage for mapped-first and fallback
behavior.

### ⚙️ Type of Change
- [x] 🐞 Bug fix (non-breaking change which fixes an issue)
- [ ] ✨ New feature (adds new functionality without breaking existing
usage)
- [ ] 💥 Breaking change (changes that might break existing user setups,
scripts, or configurations)

## ✅ Checklist
- [x] I have reviewed my changes to ensure they meet the project's
standards.
- [x] I have tested my changes and ensured that all tests pass (`pdm run
test`).
- [x] I have formatted the code (`pdm run format`).
- [x] I have verified that linting passes (`pdm run lint`).
- [x] I have updated documentation where necessary.

Fixes #1002

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

## Release Notes

* **Bug Fixes**
* Improved condition value handling by prioritizing API-mapped values
over legacy configuration tokens for better compatibility
* Enhanced fallback mechanism for condition selection when preferred UI
elements are unavailable, ensuring proper value translation and fallback
to generic handlers

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Jens
2026-04-29 11:56:00 +02:00
committed by GitHub
parent d843672865
commit 5674d65bf4
2 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/kleinanzeigen_bot/__init__.py
View File

@@ -3054,11 +3054,13 @@ class KleinanzeigenBot(WebScrapingMixin): # noqa: PLR0904
return False
# Kleinanzeigen changed dialog radio values from German tokens to English API codes
# (e.g. "wie_neu" -> "like_new", "sehr_gut" -> "like_new"). Try the configured value
# first (handles already-English configs), then fall back to the mapped equivalent.
candidate_values = [condition_value]
# (e.g. "wie_neu" -> "like_new", "sehr_gut" -> "like_new"). Prefer the mapped
# API value first for legacy configs, then fall back to the configured value if needed.
candidate_values:list[str] = []
if mapped_value and mapped_value != condition_value:
candidate_values.append(mapped_value)
if condition_value not in candidate_values:
candidate_values.append(condition_value)
try:
await condition_trigger.click()
@@ -3260,6 +3262,7 @@ class KleinanzeigenBot(WebScrapingMixin): # noqa: PLR0904
continue
LOG.info("Condition dialog not available, falling back to generic attribute handler for [%s]...", special_attribute_key)
special_attribute_value_str = _CONDITION_GERMAN_TO_API.get(special_attribute_value_str, special_attribute_value_str)
LOG.debug("Setting special attribute [%s] to [%s]...", special_attribute_key, special_attribute_value_str)
id_suffix_literal = _xpath_literal(f".{normalized_special_attribute_key}")

110
tests/unit/test_init.py
View File

@@ -151,15 +151,15 @@ def _login_detection_result(is_logged_in:bool, reason:LoginDetectionReason) -> L
class TestKleinanzeigenBotInitialization:
"""Tests for KleinanzeigenBot initialization and basic functionality."""
def test_constructor_initializes_default_values(self, test_bot:KleinanzeigenBot) -> None:
def test_constructor_initializes_default_values(self) -> None:
"""Verify that constructor sets all default values correctly."""
assert test_bot.root_url == "https://www.kleinanzeigen.de"
assert isinstance(test_bot.config, Config)
assert test_bot.command == "help"
assert test_bot.ads_selector == "due"
assert test_bot.keep_old_ads is False
assert test_bot.log_file_path is not None
assert test_bot.file_log is None
bot = KleinanzeigenBot()
assert bot.root_url == "https://www.kleinanzeigen.de"
assert bot.command == "help"
assert bot.ads_selector == "due"
assert bot.keep_old_ads is False
assert bot.log_file_path is not None
assert bot.file_log is None
@pytest.mark.parametrize("command", ["help", "create-config", "version"])
def test_resolve_workspace_skips_non_workspace_commands(self, test_bot:KleinanzeigenBot, command:str) -> None:
@@ -2148,17 +2148,6 @@ class TestKleinanzeigenBotBasics:
):
await test_bot.publish_ad("ad.yaml", ad_cfg, ad_cfg_orig, [], AdUpdateStrategy.MODIFY)
def test_get_root_url(self, test_bot:KleinanzeigenBot) -> None:
"""Test root URL retrieval."""
assert test_bot.root_url == "https://www.kleinanzeigen.de"
def test_get_config_defaults(self, test_bot:KleinanzeigenBot) -> None:
"""Test default configuration values."""
assert isinstance(test_bot.config, Config)
assert test_bot.command == "help"
assert test_bot.ads_selector == "due"
assert test_bot.keep_old_ads is False
def test_get_log_level(self, test_bot:KleinanzeigenBot) -> None:
"""Test log level configuration."""
# Reset log level to default
@@ -3755,13 +3744,12 @@ class TestConditionSelector:
if selector_type == By.XPATH and "contains(@for, '.condition')" in selector_value:
return trigger
if selector_type == By.XPATH and "@type='radio'" in selector_value:
if f"@value='{configured}'" in selector_value:
probed_values.append(configured)
# German token is no longer a valid DOM value — mimic that by returning None
return None if configured != expected_api_value else radio
if f"@value='{expected_api_value}'" in selector_value:
probed_values.append(expected_api_value)
return radio
if f"@value='{configured}'" in selector_value:
probed_values.append(configured)
return radio
return None
with (
@@ -3777,14 +3765,63 @@ class TestConditionSelector:
assert len(warning_messages) == 1
assert configured in warning_messages[0]
assert expected_api_value in warning_messages[0]
# Legacy German values should probe the configured token first, then the mapped API code.
assert probed_values == [configured, expected_api_value]
# Legacy German values should prefer the mapped API code and stop once it is found.
assert probed_values == [expected_api_value]
else:
assert warning_messages == []
assert probed_values == [configured]
clicked_xpath_selectors = [str(call.args[1]) for call in mock_click.await_args_list if len(call.args) > 1]
assert any(f"radio-condition-{expected_api_value}" in selector for selector in clicked_xpath_selectors)
@pytest.mark.asyncio
async def test_condition_legacy_value_falls_back_when_mapped_value_is_missing(
self,
test_bot:KleinanzeigenBot,
caplog:pytest.LogCaptureFixture,
) -> None:
"""Legacy values should still work if the mapped API radio is unavailable."""
caplog.set_level(logging.WARNING, logger = LOG.name)
dialog = MagicMock()
trigger = MagicMock()
trigger.attrs = {"id": "condition-trigger", "aria-controls": "condition-dialog"}
trigger.click = AsyncMock()
radio = MagicMock()
radio_attrs = MagicMock()
radio_attrs.id = "radio-condition-wie_neu"
radio_attrs.get.side_effect = lambda key, default = None: "radio-condition-wie_neu" if key == "id" else default
radio.attrs = radio_attrs
radio.click = AsyncMock()
probed_values:list[str] = []
async def probe_side_effect(selector_type:By, selector_value:str, **_:Any) -> Element | None:
if selector_type == By.XPATH and "contains(@for, '.condition')" in selector_value:
return trigger
if selector_type == By.XPATH and "@type='radio'" in selector_value:
if "@value='like_new'" in selector_value:
probed_values.append("like_new")
return None
if "@value='wie_neu'" in selector_value:
probed_values.append("wie_neu")
return radio
return None
with (
patch.object(test_bot, "web_probe", new_callable = AsyncMock, side_effect = probe_side_effect),
patch.object(test_bot, "web_find", new_callable = AsyncMock, return_value = dialog),
patch.object(test_bot, "web_click", new_callable = AsyncMock) as mock_click,
):
handled = await getattr(test_bot, "_KleinanzeigenBot__set_condition")("wie_neu")
assert handled is True
warning_messages = [record.message for record in caplog.records if record.levelno == logging.WARNING]
assert len(warning_messages) == 1
assert "wie_neu" in warning_messages[0]
assert "like_new" in warning_messages[0]
assert probed_values == ["like_new", "wie_neu"]
clicked_xpath_selectors = [str(call.args[1]) for call in mock_click.await_args_list if len(call.args) > 1]
assert any("radio-condition-wie_neu" in selector for selector in clicked_xpath_selectors)
@pytest.mark.asyncio
async def test_condition_missing_selector_returns_not_handled(self, test_bot:KleinanzeigenBot) -> None:
"""Missing condition trigger should return not-handled and use generic fallback path."""
@@ -3880,9 +3917,22 @@ class TestConditionFallbackToGenericHandler:
"""
@pytest.mark.asyncio
async def test_condition_falls_back_to_generic_handler_when_dialog_not_handled(self, test_bot:KleinanzeigenBot, base_ad_config:dict[str, Any]) -> None:
"""When condition dialog is not handled, generic handler should be used as fallback."""
ad_cfg = Ad.model_validate(base_ad_config | {"category": "185/249", "special_attributes": {"condition_s": "new"}, "shipping_type": "PICKUP"})
@pytest.mark.parametrize(
("condition_s", "expected_generic_value"),
[
("new", "new"),
("wie_neu", "like_new"),
],
)
async def test_condition_falls_back_to_generic_handler_with_canonical_value(
self,
test_bot:KleinanzeigenBot,
base_ad_config:dict[str, Any],
condition_s:str,
expected_generic_value:str,
) -> None:
"""Fallback should pass the canonical condition value to the generic combobox handler."""
ad_cfg = Ad.model_validate(base_ad_config | {"category": "185/249", "special_attributes": {"condition_s": condition_s}, "shipping_type": "PICKUP"})
button_elem = MagicMock()
button_attrs = MagicMock()
@@ -3911,8 +3961,8 @@ class TestConditionFallbackToGenericHandler:
):
await getattr(test_bot, "_KleinanzeigenBot__set_special_attributes")(ad_cfg)
mock_set_condition.assert_awaited_once_with("new")
mock_select_combobox.assert_awaited_once_with("modellbau.condition", "new")
mock_set_condition.assert_awaited_once_with(condition_s)
mock_select_combobox.assert_awaited_once_with("modellbau.condition", expected_generic_value)
@pytest.mark.asyncio
async def test_condition_timeout_propagates_instead_of_falling_back(self, test_bot:KleinanzeigenBot, base_ad_config:dict[str, Any]) -> None: