[DLBACK-49] Actualize signature for EnvParamGetter.get_xxx_value()

Author: kc41

lib/dl_testing/dl_testing/env_params/generic.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Optional
+
 import attr
 import yaml
 
@@ -12,7 +14,7 @@ class GenericEnvParamGetter(EnvParamGetter):
     _loader: EnvParamGetterLoader = attr.ib(init=False, factory=EnvParamGetterLoader)
     _key_mapping: dict[str, tuple[str, str]] = attr.ib(init=False, factory=dict)  # key -> (getter_name, remapped_key)
 
-    def get_str_value(self, key: str) -> str:
+    def get_str_value(self, key: str) -> Optional[str]:
         getter_name, remapped_key = self._key_mapping[key]
         getter = self._loader.get_getter(getter_name)
         value = getter.get_str_value(remapped_key)

lib/dl_testing/dl_testing/env_params/getter.py

@@ -2,26 +2,33 @@
 
 import abc
 import json
+from typing import Optional
 
 import yaml
 
 
 class EnvParamGetter(abc.ABC):
     @abc.abstractmethod
-    def get_str_value(self, key: str) -> str:
+    def get_str_value(self, key: str) -> Optional[str]:
         raise NotImplementedError
 
-    def get_int_value(self, key: str) -> int:
+    def get_int_value(self, key: str) -> Optional[int]:
         str_value = self.get_str_value(key)
-        return int(str_value)
+        if str_value is not None:
+            return int(str_value)
+        return None
 
-    def get_json_value(self, key: str) -> dict:
+    def get_json_value(self, key: str) -> Optional[dict]:
         str_value = self.get_str_value(key)
-        return json.loads(str_value)
+        if str_value is not None:
+            return json.loads(str_value)
+        return None
 
-    def get_yaml_value(self, key: str) -> dict:
+    def get_yaml_value(self, key: str) -> Optional[dict]:
         str_value = self.get_str_value(key)
-        return yaml.safe_load(str_value)
+        if str_value is not None:
+            return yaml.safe_load(str_value)
+        return None
 
     def initialize(self, config: dict) -> None:
         pass

lib/dl_testing/dl_testing/env_params/main.py

@@ -1,4 +1,5 @@
 import os
+from typing import Optional
 
 import attr
 from dotenv import (
@@ -26,7 +27,7 @@ def initialize(self, config: dict) -> None:
         env_file = os.environ.get("DL_TESTS_ENV_FILE") or find_dotenv(filename=".env")
         self._env_from_file = dotenv_values(env_file)
 
-    def get_str_value(self, key: str) -> str:
+    def get_str_value(self, key: str) -> Optional[str]:
         env_value = os.environ.get(key)
 
         if env_value is None: