Fix merge conflicts and typing in cache_selfie.

Author: nedtwigg

python/selfie-lib/selfie_lib/CacheSelfie.py

@@ -4,6 +4,7 @@
 from .Literals import LiteralValue, LiteralString, TodoStub
 from .SnapshotSystem import DiskStorage
 from .RoundTrip import Roundtrip
+import base64
 
 T = TypeVar("T")
 
@@ -90,7 +91,9 @@ def to_match_disk_TODO(self, sub: str = "") -> T:
         return self._to_match_disk_impl(sub, True)
 
     def _to_match_disk_impl(self, sub: str, is_todo: bool) -> T:
-        system = get_system()
+        from .Selfie import _selfieSystem
+
+        system = _selfieSystem()
         call = recordCall(False)
 
         if system.mode.can_write(is_todo, call, system):
@@ -127,7 +130,9 @@ def to_be_file(self, subpath: str) -> T:
         return self._to_be_file_impl(subpath, False)
 
     def _to_be_file_impl(self, subpath: str, is_todo: bool) -> T:
-        system = get_system()
+        from .Selfie import _selfieSystem
+
+        system = _selfieSystem()
         call = recordCall(False)
         writable = system.mode.can_write(is_todo, call, system)
 
@@ -156,7 +161,9 @@ def to_be_base64(self, snapshot: str) -> T:
         return self._to_be_base64_impl(snapshot)
 
     def _to_be_base64_impl(self, snapshot: Optional[str]) -> T:
-        system = get_system()
+        from .Selfie import _selfieSystem
+
+        system = _selfieSystem()
         call = recordCall(False)
         writable = system.mode.can_write(snapshot is None, call, system)
 

python/selfie-lib/selfie_lib/Selfie.py

@@ -1,4 +1,4 @@
-from typing import TypeVar, Any, Protocol, Union, overload
+from typing import Any, TypeVar, Optional, Protocol, Union, overload
 from .SelfieImplementations import ReprSelfie, StringSelfie
 from .SnapshotSystem import _selfieSystem
 from .Snapshot import Snapshot
@@ -39,15 +39,25 @@ def expect_selfie(
         return ReprSelfie(actual)
 
 
-def cache_selfie_string(to_cache: Cacheable[str]) -> CacheSelfie[str]:
-    """Create a CacheSelfie instance for caching strings with identity transformation."""
-    identity_roundtrip = Roundtrip.identity()
-    return cache_selfie_generic(identity_roundtrip, to_cache)
+@overload
+def cache_selfie(to_cache: Cacheable[str]) -> CacheSelfie[str]: ...
 
 
-def cache_selfie_generic(
-    roundtrip: Roundtrip[T, str], to_cache: Cacheable[T]
-) -> CacheSelfie[T]:
-    """Create a CacheSelfie instance for caching generic objects with specified roundtrip."""
-    deferred_disk_storage = _selfieSystem().disk_thread_local()
-    return CacheSelfie(deferred_disk_storage, roundtrip, to_cache)
+@overload
+def cache_selfie(
+    to_cache: Cacheable[T], roundtrip: Roundtrip[T, str]
+) -> CacheSelfie[T]: ...
+
+
+def cache_selfie(
+    to_cache: Union[Cacheable[str], Cacheable[T]],
+    roundtrip: Optional[Roundtrip[T, str]] = None,
+) -> Union[CacheSelfie[str], CacheSelfie[T]]:
+    if roundtrip is None:
+        # the cacheable better be a string!
+        return cache_selfie(to_cache, Roundtrip.identity())  # type: ignore
+    elif isinstance(roundtrip, Roundtrip) and to_cache is not None:
+        deferred_disk_storage = _selfieSystem().disk_thread_local()
+        return CacheSelfie(deferred_disk_storage, roundtrip, to_cache)
+    else:
+        raise TypeError("Invalid arguments provided to cache_selfie")