From e75a99f1fe7240da3a0c028bbbeb10fc29ac56f9 Mon Sep 17 00:00:00 2001 From: Svjatoslav Agejenko Date: Sat, 12 Jul 2025 09:57:32 +0300 Subject: [PATCH] Minor refactoring. --- .../eu/svjatoslav/alyverkko_cli/AiTask.java | 6 +++--- .../MailCorrespondentCommand.java | 17 +++++++---------- .../commands/mail_correspondant/MailQuery.java | 7 +++++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/eu/svjatoslav/alyverkko_cli/AiTask.java b/src/main/java/eu/svjatoslav/alyverkko_cli/AiTask.java index c431b23..ea53d5f 100644 --- a/src/main/java/eu/svjatoslav/alyverkko_cli/AiTask.java +++ b/src/main/java/eu/svjatoslav/alyverkko_cli/AiTask.java @@ -14,7 +14,7 @@ import static java.lang.String.join; *

Key processing steps: *

    *
  1. Build standardized input prompt
  2. - *
  3. Create temporary input file
  4. + *
  5. Create a temporary input file
  6. *
  7. Execute llama.cpp with appropriate parameters
  8. *
  9. Capture and filter output
  10. *
  11. Perform cleanup operations
  12. @@ -146,7 +146,7 @@ public class AiTask { public String runAiQuery() throws InterruptedException, IOException { try { // Record the start time of the query - mailQuery.startTime = System.currentTimeMillis(); + mailQuery.startTimeMillis = System.currentTimeMillis(); // Build input prompt initializeInputFile(buildAiQuery()); @@ -172,7 +172,7 @@ public class AiTask { outputThread.join(); // Record the end time of the query - mailQuery.endTime = System.currentTimeMillis(); + mailQuery.endTimeMillis = System.currentTimeMillis(); // Clean up the AI response: remove partial prompt text, end-of-text marker, etc. return filterParticipantsInAiResponse(cleanupAiResponse(result.toString())); diff --git a/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailCorrespondentCommand.java b/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailCorrespondentCommand.java index 4ddf27e..8fffb5c 100644 --- a/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailCorrespondentCommand.java +++ b/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailCorrespondentCommand.java @@ -269,23 +269,20 @@ public class MailCorrespondentCommand implements Command { * @return a string for the first line. */ private static String getDoneLine(MailQuery mailQuery) { - return "DONE: prompt=" + mailQuery.systemPromptName + " model=" + mailQuery.model.alias + " duration=" + getDuration(mailQuery.startTime, mailQuery.endTime) + "\n"; + return "DONE: prompt=" + mailQuery.systemPromptName + + " model=" + mailQuery.model.alias + + " duration=" + getDuration(mailQuery.startTimeMillis, mailQuery.endTimeMillis) + "\n"; } - private static String getDuration(long startTime, long endTime) { + private static String getDuration(long startTimeMillis, long endTimeMillis) { - long durationMillis = endTime - startTime; - long durationSeconds = durationMillis / 1000; + long durationSeconds = (endTimeMillis - startTimeMillis) / 1000; - if (durationSeconds < 180){ - return String.valueOf(durationSeconds) + "s"; - } + if (durationSeconds < 180) return durationSeconds + "s"; long durationMinutes = durationSeconds / 60; - if (durationMinutes < 180) { - return durationMinutes + "m"; - } + if (durationMinutes < 180) return durationMinutes + "m"; long durationHours = durationMinutes / 60; return durationHours + "h"; diff --git a/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailQuery.java b/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailQuery.java index e17e73d..bf187cb 100644 --- a/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailQuery.java +++ b/src/main/java/eu/svjatoslav/alyverkko_cli/commands/mail_correspondant/MailQuery.java @@ -34,13 +34,16 @@ public class MailQuery { /** * The start time of the query (milliseconds since epoch). */ - public long startTime; + public long startTimeMillis; /** * The end time of the query (milliseconds since epoch). */ - public long endTime; + public long endTimeMillis; + /** + * Task priority. Bigger integer has higher priority. + */ public int priority; /** -- 2.20.1