Merge branch 'mdmosby-fix-dup-ids'

Author: tjfulle

src/_canary/testspec.py

@@ -61,7 +61,9 @@ def unmasked(cls) -> "Mask":
 @dataclasses.dataclass
 class BaseSpec(Generic[T]):
     file_root: Path
+    """The search path contiaining the generated spec; typically the some version-control root"""
     file_path: Path
+    """The path to the test file relative to `file_root`"""
     family: str = ""
     stdout: str = "canary-out.txt"
     stderr: str | None = None  # combine stdout/stderr by default
@@ -132,6 +134,7 @@ def from_dict(cls: Type[T], d: dict, lookup: dict[str, T]) -> T:
 
     @cached_property
     def file(self) -> Path:
+        """Path to the test specification file"""
         return self.file_root / self.file_path
 
     @property
@@ -485,40 +488,56 @@ def _generate_dependency_patterns(
 
 
 class _GlobalSpecCache:
-    _file_hash: dict[Path, str] = {}
-    _repo_root: dict[Path, Path] = {}
-    _lock = threading.Lock()
+    """Simple cache for storing re-used data feeding the spec ID"""
 
-    @classmethod
-    def file_hash(cls, path: Path) -> str:
-        path = path.absolute()
-        try:
-            return cls._file_hash[path]
-        except KeyError:
-            pass
-        h = hashlib.blake2b(digest_size=16)
-        h.update(path.read_bytes())
-        digest = h.hexdigest()
-        with cls._lock:
-            return cls._file_hash.setdefault(path, digest)
+    _key: dict[Path, Path] = {}
+    """Maps the input file path to a key index (absolute path)"""
+
+    _file_hash: dict[Path, bytes] = {}
+    _repo_root: dict[Path, bytes] = {}
+    _rel_repo: dict[Path, bytes] = {}
+    _lock = threading.Lock()
 
     @classmethod
-    def repo_root(cls, path: Path) -> Path:
-        path = path.absolute()
-        try:
-            return cls._repo_root[path]
-        except KeyError:
-            pass
+    def _compute_repo_root(cls, path: Path) -> Path:
         d = path.parent
         while d.parent != d:
             if (d / ".git").exists() or (d / ".repo").exists():
                 root = d
                 break
             d = d.parent
         else:
-            root = path.parent
+            root = d
+        return root
+
+    @classmethod
+    def populate_cache(cls, path: Path) -> Path:
+        try:
+            return cls._key[path]
+        except KeyError:
+            pass
+
+        key = path.absolute()
+        h = hashlib.blake2b(digest_size=16)
+        h.update(key.read_bytes())
+        root = cls._compute_repo_root(key)
+        rel = key.relative_to(root)
+
         with cls._lock:
-            return cls._repo_root.setdefault(path, root)
+            cls._repo_root[key] = str(root).encode()
+            cls._rel_repo[key] = str(rel).encode()
+            cls._file_hash[key] = h.hexdigest().encode()
+            return cls._key.setdefault(path, key)
+
+    @classmethod
+    def file_hash(cls, path: Path) -> bytes:
+        key = cls.populate_cache(path)
+        return cls._file_hash[key]
+
+    @classmethod
+    def rel_repo(cls, path: Path) -> bytes:
+        key = cls.populate_cache(path)
+        return cls._rel_repo[key]
 
 
 def build_spec_id(spec: BaseSpec) -> str:
@@ -529,8 +548,8 @@ def build_spec_id(spec: BaseSpec) -> str:
     if parameters:
         for p in sorted(parameters):
             hasher.update(f"{p}={stringify(parameters[p], float_fmt='%.16e')}".encode())
-    hasher.update(_GlobalSpecCache.file_hash(spec.file).encode())
-    hasher.update(str(_GlobalSpecCache.repo_root(spec.file)).encode())
+    hasher.update(_GlobalSpecCache.file_hash(spec.file))
+    hasher.update(_GlobalSpecCache.rel_repo(spec.file))
     return hasher.hexdigest()