More query options

app.py

@@ -1170,7 +1170,15 @@ def get_picture_query(query_data):

                                
                                
                                
                            
                                
                                    
                                        
                                            1170  
                                                    "after_date": lambda value: PictureResource.timestamp >= datetime.utcfromtimestamp(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1171  
                                                            value),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1172  
                                                    "in_gallery": lambda value: PictureResource.galleries.any(PictureInGallery.gallery_id.in_(value)),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1173 +
                                                "above_rating": lambda value: db.select(db.func.coalesce(db.func.avg(PictureRating.rating), 5)).where(PictureRating.resource_id == PictureResource.id).scalar_subquery() >= value,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1174 +
                                                "below_rating": lambda value: db.select(db.func.coalesce(db.func.avg(PictureRating.rating), 0)).where(PictureRating.resource_id == PictureResource.id).scalar_subquery() <= value,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1175 +
                                                "above_rating_count": lambda value: db.select(db.func.count(PictureRating.id)).where(PictureRating.resource_id == PictureResource.id).correlate(PictureResource).scalar_subquery() >= value,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1176 +
                                                "below_rating_count": lambda value: db.select(db.func.count(PictureRating.id)).where(PictureRating.resource_id == PictureResource.id).correlate(PictureResource).scalar_subquery() <= value,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1177 +
                                                "above_region_count": lambda value: db.select(db.func.count(PictureRegion.id)).where(PictureRegion.resource_id == PictureResource.id).correlate(PictureResource).scalar_subquery() >= value,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1178 +
                                                "below_region_count": lambda value: db.select(db.func.count(PictureRegion.id)).where(PictureRegion.resource_id == PictureResource.id).correlate(PictureResource).scalar_subquery() <= value,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1179 +
                                                "copied_from": lambda value: PictureResource.copied_from_id.in_(value),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1180  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1181 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1182  
                                                if "want" in query_data:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1183  
                                                    for i in query_data["want"]:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1184  
                                                        if len(i) != 1: