Update newapp.py

newapp.py

@@ -162,48 +162,49 @@ def get_location():
 @app.route('/verify', methods=['POST'])
 def verify_property():
     try:
-        if not request.form and not request.files:
-            logger.warning("No form data or files provided")
-            return jsonify({
-                'error': 'No data provided',
-                'status': 'error'
-            }), 400
-
-        data = {
-            'property_name': request.form.get('property_name', '').strip(),
-            'property_type': request.form.get('property_type', '').strip(),
-            'status': request.form.get('status', '').strip(),
-            'description': request.form.get('description', '').strip(),
-            'address': request.form.get('address', '').strip(),
-            'city': request.form.get('city', '').strip(),
-            'state': request.form.get('state', '').strip(),
-            'country': request.form.get('country', 'India').strip(),
-            'zip': request.form.get('zip', '').strip(),
-            'latitude': request.form.get('latitude', '').strip(),
-            'longitude': request.form.get('longitude', '').strip(),
-            'bedrooms': request.form.get('bedrooms', '').strip(),
-            'bathrooms': request.form.get('bathrooms', '').strip(),
-            'total_rooms': request.form.get('total_rooms', '').strip(),
-            'year_built': request.form.get('year_built', '').strip(),
-            'parking': request.form.get('parking', '').strip(),
-            'sq_ft': request.form.get('sq_ft', '').strip(),
-            'market_value': request.form.get('market_value', '').strip(),
-            'amenities': request.form.get('amenities', '').strip(),
-            'nearby_landmarks': request.form.get('nearby_landmarks', '').strip(),
-            'legal_details': request.form.get('legal_details', '').strip()
-        }
+        # Handle both form data and JSON data
+        if request.is_json:
+            data = request.get_json()
+        else:
+            data = {
+                'property_name': request.form.get('property_name', '').strip(),
+                'property_type': request.form.get('property_type', '').strip(),
+                'status': request.form.get('status', '').strip(),
+                'description': request.form.get('description', '').strip(),
+                'address': request.form.get('address', '').strip(),
+                'city': request.form.get('city', '').strip(),
+                'state': request.form.get('state', '').strip(),
+                'country': request.form.get('country', 'India').strip(),
+                'zip': request.form.get('zip', '').strip(),
+                'latitude': request.form.get('latitude', '').strip(),
+                'longitude': request.form.get('longitude', '').strip(),
+                'bedrooms': request.form.get('bedrooms', '').strip(),
+                'bathrooms': request.form.get('bathrooms', '').strip(),
+                'total_rooms': request.form.get('total_rooms', '').strip(),
+                'year_built': request.form.get('year_built', '').strip(),
+                'parking': request.form.get('parking', '').strip(),
+                'sq_ft': request.form.get('sq_ft', '').strip(),
+                'market_value': request.form.get('market_value', '').strip(),
+                'amenities': request.form.get('amenities', '').strip(),
+                'nearby_landmarks': request.form.get('nearby_landmarks', '').strip(),
+                'legal_details': request.form.get('legal_details', '').strip()
+            }
 
-        required_fields = ['property_name', 'property_type', 'address', 'city', 'state']
-        missing_fields = [field for field in required_fields if not data[field]]
-        if missing_fields:
-            logger.warning(f"Missing required fields: {', '.join(missing_fields)}")
+        # Check if we have at least some basic property information
+        if not any([data.get('property_name'), data.get('property_type'), data.get('address')]):
+            logger.warning("No basic property information provided")
             return jsonify({
-                'error': f"Missing required fields: {', '.join(missing_fields)}",
+                'error': 'Please provide at least property name, type, and address',
                 'status': 'error'
             }), 400
 
+        # Initialize empty lists for images and documents
         images = []
         image_analysis = []
+        pdf_texts = []
+        pdf_analysis = []
+
+        # Process images if provided
         if 'images' in request.files:
             image_files = request.files.getlist('images')
             for img_file in image_files:
@@ -219,8 +220,7 @@ def verify_property():
                         logger.error(f"Error processing image {img_file.filename}: {str(e)}")
                         image_analysis.append({'error': str(e), 'is_property_related': False})
 
-        pdf_texts = []
-        pdf_analysis = []
+        # Process documents if provided
         if 'documents' in request.files:
             pdf_files = request.files.getlist('documents')
             for pdf_file in pdf_files:
@@ -236,66 +236,40 @@ def verify_property():
                         logger.error(f"Error processing PDF {pdf_file.filename}: {str(e)}")
                         pdf_analysis.append({'error': str(e)})
 
