Some minor fixes

src/aerovaldb/const.py

@@ -0,0 +1 @@
+IMG_FILE_EXTS = set([".bmp", ".jpeg", ".jpg", ".png", ".tiff"])

src/aerovaldb/jsondb/jsonfiledb.py

@@ -11,6 +11,7 @@
 from packaging.version import Version
 
 from aerovaldb.aerovaldb import AerovalDB
+from aerovaldb.const import IMG_FILE_EXTS
 from aerovaldb.exceptions import UnusedArguments
 from aerovaldb.types import AccessType
 from ..utils.string_mapper import StringMapper, VersionConstraintMapper
@@ -348,7 +349,10 @@ async def _get_uri_for_file(self, file_path: str) -> str:
 
         _, ext = os.path.splitext(file_path)
 
-        if ext.lower() in [".png", ".jpg"]:
+        if ext.lower() in IMG_FILE_EXTS:
+            # TODO: Fix this.
+            # The image endpoint is the only endpoint which needs to accept an arbitrary path
+            # under the experiment directory. Treating it as a special case for now.
             split = file_path.split("/")
             project = split[1]
             experiment = split[2]
@@ -541,11 +545,6 @@ async def get_by_uri(
             return uri
 
         route, route_args, kwargs = parse_uri(uri)
-        for k, v in route_args.items():
-            route_args[k] = v.replace(":", "/")
-
-        for k, v in kwargs.items():
-            route_args[k] = v.replace(":", "/")
 
         if route.startswith("/v0/report-image/"):
             return await self.get_report_image(
@@ -567,11 +566,6 @@ async def get_by_uri(
     @async_and_sync
     async def put_by_uri(self, obj, uri: str):
         route, route_args, kwargs = parse_uri(uri)
-        for k, v in route_args.items():
-            route_args[k] = v.replace(":", "/")
-
-        for k, v in kwargs.items():
-            route_args[k] = v.replace(":", "/")
 
         if route.startswith("/v0/report-image/"):
             await self.put_report_image(
@@ -659,6 +653,6 @@ async def put_report_image(self, obj, project: str, experiment: str, path: str):
             self._basedir,
             template.format(project=project, experiment=experiment, path=path),
         )
-        os.makedirs(Path(file_path).parent)
+        os.makedirs(Path(file_path).parent, exist_ok=True)
         with open(file_path, "wb") as f:
             f.write(obj)

src/aerovaldb/utils/uri.py

@@ -62,6 +62,8 @@ def parse_uri(uri: str) -> tuple[str, dict[str, str], dict[str, str]]:
             except Exception:
                 continue
             else:
+                for k, v in route_args.items():
+                    route_args[k] = v.replace(":", "/")
                 return (template, route_args, dict())
 
         elif len(split) == 2:

tests/test_aerovaldb.py

@@ -487,7 +487,7 @@ def test_list_glob_stats(testdb):
 @TESTDB_PARAMETRIZATION
 def test_list_all(testdb):
     with aerovaldb.open(testdb) as db:
-        assert len(db.list_all()) == 42
+        assert len(db.list_all()) == 46
 
 
 @TESTDB_PARAMETRIZATION
@@ -508,4 +508,4 @@ def test_rm_experiment_data(tmpdb):
 
         tmpdb.rm_experiment_data("project", "experiment")
 
-        assert len(list(tmpdb.list_all())) == 26
+        assert len(list(tmpdb.list_all())) == 30