fixes #582

Author: jph00

fastcore/__init__.py

@@ -1 +1 @@
-__version__ = "1.5.53"
+__version__ = "1.5.54"

fastcore/xtras.py

@@ -686,44 +686,48 @@ def mk_dataclass(cls):
             setattr(cls, k, field(default=None))
     dataclass(cls, init=True, repr=True, eq=True, order=False, unsafe_hash=False, frozen=False)
 
-# %% ../nbs/03_xtras.ipynb 179
+# %% ../nbs/03_xtras.ipynb 181
 def flexicache(*funcs, maxsize=128):
     "Like `lru_cache`, but customisable with policy `funcs`"
     def _f(func):
         cache,states = {}, [None]*len(funcs)
         @wraps(func)
         def wrapper(*args, **kwargs):
-            key = str(args) + str(kwargs)
+            key = f"{args} // {kwargs}"
             if key in cache:
-                result, states = cache[key]
-                if not any(func(state) for func, state in zip(funcs, states)):
+                result,states = cache[key]
+                if not any(f(state) for f,state in zip(funcs, states)):
                     cache[key] = cache.pop(key)
                     return result
                 del cache[key]
-            result = func(*args, **kwargs)
-            cache[key] = (result, [func(None) for func in funcs])
-            if len(cache) > maxsize: cache.pop(next(iter(cache)))
-            return result
+            try: newres = func(*args, **kwargs)
+            except:
+                if key not in cache: raise
+                cache[key] = cache.pop(key)
+                return result
+            cache[key] = (newres, [f(None) for f in funcs])
+            if len(cache) > maxsize: cache.popitem()
+            return newres
         return wrapper
     return _f
 
-# %% ../nbs/03_xtras.ipynb 181
+# %% ../nbs/03_xtras.ipynb 183
 def time_policy(seconds):
     "A `flexicache` policy that expires cached items after `seconds` have passed"
     def policy(last_time):
         now = time()
         return now if last_time is None or now-last_time>seconds else None
     return policy
 
-# %% ../nbs/03_xtras.ipynb 182
+# %% ../nbs/03_xtras.ipynb 184
 def mtime_policy(filepath):
     "A `flexicache` policy that expires cached items after `filepath` modified-time changes"
     def policy(mtime):
         current_mtime = getmtime(filepath)
         return current_mtime if mtime is None or current_mtime>mtime else None
     return policy
 
-# %% ../nbs/03_xtras.ipynb 185
+# %% ../nbs/03_xtras.ipynb 187
 def timed_cache(seconds=60, maxsize=128):
     "Like `lru_cache`, but also with time-based eviction"
     return flexicache(time_policy(seconds), maxsize=maxsize)

nbs/03_xtras.ipynb

@@ -2842,7 +2842,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d = dict(a=1,b=2)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d.popitem()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2853,17 +2871,21 @@
     "        cache,states = {}, [None]*len(funcs)\n",
     "        @wraps(func)\n",
     "        def wrapper(*args, **kwargs):\n",
-    "            key = str(args) + str(kwargs)\n",
+    "            key = f\"{args} // {kwargs}\"\n",
     "            if key in cache:\n",
-    "                result, states = cache[key]\n",
-    "                if not any(func(state) for func, state in zip(funcs, states)):\n",
+    "                result,states = cache[key]\n",
+    "                if not any(f(state) for f,state in zip(funcs, states)):\n",
     "                    cache[key] = cache.pop(key)\n",
     "                    return result\n",
     "                del cache[key]\n",
-    "            result = func(*args, **kwargs)\n",
-    "            cache[key] = (result, [func(None) for func in funcs])\n",
-    "            if len(cache) > maxsize: cache.pop(next(iter(cache)))\n",
-    "            return result\n",
+    "            try: newres = func(*args, **kwargs)\n",
+    "            except:\n",
+    "                if key not in cache: raise\n",
+    "                cache[key] = cache.pop(key)\n",
+    "                return result\n",
+    "            cache[key] = (newres, [f(None) for f in funcs])\n",
+    "            if len(cache) > maxsize: cache.popitem()\n",
+    "            return newres\n",
     "        return wrapper\n",
     "    return _f"
    ]
@@ -2877,7 +2899,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2892,7 +2914,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2960,13 +2982,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "@timed_cache(seconds=0.1, maxsize=2)\n",
+    "@timed_cache(seconds=0.01, maxsize=2)\n",
     "def cached_func(x): return x * 2, time()\n",
     "\n",
     "# basic caching\n",
     "result1, time1 = cached_func(2)\n",
     "test_eq(result1, 4)\n",
-    "sleep(0.01)\n",
+    "sleep(0.001)\n",
     "result2, time2 = cached_func(2)\n",
     "test_eq(result2, 4)\n",
     "test_eq(time1, time2)\n",
@@ -2983,7 +3005,7 @@
     "test_ne(time3_new, time())\n",
     "\n",
     "# time expiration\n",
-    "sleep(0.2)\n",
+    "sleep(0.05)\n",
     "_, time4_new = cached_func(4)\n",
     "test_ne(time4_new, time())"
    ]
@@ -3018,21 +3040,9 @@
    "split_at_heading": true
   },
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "python3",
    "language": "python",
    "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.8"
   }
  },
  "nbformat": 4,

settings.ini

@@ -8,7 +8,7 @@ author = Jeremy Howard and Sylvain Gugger
 author_email = [email protected]
 copyright = fast.ai
 branch = master
-version = 1.5.53
+version = 1.5.54
 min_python = 3.7
 audience = Developers
 language = English