update object mapper

Author: mkrd

dictdatabase/object_mapper.py

@@ -35,8 +35,7 @@ def fill_object_from_dict_using_type_hints(obj, cls, data: dict):
 		if var_name not in data:
 			nullable = var_type_origin is UnionType and NoneType in var_type_args
 			if not nullable:
-				raise RuntimeError(f"Missing variable '{var_name}' in {cls.__name__}.")
-			continue
+				raise KeyError(f"Missing variable '{var_name}' in {cls.__name__}.")
 		# When it is a list, fill the list with the items
 		if var_type_origin is list and len(var_type_args) == 1:
 			item_type = var_type_args[0]
@@ -68,7 +67,15 @@ class FileDictModel(ABC, Generic[T]):
 	"""
 
 	__file__ = None
-	__item_model__: Type[T]
+
+	@classmethod
+	def _get_item_model(cls):
+		for base in cls.__orig_bases__:
+			for type_args in get_args(base):
+				if issubclass(type_args, FileDictItemModel):
+					return type_args
+		raise AttributeError("FileDictModel must specify a FileDictItemModel")
+
 
 	@classmethod
 	def get_at_key(cls, key) -> T:
@@ -77,20 +84,17 @@ def get_at_key(cls, key) -> T:
 			The data is partially read from the __file__.
 		"""
 		data = io_safe.partial_read(cls.__file__, key)
-		res: T = cls.__item_model__.from_key_value(key, data)
+		res: T = cls._get_item_model().from_key_value(key, data)
 		return res
 
 	@classmethod
 	def session_at_key(cls, key):
-		return cls.__item_model__.session(key)
+		return cls._get_item_model().session(key)
 
 	@classmethod
-	def items(cls) -> list[Tuple[str, T]]:
-		"""
-			Gets all items as a list of tuples (key, ORM model of value).
-		"""
+	def get_all(cls) -> dict[str, T]:
 		data = io_safe.read(cls.__file__)
-		return [(k, cls.__item_model__.from_key_value(k, v)) for k, v in data.items()]
+		return {k: cls._get_item_model().from_key_value(k, v) for k, v in data.items()}
 
 	@classmethod
 	def session(cls):
@@ -101,18 +105,18 @@ def session(cls):
 		def make_session_obj_from_dict(data):
 			sess_obj = {}
 			for k, v in data.items():
-				sess_obj[k] = cls.__item_model__.from_key_value(k, v)
+				sess_obj[k] = cls._get_item_model().from_key_value(k, v)
 			return sess_obj
 		return SessionFileFull(cls.__file__, make_session_obj_from_dict)
 
 
 	@classmethod
-	def get_where(cls, where: callable) -> list[Tuple[str, T]]:
+	def get_where(cls, where: callable[str, T]) -> dict[str, T]:
 		"""
-			Gets all items where the where function returns True.
-			The where function takes an object of type __item_model__.
+		Return a dictionary of all the items for which the where function returns True.
+		Where takes the key and the value's model object as arguments.
 		"""
-		return [(k, v) for k, v in cls.items() if where(v)]
+		return {k: v for k, v in cls.get_all().items() if where(k, v)}