Skip to content

Commit 5362ee0

Browse files
vilsonrodriguesclaude
vilsonrodrigues
and
claude
committed
refactor: remove unnecessary Json validator type
Removed Json validator type as it adds unnecessary complexity: - JSON strings are better validated when used, not when loaded - Using plain `str` type is clearer and more flexible - Simplifies _preprocess_env_value logic - Reduces dec_hook complexity Updated: - Removed _Json class from types.py - Removed Json from all imports and exports - Removed Json tests (121 tests passing) - Updated example to remove JSON validation section - Renamed example to 08_advanced_validators.py All 121 type tests passing ✓ 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 5b7e5e6 commit 5362ee0

File tree

5 files changed

+270
-111
lines changed

5 files changed

+270
-111
lines changed

‎examples/08_advanced_validators.py‎

Lines changed: 270 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,270 @@
1+
"""Example demonstrating advanced validators.
2+
3+
This example shows advanced validators:
4+
- IPv4Address, IPv6Address, IPvAnyAddress for IP validation
5+
- MacAddress for MAC address validation
6+
- ConStr for constrained strings
7+
- ByteSize for storage size parsing
8+
- PastDate, FutureDate for date validation
9+
"""
10+
11+
import os
12+
from datetime import date, timedelta
13+
14+
from msgspec_ext import (
15+
BaseSettings,
16+
ByteSize,
17+
ConStr,
18+
FutureDate,
19+
IPv4Address,
20+
IPv6Address,
21+
IPvAnyAddress,
22+
MacAddress,
23+
PastDate,
24+
SettingsConfigDict,
25+
)
26+
27+
28+
# Example 1: IP Address validation
29+
class NetworkSettings(BaseSettings):
30+
"""Settings with IP address validation."""
31+
32+
model_config = SettingsConfigDict(env_prefix="NET_")
33+
34+
server_ipv4: IPv4Address
35+
server_ipv6: IPv6Address
36+
proxy_ip: IPvAnyAddress # Accepts both IPv4 and IPv6
37+
38+
39+
# Example 2: MAC Address validation
40+
class DeviceSettings(BaseSettings):
41+
"""Settings with MAC address validation."""
42+
43+
model_config = SettingsConfigDict(env_prefix="DEVICE_")
44+
45+
primary_mac: MacAddress
46+
backup_mac: MacAddress
47+
48+
49+
# Example 3: Constrained String validation
50+
class UsernameSettings(BaseSettings):
51+
"""Settings with constrained strings."""
52+
53+
model_config = SettingsConfigDict(env_prefix="USER_")
54+
55+
username: ConStr # Can add min_length, max_length, pattern constraints
56+
57+
58+
# Example 4: ByteSize validation
59+
class StorageSettings(BaseSettings):
60+
"""Settings with storage size validation."""
61+
62+
model_config = SettingsConfigDict(env_prefix="STORAGE_")
63+
64+
max_file_size: ByteSize
65+
cache_size: ByteSize
66+
upload_limit: ByteSize
67+
68+
69+
# Example 5: Date validation
70+
class EventSettings(BaseSettings):
71+
"""Settings with date validation."""
72+
73+
model_config = SettingsConfigDict(env_prefix="EVENT_")
74+
75+
launch_date: FutureDate # Must be in the future
76+
founding_date: PastDate # Must be in the past
77+
78+
79+
# Example 6: Combined advanced validators
80+
class AppSettings(BaseSettings):
81+
"""Real-world app settings with advanced validators."""
82+
83+
# Network
84+
api_server: IPv4Address
85+
dns_server: IPvAnyAddress
86+
87+
# MAC Address
88+
server_mac: MacAddress
89+
90+
# Storage
91+
max_upload: ByteSize
92+
cache_limit: ByteSize
93+
94+
# Dates
95+
release_date: FutureDate
96+
97+
98+
def main(): # noqa: PLR0915
99+
print("=" * 60)
100+
print("msgspec-ext Advanced Validators Demo")
101+
print("=" * 60)
102+
103+
# Example 1: IP Address validation
104+
print("\n1. IP Address Validation")
105+
print("-" * 60)
106+
107+
os.environ.update(
108+
{
109+
"NET_SERVER_IPV4": "192.168.1.100",
110+
"NET_SERVER_IPV6": "2001:db8::1",
111+
"NET_PROXY_IP": "10.0.0.1", # Can be IPv4 or IPv6
112+
}
113+
)
114+
115+
net_settings = NetworkSettings()
116+
print(f"Server IPv4: {net_settings.server_ipv4}")
117+
print(f"Server IPv6: {net_settings.server_ipv6}")
118+
print(f"Proxy IP: {net_settings.proxy_ip}")
119+
120+
# Try invalid IPv4
121+
try:
122+
IPv4Address("256.1.1.1")
123+
except ValueError as e:
124+
print(f"✓ IPv4 validation works: {e}")
125+
126+
# Try invalid IPv6
127+
try:
128+
IPv6Address("gggg::1")
129+
except ValueError as e:
130+
print(f"✓ IPv6 validation works: {e}")
131+
132+
# Example 2: MAC Address validation
133+
print("\n2. MAC Address Validation")
134+
print("-" * 60)
135+
136+
os.environ.update(
137+
{
138+
"DEVICE_PRIMARY_MAC": "00:1B:44:11:3A:B7",
139+
"DEVICE_BACKUP_MAC": "001B.4411.3AB7", # Different format
140+
}
141+
)
142+
143+
device_settings = DeviceSettings()
144+
print(f"Primary MAC: {device_settings.primary_mac}")
145+
print(f"Backup MAC: {device_settings.backup_mac}")
146+
147+
# Try invalid MAC
148+
try:
149+
MacAddress("GG:1B:44:11:3A:B7")
150+
except ValueError as e:
151+
print(f"✓ MAC validation works: {e}")
152+
153+
# Example 3: Constrained String
154+
print("\n3. Constrained String Validation")
155+
print("-" * 60)
156+
157+
# ConStr with no constraints
158+
username1 = ConStr("john_doe")
159+
print(f"Username (no constraints): {username1}")
160+
161+
# ConStr with min/max length
162+
username2 = ConStr("alice", min_length=3, max_length=20)
163+
print(f"Username (with length): {username2}")
164+
165+
# ConStr with pattern
166+
username3 = ConStr("bob123", pattern=r"^[a-z0-9]+$")
167+
print(f"Username (with pattern): {username3}")
168+
169+
# Try too short
170+
try:
171+
ConStr("ab", min_length=5)
172+
except ValueError as e:
173+
print(f"✓ Min length validation works: {e}")
174+
175+
# Try pattern mismatch
176+
try:
177+
ConStr("ABC", pattern=r"^[a-z]+$")
178+
except ValueError as e:
179+
print(f"✓ Pattern validation works: {e}")
180+
181+
# Example 4: ByteSize validation
182+
print("\n4. Byte Size Validation")
183+
print("-" * 60)
184+
185+
os.environ.update(
186+
{
187+
"STORAGE_MAX_FILE_SIZE": "10MB",
188+
"STORAGE_CACHE_SIZE": "500MB",
189+
"STORAGE_UPLOAD_LIMIT": "1GB",
190+
}
191+
)
192+
193+
storage_settings = StorageSettings()
194+
print(f"Max File Size: {storage_settings.max_file_size} bytes = 10MB")
195+
print(f"Cache Size: {storage_settings.cache_size} bytes = 500MB")
196+
print(f"Upload Limit: {storage_settings.upload_limit} bytes = 1GB")
197+
198+
# Different units
199+
print(f"\n1KB = {ByteSize('1KB')} bytes")
200+
print(f"1MB = {ByteSize('1MB')} bytes")
201+
print(f"1GB = {ByteSize('1GB')} bytes")
202+
print(f"1KiB = {ByteSize('1KiB')} bytes (binary)")
203+
print(f"1MiB = {ByteSize('1MiB')} bytes (binary)")
204+
205+
# Try invalid size
206+
try:
207+
ByteSize("100XB")
208+
except ValueError as e:
209+
print(f"✓ ByteSize validation works: {e}")
210+
211+
# Example 5: Date validation
212+
print("\n5. Past/Future Date Validation")
213+
print("-" * 60)
214+
215+
yesterday = date.today() - timedelta(days=1)
216+
tomorrow = date.today() + timedelta(days=1)
217+
218+
os.environ.update(
219+
{
220+
"EVENT_FOUNDING_DATE": yesterday.isoformat(),
221+
"EVENT_LAUNCH_DATE": tomorrow.isoformat(),
222+
}
223+
)
224+
225+
event_settings = EventSettings()
226+
print(f"Founding Date (past): {event_settings.founding_date}")
227+
print(f"Launch Date (future): {event_settings.launch_date}")
228+
229+
# Try future date as past (invalid)
230+
try:
231+
PastDate(tomorrow)
232+
except ValueError as e:
233+
print(f"✓ PastDate validation works: {e}")
234+
235+
# Try past date as future (invalid)
236+
try:
237+
FutureDate(yesterday)
238+
except ValueError as e:
239+
print(f"✓ FutureDate validation works: {e}")
240+
241+
# Example 6: Real-World Combined validators
242+
print("\n6. Real-World App Settings")
243+
print("-" * 60)
244+
245+
os.environ.update(
246+
{
247+
"API_SERVER": "192.168.1.50",
248+
"DNS_SERVER": "8.8.8.8",
249+
"SERVER_MAC": "AA:BB:CC:DD:EE:FF",
250+
"MAX_UPLOAD": "50MB",
251+
"CACHE_LIMIT": "1GB",
252+
"RELEASE_DATE": tomorrow.isoformat(),
253+
}
254+
)
255+
256+
app_settings = AppSettings()
257+
print(f"API Server: {app_settings.api_server}")
258+
print(f"DNS Server: {app_settings.dns_server}")
259+
print(f"Server MAC: {app_settings.server_mac}")
260+
print(f"Max Upload: {app_settings.max_upload} bytes")
261+
print(f"Cache Limit: {app_settings.cache_limit} bytes")
262+
print(f"Release Date: {app_settings.release_date}")
263+
264+
print("\n" + "=" * 60)
265+
print("All advanced validator examples completed successfully!")
266+
print("=" * 60)
267+
268+
269+
if __name__ == "__main__":
270+
main()

