Convert deprecated class Config pattern to modern ConfigDict pattern across all data models: - models/asset.py: Updated 6 classes (AssetFolder, Asset, AssetUpload, AssetRename, AssetMove, FolderCreate) - models/group.py: Updated 8 classes (GroupPermission, GroupPageRule, GroupUser, Group, GroupCreate, GroupUpdate, GroupAssignUser, GroupUnassignUser) - models/user.py: Updated 3 classes (User, UserCreate, UserUpdate) Changes: - Added ConfigDict import from pydantic - Replaced 'class Config:' with 'model_config = ConfigDict(...)' - Preserved all config options (populate_by_name, str_strip_whitespace) Impact: - Eliminated 19 Pydantic deprecation warnings - All 423 tests still passing - No breaking changes to functionality - Future-proofed for Pydantic v3 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
194 lines
6.2 KiB
Python
194 lines
6.2 KiB
Python
"""Data models for Wiki.js groups."""
|
|
|
|
from typing import List, Optional
|
|
|
|
from pydantic import ConfigDict, Field, field_validator
|
|
|
|
from .base import BaseModel, TimestampedModel
|
|
|
|
|
|
class GroupPermission(BaseModel):
|
|
"""Group permission model."""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
id: str = Field(..., description="Permission identifier")
|
|
name: Optional[str] = Field(None, description="Permission name")
|
|
|
|
|
|
class GroupPageRule(BaseModel):
|
|
"""Group page access rule model."""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
id: str = Field(..., description="Rule identifier")
|
|
path: str = Field(..., description="Page path pattern")
|
|
roles: List[str] = Field(default_factory=list, description="Allowed roles")
|
|
match: str = Field(default="START", description="Match type (START, EXACT, REGEX)")
|
|
deny: bool = Field(default=False, description="Whether this is a deny rule")
|
|
locales: List[str] = Field(default_factory=list, description="Allowed locales")
|
|
|
|
|
|
class GroupUser(BaseModel):
|
|
"""User member of a group (minimal representation)."""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
id: int = Field(..., description="User ID")
|
|
name: str = Field(..., description="User name")
|
|
email: str = Field(..., description="User email")
|
|
|
|
|
|
class Group(TimestampedModel):
|
|
"""Wiki.js group model.
|
|
|
|
Represents a complete group with all fields.
|
|
|
|
Attributes:
|
|
id: Group ID
|
|
name: Group name
|
|
is_system: Whether this is a system group
|
|
redirect_on_login: Path to redirect to on login
|
|
permissions: List of group permissions
|
|
page_rules: List of page access rules
|
|
users: List of users in this group (only populated in get operations)
|
|
created_at: Creation timestamp
|
|
updated_at: Last update timestamp
|
|
"""
|
|
|
|
id: int = Field(..., description="Group ID")
|
|
name: str = Field(..., min_length=1, max_length=255, description="Group name")
|
|
is_system: bool = Field(
|
|
default=False, alias="isSystem", description="System group flag"
|
|
)
|
|
redirect_on_login: Optional[str] = Field(
|
|
None, alias="redirectOnLogin", description="Redirect path on login"
|
|
)
|
|
permissions: List[str] = Field(
|
|
default_factory=list, description="Permission identifiers"
|
|
)
|
|
page_rules: List[GroupPageRule] = Field(
|
|
default_factory=list, alias="pageRules", description="Page access rules"
|
|
)
|
|
users: List[GroupUser] = Field(
|
|
default_factory=list, description="Users in this group"
|
|
)
|
|
|
|
@field_validator("name")
|
|
@classmethod
|
|
def validate_name(cls, v: str) -> str:
|
|
"""Validate group name."""
|
|
if not v or not v.strip():
|
|
raise ValueError("Group name cannot be empty")
|
|
if len(v.strip()) < 1:
|
|
raise ValueError("Group name must be at least 1 character")
|
|
if len(v) > 255:
|
|
raise ValueError("Group name cannot exceed 255 characters")
|
|
return v.strip()
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
|
|
class GroupCreate(BaseModel):
|
|
"""Model for creating a new group.
|
|
|
|
Attributes:
|
|
name: Group name (required)
|
|
redirect_on_login: Path to redirect to on login
|
|
permissions: List of permission identifiers
|
|
page_rules: List of page access rule configurations
|
|
"""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
name: str = Field(..., min_length=1, max_length=255, description="Group name")
|
|
redirect_on_login: Optional[str] = Field(
|
|
None, alias="redirectOnLogin", description="Redirect path on login"
|
|
)
|
|
permissions: List[str] = Field(
|
|
default_factory=list, description="Permission identifiers"
|
|
)
|
|
page_rules: List[dict] = Field(
|
|
default_factory=list, alias="pageRules", description="Page access rules"
|
|
)
|
|
|
|
@field_validator("name")
|
|
@classmethod
|
|
def validate_name(cls, v: str) -> str:
|
|
"""Validate group name."""
|
|
if not v or not v.strip():
|
|
raise ValueError("Group name cannot be empty")
|
|
if len(v.strip()) < 1:
|
|
raise ValueError("Group name must be at least 1 character")
|
|
if len(v) > 255:
|
|
raise ValueError("Group name cannot exceed 255 characters")
|
|
return v.strip()
|
|
|
|
|
|
class GroupUpdate(BaseModel):
|
|
"""Model for updating an existing group.
|
|
|
|
All fields are optional to support partial updates.
|
|
|
|
Attributes:
|
|
name: Updated group name
|
|
redirect_on_login: Updated redirect path
|
|
permissions: Updated permission list
|
|
page_rules: Updated page access rules
|
|
"""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
name: Optional[str] = Field(
|
|
None, min_length=1, max_length=255, description="Group name"
|
|
)
|
|
redirect_on_login: Optional[str] = Field(
|
|
None, alias="redirectOnLogin", description="Redirect path on login"
|
|
)
|
|
permissions: Optional[List[str]] = Field(None, description="Permission identifiers")
|
|
page_rules: Optional[List[dict]] = Field(
|
|
None, alias="pageRules", description="Page access rules"
|
|
)
|
|
|
|
@field_validator("name")
|
|
@classmethod
|
|
def validate_name(cls, v: Optional[str]) -> Optional[str]:
|
|
"""Validate group name if provided."""
|
|
if v is None:
|
|
return v
|
|
if not v or not v.strip():
|
|
raise ValueError("Group name cannot be empty")
|
|
if len(v.strip()) < 1:
|
|
raise ValueError("Group name must be at least 1 character")
|
|
if len(v) > 255:
|
|
raise ValueError("Group name cannot exceed 255 characters")
|
|
return v.strip()
|
|
|
|
|
|
class GroupAssignUser(BaseModel):
|
|
"""Model for assigning a user to a group.
|
|
|
|
Attributes:
|
|
group_id: Group ID
|
|
user_id: User ID
|
|
"""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
group_id: int = Field(..., alias="groupId", description="Group ID")
|
|
user_id: int = Field(..., alias="userId", description="User ID")
|
|
|
|
|
|
class GroupUnassignUser(BaseModel):
|
|
"""Model for removing a user from a group.
|
|
|
|
Attributes:
|
|
group_id: Group ID
|
|
user_id: User ID
|
|
"""
|
|
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
group_id: int = Field(..., alias="groupId", description="Group ID")
|
|
user_id: int = Field(..., alias="userId", description="User ID")
|