Merge branch 'master' into test_resolve_conflicts

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/interrogate.py b/modules/interrogate.py
index 9263d65a..64b91eb4 100644
--- a/modules/interrogate.py
+++ b/modules/interrogate.py
@@ -123,7 +123,7 @@ class InterrogateModels:
 

         return caption[0]

 

-    def interrogate(self, pil_image, include_ranks=False):

+    def interrogate(self, pil_image):

         res = None

 

         try:

@@ -156,10 +156,10 @@ class InterrogateModels:
                 for name, topn, items in self.categories:

                     matches = self.rank(image_features, items, top_count=topn)

                     for match, score in matches:

-                        if include_ranks:

-                            res += ", " + match

+                        if shared.opts.interrogate_return_ranks:

+                            res += f", ({match}:{score/100:.3f})"

                         else:

-                            res += f", ({match}:{score})"

+                            res += ", " + match

 

         except Exception:

             print(f"Error interrogating", file=sys.stderr)