guestDocument: split codes

src/main/kotlin/com/android/trisolarisserver/component/GuestDocumentEvents.kt

@@ -1,8 +1,8 @@
 package com.android.trisolarisserver.component
 
 import com.android.trisolarisserver.controller.GuestDocumentResponse
+import com.android.trisolarisserver.controller.toResponse
 import com.android.trisolarisserver.db.repo.GuestDocumentRepo
-import com.android.trisolarisserver.models.booking.GuestDocument
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
@@ -79,30 +79,3 @@ private data class GuestDocKey(
     val propertyId: UUID,
     val guestId: UUID
 )
-
-private fun GuestDocument.toResponse(objectMapper: ObjectMapper): GuestDocumentResponse {
-    val id = id ?: throw IllegalStateException("Document id missing")
-    val extracted: Map<String, String>? = extractedData?.let {
-        try {
-            val raw = objectMapper.readValue(it, Map::class.java)
-            raw.entries.associate { entry ->
-                entry.key.toString() to (entry.value?.toString() ?: "")
-            }
-        } catch (_: Exception) {
-            null
-        }
-    }
-    return GuestDocumentResponse(
-        id = id,
-        propertyId = property.id!!,
-        guestId = guest.id!!,
-        bookingId = booking.id!!,
-        uploadedByUserId = uploadedBy.id!!,
-        uploadedAt = uploadedAt.toString(),
-        originalFilename = originalFilename,
-        contentType = contentType,
-        sizeBytes = sizeBytes,
-        extractedData = extracted,
-        extractedAt = extractedAt?.toString()
-    )
-}

src/main/kotlin/com/android/trisolarisserver/component/LlamaClient.kt

