clean up call_with_cache

Author: alexluck-sift

python/lib/sift_client/_internal/low_level_wrappers/base.py

@@ -3,7 +3,7 @@
 from abc import ABC
 from typing import Any, Callable, TypeVar
 
-from sift_py.grpc.cache import ignore_cache, with_cache, with_force_refresh
+from sift_py.grpc.cache import with_cache, with_force_refresh
 
 T = TypeVar("T")
 
@@ -56,7 +56,7 @@ async def _handle_pagination(
         return results
 
     @staticmethod
-    async def _call_with_cache(
+    async def call_with_cache(
         stub_method: Callable[[Any, tuple[tuple[str, str], ...]], T],
         request: Any,
         *,
@@ -109,12 +109,12 @@ async def _call_with_cache(
                 use_cache=False,
             )
         """
+        if not use_cache:
+            return await stub_method(request)
 
         if force_refresh:
             metadata = with_force_refresh(ttl=ttl)
-        elif use_cache:
-            metadata = with_cache(ttl=ttl)
         else:
-            metadata = ignore_cache()
+            metadata = with_cache(ttl=ttl)
 
         return await stub_method(request, metadata=metadata)

python/lib/sift_client/transport/grpc_transport.py

@@ -179,7 +179,7 @@ def __init__(self, config: GrpcConfig):
         self._stubs_async_map: dict[asyncio.AbstractEventLoop, dict[type[Any], Any]] = {}
 
         # Initialize cache if caching is enabled
-        self._cache = self._init_cache()
+        self.cache = self._init_cache()
 
         # default loop for sync API
         self._default_loop = asyncio.new_event_loop()
@@ -224,6 +224,10 @@ def _init_cache(self) -> GrpcCache | None:
             logger.warning(f"Failed to initialize cache: {e}")
             return None
 
+    @property
+    def has_cache(self):
+        return self.cache is not None
+
     @property
     def default_loop(self) -> asyncio.AbstractEventLoop:
         """Return the default event loop used for synchronous API operations.
@@ -246,7 +250,7 @@ def get_stub(self, stub_class: type[Any]) -> Any:
 
         if loop not in self._channels_async:
             channel = use_sift_async_channel(
-                self._config._to_sift_channel_config(), self._config.metadata, self._cache
+                self._config._to_sift_channel_config(), self._config.metadata, self.cache
             )
             self._channels_async[loop] = channel
             self._stubs_async_map[loop] = {}
@@ -289,4 +293,4 @@ async def _create_async_channel(
         self, cfg: SiftChannelConfig, metadata: dict[str, str] | None
     ) -> Any:
         """Helper to create async channel on default loop."""
-        return use_sift_async_channel(cfg, metadata, self._cache)
+        return use_sift_async_channel(cfg, metadata, self.cache)