Introduce AnnotatedUserId, removing pydantic dependency from UserId

Change-Id: Id8f12caaaa26de505ecb703f115b0e2ac1e427a3

Author: spt29

cmk/gui/pagetypes.py

@@ -79,6 +79,7 @@
 )
 from cmk.gui.table import init_rowselect, Table, table_element
 from cmk.gui.type_defs import (
+    AnnotatedUserId,
     HTTPVariables,
     Icon,
     MegaMenu,
@@ -137,7 +138,7 @@ class BaseConfig:
 
 
 class OverridableModel(BaseModel):
-    owner: UserId
+    owner: AnnotatedUserId
     public: bool | tuple[Literal["contact_groups", "sites"], Sequence[str]] | None
     hidden: bool = False  # TODO: Seems it is not configurable through the UI. Is it OK?
 

cmk/gui/type_defs.py

@@ -10,9 +10,9 @@
 from collections.abc import Callable, Iterable, Mapping, Sequence
 from dataclasses import asdict, dataclass, field
 from datetime import datetime
-from typing import Any, Literal, NamedTuple, NewType, NotRequired, TypedDict
+from typing import Annotated, Any, Literal, NamedTuple, NewType, NotRequired, TypedDict
 
-from pydantic import BaseModel
+from pydantic import BaseModel, PlainValidator
 
 from livestatus import SiteId
 
@@ -699,11 +699,14 @@ class ViewProcessTracking:
     duration_view_render: Snapshot = Snapshot.null()
 
 
+AnnotatedUserId = Annotated[UserId, PlainValidator(UserId.parse)]
+
+
 class Key(BaseModel):
     certificate: str
     private_key: str
     alias: str
-    owner: UserId
+    owner: AnnotatedUserId
     date: float
     # Before 2.2 this field was only used for Setup backup keys. Now we add it to all key, because it
     # won't hurt for other types of keys (e.g. the bakery signing keys). We set a default of False

cmk/utils/user.py

@@ -3,14 +3,8 @@
 # This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
 # conditions defined in the file COPYING, which is part of this source code package.
 
-
-from __future__ import annotations
-
 import re
-from typing import Any
-
-from pydantic import GetCoreSchemaHandler
-from pydantic_core import core_schema
+from typing import Self
 
 
 class UserId(str):
@@ -57,19 +51,7 @@ class UserId(str):
     # Note: livestatus.py duplicates the regex to validate incoming UserIds!
     USER_ID_REGEX = re.compile(r"^[\w$][-@.+\w$]*$", re.UNICODE)
 
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls, source_type: Any, _handler: GetCoreSchemaHandler
-    ) -> core_schema.CoreSchema:
-        return core_schema.no_info_after_validator_function(
-            cls,
-            core_schema.union_schema(
-                [core_schema.str_schema(), core_schema.is_instance_schema(cls)]
-            ),
-            serialization=core_schema.to_string_ser_schema(),
-        )
-
-    def __new__(cls, text: str) -> UserId:
+    def __new__(cls, text: str) -> Self:
         """Construct a new UserId object
 
         UserIds are used in a variety of contexts, including HTML, file paths and other external
@@ -154,7 +136,15 @@ def __new__(cls, text: str) -> UserId:
         return super().__new__(cls, text)
 
     @classmethod
-    def builtin(cls) -> UserId:
+    def parse(cls, x: object) -> Self:
+        if isinstance(x, cls):
+            return x
+        if isinstance(x, str):
+            return cls(x)
+        raise ValueError(f"invalid username: {x!r}")
+
+    @classmethod
+    def builtin(cls) -> Self:
         """A special UserId signifying something is owned or created not by a real user but shipped
         as a built in functionality.
         This is mostly used in cmk.gui.visuals.
@@ -163,4 +153,4 @@ def builtin(cls) -> UserId:
         Moreover, be aware that it is very possible that some parts of the code use the UserId ""
         with a different meaning.
         """
-        return UserId("")
+        return cls("")