langroid 0.58.2__py3-none-any.whl → 0.59.0b1__py3-none-any.whl

langroid/utils/globals.py

@@ -1,6 +1,8 @@
-from typing import Any, Dict, Optional, Type, TypeVar
+from typing import Any, Dict, Optional, Type, TypeVar, cast
 
-from langroid.pydantic_v1 import BaseModel
+from pydantic import BaseModel
+from pydantic.fields import ModelPrivateAttr
+from pydantic_core import PydanticUndefined
 
 T = TypeVar("T", bound="GlobalState")
 
@@ -18,9 +20,23 @@ class GlobalState(BaseModel):
         Returns:
             The global instance of the subclass.
         """
-        if cls._instance is None:
-            cls._instance = cls()
-        return cls._instance
+        # Get the actual value from ModelPrivateAttr when accessing on class
+        instance_attr = getattr(cls, "_instance", None)
+        actual_instance: Optional["GlobalState"]
+        if isinstance(instance_attr, ModelPrivateAttr):
+            default_value = instance_attr.default
+            if default_value is PydanticUndefined:
+                actual_instance = None
+            else:
+                actual_instance = cast(Optional["GlobalState"], default_value)
+        else:
+            actual_instance = instance_attr
+
+        if actual_instance is None:
+            new_instance = cls()
+            cls._instance = new_instance
+            return new_instance
+        return actual_instance  # type: ignore
 
     @classmethod
     def set_values(cls: Type[T], **kwargs: Dict[str, Any]) -> None:

langroid/utils/globals.py-e

@@ -0,0 +1,49 @@
+from typing import Any, Dict, Optional, Type, TypeVar
+
+from pydantic import BaseModel
+
+T = TypeVar("T", bound="GlobalState")
+
+
+class GlobalState(BaseModel):
+    """A base Pydantic model for global states."""
+
+    _instance: Optional["GlobalState"] = None
+
+    @classmethod
+    def get_instance(cls: Type["GlobalState"]) -> "GlobalState":
+        """
+        Get the global instance of the specific subclass.
+
+        Returns:
+            The global instance of the subclass.
+        """
+        if cls._instance is None:
+            cls._instance = cls()
+        return cls._instance
+
+    @classmethod
+    def set_values(cls: Type[T], **kwargs: Dict[str, Any]) -> None:
+        """
+        Set values on the global instance of the specific subclass.
+
+        Args:
+            **kwargs: The fields and their values to set.
+        """
+        instance = cls.get_instance()
+        for key, value in kwargs.items():
+            setattr(instance, key, value)
+
+    @classmethod
+    def get_value(cls: Type[T], name: str) -> Any:
+        """
+        Retrieve the value of a specific field from the global instance.
+
+        Args:
+            name (str): The name of the field to retrieve.
+
+        Returns:
+            str: The value of the specified field.
+        """
+        instance = cls.get_instance()
+        return getattr(instance, name)

langroid/utils/html_logger.py

@@ -10,7 +10,8 @@ from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict, List
 
-from langroid.pydantic_v1 import BaseModel
+from pydantic import BaseModel
+
 from langroid.utils.logging import setup_logger