✨ Refactor project and rabbitmq basic types to use TypeAlias with Annotated and StringConstraints

Author: pcrespov

packages/models-library/src/models_library/projects.py

@@ -11,7 +11,14 @@
 from models_library.basic_types import ConstrainedStr
 from models_library.folders import FolderID
 from models_library.workspaces import WorkspaceID
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    HttpUrl,
+    StringConstraints,
+    field_validator,
+)
 
 from .basic_regex import DATE_RE, UUID_RE_BASE
 from .emails import LowerCaseEmailStr
@@ -35,8 +42,7 @@
 _DATETIME_FORMAT: Final[str] = "%Y-%m-%dT%H:%M:%S.%fZ"
 
 
-class ProjectIDStr(ConstrainedStr):
-    pattern = UUID_RE_BASE
+ProjectIDStr: TypeAlias = Annotated[str, StringConstraints(pattern=UUID_RE_BASE)]
 
 
 class DateTimeStr(ConstrainedStr):

packages/models-library/src/models_library/rabbitmq_basic_types.py

@@ -1,7 +1,7 @@
-from typing import Final
+from typing import Annotated, Final, TypeAlias
 
 from models_library.basic_types import ConstrainedStr
-from pydantic import TypeAdapter
+from pydantic import StringConstraints, TypeAdapter
 
 REGEX_RABBIT_QUEUE_ALLOWED_SYMBOLS: Final[str] = r"^[\w\-\.]*$"
 
@@ -21,7 +21,9 @@ def from_entries(cls, entries: dict[str, str]) -> "RPCNamespace":
         return TypeAdapter(cls).validate_python(composed_string)
 
 
-class RPCMethodName(ConstrainedStr):
-    pattern = REGEX_RABBIT_QUEUE_ALLOWED_SYMBOLS
-    min_length: int = 1
-    max_length: int = 252
+RPCMethodName: TypeAlias = Annotated[
+    str,
+    StringConstraints(
+        pattern=REGEX_RABBIT_QUEUE_ALLOWED_SYMBOLS, min_length=1, max_length=252
+    ),
+]