use new cache dir

Author: ptiurin

src/firebolt/utils/cache.py

@@ -1,5 +1,7 @@
+import getpass
 import logging
 import os
+import sys
 import time
 from dataclasses import asdict, dataclass, field
 from json import JSONDecodeError
@@ -17,8 +19,6 @@
     TypeVar,
 )
 
-from appdirs import user_data_dir
-
 from firebolt.utils.file_operations import (
     FernetEncrypter,
     generate_encrypted_file_name,
@@ -193,6 +193,37 @@ def __hash__(self) -> int:
         return hash(self.key)
 
 
+def get_cache_data_dir(appname: str = APPNAME) -> str:
+    """
+    Return the directory for storing cache files based on the OS.
+    Mac: use $TMPDIR
+    Windows: use the system property 'java.io.tmpdir'
+    Linux: use $XDG_RUNTIME_DIR, fallback to /tmp/<user_home>
+    """
+
+    if sys.platform == "darwin":
+        tmpdir = os.environ.get("TMPDIR")
+        if tmpdir:
+            return os.path.join(tmpdir, appname)
+        # fallback
+        return os.path.join("/tmp", appname)
+    elif sys.platform.startswith("win"):
+        # Python doesn't expose java.io.tmpdir, but os.environ['TEMP'] is standard
+        tmpdir = os.environ.get("TEMP")
+        if tmpdir:
+            return os.path.join(tmpdir, appname)
+        # fallback
+        return os.path.join("C:\\Temp", appname)
+    else:
+        # Assume Linux/Unix
+        xdg_dir = os.environ.get("XDG_RUNTIME_DIR")
+        if xdg_dir:
+            return os.path.join(xdg_dir, appname)
+    # fallback: /tmp/<username>
+    username = getpass.getuser()
+    return os.path.join("/tmp", username, appname)
+
+
 class FileBasedCache:
     """
     File-based cache that persists to disk with encryption.
@@ -202,7 +233,7 @@ class FileBasedCache:
 
     def __init__(self, memory_cache: UtilCache[ConnectionInfo], cache_name: str = ""):
         self.memory_cache = memory_cache
-        self._data_dir = user_data_dir(appname=APPNAME)  # TODO: change to new dir
+        self._data_dir = get_cache_data_dir(APPNAME)
         makedirs(self._data_dir, exist_ok=True)
         # FileBasedCache has its own disabled state, independent of memory cache
         cache_env_var = f"FIREBOLT_SDK_DISABLE_CACHE_${cache_name}"

tests/unit/utils/test_cache.py

@@ -1,6 +1,8 @@
+import getpass
 import json
 import os
 import re
+import sys
 import time
 from typing import Generator
 from unittest.mock import mock_open, patch
@@ -10,12 +12,14 @@
 from firebolt.client.auth.client_credentials import ClientCredentials
 from firebolt.db import connect
 from firebolt.utils.cache import (
+    APPNAME,
     CACHE_EXPIRY_SECONDS,
     ConnectionInfo,
     FileBasedCache,
     SecureCacheKey,
     UtilCache,
     _firebolt_cache,
+    get_cache_data_dir,
 )
 from firebolt.utils.file_operations import FernetEncrypter, generate_salt
 from tests.unit.response import Response
@@ -1319,3 +1323,36 @@ def test_disk_file_operations_with_pyfakefs(
         )
         cache_data = _firebolt_cache.get(cache_key)
         assert cache_data is not None, "Cache data should be accessible"
+
+
+def test_get_cache_data_dir_os(monkeypatch):
+    """Test get_cache_data_dir returns correct path for each OS and env."""
+
+    # Mac
+    monkeypatch.setattr(sys, "platform", "darwin")
+    monkeypatch.setenv("TMPDIR", "/mac/tmpdir/")
+    assert get_cache_data_dir(APPNAME) == os.path.join("/mac/tmpdir/", APPNAME)
+    monkeypatch.delenv("TMPDIR", raising=False)
+    assert get_cache_data_dir(APPNAME) == os.path.join("/tmp", APPNAME)
+
+    # Windows
+    monkeypatch.setattr(sys, "platform", "win32")
+    monkeypatch.setenv("TEMP", "C:/win/TEMP/")
+    assert get_cache_data_dir(APPNAME) == os.path.join("C:/win/TEMP/", APPNAME)
+    monkeypatch.delenv("TEMP", raising=False)
+    # Fallback to C:\\Temp/firebolt, but os.path.join on non-Windows will use /, so check both
+    expected = os.path.join("C:\\Temp", APPNAME)
+    actual = get_cache_data_dir(APPNAME)
+    assert actual == expected or actual.replace("\\", "/") == expected.replace(
+        "\\", "/"
+    )
+
+    # Linux
+    monkeypatch.setattr(sys, "platform", "linux")
+    monkeypatch.setenv("XDG_RUNTIME_DIR", "/linux/xdg/")
+    assert get_cache_data_dir(APPNAME) == os.path.join("/linux/xdg/", APPNAME)
+    monkeypatch.delenv("XDG_RUNTIME_DIR", raising=False)
+    monkeypatch.setenv("user.home", "/home/testuser")
+    monkeypatch.setattr(getpass, "getuser", lambda: "testuser")
+    assert get_cache_data_dir(APPNAME) == os.path.join("/tmp", "testuser", APPNAME)
+    monkeypatch.delenv("user.home", raising=False)