Merge pull request #92 from UN-OCHA/develop

v1.7.0

modules/ocha_ai_chat/config/install/ocha_ai_chat.settings.yml

@@ -7,12 +7,13 @@ defaults:
       format: 'plain_text'
     feedback: ''
     formatting: 'basic'
+    retrieval_mode: 'embeddings'
     answers:
       no_document: 'Sorry, no source documents were found.'
       no_passage: 'Sorry, I could not find information to answer the question.'
       no_answer: 'Sorry, I was unable to answer your question. Please try again in a short moment.'
       invalid_answer: 'Sorry, I was unable to answer your question.'
-      document_embedding_error: 'Sorry, there was an error trying to retrieve the documents to the answer to your question.'
+      document_embedding_error: 'Sorry, there was an error trying to retrieve the documents to answer your question.'
       question_embedding_error: 'Sorry, there was an error trying to process the qestion.'
   plugins:
     answer_validator:

modules/ocha_ai_chat/config/schema/ocha_ai_chat.schema.yml

@@ -84,6 +84,9 @@ ocha_ai_chat.settings:
             formatting:
               type: string
               label: 'Formatting mode.'
+            retrieval_mode:
+              type: string
+              label: 'Passage retrieval mode: embeddings or keywords.'
             answers:
               type: mapping
               mapping:

modules/ocha_ai_chat/drush.services.yml

@@ -0,0 +1,6 @@
+services:
+  ocha_ai_chat.commands:
+    class: \Drupal\ocha_ai_chat\Commands\ReliefwebAiChatCommands
+    arguments: ['@entity_type.manager', '@ocha_ai_chat.chat']
+    tags:
+      - { name: drush.command }

modules/ocha_ai_chat/ocha_ai_chat.services.yml

@@ -8,6 +8,7 @@ services:
       - '@current_user'
       - '@database'
       - '@datetime.time'
+      - '@http_client'
       - '@plugin.manager.ocha_ai.answer_validator'
       - '@plugin.manager.ocha_ai.completion'
       - '@plugin.manager.ocha_ai.embedding'

modules/ocha_ai_chat/src/Commands/ReliefwebAiChatCommands.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Drupal\ocha_ai_chat\Commands;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\ocha_ai_chat\Services\OchaAiChat;
+use Drush\Commands\DrushCommands;
+
+/**
+ * Analyze AI Chat logs.
+ */
+class ReliefwebAiChatCommands extends DrushCommands {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    protected EntityTypeManagerInterface $entityTypeManager,
+    protected OchaAiChat $ochaChat,
+  ) {}
+
+  /**
+   * Analyze logs.
+   *
+   * @command ocha-ai-chat:analyze-logs
+   *
+   * @usage ocha-ai-chat:analyze-logs
+   *   Analyze logs.
+   *
+   * @validate-module-enabled ocha_ai_chat
+   */
+  public function analyzeLogs(string $filename = '/var/www/html/rw-chat-logs.tsv', string $filename_out = '/var/www/html/rw-chat-rerun.tsv') {
+    if (!file_exists($filename)) {
+      $this->output->writeln('File not found: ' . $filename);
+    }
+
+    $out = fopen($filename_out, 'w');
+
+    $f = fopen($filename, 'r');
+    $header = fgetcsv($f, NULL, "\t");
+    $header_lowercase = array_map('strtolower', $header);
+    $header_lowercase[] = 'url';
+    $header_lowercase[] = 'new answer';
+    $header_lowercase[] = 'new status';
+    $header_lowercase[] = 'original_answer';
+
+    fputcsv($out, $header_lowercase, "\t");
+
+    // Get data.
+    $count = 0;
+    while (($row = fgetcsv($f, NULL, "\t")) && $count < 1000) {
+      $data = [];
+      for ($i = 0; $i < count($row); $i++) {
+        $data[$header_lowercase[$i]] = $row[$i];
+      }
+
+      if (!isset($data['status']) || $data['status'] == 'success') {
+        continue;
+      }
+
+      $source_data = json_decode($data['source_data'], TRUE);
+      $data['url'] = $source_data['url'];
+      $data['url'] = str_replace('https://reliefweb.int/updates?search=url_alias:', '', $data['url']);
+      $data['url'] = str_replace('"', '', $data['url']);
+
+      $count++;
+      $this->output->writeln($count . '. ' . $data['url']);
+
+      $question = $data['question'];
+      $answer = $this->ochaChat->answer($question, $source_data);
+
+      $data['new answer'] = $answer['answer'];
+      $data['new status'] = $answer['status'];
+      $data['new original_answer'] = $answer['original_answer'];
+      fputcsv($out, $data, "\t");
+    }
+
+    fclose($f);
+    fclose($out);
+  }
+
+}

modules/ocha_ai_chat/src/Form/OchaAiChatConfigForm.php

@@ -207,6 +207,19 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#description' => $this->t('Basic formatting means that the module takes the answer from the LLM and restores line breaks within HTML.'),
     ];
 
+    // Passage retrieval mode.
+    $form['defaults']['form']['retrieval_mode'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Passage retrieval mode.'),
+      '#default_value' => $defaults['form']['retrieval_mode'] ?? '',
+      '#options' => [
+        'embeddings' => $this->t('Embeddings'),
+        'keywords' => $this->t('Keywords'),
+      ],
+      '#description' => $this->t('Retrieve relevant passages using embeddings or keywords.'),
+    ];
+
+    // Default answers when there is an error for example.
     $form['defaults']['form']['answers'] = [
       '#type' => 'details',
       '#title' => $this->t('Answers'),