‎src/msgspec_ext/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
IPv4Address,
1414
IPv6Address,
1515
IPvAnyAddress,
16-
Json,
1716
MacAddress,
1817
NegativeFloat,
1918
NegativeInt,

‎src/msgspec_ext/settings.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
IPv4Address,
1818
IPv6Address,
1919
IPvAnyAddress,
20-
Json,
2120
MacAddress,
2221
PastDate,
2322
PaymentCardNumber,
@@ -58,7 +57,6 @@ def _dec_hook(typ: type, obj: Any) -> Any:
5857
IPv4Address,
5958
IPv6Address,
6059
IPvAnyAddress,
61-
Json,
6260
MacAddress,
6361
)
6462
if typ in custom_types:

‎src/msgspec_ext/types.py‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class AppSettings(BaseSettings):
1313
"""
1414

1515
import ipaddress
16-
import json
1716
import os
1817
import re
1918
from datetime import date, datetime
@@ -33,7 +32,6 @@ class AppSettings(BaseSettings):
3332
"IPv4Address",
3433
"IPv6Address",
3534
"IPvAnyAddress",
36-
"Json",
3735
"MacAddress",
3836
"NegativeFloat",
3937
"NegativeInt",
@@ -626,42 +624,6 @@ def __repr__(self) -> str:
626624
# ==============================================================================
627625

628626

629-
class _Json(str):
630-
"""JSON string validation.
631-
632-
Validates that a string contains valid JSON.
633-
"""
634-
635-
__slots__ = ()
636-
637-
def __new__(cls, value: str) -> "_Json":
638-
"""Create and validate JSON string.
639-
640-
Args:
641-
value: JSON string
642-
643-
Returns:
644-
Validated JSON string
645-
646-
Raises:
647-
ValueError: If JSON is invalid
648-
"""
649-
if not isinstance(value, str):
650-
raise TypeError(f"Expected str, got {type(value).__name__}")
651-
652-
value = value.strip()
653-
654-
try:
655-
# Validate by parsing
656-
json.loads(value)
657-
return str.__new__(cls, value)
658-
except json.JSONDecodeError as e:
659-
raise ValueError(f"Invalid JSON: {e}") from e
660-
661-
def __repr__(self) -> str:
662-
return f"Json({str.__repr__(self)})"
663-
664-
665627
class _MacAddress(str):
666628
"""MAC address validation.
667629
@@ -931,7 +893,6 @@ def __repr__(self) -> str:
931893
IPv4Address = _IPv4Address
932894
IPv6Address = _IPv6Address
933895
IPvAnyAddress = _IPvAnyAddress
934-
Json = _Json
935896
MacAddress = _MacAddress
936897
ConStr = _ConStr
937898
ByteSize = _ByteSize

0 commit comments

Comments
 (0)