Move query pictures under /api

app.py

@@ -765,7 +765,47 @@ def get_picture_query(query_data):

                                
                                
                                
                            
                                
                                    
                                        
                                            765  
                                                return query
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            766  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            767  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        768 -
                                        @app.route("/query-pictures", methods=["POST"])      # sadly GET can't have a body
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        768 +
                                        @app.route("/query-pictures")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        769 +
                                        def graphical_query_pictures():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        770 +
                                            return flask.render_template("graphical-query-pictures.html")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        771 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        772 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        773 +
                                        @app.route("/query-pictures-results")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        774 +
                                        def graphical_query_pictures_results():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        775 +
                                            query_yaml = flask.request.args.get("query", "")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        776 +
                                            yaml_parser = yaml.YAML()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        777 +
                                            query_data = yaml_parser.load(query_yaml) or {}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        778 +
                                            query = get_picture_query(query_data)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        779 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        780 +
                                            page = int(flask.request.args.get("page", 1))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        781 +
                                            per_page = int(flask.request.args.get("per_page", 16))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        782 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        783 +
                                            resources = query.paginate(page=page, per_page=per_page)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        784 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        785 +
                                            return flask.render_template("graphical-query-pictures-results.html", resources=resources, query=query_yaml,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        786 +
                                                                          page_number=page, page_length=per_page, num_pages=resources.pages,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        787 +
                                                                          prev_page=resources.prev_num, next_page=resources.next_num)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        788 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        789 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        790 +
                                        @app.route("/raw/picture/<int:id>")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        791 +
                                        def raw_picture(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        792 +
                                            resource = db.session.get(PictureResource, id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        793 +
                                            if resource is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        794 +
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        795 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        796 +
                                            response = flask.send_from_directory(path.join(config.DATA_PATH, "pictures"), str(resource.id))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        797 +
                                            response.mimetype = resource.file_format
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        798 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        799 +
                                            return response
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        800 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        801 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        802 +
                                        @app.route("/api/object-types")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        803 +
                                        def object_types():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        804 +
                                            objects = db.session.query(PictureObject).all()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        805 +
                                            return flask.jsonify({object.id: object.description for object in objects})
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        806 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        807 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        808 +
                                        @app.route("/api/query-pictures", methods=["POST"])      # sadly GET can't have a body
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            809  
                                            def query_pictures():
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            810  
                                                offset = int(flask.request.args.get("offset", 0))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            811  
                                                limit = int(flask.request.args.get("limit", 16))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -834,42 +874,3 @@ def query_pictures():

                                
                                
                                
                            
                                
                                    
                                        
                                            874  
                                                response.headers["Content-Type"] = "application/json"
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            875  
                                                return response
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            876  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        837 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        838 -
                                        @app.route("/graphical-query-pictures")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        839 -
                                        def graphical_query_pictures():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        840 -
                                            return flask.render_template("graphical-query-pictures.html")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        841 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        842 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        843 -
                                        @app.route("/graphical-query-pictures-results")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        844 -
                                        def graphical_query_pictures_results():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        845 -
                                            query_yaml = flask.request.args.get("query", "")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        846 -
                                            yaml_parser = yaml.YAML()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        847 -
                                            query_data = yaml_parser.load(query_yaml) or {}
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        848 -
                                            query = get_picture_query(query_data)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        849 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        850 -
                                            page = int(flask.request.args.get("page", 1))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        851 -
                                            per_page = int(flask.request.args.get("per_page", 16))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        852 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        853 -
                                            resources = query.paginate(page=page, per_page=per_page)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        854 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        855 -
                                            return flask.render_template("graphical-query-pictures-results.html", resources=resources, query=query_yaml,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        856 -
                                                                          page_number=page, page_length=per_page, num_pages=resources.pages,
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        857 -
                                                                          prev_page=resources.prev_num, next_page=resources.next_num)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        858 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        859 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        860 -
                                        @app.route("/raw/picture/<int:id>")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        861 -
                                        def raw_picture(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        862 -
                                            resource = db.session.get(PictureResource, id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        863 -
                                            if resource is None:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        864 -
                                                flask.abort(404)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        865 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        866 -
                                            response = flask.send_from_directory(path.join(config.DATA_PATH, "pictures"), str(resource.id))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        867 -
                                            response.mimetype = resource.file_format
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        868 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        869 -
                                            return response
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        870 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        871 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        872 -
                                        @app.route("/api/object-types")
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        873 -
                                        def object_types():
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        874 -
                                            objects = db.session.query(PictureObject).all()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        875 -
                                            return flask.jsonify({object.id: object.description for object in objects})
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/graphical-query-pictures.html

@@ -5,7 +5,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            5  
                                            {% block content %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                                <x-frame style="--width: 768px" class="vbox">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                                    <h1>Query pictures</h1>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        8 -
                                                <form method="GET" action="/graphical-query-pictures-results" class="vbox">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        8 +
                                                <form method="GET" action="/query-pictures-results" class="vbox">
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            9  
                                                        <label>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            10  
                                                            <span class="required-asterisk">Query YAML</span>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            11  
                                                            <textarea name="query" required rows="16"></textarea>