scitex 2.13.0__py3-none-any.whl → 2.15.1__py3-none-any.whl

scitex/scholar/core/Paper.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Timestamp: "2025-10-07 10:47:02 (ywatanabe)"
 # File: /home/ywatanabe/proj/scitex_repo/src/scitex/scholar/core/Paper.py
 # ----------------------------------------
 from __future__ import annotations
+
 import os
 
 __FILE__ = "./src/scitex/scholar/core/Paper.py"
@@ -22,12 +22,14 @@ This module uses Pydantic for:
 
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
 
 class IDMetadata(BaseModel):
     """Identification metadata with source tracking."""
 
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
+
     doi: Optional[str] = None
     doi_engines: List[str] = Field(default_factory=list)
 
@@ -49,10 +51,6 @@ class IDMetadata(BaseModel):
     scholar_id: Optional[str] = None
     scholar_id_engines: List[str] = Field(default_factory=list)
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
-
 
 class BasicMetadata(BaseModel):
     """Basic bibliographic metadata with source tracking."""
@@ -83,9 +81,7 @@ class BasicMetadata(BaseModel):
             raise ValueError(f"Year {v} is outside reasonable range (1900-2100)")
         return v
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class CitationCountMetadata(BaseModel):
@@ -149,9 +145,7 @@ class CitationCountMetadata(BaseModel):
             raise ValueError(f"Citation count cannot be negative: {v}")
         return v
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too  # Allow both "2025" and "y2025"
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def model_dump(self, **kwargs) -> Dict[str, Any]:
         """Custom serialization to use aliases in output."""
@@ -202,9 +196,7 @@ class PublicationMetadata(BaseModel):
             raise ValueError(f"Impact factor cannot be negative: {v}")
         return v
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class URLMetadata(BaseModel):
@@ -237,9 +229,7 @@ class URLMetadata(BaseModel):
     additional_files: List[str] = Field(default_factory=list)
     additional_files_engines: List[str] = Field(default_factory=list)
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class PathMetadata(BaseModel):
@@ -254,9 +244,7 @@ class PathMetadata(BaseModel):
     additional_files: List[str] = Field(default_factory=list)
     additional_files_engines: List[str] = Field(default_factory=list)
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class AccessMetadata(BaseModel):
@@ -285,9 +273,7 @@ class AccessMetadata(BaseModel):
     paywall_bypass_attempted: Optional[bool] = None
     paywall_bypass_success: Optional[bool] = None
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class SystemMetadata(BaseModel):
@@ -301,9 +287,7 @@ class SystemMetadata(BaseModel):
     searched_by_Semantic_Scholar: Optional[bool] = None
     searched_by_URL: Optional[bool] = None
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class PaperMetadataStructure(BaseModel):
@@ -318,9 +302,7 @@ class PaperMetadataStructure(BaseModel):
     access: AccessMetadata = Field(default_factory=AccessMetadata)
     system: SystemMetadata = Field(default_factory=SystemMetadata)
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     @model_validator(mode="after")
     def sync_ids_and_urls(self):
@@ -487,9 +469,7 @@ class ContainerMetadata(BaseModel):
             raise ValueError(f"PDF size cannot be negative: {v}")
         return v
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
 
 class Paper(BaseModel):
@@ -498,9 +478,7 @@ class Paper(BaseModel):
     metadata: PaperMetadataStructure = Field(default_factory=PaperMetadataStructure)
     container: ContainerMetadata = Field(default_factory=ContainerMetadata)
 
-    class Config:
-        populate_by_name = True
-        validate_assignment = True  # Validate on attribute assignment too
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def model_dump(self, **kwargs) -> Dict[str, Any]:
         """Custom serialization to ensure all nested models use aliases."""
@@ -512,7 +490,7 @@ class Paper(BaseModel):
         }
 
     @classmethod
-    def from_dict(cls, data: Dict[str, Any]) -> "Paper":
+    def from_dict(cls, data: Dict[str, Any]) -> Paper:
         """Create from dictionary (for loading from JSON).
 
         Uses Pydantic's model_validate which handles:
@@ -533,7 +511,7 @@ class Paper(BaseModel):
         self,
         use_unpaywall: bool = False,
         update_metadata: bool = True,
-    ) -> "OAResult":
+    ) -> OAResult:
         """
         Detect open access status for this paper.
 
@@ -544,10 +522,11 @@ class Paper(BaseModel):
             use_unpaywall: If True, query Unpaywall API for uncertain cases
             update_metadata: If True, update self.metadata.access with results
 
-        Returns:
+        Returns
+        -------
             OAResult with detection results
         """
-        from .open_access import check_oa_status, OAResult
+        from .open_access import check_oa_status
 
         result = check_oa_status(
             doi=self.metadata.id.doi,
@@ -599,7 +578,6 @@ class Paper(BaseModel):
 
 if __name__ == "__main__":
     import json
-    from pprint import pprint
 
     print("=" * 80)
     print("Paper Class - Pydantic Type-Safe Metadata with Runtime Validation")