Evolution moteur de recherche

zds/search/utils.py

@@ -239,15 +239,16 @@ def import_documents(objects, doc_type):
                         f"    {indexed_counter} so far ({obj_per_sec} obj/s, batch size: {objects_per_batch})"
                     )
 
-                    if prev_obj_per_sec is not None:
+                    if prev_obj_per_sec is not None and len(objects) == objects_per_batch:
+                        # we are not in the first neither in the last batch, let see if we should adjust batch size:
                         ratio = obj_per_sec / prev_obj_per_sec
                         # if we processed this batch 20% slower/faster than the previous one, adjust batch size following exponential algorithm
                         if ratio > 1.2 or (ratio < 0.8 and objects_per_batch > 1):
                             if ratio > 1:
                                 # Performance was better, increase batch size to see if we can do even better with larger batch size:
                                 objects_per_batch *= 2
                             else:
-                                objects_per_batch >> 1  # use >> 1 instead of / 2 to keep an int
+                                objects_per_batch >>= 1  # use >> 1 instead of / 2 to keep an int
                             verbose_print(f"     {round(ratio, 2)}x, new batch size: {objects_per_batch}")
                     prev_obj_per_sec = obj_per_sec
 

zds/settings/abstract_base/zds.py

@@ -23,7 +23,7 @@
         }
     ],
     "api_key": "xyz",
-    "connection_timeout_seconds": 5,
+    "connection_timeout_seconds": 10,  # removing collections can take time
 }
 
 # Anonymous [Dis]Likes. Authors of [dis]likes before those pk will never be shown