♻️ Maintenance/ensure director v2 restarts only for code change (ITISFoundation#2598)

* ensure rebooting is only checking the python code
* remove validator to fix simcore-sdk test

Author: sanderegg

packages/models-library/src/models_library/generics.py

@@ -11,7 +11,6 @@
     ValuesView,
 )
 
-from pydantic import validator
 from pydantic.generics import GenericModel
 
 DictKey = TypeVar("DictKey")
@@ -65,12 +64,3 @@ def __len__(self):
 class Envelope(GenericModel, Generic[DataT]):
     data: Optional[DataT]
     error: Optional[Any]
-
-    @validator("error")
-    @classmethod
-    def data_and_error_cannot_be_populated_together(cls, v, values):
-        if v is not None and values.get("data") is not None:
-            raise ValueError(
-                "both data and error cannot contain values at the same time"
-            )
-        return v

packages/models-library/tests/test_generics.py

@@ -56,6 +56,3 @@ def test_data_enveloped(faker: Faker):
     assert some_enveloped_bool
     assert not some_enveloped_bool.data
     assert some_enveloped_bool.error == random_text
-
-    with pytest.raises(ValueError):
-        Envelope[int](data=213, error="some error message")

services/director-v2/docker/boot.sh

@@ -36,11 +36,17 @@ fi
 if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then
   # NOTE: ptvsd is programmatically enabled inside of the service
   # this way we can have reload in place as well
+  reload_dir_packages=$(find packages -maxdepth 3 -type d -path "*/src/*" ! -path "*.*" -exec echo --reload-dir {} \;)
+
+  # NOTE: keep the reload_dir_package as un-quoted as the IFS (internal field separators works only this way. any SH shell guru is welcome to enhance this!
+  # FIXME: when uvicorn >0.15.0 comes in, replace it with --reload-include '*.py'
+  IFS=$(printf ' \n\t');
+  #shellcheck disable=SC2086
   exec uvicorn simcore_service_director_v2.main:the_app \
-    --reload \
     --host 0.0.0.0 \
-    --reload-dir services/director-v2/src/simcore_service_director_v2 \
-    --reload-dir packages
+    --reload \
+    $reload_dir_packages \
+    --reload-dir services/director-v2/src/simcore_service_director_v2
 else
   exec uvicorn simcore_service_director_v2.main:the_app \
     --host 0.0.0.0

services/storage/src/simcore_service_storage/handlers.py

@@ -214,7 +214,9 @@ async def get_file_metadata(request: web.Request):
         )
         # when no metadata is found
         if data is None:
-            return {"error": "No result found"}
+            # NOTE: This is what happens Larry... data must be an empty {} or else some old
+            # dynamic services will FAIL (sic)
+            return {"error": "No result found", "data": {}}
 
         return {
             "error": None,