valentina-python-client 3.4.0__tar.gz → 3.5.0__tar.gz

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valentina-python-client
-Version: 3.4.0
+Version: 3.5.0
 Summary: Async Python client library for the Valentina Noir API
 Author: Nate Landau
 Author-email: Nate Landau <github@natenate.org>

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/pyproject.toml

@@ -15,7 +15,7 @@ description = "Async Python client library for the Valentina Noir API"
 name = "valentina-python-client"
 readme = "README.md"
 requires-python = ">=3.13"
-version = "3.4.0"
+version = "3.5.0"
 
 [[project.authors]]
 name = "Nate Landau"

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/pyproject.toml.orig

@@ -17,7 +17,7 @@
     name = "valentina-python-client"
     readme = "README.md"
     requires-python = ">=3.13"
-    version = "3.4.0"
+    version = "3.5.0"
 
     [project.optional-dependencies]
         testing = ["polyfactory>=3.3.0"]

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/__init__.py

@@ -116,4 +116,4 @@ __all__ = (
     "users_service",
 )
 
-__version__ = "3.4.0"
+__version__ = "3.5.0"

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/_sync/services/character_traits.py

@@ -5,7 +5,7 @@ from collections.abc import Iterator
 from typing import TYPE_CHECKING
 
 from vclient._sync.services.base import SyncBaseService
-from vclient.constants import DEFAULT_PAGE_LIMIT, DamageType, TrackerAction, TraitModifyCurrency
+from vclient.constants import DEFAULT_PAGE_LIMIT, TrackerAction, TraitModifyCurrency
 from vclient.endpoints import Endpoints
 from vclient.models import (
     _TRACKER_ADAPTER,
@@ -407,7 +407,7 @@ class SyncCharacterTraitsService(SyncBaseService):
             character_trait_id: The ID of the character trait.
 
         Returns:
-            A CounterTracker, DamageTracker, or StainsTracker. Switch on ``type``.
+            A CounterTracker or StainsTracker. Switch on ``type``.
 
         Raises:
             NotFoundError: If the trait has no tracker for the character's game version.
@@ -425,16 +425,15 @@ class SyncCharacterTraitsService(SyncBaseService):
     ) -> Tracker:
         """Replace the full state of a trait tracker, such as to correct a mistake.
 
-        Send only the fields for the tracker's type: ``current`` for counters (required),
-        ``superficial`` and ``aggravated`` for damage tracks, ``stains`` for stains. Omitted
-        fields reset to 0, so an empty request clears a damage or stains tracker. Use
+        Send only the field for the tracker's type: ``current`` for counters (required) or
+        ``stains`` for stains. An empty request clears a stains tracker. Use
         ``apply_tracker_action`` for in-play changes instead.
 
         Args:
             character_trait_id: The ID of the character trait.
             request: A TrackerStateSet model, OR pass fields as keyword arguments.
             **kwargs: Fields for TrackerStateSet if request is not provided.
-                Accepts: current, superficial, aggravated, stains (int >= 0).
+                Accepts: current, stains (int >= 0).
 
         Returns:
             The updated tracker.
@@ -442,7 +441,7 @@ class SyncCharacterTraitsService(SyncBaseService):
         Raises:
             NotFoundError: If the trait has no tracker for the character's game version.
             AuthorizationError: If you are not the character's player or a storyteller.
-            RequestValidationError: If a value is negative.
+            RequestValidationError: If a value is negative or a field is unknown.
             ValidationError: If a field does not fit the tracker type, a counter has no
                 ``current``, or a value exceeds the tracker size.
         """
@@ -456,25 +455,17 @@ class SyncCharacterTraitsService(SyncBaseService):
         return _TRACKER_ADAPTER.validate_python(response.json())
 
     def apply_tracker_action(
-        self,
-        character_trait_id: str,
-        action: TrackerAction,
-        *,
-        amount: int = 1,
-        damage_type: DamageType | None = None,
+        self, character_trait_id: str, action: TrackerAction, *, amount: int = 1
     ) -> Tracker:
         """Apply one in-play action to a trait tracker, such as spending Willpower.
 
-        The server applies the game rules for the character's game version. Which actions
-        and damage types fit each tracker is listed in ``characters.TrackerRules`` from
-        ``options.get_options()``. A STAINS response reports overflow into Willpower in
-        ``willpower_damage_applied``.
+        The actions each tracker accepts are listed in
+        ``characters.TrackerRules[game_version][tracker.type]`` from ``options.get_options()``.
 
         Args:
             character_trait_id: The ID of the character trait.
             action: The action to apply.
             amount: How many points to apply. Must be at least 1.
-            damage_type: The damage type for ``damage`` and ``heal`` on damage tracks.
 
         Returns:
             The updated tracker.
@@ -483,12 +474,10 @@ class SyncCharacterTraitsService(SyncBaseService):
             NotFoundError: If the trait has no tracker for the character's game version.
             AuthorizationError: If you are not the character's player or a storyteller.
             RequestValidationError: If ``amount`` is less than 1.
-            ValidationError: If the action or damage type does not fit the tracker, a
-                damage type is missing or not allowed, or a spend exceeds the current value.
+            ValidationError: If the action does not fit the tracker or a spend exceeds the
+                current value.
         """
