Fix model names with same sub-prefix (#1745)

Author: RobertLucian

pkg/cortex/serve/cortex_internal/lib/api/predictor.py

@@ -551,7 +551,7 @@ def model_downloader(
         return None
 
     # validate model
-    model_contents = glob.glob(temp_dest + "*/**", recursive=True)
+    model_contents = glob.glob(os.path.join(temp_dest, "**"), recursive=True)
     model_contents = util.remove_non_empty_directory_paths(model_contents)
     try:
         validate_model_paths(model_contents, predictor_type, temp_dest)

pkg/cortex/serve/cortex_internal/lib/model/cron.py

@@ -348,7 +348,9 @@ def _refresh_model(
             update_model = False
             ondisk_model_version_path = os.path.join(ondisk_model_path, version)
             if os.path.exists(ondisk_model_version_path):
-                local_paths = glob.glob(ondisk_model_version_path + "*/**", recursive=True)
+                local_paths = glob.glob(
+                    os.path.join(ondisk_model_version_path, "**"), recursive=True
+                )
                 local_paths = util.remove_non_empty_directory_paths(local_paths)
                 local_paths = [
                     os.path.relpath(local_path, ondisk_model_version_path)
@@ -385,7 +387,7 @@ def _refresh_model(
                 client.download_dir_contents(cloud_src, temp_dest)
 
                 # validate the downloaded model
-                model_contents = glob.glob(temp_dest + "*/**", recursive=True)
+                model_contents = glob.glob(os.path.join(temp_dest, "**"), recursive=True)
                 model_contents = util.remove_non_empty_directory_paths(model_contents)
                 try:
                     validate_model_paths(model_contents, self._predictor_type, temp_dest)
@@ -419,7 +421,7 @@ def _refresh_model(
         # except when the model version found on disk is 1 and the number of detected versions on the upstream is 0,
         # thus indicating the 1-version on-disk model must be a model that came without a version
         if os.path.exists(ondisk_model_path):
-            ondisk_model_versions = glob.glob(ondisk_model_path + "*/**")
+            ondisk_model_versions = glob.glob(os.path.join(ondisk_model_path, "**"))
             ondisk_model_versions = [
                 os.path.relpath(path, ondisk_model_path) for path in ondisk_model_versions
             ]
@@ -434,7 +436,7 @@ def _refresh_model(
                         f.write("not-available")
 
             # remove the model directory if there are no models left
-            if len(glob.glob(ondisk_model_path + "*/**")) == 0:
+            if len(glob.glob(os.path.join(ondisk_model_path, "**"))) == 0:
                 shutil.rmtree(ondisk_model_path)
 
         # if it's a non-versioned model ModelVersion.NOT_PROVIDED
@@ -448,7 +450,9 @@ def _refresh_model(
             update_model = False
             ondisk_model_version_path = os.path.join(ondisk_model_path, "1")
             if os.path.exists(ondisk_model_version_path):
-                local_paths = glob.glob(ondisk_model_version_path + "*/**", recursive=True)
+                local_paths = glob.glob(
+                    os.path.join(ondisk_model_version_path, "**"), recursive=True
+                )
                 local_paths = util.remove_non_empty_directory_paths(local_paths)
                 local_paths = [
                     os.path.relpath(local_path, ondisk_model_version_path)
@@ -486,7 +490,7 @@ def _refresh_model(
             client.download_dir_contents(model_path, temp_dest)
 
             # validate the downloaded model
-            model_contents = glob.glob(temp_dest + "*/**", recursive=True)
+            model_contents = glob.glob(os.path.join(temp_dest, "**"), recursive=True)
             model_contents = util.remove_non_empty_directory_paths(model_contents)
             try:
                 validate_model_paths(model_contents, self._predictor_type, temp_dest)
@@ -973,7 +977,9 @@ def _refresh_model(
             update_model = False
             ondisk_model_version_path = os.path.join(ondisk_model_path, version)
             if os.path.exists(ondisk_model_version_path):
-                local_paths = glob.glob(ondisk_model_version_path + "*/**", recursive=True)
+                local_paths = glob.glob(
+                    os.path.join(ondisk_model_version_path, "**"), recursive=True
+                )
                 local_paths = util.remove_non_empty_directory_paths(local_paths)
                 local_paths = [
                     os.path.relpath(local_path, ondisk_model_version_path)
@@ -1004,7 +1010,7 @@ def _refresh_model(
                 client.download_dir_contents(cloud_src, temp_dest)
 
                 # validate the downloaded model
-                model_contents = glob.glob(temp_dest + "*/**", recursive=True)
+                model_contents = glob.glob(os.path.join(temp_dest, "**"), recursive=True)
                 model_contents = util.remove_non_empty_directory_paths(model_contents)
                 try:
                     validate_model_paths(model_contents, self._predictor_type, temp_dest)
@@ -1036,7 +1042,7 @@ def _refresh_model(
         # except when the model version found on disk is 1 and the number of detected versions on the upstream is 0,
         # thus indicating the 1-version on-disk model must be a model that came without a version
         if os.path.exists(ondisk_model_path):
-            ondisk_model_versions = glob.glob(ondisk_model_path + "*/**")
+            ondisk_model_versions = glob.glob(os.path.join(ondisk_model_path, "**"))
             ondisk_model_versions = [
                 os.path.relpath(path, ondisk_model_path) for path in ondisk_model_versions
             ]
@@ -1045,7 +1051,7 @@ def _refresh_model(
                     ondisk_model_version_path = os.path.join(ondisk_model_path, ondisk_version)
                     shutil.rmtree(ondisk_model_version_path)
 
-            if len(glob.glob(ondisk_model_path + "*/**")) == 0:
+            if len(glob.glob(os.path.join(ondisk_model_path, "**"))) == 0:
                 shutil.rmtree(ondisk_model_path)
 
         # if it's a non-versioned model ModelVersion.NOT_PROVIDED
@@ -1057,7 +1063,9 @@ def _refresh_model(
             update_model = False
             ondisk_model_version_path = os.path.join(ondisk_model_path, "1")
             if os.path.exists(ondisk_model_version_path):
-                local_paths = glob.glob(ondisk_model_version_path + "*/**", recursive=True)
+                local_paths = glob.glob(
+                    os.path.join(ondisk_model_version_path, "**"), recursive=True
+                )
                 local_paths = util.remove_non_empty_directory_paths(local_paths)
                 local_paths = [
                     os.path.relpath(local_path, ondisk_model_version_path)
@@ -1090,7 +1098,7 @@ def _refresh_model(
             client.download_dir_contents(model_path, temp_dest)
 
             # validate the downloaded model
-            model_contents = glob.glob(temp_dest + "*/**", recursive=True)
+            model_contents = glob.glob(os.path.join(temp_dest, "**"), recursive=True)
             model_contents = util.remove_non_empty_directory_paths(model_contents)
             try:
                 validate_model_paths(model_contents, self._predictor_type, temp_dest)
@@ -1574,7 +1582,9 @@ def _make_local_models_available(self):
                 ondisk_model_version_path = os.path.join(
                     self._ondisk_models_dir, model_name, model_version
                 )
-                ondisk_paths = glob.glob(ondisk_model_version_path + "*/**", recursive=True)
+                ondisk_paths = glob.glob(
+                    os.path.join(ondisk_model_version_path, "**"), recursive=True
+                )
                 ondisk_paths = util.remove_non_empty_directory_paths(ondisk_paths)
                 # removable is set to false to prevent the local models from being removed
                 self._tree.update_model(
@@ -1592,7 +1602,9 @@ def _make_local_models_available(self):
                 ondisk_model_version_path = os.path.join(
                     self._ondisk_models_dir, model_name, model_version
                 )
-                ondisk_paths = glob.glob(ondisk_model_version_path + "*/**", recursive=True)
+                ondisk_paths = glob.glob(
+                    os.path.join(ondisk_model_version_path, "**"), recursive=True
+                )
                 ondisk_paths = util.remove_non_empty_directory_paths(ondisk_paths)
                 # removable is set to false to prevent the local models from being removed
                 self._tree.update_model(