feature: reimplement as MultiDict

Author: lilatomic

alpacloud/eztag/BUILD

@@ -2,7 +2,7 @@ python_sources()
 
 python_tests(
 	name="tests",
-#	dependencies=["./test_resources:k8s_objs"],
+	# dependencies=["./test_resources:k8s_objs"],
 )
 
 python_test_utils(

alpacloud/eztag/multidict.py

@@ -0,0 +1,48 @@
+from typing import Iterable, TypeAlias
+
+K: TypeAlias = str
+V: TypeAlias = str | None
+
+
+def _is_collection(obj):
+	"""
+	Checks if an object is an iterable collection, excluding strings and bytes.
+	"""
+	return isinstance(obj, Iterable) and not isinstance(obj, (str, bytes, bytearray))
+
+
+class MultiDict:
+	"""
+	A dictionary that allows multiple values for the same key.
+	This allows us to have a tag set like `env=prd, env=stg`
+	"""
+
+	def __init__(self):
+		self.d: dict[K, set[V]] = {}
+
+	@classmethod
+	def from_dict(cls, d: dict[K, V]):
+		md = cls()
+		for k, v in d.items():
+			md[k] = {v}
+		return md
+
+	@classmethod
+	def create(cls, d: dict[K, Iterable[V] | V]):
+		md = cls()
+		for k, vs in d.items():
+			if not _is_collection(vs):
+				n = {vs}
+			else:
+				n = set(vs)
+			md.d[k] = n
+		return md
+
+	def __getitem__(self, key):
+		return self.d[key]
+
+	def __setitem__(self, key, value):
+		self.d.setdefault(key, set()).add(value)
+
+	def __contains__(self, key):
+		return key in self.d

alpacloud/eztag/tag.py

@@ -3,26 +3,38 @@
 import re
 from dataclasses import dataclass
 
+from alpacloud.eztag.multidict import MultiDict
+
+
 @dataclass
 class TagSet:
 	"""A set of tags"""
-	ts: dict[str, str | None]
+
+	ts: MultiDict
 
 	def has(self, k: str) -> bool:
 		"""Check if the key exists in the tagset"""
 		return k in self.ts
 
-	def match(self, k: str, v: str) -> bool:
-		"""Exact match the value for this key"""
-		return self.ts[k] == v
+	def match(self, k: str, v: str | None) -> bool:
+		"""Exact match the value for this key (returns True if any value matches)"""
+		if not self.has(k):
+			return False
+		return v in self.ts[k]
 
 	def rematch(self, k: str, v: str | re.Pattern) -> bool:
-		"""Regex match the value for this key"""
+		"""Regex match the value for this key (returns True if any value matches)"""
 		if isinstance(v, str):
 			v = re.compile(v)
 
-		return self.has(k) and v.fullmatch(self.ts[k]) is not None
+		if not self.has(k):
+			return False
+
+		return any(val is not None and v.fullmatch(val) is not None for val in self.ts[k])
 
 	def contains(self, k: str, v: str) -> bool:
-		"""Check if the value for this key contains the substring"""
-		return self.has(k) and self.ts[k] is not None and v in self.ts[k]
+		"""Check if any value for this key contains the substring"""
+		if not self.has(k):
+			return False
+
+		return any(val is not None and v in val for val in self.ts[k])