-        body = self._validate_request(
-            _TrackerAction, action=action, amount=amount, damage_type=damage_type
-        )
+        body = self._validate_request(_TrackerAction, action=action, amount=amount)
         response = self._post(
             self._format_endpoint(
                 Endpoints.CHARACTER_TRAIT_TRACKER_ACTIONS, character_trait_id=character_trait_id

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/_sync/services/characters.py

@@ -12,7 +12,6 @@ from vclient.constants import (
     CharacterInclude,
     CharacterStatus,
     CharacterType,
-    DamageType,
     TrackerAction,
 )
 from vclient.endpoints import Endpoints
@@ -905,15 +904,14 @@ class SyncCharactersService(SyncBaseService):
     ) -> Health:
         """Replace a character's full health state, such as to correct a mistake.
 
-        Every field is sent, so omitted fields reset to 0. V4 uses ``bashing``,
-        ``lethal``, and ``aggravated``; V5 uses ``superficial`` and ``aggravated``.
-        ``extra_levels`` applies to both. Use ``apply_health_action`` for in-play changes.
+        Every field is sent, so omitted fields reset to 0. Use ``apply_health_action`` for
+        in-play changes.
 
         Args:
             character_id: The ID of the character.
             request: A HealthStateSet model, OR pass fields as keyword arguments.
             **kwargs: Fields for HealthStateSet if request is not provided.
-                Accepts: extra_levels, superficial, aggravated, bashing, lethal (int >= 0).
+                Accepts: extra_levels, damage (int >= 0).
 
         Returns:
             The updated Health.
@@ -921,9 +919,8 @@ class SyncCharactersService(SyncBaseService):
         Raises:
             NotFoundError: If the character does not exist or has no health track.
             AuthorizationError: If you are not the character's player or a storyteller.
-            RequestValidationError: If a value is negative.
-            ValidationError: If a nonzero field is not used by the game version, or the
-                marks exceed the track size.
+            RequestValidationError: If a value is negative or a field is unknown.
+            ValidationError: If the damage exceeds the track size.
         """
         body = request if request is not None else self._validate_request(HealthStateSet, **kwargs)
         response = self._put(
@@ -933,24 +930,17 @@ class SyncCharactersService(SyncBaseService):
         return Health.model_validate(response.json())
 
     def apply_health_action(
-        self,
-        character_id: str,
-        action: TrackerAction,
-        *,
-        amount: int = 1,
-        damage_type: DamageType | None = None,
+        self, character_id: str, action: TrackerAction, *, amount: int = 1
     ) -> Health:
         """Apply one in-play action to a character's health, such as taking damage.
 
-        Health accepts ``damage``, ``heal``, and ``reset``. V4 damage types are
-        ``BASHING``, ``LETHAL``, and ``AGGRAVATED``; V5 damage types are ``SUPERFICIAL``
-        and ``AGGRAVATED``. The server applies overflow and upgrade rules.
+        Health accepts ``damage``, ``heal``, and ``reset``. Damage past a full track and
+        healing past 0 are dropped.
 
         Args:
             character_id: The ID of the character.
             action: The action to apply.
             amount: How many points to apply. Must be at least 1.
-            damage_type: The damage type for ``damage`` and ``heal``.
 
         Returns:
             The updated Health.
@@ -959,11 +949,9 @@ class SyncCharactersService(SyncBaseService):
             NotFoundError: If the character does not exist or has no health track.
             AuthorizationError: If you are not the character's player or a storyteller.
             RequestValidationError: If ``amount`` is less than 1.
-            ValidationError: If the action or damage type does not fit the game version.
+            ValidationError: If the action does not apply to health.
         """
-        body = self._validate_request(
-            _TrackerAction, action=action, amount=amount, damage_type=damage_type
-        )
+        body = self._validate_request(_TrackerAction, action=action, amount=amount)
         response = self._post(
             self._format_endpoint(Endpoints.CHARACTER_HEALTH_ACTIONS, character_id=character_id),
             json=body.model_dump(exclude_none=True, mode="json"),

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/_sync/services/options.py

@@ -36,9 +36,9 @@ class SyncOptionsService(SyncBaseService):
         """Retrieve all options and enumerations for the api.
 
         Most values are lists of enum values. ``characters.TrackerRules`` is a nested map
-        ``{game_version: {tracker_key: {"actions": [...], "damage_types": [...]}}}`` where
-        ``tracker_key`` is a tracker type or ``HEALTH``. Use it to choose which tracker
-        actions and damage types to offer instead of hardcoding them.
+        ``{game_version: {tracker_type: {"actions": [...]}}}``. Health is keyed by its
+        ``type``, ``DAMAGE``. Use it to choose which tracker actions to offer instead of
+        hardcoding them.
 
         Returns:
             A dictionary of options and enumerations for the api.

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/constants.py

@@ -106,4 +106,3 @@ BlueprintTraitOrderBy = Literal["NAME", "SHEET"]
 TraitModifyCurrency = Literal["XP", "STARTING_POINTS", "NO_COST"]
 TrackerType = Literal["COUNTER", "DAMAGE", "STAINS"]
 TrackerAction = Literal["spend", "gain", "damage", "heal", "add_stain", "remove_stain", "reset"]
-DamageType = Literal["SUPERFICIAL", "AGGRAVATED", "BASHING", "LETHAL"]

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/models/__init__.py

@@ -51,7 +51,6 @@ from .character_trait import (
     CharacterTraitSpecialtyUpdate,
     CharacterTraitValueOptionsResponse,
     CounterTracker,
-    DamageTracker,
     Health,
     HealthLevel,
     HealthStateSet,
@@ -213,7 +212,6 @@ __all__ = [
     "CompanyUpdate",
     "CounterTracker",
     "CreateAutogenerateDTO",
-    "DamageTracker",
     "Developer",
     "DeveloperCompanyPermission",
     "DeveloperCreate",

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/models/character_trait.py

@@ -3,9 +3,9 @@
 from datetime import datetime
 from typing import Annotated, Literal
 
-from pydantic import BaseModel, Field, TypeAdapter
+from pydantic import BaseModel, ConfigDict, Field, TypeAdapter
 
-from vclient.constants import DamageType, TrackerAction, TraitModifyCurrency
+from vclient.constants import TrackerAction, TraitModifyCurrency
 
 from .shared import Trait
 
@@ -20,77 +20,52 @@ class CharacterTraitSpecialty(BaseModel):
 
 
 class HealthLevel(BaseModel):
-    """One V4 health level with its dice penalty and the damage marked on it."""
+    """One V4 health level and whether it is marked."""
 
     name: str
-    penalty: int | None = Field(
-        default=None, description="Dice pool penalty at this level. None for Incapacitated."
-    )
-    mark: DamageType | None = Field(
-        default=None, description="Damage marked on this level, or None when empty."
+    marked: bool | None = Field(
+        default=None, description="Whether the level is marked. None only from older API versions."
     )
 
 
 class CounterTracker(BaseModel):
-    """Tracker for a trait whose current value is spent and regained in play, such as V4 Willpower."""
+    """Tracker for a trait whose current value is spent and regained in play, such as Willpower."""
 
     type: Literal["COUNTER"] = "COUNTER"
     size: int = Field(..., description="Maximum, equal to the trait's value.")
     current: int = Field(..., description="Points currently available.")
 
 
-class DamageTracker(BaseModel):
-    """Damage track used by V5 Willpower and by Health in both game versions.
-
-    The V4-only fields (``bashing``, ``lethal``, ``levels``, ``current_penalty``) are ``None``
-    for V5.
-    """
-
-    type: Literal["DAMAGE"] = "DAMAGE"
-    size: int = Field(..., description="Number of boxes on the track.")
-    superficial: int
-    aggravated: int
-    boxes: list[DamageType | None] = Field(
-        default_factory=list,
-        description="One entry per box in severity order, padded with None for empty boxes.",
-    )
-    is_impaired: bool
-    bashing: int | None = None
-    lethal: int | None = None
-    levels: list[HealthLevel] | None = None
-    current_penalty: int | None = Field(
-        default=None,
-        description="Dice pool penalty from the most severe marked V4 level. None on V5, and on V4 "
-        "when Incapacitated is marked.",
-    )
-
-
 class StainsTracker(BaseModel):
-    """Tracker for V5 Humanity stains."""
+    """Tracker for V5 vampire Humanity stains."""
 
     type: Literal["STAINS"] = "STAINS"
     humanity: int
     stain_capacity: int = Field(..., description="Boxes left for stains, 10 minus Humanity.")
     stains: int
-    is_impaired: bool
-    willpower_damage_applied: int | None = Field(
-        default=None,
-        description="Stains that overflowed into Willpower damage. Set only on action responses.",
-    )
 
 
 # In-play tracker state for a trait; pydantic picks the variant from ``type``.
-Tracker = Annotated[CounterTracker | DamageTracker | StainsTracker, Field(discriminator="type")]
+Tracker = Annotated[CounterTracker | StainsTracker, Field(discriminator="type")]
 
 _TRACKER_ADAPTER: TypeAdapter[Tracker] = TypeAdapter(Tracker)
 
 
-class Health(DamageTracker):
-    """A character's health track: a damage track plus V4 extra health levels."""
+class Health(BaseModel):
+    """A character's health track: one damage count, plus named levels in V4."""
 
+    type: Literal["DAMAGE"] = "DAMAGE"
+    size: int = Field(..., description="Number of boxes on the track.")
+    damage: int | None = Field(
+        default=None,
+        description="Marked boxes. None only from API versions that report typed damage marks.",
+    )
     extra_levels: int = Field(
         default=0, description="Health levels added on top of the base track."
     )
+    levels: list[HealthLevel] | None = Field(
+        default=None, description="Named V4 health levels in track order. None for V5."
+    )
 
 
 class CharacterTrait(BaseModel):
@@ -114,28 +89,27 @@ class CharacterTrait(BaseModel):
 class TrackerStateSet(BaseModel):
     """Request model for setting a trait tracker's full state.
 
-    Set only the fields for the tracker's type: ``current`` for counters (required),
-    ``superficial`` and ``aggravated`` for damage tracks, ``stains`` for stains.
+    Set only the field for the tracker's type: ``current`` for counters (required) or
+    ``stains`` for stains. Unknown fields raise so a stale key fails instead of being dropped.
     """
 
+    model_config = ConfigDict(extra="forbid")
+
     current: int | None = Field(default=None, ge=0)
-    superficial: int | None = Field(default=None, ge=0)
-    aggravated: int | None = Field(default=None, ge=0)
     stains: int | None = Field(default=None, ge=0)
 
 
 class HealthStateSet(BaseModel):
     """Request model for setting a character's full health state.
 
-    V4 uses ``bashing``, ``lethal``, and ``aggravated``; V5 uses ``superficial`` and
-    ``aggravated``. ``extra_levels`` applies to both. Omitted fields reset to 0.
+    Omitted fields reset to 0. Unknown fields raise so a stale key fails instead of
+    silently clearing the track.
     """
 
+    model_config = ConfigDict(extra="forbid")
+
     extra_levels: int = Field(default=0, ge=0)
-    superficial: int = Field(default=0, ge=0)
-    aggravated: int = Field(default=0, ge=0)
-    bashing: int = Field(default=0, ge=0)
-    lethal: int = Field(default=0, ge=0)
+    damage: int = Field(default=0, ge=0)
 
 
 class _TrackerAction(BaseModel):
@@ -143,7 +117,6 @@ class _TrackerAction(BaseModel):
 
     action: TrackerAction
     amount: int = Field(default=1, ge=1)
-    damage_type: DamageType | None = None
 
 
 class CharacterCreateTraitAssign(BaseModel):
@@ -273,7 +246,6 @@ __all__ = [
     "CharacterTraitValueOption",
     "CharacterTraitValueOptionsResponse",
     "CounterTracker",
-    "DamageTracker",
     "Health",
     "HealthLevel",
     "HealthStateSet",

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/models/characters.py

@@ -309,7 +309,7 @@ class CharacterCreate(BaseModel):
     )
     health: HealthStateSet | None = Field(
         default=None,
-        description="Starting health marks. Omit for an unhurt character.",
+        description="Starting health damage. Omit for an unhurt character.",
     )
     vampire_attributes: VampireAttributesCreate | None = Field(
         default=None, description="Vampire-specific attributes."

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/services/character_traits.py

@@ -3,7 +3,7 @@
 from collections.abc import AsyncIterator
 from typing import TYPE_CHECKING
 
-from vclient.constants import DEFAULT_PAGE_LIMIT, DamageType, TrackerAction, TraitModifyCurrency
+from vclient.constants import DEFAULT_PAGE_LIMIT, TrackerAction, TraitModifyCurrency
 from vclient.endpoints import Endpoints
 from vclient.models import (
     _TRACKER_ADAPTER,
@@ -463,7 +463,7 @@ class CharacterTraitsService(BaseService):
             character_trait_id: The ID of the character trait.
 
         Returns:
-            A CounterTracker, DamageTracker, or StainsTracker. Switch on ``type``.
+            A CounterTracker or StainsTracker. Switch on ``type``.
 
         Raises:
             NotFoundError: If the trait has no tracker for the character's game version.
@@ -484,16 +484,15 @@ class CharacterTraitsService(BaseService):
     ) -> Tracker:
         """Replace the full state of a trait tracker, such as to correct a mistake.
 
-        Send only the fields for the tracker's type: ``current`` for counters (required),
-        ``superficial`` and ``aggravated`` for damage tracks, ``stains`` for stains. Omitted
-        fields reset to 0, so an empty request clears a damage or stains tracker. Use
+        Send only the field for the tracker's type: ``current`` for counters (required) or
+        ``stains`` for stains. An empty request clears a stains tracker. Use
         ``apply_tracker_action`` for in-play changes instead.
 
         Args:
             character_trait_id: The ID of the character trait.
             request: A TrackerStateSet model, OR pass fields as keyword arguments.
             **kwargs: Fields for TrackerStateSet if request is not provided.
-                Accepts: current, superficial, aggravated, stains (int >= 0).
+                Accepts: current, stains (int >= 0).
 
         Returns:
             The updated tracker.
@@ -501,7 +500,7 @@ class CharacterTraitsService(BaseService):
         Raises:
             NotFoundError: If the trait has no tracker for the character's game version.
             AuthorizationError: If you are not the character's player or a storyteller.
-            RequestValidationError: If a value is negative.
+            RequestValidationError: If a value is negative or a field is unknown.
             ValidationError: If a field does not fit the tracker type, a counter has no
                 ``current``, or a value exceeds the tracker size.
         """
@@ -520,20 +519,16 @@ class CharacterTraitsService(BaseService):
         action: TrackerAction,
         *,
         amount: int = 1,
-        damage_type: DamageType | None = None,
     ) -> Tracker:
         """Apply one in-play action to a trait tracker, such as spending Willpower.
 
-        The server applies the game rules for the character's game version. Which actions
-        and damage types fit each tracker is listed in ``characters.TrackerRules`` from
-        ``options.get_options()``. A STAINS response reports overflow into Willpower in
-        ``willpower_damage_applied``.
+        The actions each tracker accepts are listed in
+        ``characters.TrackerRules[game_version][tracker.type]`` from ``options.get_options()``.
 
         Args:
             character_trait_id: The ID of the character trait.
             action: The action to apply.
             amount: How many points to apply. Must be at least 1.
-            damage_type: The damage type for ``damage`` and ``heal`` on damage tracks.
 
         Returns:
             The updated tracker.
@@ -542,12 +537,10 @@ class CharacterTraitsService(BaseService):
             NotFoundError: If the trait has no tracker for the character's game version.
             AuthorizationError: If you are not the character's player or a storyteller.
             RequestValidationError: If ``amount`` is less than 1.
-            ValidationError: If the action or damage type does not fit the tracker, a
-                damage type is missing or not allowed, or a spend exceeds the current value.
+            ValidationError: If the action does not fit the tracker or a spend exceeds the
+                current value.
         """
-        body = self._validate_request(
-            _TrackerAction, action=action, amount=amount, damage_type=damage_type
-        )
+        body = self._validate_request(_TrackerAction, action=action, amount=amount)
         response = await self._post(
             self._format_endpoint(
                 Endpoints.CHARACTER_TRAIT_TRACKER_ACTIONS, character_trait_id=character_trait_id

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/services/characters.py

@@ -10,7 +10,6 @@ from vclient.constants import (
     CharacterInclude,
     CharacterStatus,
     CharacterType,
-    DamageType,
     TrackerAction,
 )
 from vclient.endpoints import Endpoints
@@ -1033,15 +1032,14 @@ class CharactersService(BaseService):
     ) -> Health:
         """Replace a character's full health state, such as to correct a mistake.
 
-        Every field is sent, so omitted fields reset to 0. V4 uses ``bashing``,
-        ``lethal``, and ``aggravated``; V5 uses ``superficial`` and ``aggravated``.
-        ``extra_levels`` applies to both. Use ``apply_health_action`` for in-play changes.
+        Every field is sent, so omitted fields reset to 0. Use ``apply_health_action`` for
+        in-play changes.
 
         Args:
             character_id: The ID of the character.
             request: A HealthStateSet model, OR pass fields as keyword arguments.
             **kwargs: Fields for HealthStateSet if request is not provided.
-                Accepts: extra_levels, superficial, aggravated, bashing, lethal (int >= 0).
+                Accepts: extra_levels, damage (int >= 0).
 
         Returns:
             The updated Health.
@@ -1049,9 +1047,8 @@ class CharactersService(BaseService):
         Raises:
             NotFoundError: If the character does not exist or has no health track.
             AuthorizationError: If you are not the character's player or a storyteller.
-            RequestValidationError: If a value is negative.
-            ValidationError: If a nonzero field is not used by the game version, or the
-                marks exceed the track size.
+            RequestValidationError: If a value is negative or a field is unknown.
+            ValidationError: If the damage exceeds the track size.
         """
         body = request if request is not None else self._validate_request(HealthStateSet, **kwargs)
         response = await self._put(
@@ -1066,19 +1063,16 @@ class CharactersService(BaseService):
         action: TrackerAction,
         *,
         amount: int = 1,
-        damage_type: DamageType | None = None,
     ) -> Health:
         """Apply one in-play action to a character's health, such as taking damage.
 
-        Health accepts ``damage``, ``heal``, and ``reset``. V4 damage types are
-        ``BASHING``, ``LETHAL``, and ``AGGRAVATED``; V5 damage types are ``SUPERFICIAL``
-        and ``AGGRAVATED``. The server applies overflow and upgrade rules.
+        Health accepts ``damage``, ``heal``, and ``reset``. Damage past a full track and
+        healing past 0 are dropped.
 
         Args:
             character_id: The ID of the character.
             action: The action to apply.
             amount: How many points to apply. Must be at least 1.
-            damage_type: The damage type for ``damage`` and ``heal``.
 
         Returns:
             The updated Health.
@@ -1087,11 +1081,9 @@ class CharactersService(BaseService):
             NotFoundError: If the character does not exist or has no health track.
             AuthorizationError: If you are not the character's player or a storyteller.
             RequestValidationError: If ``amount`` is less than 1.
-            ValidationError: If the action or damage type does not fit the game version.
+            ValidationError: If the action does not apply to health.
         """
-        body = self._validate_request(
-            _TrackerAction, action=action, amount=amount, damage_type=damage_type
-        )
+        body = self._validate_request(_TrackerAction, action=action, amount=amount)
         response = await self._post(
             self._format_endpoint(Endpoints.CHARACTER_HEALTH_ACTIONS, character_id=character_id),
             json=body.model_dump(exclude_none=True, mode="json"),

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/services/options.py

@@ -37,9 +37,9 @@ class OptionsService(BaseService):
         """Retrieve all options and enumerations for the api.
 
         Most values are lists of enum values. ``characters.TrackerRules`` is a nested map
-        ``{game_version: {tracker_key: {"actions": [...], "damage_types": [...]}}}`` where
-        ``tracker_key`` is a tracker type or ``HEALTH``. Use it to choose which tracker
-        actions and damage types to offer instead of hardcoding them.
+        ``{game_version: {tracker_type: {"actions": [...]}}}``. Health is keyed by its
+        ``type``, ``DAMAGE``. Use it to choose which tracker actions to offer instead of
+        hardcoding them.
 
         Returns:
             A dictionary of options and enumerations for the api.

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/testing/__init__.py

@@ -39,7 +39,6 @@ from vclient.testing._factories import (
     CompanyFactory,
     CompanyPermissionsFactory,
     CounterTrackerFactory,
-    DamageTrackerFactory,
     DeveloperFactory,
     DeveloperWithApiKeyFactory,
     DicerollFactory,
@@ -100,7 +99,6 @@ __all__ = [
     "CompanyFactory",
     "CompanyPermissionsFactory",
     "CounterTrackerFactory",
-    "DamageTrackerFactory",
     "DeveloperFactory",
     "DeveloperWithApiKeyFactory",
     "DicerollFactory",

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/testing/_factories.py

@@ -1,6 +1,5 @@
 """Polyfactory model factories for all vclient response models."""
 
-import random
 from typing import Any
 
 from polyfactory import Use
@@ -31,7 +30,6 @@ from vclient.models import (
     Company,
     CompanyPermissions,
     CounterTracker,
-    DamageTracker,
     Developer,
     DeveloperWithApiKey,
     Diceroll,
@@ -186,11 +184,9 @@ class CharacterTraitFactory(_GeneratedFieldsFactory[CharacterTrait]):
     __generated_fields__ = frozenset({"tracker"})
 
     @classmethod
-    def tracker(cls) -> CounterTracker | DamageTracker | StainsTracker | None:
+    def tracker(cls) -> CounterTracker | StainsTracker | None:
         """Return a random tracker variant, or None for a trait without a tracker."""
-        factory = cls.__random__.choice(
-            [CounterTrackerFactory, DamageTrackerFactory, StainsTrackerFactory, None]
-        )
+        factory = cls.__random__.choice([CounterTrackerFactory, StainsTrackerFactory, None])
         return factory.build() if factory is not None else None
 
 
@@ -370,24 +366,6 @@ class WerewolfTribeFactory(ModelFactory[WerewolfTribe]):
     __use_defaults__ = True
 
 
-def _damage_track_values(rng: random.Random, overrides: dict[str, Any]) -> dict[str, Any]:
-    """Return damage track fields whose counts, boxes, and impairment agree with each other.
-
-    Fields passed in ``overrides`` are kept and the rest are derived from them.
-    """
-    size: int = overrides.get("size", rng.randint(1, 10))
-    aggravated: int = overrides.get("aggravated", rng.randint(0, size))
-    superficial: int = overrides.get("superficial", rng.randint(0, max(size - aggravated, 0)))
-    marks: list[str | None] = ["AGGRAVATED"] * aggravated + ["SUPERFICIAL"] * superficial
-    return {
-        "size": size,
-        "aggravated": aggravated,
-        "superficial": superficial,
-        "boxes": overrides.get("boxes", (marks + [None] * size)[:size]),
-        "is_impaired": overrides.get("is_impaired", aggravated + superficial >= size),
-    }
-
-
 class CounterTrackerFactory(ModelFactory[CounterTracker]):
     __model__ = CounterTracker
     __use_defaults__ = True
@@ -400,25 +378,22 @@ class CounterTrackerFactory(ModelFactory[CounterTracker]):
         return super().build(factory_use_construct, **kwargs)
 
 
-class DamageTrackerFactory(ModelFactory[DamageTracker]):
-    __model__ = DamageTracker
-    __use_defaults__ = True
-
-    @classmethod
-    def build(cls, factory_use_construct: bool = False, **kwargs: Any) -> DamageTracker:  # noqa: FBT001, FBT002
-        """Build a damage track whose boxes match its superficial and aggravated counts."""
-        kwargs = {**kwargs, **_damage_track_values(cls.__random__, kwargs)}
-        return super().build(factory_use_construct, **kwargs)
-
-
 class HealthFactory(ModelFactory[Health]):
     __model__ = Health
     __use_defaults__ = True
 
     @classmethod
     def build(cls, factory_use_construct: bool = False, **kwargs: Any) -> Health:  # noqa: FBT001, FBT002
-        """Build a health track whose boxes match its superficial and aggravated counts."""
-        kwargs = {**kwargs, **_damage_track_values(cls.__random__, kwargs)}
+        """Build a V4 or V5 health track whose damage fits it and whose V4 levels match it."""
+        size: int = kwargs.get("size", cls.__random__.randint(1, 10))
+        damage: int | None = kwargs.get("damage", cls.__random__.randint(0, size))
+        levels: list[HealthLevel] | None = kwargs.get("levels")
+        if "levels" not in kwargs and cls.__random__.choice((True, False)):
+            levels = [
+                HealthLevel(name=f"Level {i + 1}", marked=None if damage is None else i < damage)
+                for i in range(size)
+            ]
+        kwargs = {"size": size, "damage": damage, "levels": levels, **kwargs}
         return super().build(factory_use_construct, **kwargs)
 
 
@@ -426,6 +401,12 @@ class HealthLevelFactory(ModelFactory[HealthLevel]):
     __model__ = HealthLevel
     __use_defaults__ = True
 
+    @classmethod
+    def build(cls, factory_use_construct: bool = False, **kwargs: Any) -> HealthLevel:  # noqa: FBT001, FBT002
+        """Build a health level in the current API shape, with ``marked`` set."""
+        kwargs = {"marked": cls.__random__.choice((True, False)), **kwargs}
+        return super().build(factory_use_construct, **kwargs)
+
 
 class StainsTrackerFactory(ModelFactory[StainsTracker]):
     __model__ = StainsTracker
@@ -470,7 +451,6 @@ __all__ = [
     "CompanyFactory",
     "CompanyPermissionsFactory",
     "CounterTrackerFactory",
-    "DamageTrackerFactory",
     "DeveloperFactory",
     "DeveloperWithApiKeyFactory",
     "DicerollFactory",

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/testing/_router.py

@@ -33,7 +33,6 @@ from vclient.models import (
     Company,
     CompanyPermissions,
     CounterTracker,
-    DamageTracker,
     Developer,
     DeveloperWithApiKey,
     Diceroll,
@@ -87,7 +86,6 @@ from vclient.testing._factories import (
     CompanyFactory,
     CompanyPermissionsFactory,
     CounterTrackerFactory,
-    DamageTrackerFactory,
     DeveloperFactory,
     DeveloperWithApiKeyFactory,
     DicerollFactory,
@@ -121,7 +119,6 @@ from vclient.testing._routes import BYTES, LIST, NO_CONTENT, PAGINATED, RAW_JSON
 
 _FACTORY_MAP: dict[type, type[ModelFactory]] = {
     CounterTracker: CounterTrackerFactory,
-    DamageTracker: DamageTrackerFactory,
     Health: HealthFactory,
     HealthLevel: HealthLevelFactory,
     StainsTracker: StainsTrackerFactory,

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/testing/_routes.py

@@ -23,7 +23,7 @@ from vclient.models import (
     CharacterTraitValueOptionsResponse,
     Company,
     CompanyPermissions,
-    DamageTracker,
+    CounterTracker,
     Developer,
     DeveloperWithApiKey,
     Diceroll,
@@ -351,15 +351,15 @@ class Routes:
     CHARACTER_TRAITS_SPECIALTY_DELETE = RouteSpec(
         "DELETE", Endpoints.CHARACTER_TRAIT_SPECIALTY, NO_CONTENT, None
     )
-    # Tracker routes return any tracker variant; the default response is a DamageTracker.
+    # Tracker routes return any tracker variant; the default response is a CounterTracker.
     CHARACTER_TRAITS_TRACKER_GET = RouteSpec(
-        "GET", Endpoints.CHARACTER_TRAIT_TRACKER, SINGLE, DamageTracker
+        "GET", Endpoints.CHARACTER_TRAIT_TRACKER, SINGLE, CounterTracker
     )
     CHARACTER_TRAITS_TRACKER_SET = RouteSpec(
-        "PUT", Endpoints.CHARACTER_TRAIT_TRACKER, SINGLE, DamageTracker
+        "PUT", Endpoints.CHARACTER_TRAIT_TRACKER, SINGLE, CounterTracker
     )
     CHARACTER_TRAITS_TRACKER_ACTION = RouteSpec(
-        "POST", Endpoints.CHARACTER_TRAIT_TRACKER_ACTIONS, SINGLE, DamageTracker
+        "POST", Endpoints.CHARACTER_TRAIT_TRACKER_ACTIONS, SINGLE, CounterTracker
     )
 
     # Blueprint sections

{valentina_python_client-3.4.0 → valentina_python_client-3.5.0}/src/vclient/validate_constants.py

@@ -70,7 +70,6 @@ CONSTANT_MAP: dict[str, ConstantMapping] = {
     "CharacterInventoryType": ConstantMapping("characters", "InventoryItemType"),
     "CharacterStatus": ConstantMapping("characters", "CharacterStatus"),
     "CharacterType": ConstantMapping("characters", "CharacterType"),
-    "DamageType": ConstantMapping("characters", "DamageType"),
     "DiceSize": ConstantMapping("gameplay", "DiceSize"),
     "FreeTraitChangesPermission": ConstantMapping("companies", "PermissionsFreeTraitChanges"),
     "GameVersion": ConstantMapping("characters", "GameVersion"),