+        # Create consolidated text for analysis
         consolidated_text = f"""
-        Property Name: {data['property_name']}
-        Property Type: {data['property_type']}
-        Status: {data['status']}
-        Description: {data['description']}
-        Location: {data['address']}, {data['city']}, {data['state']}, {data['country']}, {data['zip']}
-        Coordinates: Lat {data['latitude']}, Long {data['longitude']}
-        Specifications: {data['bedrooms']} bedrooms, {data['bathrooms']} bathrooms, {data['total_rooms']} total rooms
-        Year Built: {data['year_built']}
-        Parking: {data['parking']}
-        Size: {data['sq_ft']} sq. ft.
-        Market Value: ₹{data['market_value']}
-        Amenities: {data['amenities']}
-        Nearby Landmarks: {data['nearby_landmarks']}
-        Legal Details: {data['legal_details']}
+        Property Name: {data.get('property_name', '')}
+        Property Type: {data.get('property_type', '')}
+        Status: {data.get('status', '')}
+        Description: {data.get('description', '')}
+        Location: {data.get('address', '')}, {data.get('city', '')}, {data.get('state', '')}, {data.get('country', '')}, {data.get('zip', '')}
+        Coordinates: Lat {data.get('latitude', '')}, Long {data.get('longitude', '')}
+        Specifications: {data.get('bedrooms', '')} bedrooms, {data.get('bathrooms', '')} bathrooms, {data.get('total_rooms', '')} total rooms
+        Year Built: {data.get('year_built', '')}
+        Parking: {data.get('parking', '')}
+        Size: {data.get('sq_ft', '')} sq. ft.
+        Market Value: ₹{data.get('market_value', '')}
+        Amenities: {data.get('amenities', '')}
+        Nearby Landmarks: {data.get('nearby_landmarks', '')}
+        Legal Details: {data.get('legal_details', '')}
         """
 
-        try:
-            description = data['description']
-            if description and len(description) > 10:
-                text_language = detect(description)
-                if text_language != 'en':
-                    translated_description = GoogleTranslator(source=text_language, target='en').translate(description)
-                    data['description_translated'] = translated_description
-                else:
-                    data['description_translated'] = description
-            else:
-                data['description_translated'] = description
-        except Exception as e:
-            logger.error(f"Error in language detection/translation: {str(e)}")
-            data['description_translated'] = data['description']
-
+        # Perform all analyses regardless of images/documents
         summary = generate_property_summary(data)
         fraud_classification = classify_fraud(consolidated_text, data)
         trust_score, trust_reasoning = generate_trust_score(consolidated_text, image_analysis, pdf_analysis)
         suggestions = generate_suggestions(consolidated_text, data)
-        quality_assessment = assess_text_quality(data['description_translated'])
+        quality_assessment = assess_text_quality(data.get('description', ''))
         address_verification = verify_address(data)
         cross_validation = perform_cross_validation(data)
         location_analysis = analyze_location(data)
         price_analysis = analyze_price(data)
-        legal_analysis = analyze_legal_details(data['legal_details'])
+        legal_analysis = analyze_legal_details(data.get('legal_details', ''))
         specs_verification = verify_property_specs(data)
         market_analysis = analyze_market_value(data)
 
-        document_analysis = {
-            'pdf_count': len(pdf_texts),
-            'pdf_texts': pdf_texts,
-            'pdf_analysis': pdf_analysis
-        }
-        image_results = {
-            'image_count': len(images),
-            'image_analysis': image_analysis
-        }
-
-        report_id = str(uuid.uuid4())
-
+        # Prepare results
         results = {
-            'report_id': report_id,
-            'timestamp': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
             'summary': summary,
             'fraud_classification': fraud_classification,
             'trust_score': {
@@ -309,11 +283,17 @@ def verify_property():
             'location_analysis': location_analysis,
             'price_analysis': price_analysis,
             'legal_analysis': legal_analysis,
-            'document_analysis': document_analysis,
-            'image_analysis': image_results,
             'specs_verification': specs_verification,
             'market_analysis': market_analysis,
-            'images': images
+            'document_analysis': {
+                'pdf_count': len(pdf_texts),
+                'pdf_texts': pdf_texts,
+                'pdf_analysis': pdf_analysis
+            },
+            'image_analysis': {
+                'image_count': len(images),
+                'image_analysis': image_analysis
+            }
         }
 
         return jsonify(make_json_serializable(results))