@@ -13,7 +13,17 @@ class LlamaClient(
     private val restTemplate: RestTemplate,
     private val objectMapper: ObjectMapper,
     @Value("\${ai.llama.baseUrl}")
-    private val baseUrl: String
+    private val baseUrl: String,
+    @Value("\${ai.llama.temperature:0.7}")
+    private val temperature: Double,
+    @Value("\${ai.llama.topP:0.8}")
+    private val topP: Double,
+    @Value("\${ai.llama.minP:0.2}")
+    private val minP: Double,
+    @Value("\${ai.llama.repeatPenalty:1.0}")
+    private val repeatPenalty: Double,
+    @Value("\${ai.llama.topK:40}")
+    private val topK: Int
 ) {
     private val systemPrompt =
         "Look only at visible text. " +
@@ -24,6 +34,11 @@ class LlamaClient(
     fun ask(imageUrl: String, question: String): String {
         val payload = mapOf(
             "model" to "qwen",
+            "temperature" to temperature,
+            "top_p" to topP,
+            "min_p" to minP,
+            "repeat_penalty" to repeatPenalty,
+            "top_k" to topK,
             "messages" to listOf(
                 mapOf(
                     "role" to "system",
@@ -44,6 +59,11 @@ class LlamaClient(
     fun askText(content: String, question: String): String {
         val payload = mapOf(
             "model" to "qwen",
+            "temperature" to temperature,
+            "top_p" to topP,
+            "min_p" to minP,
+            "repeat_penalty" to repeatPenalty,
+            "top_k" to topK,
             "messages" to listOf(
                 mapOf(
                     "role" to "system",

src/main/kotlin/com/android/trisolarisserver/controller/GuestDocuments.kt

@@ -4,16 +4,14 @@ import com.android.trisolarisserver.component.DocumentStorage
 import com.android.trisolarisserver.component.DocumentTokenService
 import com.android.trisolarisserver.component.ExtractionQueue
 import com.android.trisolarisserver.component.GuestDocumentEvents
-import com.android.trisolarisserver.component.LlamaClient
+import com.android.trisolarisserver.component.DocumentExtractionService
 import com.android.trisolarisserver.component.PropertyAccess
 import com.android.trisolarisserver.db.repo.BookingRepo
 import com.android.trisolarisserver.db.repo.GuestDocumentRepo
 import com.android.trisolarisserver.db.repo.GuestRepo
 import com.android.trisolarisserver.models.booking.GuestDocument
-import com.android.trisolarisserver.models.booking.GuestVehicle
 import com.android.trisolarisserver.models.property.Role
 import com.android.trisolarisserver.repo.AppUserRepo
-import com.android.trisolarisserver.repo.GuestVehicleRepo
 import com.android.trisolarisserver.repo.PropertyRepo
 import com.android.trisolarisserver.security.MyPrincipal
 import com.fasterxml.jackson.databind.ObjectMapper
@@ -43,12 +41,11 @@ class GuestDocuments(
     private val bookingRepo: BookingRepo,
     private val guestDocumentRepo: GuestDocumentRepo,
     private val appUserRepo: AppUserRepo,
-    private val guestVehicleRepo: GuestVehicleRepo,
     private val storage: DocumentStorage,
     private val tokenService: DocumentTokenService,
     private val extractionQueue: ExtractionQueue,
     private val guestDocumentEvents: GuestDocumentEvents,
-    private val llamaClient: LlamaClient,
+    private val extractionService: DocumentExtractionService,
     private val objectMapper: ObjectMapper,
     @org.springframework.beans.factory.annotation.Value("\${storage.documents.publicBaseUrl}")
     private val publicBaseUrl: String,
@@ -214,224 +211,12 @@ class GuestDocuments(
                 val imageUrl =
                     "${aiBaseUrl}/properties/$propertyId/guests/$guestId/documents/${document.id}/file?token=$token"
 
-                val results = linkedMapOf<String, String>()
-                results["isVehiclePhoto"] = llamaClient.ask(
-                    imageUrl,
-                    "IS THIS A VEHICLE NUMBER PLATE PHOTO? Answer YES or NO only."
-                )
-
-
-                if (isYes(results["isVehiclePhoto"])) {
-                    results["vehicleNumber"] = llamaClient.ask(
-                        imageUrl,
-                        "VEHICLE NUMBER PLATE? Reply only number or NONE."
-                    )
-                }
-                results["hasAadhar"] = llamaClient.ask(imageUrl, "CONTAINS AADHAAR? Answer YES or NO only.")
-                results["hasUidai"] = llamaClient.ask(imageUrl, "CONTAINS UIDAI? Answer YES or NO only.")
-                val hasAadhar = isYes(results["hasAadhar"]) || isYes(results["hasUidai"])
-                if (hasAadhar) {
-                    val aadharQuestions = linkedMapOf(
-                        "hasAddress" to "POSTAL ADDRESS PRESENT? Answer YES or NO only.",
-                        "hasDob" to "DOB? Reply YES or NO.",
-                        "hasGenderMentioned" to "GENDER MENTIONED? Reply YES or NO."
-                    )
-                    for ((key, question) in aadharQuestions) {
-                        results[key] = llamaClient.ask(imageUrl, question)
-                    }
-                    val hasAddress = isYes(results["hasAddress"])
-                    if (hasAddress) {
-                        val addressQuestions = linkedMapOf(
-                            DocumentPrompts.PIN_CODE,
-                            DocumentPrompts.ADDRESS
-                        )
-                        for ((key, question) in addressQuestions) {
-                            results[key] = llamaClient.ask(imageUrl, question)
-                        }
-                    }
-                    val hasDob = isYes(results["hasDob"])
-                    val hasGender = isYes(results["hasGenderMentioned"])
-                    if (hasDob && hasGender) {
-                        val aadharFrontQuestions = linkedMapOf(
-                            DocumentPrompts.NAME,
-                            DocumentPrompts.DOB,
-                            DocumentPrompts.ID_NUMBER,
-                            DocumentPrompts.GENDER
-                        )
-                        for ((key, question) in aadharFrontQuestions) {
-                            results[key] = llamaClient.ask(imageUrl, question)
-                        }
-                    }
-
-                } else {
-                    results["hasDrivingLicence"] = llamaClient.ask(
-                        imageUrl,
-                        "CONTAINS DRIVING LICENCE? Answer YES or NO only."
-                    )
-                    results["hasTransportDept"] = llamaClient.ask(
-                        imageUrl,
-                        "CONTAINS TRANSPORT DEPARTMENT? Answer YES or NO only."
-                    )
-                    val isDriving = isYes(results["hasDrivingLicence"]) || isYes(results["hasTransportDept"])
-                    if (isDriving) {
-                        val drivingQuestions = linkedMapOf(
-                            DocumentPrompts.NAME,
-                            DocumentPrompts.DOB,
-                            "idNumber" to "DL NUMBER? Reply only number or NONE.",
-                            DocumentPrompts.ADDRESS,
-                            DocumentPrompts.PIN_CODE,
-                            DocumentPrompts.CITY,
-                            DocumentPrompts.GENDER,
-                            DocumentPrompts.NATIONALITY
-                        )
-                        for ((key, question) in drivingQuestions) {
-                            results[key] = llamaClient.ask(imageUrl, question)
-                        }
-                    } else {
-                        results["hasElectionCommission"] = llamaClient.ask(
-                            imageUrl,
-                            "CONTAINS ELECTION COMMISSION OF INDIA? Answer YES or NO only."
-                        )
-                        if (isYes(results["hasElectionCommission"])) {
-                            val voterQuestions = linkedMapOf(
-                                DocumentPrompts.NAME,
-                                DocumentPrompts.DOB,
-                                "idNumber" to "VOTER ID NUMBER? Reply only number or NONE.",
-                                DocumentPrompts.ADDRESS,
-                                DocumentPrompts.PIN_CODE,
-                                DocumentPrompts.CITY,
-                                DocumentPrompts.GENDER,
-                                DocumentPrompts.NATIONALITY
-                            )
-                            for ((key, question) in voterQuestions) {
-                                results[key] = llamaClient.ask(imageUrl, question)
-                            }
-                        } else {
-                            results["hasIncomeTaxDept"] = llamaClient.ask(
-                                imageUrl,
-                                "CONTAINS INCOME TAX DEPARTMENT? Answer YES or NO only."
-                            )
-                            if (isYes(results["hasIncomeTaxDept"])) {
-                                val panQuestions = linkedMapOf(
-                                    DocumentPrompts.NAME,
-                                    DocumentPrompts.DOB,
-                                    "idNumber" to "PAN NUMBER? Reply only number or NONE.",
-                                    DocumentPrompts.ADDRESS,
-                                    DocumentPrompts.PIN_CODE,
-                                    DocumentPrompts.CITY,
-                                    DocumentPrompts.GENDER,
-                                    DocumentPrompts.NATIONALITY
-                                )
-                                for ((key, question) in panQuestions) {
-                                    results[key] = llamaClient.ask(imageUrl, question)
-                                }
-                            } else {
-                                results["hasPassport"] = llamaClient.ask(
-                                    imageUrl,
-                                    "CONTAINS PASSPORT? Answer YES or NO only."
-                                )
-                                if (isYes(results["hasPassport"])) {
-                                    val passportQuestions = linkedMapOf(
-                                        DocumentPrompts.NAME,
-                                        DocumentPrompts.DOB,
-                                        "idNumber" to "PASSPORT NUMBER? Reply only number or NONE.",
-                                        DocumentPrompts.ADDRESS,
-                                        DocumentPrompts.PIN_CODE,
-                                        DocumentPrompts.CITY,
-                                        DocumentPrompts.GENDER,
-                                        DocumentPrompts.NATIONALITY
-                                    )
-                                    for ((key, question) in passportQuestions) {
-                                        results[key] = llamaClient.ask(imageUrl, question)
-                                    }
-                                } else {
-                                    val generalQuestions = linkedMapOf(
-                                        DocumentPrompts.NAME,
-                                        DocumentPrompts.DOB,
-                                        DocumentPrompts.ID_NUMBER,
-                                        DocumentPrompts.ADDRESS,
-                                        DocumentPrompts.VEHICLE_NUMBER,
-                                        DocumentPrompts.PIN_CODE,
-                                        DocumentPrompts.CITY,
-                                        DocumentPrompts.GENDER,
-                                        DocumentPrompts.NATIONALITY
-                                    )
-                                    for ((key, question) in generalQuestions) {
-                                        results[key] = llamaClient.ask(imageUrl, question)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                results["docType"] = when {
-                    isYes(results["hasCourt"]) ||
-                        isYes(results["hasHighCourt"]) ||
-                        isYes(results["hasSupremeCourt"]) ||
-                        isYes(results["hasJudiciary"]) -> "COURT_ID"
-                    isYes(results["hasPolice"]) -> "POLICE_ID"
-                    isYes(results["hasPassport"]) -> "PASSPORT"
-                    isYes(results["hasTransportDept"]) ||
-                        isYes(results["hasDrivingLicence"]) -> "TRANSPORT"
-                    isYes(results["hasIncomeTaxDept"]) -> "PAN"
-                    isYes(results["hasElectionCommission"]) -> "VOTER_ID"
-                    isYes(results["hasAadhar"]) ||
-                        isYes(results["hasUidai"]) -> {
-                        if (isYes(results["hasAddress"])) "AADHAR_BACK" else "AADHAR_FRONT"
-                    }
-                    results["vehicleNumber"].orEmpty().isNotBlank() && !results["vehicleNumber"]!!.contains("NONE", true) -> "VEHICLE"
-                    isYes(results["isVehiclePhoto"]) -> "VEHICLE_PHOTO"
-                    else -> "UNKNOWN"
-                }
+                val extraction = extractionService.extractAndApply(imageUrl, document, propertyId)
+                val results = extraction.results
 
                 document.extractedData = objectMapper.writeValueAsString(results)
                 document.extractedAt = OffsetDateTime.now()
                 guestDocumentRepo.save(document)
-
-                val extractedName = cleanedValue(results[DocumentPrompts.NAME.first])
-                val extractedAddress = cleanedValue(results[DocumentPrompts.ADDRESS.first])
-                val guestIdValue = document.guest.id
-                if (guestIdValue != null && (extractedName != null || extractedAddress != null)) {
-                    val guestEntity = guestRepo.findById(guestIdValue).orElse(null)
-                    if (guestEntity != null) {
-                        var updated = false
-                        if (guestEntity.name.isNullOrBlank() && extractedName != null) {
-                            guestEntity.name = extractedName
-                            updated = true
-                        }
-                        if (guestEntity.addressText.isNullOrBlank() && extractedAddress != null) {
-                            guestEntity.addressText = extractedAddress
-                            updated = true
-                        }
-                        if (updated) {
-                            guestEntity.updatedAt = OffsetDateTime.now()
-                            guestRepo.save(guestEntity)
-                        }
-                    }
-                }
-
-                val extractedVehicle = cleanedValue(results["vehicleNumber"])
-                if (isYes(results["isVehiclePhoto"]) && extractedVehicle != null) {
-                    val guestIdSafe = document.guest.id
-                    if (guestIdSafe != null &&
-                        !guestVehicleRepo.existsByPropertyIdAndVehicleNumberIgnoreCase(propertyId, extractedVehicle)
-                    ) {
-                        val property = propertyRepo.findById(propertyId).orElse(null)
-                        val guestEntity = guestRepo.findById(guestIdSafe).orElse(null)
-                        if (property != null && guestEntity != null) {
-                            val booking = bookingRepo.findById(document.booking.id!!).orElse(null)
-                            guestVehicleRepo.save(
-                                GuestVehicle(
-                                    property = property,
-                                    guest = guestEntity,
-                                    booking = booking,
-                                    vehicleNumber = extractedVehicle
-                                )
-                            )
-                        }
-                    }
-                }
                 guestDocumentEvents.emit(propertyId, guestId)
             } catch (_: Exception) {
                 // Keep upload successful even if AI extraction fails.
@@ -460,56 +245,3 @@ class GuestDocuments(
         }
     }
 }
-
-data class GuestDocumentResponse(
-    val id: UUID,
-    val propertyId: UUID,
-    val guestId: UUID,
-    val bookingId: UUID,
-    val uploadedByUserId: UUID,
-    val uploadedAt: String,
-    val originalFilename: String,
-    val contentType: String?,
-    val sizeBytes: Long,
-    val extractedData: Map<String, String>?,
-    val extractedAt: String?
-)
-
-private fun GuestDocument.toResponse(objectMapper: ObjectMapper): GuestDocumentResponse {
-    val id = id ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Document id missing")
-    val extracted: Map<String, String>? = extractedData?.let {
-        try {
-            val raw = objectMapper.readValue(it, Map::class.java)
-            raw.entries.associate { entry ->
-                entry.key.toString() to (entry.value?.toString() ?: "")
-            }
-        } catch (_: Exception) {
-            null
-        }
-    }
-    return GuestDocumentResponse(
-        id = id,
-        propertyId = property.id!!,
-        guestId = guest.id!!,
-        bookingId = booking.id!!,
-        uploadedByUserId = uploadedBy.id!!,
-        uploadedAt = uploadedAt.toString(),
-        originalFilename = originalFilename,
-        contentType = contentType,
-        sizeBytes = sizeBytes,
-        extractedData = extracted,
-        extractedAt = extractedAt?.toString()
-    )
-}
-
-private fun isYes(value: String?): Boolean {
-    return value.orEmpty().contains("YES", ignoreCase = true)
-}
-
-private fun cleanedValue(value: String?): String? {
-    val trimmed = value?.trim().orEmpty()
-    if (trimmed.isBlank()) return null
-    val upper = trimmed.uppercase()
-    if (upper == "NONE" || upper == "N/A" || upper == "NA" || upper == "NULL") return null
-    return trimmed
-}

src/main/resources/application.properties

@@ -1,25 +1,5 @@
-spring.application.name=TrisolarisServer
-spring.datasource.username=android
-spring.datasource.password=taddymydoggy!
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.open-in-view=false
-spring.flyway.enabled=false
-spring.flyway.locations=classpath:db/migration
-storage.documents.root=/home/androidlover5842/docs
-storage.documents.publicBaseUrl=https://api.hoteltrisolaris.in
-storage.documents.tokenSecret=change-me
-storage.documents.tokenTtlSeconds=300
-storage.emails.root=/home/androidlover5842/docs/emails
-storage.emails.publicBaseUrl=https://api.hoteltrisolaris.in
-storage.rooms.root=/home/androidlover5842/docs/rooms
-storage.rooms.publicBaseUrl=https://api.hoteltrisolaris.in
-mail.imap.host=localhost
-mail.imap.port=993
-mail.imap.protocol=imaps
-mail.imap.username=
-mail.imap.password=
-mail.imap.pollMs=60000
-mail.imap.enabled=false
-server.port=18921
-spring.servlet.multipart.max-file-size=20MB
-spring.servlet.multipart.max-request-size=20MB
+ai.llama.temperature=0.7
+ai.llama.topP=0.8
+ai.llama.minP=0.2
+ai.llama.repeatPenalty=1.0
+ai.llama.topK=40