kkpyutil 1.41.0__tar.gz → 1.43.0__tar.gz

{kkpyutil-1.41.0 → kkpyutil-1.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kkpyutil
-Version: 1.41.0
+Version: 1.43.0
 Summary: Building blocks for sysadmin and DevOps
 Home-page: https://github.com/kakyoism/kkpyutil/
 License: MIT

{kkpyutil-1.41.0 → kkpyutil-1.43.0}/kkpyutil.py

@@ -74,11 +74,47 @@ if PLATFORM == 'Windows':
 
 # region classes
 
+# class ClassicSingleton:
+#     _instances = {}
+#
+#     def __new__(cls, *args, **kwargs):
+#         if cls not in cls._instances:
+#             print(f"Creating new instance for {cls}")
+#             cls._instances[cls] = super(ClassicSingleton, cls).__new__(cls, *args, **kwargs)
+#         else:
+#             print(f"Reusing instance for {cls}")
+#         return cls._instances[cls]
+
+
 class ClassicSingleton:
-    def __new__(cls):
-        if not hasattr(cls, 'instance'):
-            cls.instance = super(ClassicSingleton, cls).__new__(cls)
-        return cls.instance
+    _instances = {}
+
+    @classmethod
+    def instance(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            # Create instance using `object.__new__` directly to avoid triggering overridden `__new__`
+            cls._instances[cls] = object.__new__(cls)
+            cls._instances[cls].__init__(*args, **kwargs)
+        return cls._instances[cls]
+
+    def __new__(cls, *args, **kwargs):
+        if cls in cls._instances:
+            # Allow the instance to exist if already created
+            return cls._instances[cls]
+            # Otherwise, raise error if someone tries to use `cls()` directly
+        raise RuntimeError("Use `cls.instance()` to access the singleton instance.")
+
+
+class MetaSingleton(type):
+    """
+    - usage: class MyClass(metaclass=MetaSingleton)
+    """
+    _instances = {}
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls._instances:
+            cls._instances[cls] = super(MetaSingleton, cls).__call__(*args, **kwargs)
+        return cls._instances[cls]
 
 
 class BorgSingleton:
@@ -95,6 +131,23 @@ class BorgSingleton:
         return obj
 
 
+class SingletonDecorator:
+    """
+    - Decorator to build Singleton class, single-inheritance only.
+    - Usage:
+        class MyClass: ...
+        myobj = SingletonDecorator(MyClass, args, kwargs)
+    """
+    def __init__(self, klass, *args, **kwargs):
+        self.klass = klass
+        self.instance = None
+
+    def __call__(self, *args, **kwargs):
+        if self.instance is None:
+            self.instance = self.klass(*args, **kwargs)
+        return self.instance
+
+
 class LowPassLogFilter(object):
     """
     Logging filter: Show log messages below input level.

{kkpyutil-1.41.0 → kkpyutil-1.43.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kkpyutil"
-version = "1.41.0"
+version = "1.43.0"
 description = "Building blocks for sysadmin and DevOps"
 authors = ["Beinan Li <li.beinan@gmail.com>"]
 maintainers = ["Beinan Li <li.beinan@gmail.com>"]