site_limit exceedance calculation simplification

Author: jacob-a-brown

backend/unifier.py

@@ -144,19 +144,18 @@ def _site_wrapper(site_source, parameter_source, persister, config):
         else:
             for site_records in site_source.chunks(sites):
                 print("sites_with_records_count:", sites_with_records_count, "|", "site_limit:", site_limit, "|", "chunk_size:", site_source.chunk_size)
-                if site_limit and sites_with_records_count == site_limit:
-                    break
-                elif site_limit and sites_with_records_count > site_limit:
-                    # remove any extra sites that were gathered
-                    num_sites_to_remove = sites_with_records_count - site_limit
-                    print(f"removing {num_sites_to_remove} to avoid exceeding the site limit")
-                    
-                    if use_summarize:
-                        persister.records = persister.records[:-num_sites_to_remove]
-                    else:
-                        persister.timeseries = persister.timeseries[:-num_sites_to_remove]
-                        persister.sites = persister.sites[:-num_sites_to_remove]
-                    break
+                if site_limit:
+                    if sites_with_records_count >= site_limit:
+                        # remove any extra sites that were gathered. removes 0 if site_limit is not exceeded
+                        num_sites_to_remove = sites_with_records_count - site_limit
+                        print(f"removing {num_sites_to_remove} to avoid exceeding the site limit")
+                        
+                        if use_summarize:
+                            persister.records = persister.records[:-num_sites_to_remove]
+                        else:
+                            persister.timeseries = persister.timeseries[:-num_sites_to_remove]
+                            persister.sites = persister.sites[:-num_sites_to_remove]
+                        break
 
                 if type(site_records) == list:
                     n = len(site_records)