pyobo 0.10.12__py3-none-any.whl → 0.11.0__py3-none-any.whl

pyobo/struct/reference.py

@@ -1,13 +1,11 @@
-# -*- coding: utf-8 -*-
-
 """Data structures for OBO."""
 
-from typing import Optional, Tuple
+from typing import Optional
 
 import bioregistry
 import curies
 from curies.api import ExpansionError
-from pydantic import Field, root_validator, validator
+from pydantic import Field, field_validator, model_validator
 
 from .utils import obo_escape
 from ..identifier_utils import normalize_curie
@@ -23,7 +21,7 @@ class Reference(curies.Reference):
 
     name: Optional[str] = Field(default=None, description="the name of the reference")
 
-    @validator("prefix")
+    @field_validator("prefix")
     def validate_prefix(cls, v):  # noqa
         """Validate the prefix for this reference."""
         norm_prefix = bioregistry.normalize_prefix(v)
@@ -41,7 +39,7 @@ class Reference(curies.Reference):
         """Get the preferred curie for this reference."""
         return f"{self.preferred_prefix}:{self.identifier}"
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def validate_identifier(cls, values):  # noqa
         """Validate the identifier."""
         prefix, identifier = values.get("prefix"), values.get("identifier")
@@ -124,7 +122,7 @@ class Reference(curies.Reference):
     def _escaped_identifier(self):
         return obo_escape(self.identifier)
 
-    def __str__(self):  # noqa: D105
+    def __str__(self):
         identifier_lower = self.identifier.lower()
         if identifier_lower.startswith(f"{self.prefix.lower()}:"):
             rv = identifier_lower
@@ -134,7 +132,7 @@ class Reference(curies.Reference):
             rv = f"{rv} ! {self.name}"
         return rv
 
-    def __hash__(self):  # noqa: D105
+    def __hash__(self):
         return hash((self.__class__, self.prefix, self.identifier))
 
 
@@ -145,32 +143,32 @@ class Referenced:
 
     @property
     def prefix(self):
-        """The prefix of the typedef."""  # noqa: D401
+        """The prefix of the typedef."""
         return self.reference.prefix
 
     @property
     def name(self):
-        """The name of the typedef."""  # noqa: D401
+        """The name of the typedef."""
         return self.reference.name
 
     @property
     def identifier(self) -> str:
-        """The local unique identifier for this typedef."""  # noqa: D401
+        """The local unique identifier for this typedef."""
         return self.reference.identifier
 
     @property
     def curie(self) -> str:
-        """The CURIE for this typedef."""  # noqa: D401
+        """The CURIE for this typedef."""
         return self.reference.curie
 
     @property
     def preferred_curie(self) -> str:
-        """The preferred CURIE for this typedef."""  # noqa: D401
+        """The preferred CURIE for this typedef."""
         return self.reference.preferred_curie
 
     @property
-    def pair(self) -> Tuple[str, str]:
-        """The pair of namespace/identifier."""  # noqa: D401
+    def pair(self) -> tuple[str, str]:
+        """The pair of namespace/identifier."""
         return self.reference.pair
 
     @property