Update all_models2.py

all_models2.py

@@ -21,18 +21,15 @@ def find_model_list(author: str="", tags: list[str]=[], not_tag="", sort: str="l
         print(f"Error: Failed to list models.")
         print(e)
         return models
-    t1=True
     for model in model_infos:
         
         if not model.private and not model.gated:
-            if t1:
-                print(model)
-                t1=False
             loadable = True
             if not_tag and not_tag in model.tags or not loadable: continue
             if model.id not in bad_models :
                 models.append(model.id)
-                models_plus_tags.append([model.id,process_tags(model.tags)])
+                #models_plus_tags.append([model.id,process_tags(model.tags)])
+                models_plus_tags.append([model.id,process_tags(model.cardData.tags)])
             if len(models) == limit: break
     return models , models_plus_tags
 
@@ -49,26 +46,27 @@ def process_tags(tags,bad_tags=bad_tags):
 
 def clas_tags(models_plus_tags,min):
     tags_plus_models=[]
-    output=[]
+    listTemp=[]
+    listAllModels=['all',0,[]]
     new_tag=True
     for ent in models_plus_tags:
+        listAllModels[1]+=1
+        listAllModels[2].append(ent[0])
         for tagClas in ent[1]:
             new_tag=True
-            for tag in tags_plus_models:
+            for tag in listTemp:
                 if tag[0] == tagClas:
                     tag[1]+=1
                     tag[2].append(ent[0])
                     new_tag=False
             if new_tag:
-                tags_plus_models.append([tagClas,1,[ent[0]]])
-    for t in tags_plus_models:
-        if t[0]=='diffusers' :
-            t[0]='all'
-            output.append(t)
-        else :
-            if t[1]>=min and t[1]!=len(models_plus_tags):
-                output.append(t)
-    return output
+                listTemp.append([tagClas,1,[ent[0]]])
+    tags_plus_models.append(listAllModels)
+    for t in listTemp:
+        if t[1]>=min and t[1]!=len(models_plus_tags):
+            tags_plus_models.append(t)
+    return tags_plus_models
+    
 def orga_tag(tags_plus_models):
     output=[]
     while(len(output)<len(tags_plus_models)):
@@ -89,7 +87,7 @@ def tag_new(models,limit=40):
         output[2].append(models[i])
     return output
     
-def tag_fav(models,fav_models):
+def tag_fav(models=models,fav_models=fav_models):
     output=["FAV",0,[]]
     for m in fav_models:
         if m in models:
@@ -107,14 +105,15 @@ def update_tag(models_plus_tags,list_new_tag):
     
 from operator import itemgetter
 
+nb_models_to_load=10000
 #models = find_model_list("Yntec", [], "", "last_modified", 20)
-models , models_plus_tags = find_model_list("John6666", ["stable-diffusion-xl"], "", "last_modified", 2000)
+models , models_plus_tags = find_model_list("John6666", ["stable-diffusion-xl"], "", "last_modified", nb_models_to_load)
 #tags_plus_models = orga_tag(clas_tags(models_plus_tags,2))
 tags_plus_models = orga_tag(clas_tags(sorted(models_plus_tags, key=itemgetter(0)),2))
-list_new=tag_new(models,40)
+list_new=tag_new(models,nb_models_to_load)
 models_plus_tags=update_tag(models_plus_tags,list_new)
 tags_plus_models.insert(1,list_new)
-list_fav=tag_fav(models,fav_models)
+list_fav=tag_fav(models)
 if list_fav[1]>0:
     tags_plus_models.insert(1,list_fav)
     models_plus_tags=update_tag(models_plus_tags,list_fav)
@@ -129,4 +128,4 @@ if list_fav[1]>0:
 #models = find_model_list("Yntec", ["anime"], "", "last_modified", 20) # Yntec's latest 20 models with 'anime' tag
 #models = find_model_list("Yntec", [], "anime", "last_modified", 20) # Yntec's latest 20 models without 'anime' tag
 #models = find_model_list("", [], "", "last_modified", 20) # latest 20 text-to-image models of huggingface
-#models = find_model_list("", [], "", "downloads", 20) # monthly most downloaded 20 text-to-image models of huggingface
+#models = find_model_list("", [], "", "downloads", 20) # monthly most downloaded 20 text-to-image models of huggingface