added discord bot to app.py

.gitattributes

@@ -1,35 +1,2 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
+# Auto detect text files and perform LF normalization
+* text=auto

README.md

@@ -1,13 +1,110 @@
----
-title: HF QA Demo
-emoji: 🏆
-colorFrom: pink
-colorTo: yellow
-sdk: gradio
-sdk_version: 3.48.0
-app_file: app.py
-pinned: false
-license: apache-2.0
----
-
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+# Hugging Face Documentation Question Answering System
+
+A multi-interface Q&A system that uses Hugging Face's LLM and Retrieval Augmented Generation (RAG) to deliver answers based on Hugging Face documentation. Operable as an API, Discord bot, or Gradio app, it also provides links to the documentation used to formulate each answer.
+
+# Example
+![Example](./assets/example.png)
+
+# Table of Contents
+- [Setting up](#setting-up)
+- [Running](#running)
+    - [Gradio](#gradio)
+    - [API](#api-serving)
+    - [Discord Bot](#discord-bot)
+- [Indexes](#indexes-list)
+- [Development instructions](#development-instructions)
+
+## Setting up
+
+To execute any of the available interfaces, specify the required parameters in the `.env` file based on the `.env.example` located in the `config/` directory. Alternatively, you can set these as environment variables:
+
+- `QUESTION_ANSWERING_MODEL_ID` - (str) A string that specifies either the model ID from the Hugging Face Hub or the directory containing the model weights
+- `EMBEDDING_MODEL_ID` - (str) embedding model ID from the Hugging Face Hub. We recommend using the `hkunlp/instructor-large`
+- `INDEX_REPO_ID` - (str) Repository ID from the Hugging Face Hub where the index is stored. List of the most actual indexes can be found in this section: [Indexes](#indexes-list)
+- `PROMPT_TEMPLATE_NAME` - (str) Name of the model prompt template used for question answering, templates are stored in the `config/api/prompt_templates` directory
+- `USE_DOCS_FOR_CONTEXT` - (bool) Use retrieved documents as a context for a given query
+- `NUM_RELEVANT_DOCS` - (int) Number of documents used for the previous feature
+- `ADD_SOURCES_TO_RESPONSE` - (bool) Include sources of the retrieved documents used as a context for a given query
+- `USE_MESSAGES_IN_CONTEXT` - (bool) Use chat history for conversational experience
+- `DEBUG` - (bool) Provides additional logging
+
+Install the necessary dependencies from the requirements file:
+
+```bash
+pip install -r requirements.txt
+```
+
+## Running
+
+### Gradio
+
+After completing all steps as described in the [Setting up](#setting-up) section, run:
+
+```bash
+python3 app.py
+```
+
+### API Serving
+
+By default, the API is served at `http://0.0.0.0:8000`. To launch it, complete all the steps outlined in the [Setting up](#setting-up) section, then execute the following command:
+
+```bash
+python3 -m api
+```
+
+### Discord Bot
+
+To interact with the system as a Discord bot, add additional required environment variables from the `Discord bot` section of the `.env.example` file in the `config/` directory.
+
+- `DISCORD_TOKEN` - (str) API key for the bot application
+- `QA_SERVICE_URL` - (str) URL of the API service. We recommend using: `http://0.0.0.0:8000`
+- `NUM_LAST_MESSAGES` - (int) Number of messages used for context in conversations
+- `USE_NAMES_IN_CONTEXT` - (bool) Include usernames in the conversation context
+- `ENABLE_COMMANDS` - (bool) Allow commands, e.g., channel cleanup
+- `DEBUG` - (bool) Provides additional logging
+
+After completing all steps, run:
+
+```bash
+python3 -m bot
+```
+
+<!-- ### Running in a Docker
+
+Tu run API and bot in a Docker container, run the following command:
+
+```bash
+./run_docker.sh
+``` -->
+
+## Indexes List
+
+The following list contains the most current indexes that can be used for the system:
+- [All Hugging Face repositories over 50 Stars - 512-Character Chunks](https://huggingface.co/datasets/KonradSzafer/index-instructor-large-512-m512-all_repos_above_50_stars)
+- [All Hugging Face repositories over 50 Stars - 812-Character Chunks](KonradSzafer/index-instructor-large-812-m512-all_repos_above_50_stars)
+
+## Development Instructions
+
+We use `Python 3.10`
+
+To install all necessary Python packages, run the following command:
+
+```bash
+pip install -r requirements.txt
+```
+We use the pipreqsnb to generate the requirements.txt file. To install pipreqsnb, run the following command:
+
+```bash
+pip install pipreqsnb
+```
+To generate the requirements.txt file, run the following command:
+
+```bash
+pipreqsnb --force .
+```
+
+To run unit tests, you can use the following command:
+
+```bash
+pytest -o "testpaths=tests" --noconftest
+```

app.py

@@ -1,10 +1,11 @@
 import gradio as gr
 
 from qa_engine import logger, Config, QAEngine
+from discord_bot import DiscordClient
 
 
 config = Config()
-model = QAEngine(
+qa_engine = QAEngine(
     llm_model_id=config.question_answering_model_id,
     embedding_model_id=config.embedding_model_id,
     index_repo_id=config.index_repo_id,
@@ -15,19 +16,45 @@ model = QAEngine(
     debug=config.debug
 )
 
-with gr.Blocks() as demo:
-    chatbot = gr.Chatbot()
-    msg = gr.Textbox()
-    clear = gr.ClearButton([msg, chatbot])
 
-    def respond(message, chat_history):
-        context = ''.join(f'User: {msg} \nBot:{bot_msg}\n' for msg, bot_msg in chat_history)
-        logger.info(f'Context: {context}')
-        response = model.get_response(message, context)
-        bot_message = response.get_answer() + response.get_sources_as_text() + '\n'
-        chat_history.append((message, bot_message))
-        return '', chat_history
+def gradio_interface():
+    with gr.Blocks() as demo:
+        chatbot = gr.Chatbot()
+        msg = gr.Textbox()
+        clear = gr.ClearButton([msg, chatbot])
 
-    msg.submit(respond, [msg, chatbot], [msg, chatbot])
+        def respond(message, chat_history):
+            context = ''.join(f'User: {msg} \nBot:{bot_msg}\n' for msg, bot_msg in chat_history)
+            logger.info(f'Context: {context}')
+            response = qa_engine.get_response(message, context)
+            bot_message = response.get_answer() + response.get_sources_as_text() + '\n'
+            chat_history.append((message, bot_message))
+            return '', chat_history
 
-demo.launch(share=False)
+        msg.submit(respond, [msg, chatbot], [msg, chatbot])
+    demo.launch(share=True)
+
+
+def discord_bot():
+    client = DiscordClient(
+        qa_engine=qa_engine,
+        num_last_messages=config.num_last_messages,
+        use_names_in_context=config.use_names_in_context,
+        enable_commands=config.enable_commands,
+        debug=config.debug
+    )
+    with gr.Blocks() as demo:
+        gr.Markdown(f'Discord bot is running.')
+        client.run(config.discord_token)
+
+
+if __name__ == '__main__':
+    if config.app_mode == 'gradio':
+        gradio_interface()
+    elif config.app_mode == 'discord':
+        discord_bot()
+    else:
+        raise ValueError(
+            f'Invalid app mode: {config.app_mode}, ',
+            f'set APP_MODE to "gradio" or "discord"'
+        )

config/.env.example

@@ -14,3 +14,6 @@ DISCORD_TOKEN=your-bot-token
 NUM_LAST_MESSAGES=1
 USE_NAMES_IN_CONTEXT=False
 ENABLE_COMMANDS=True
+
+# App mode
+APP_MODE=gradio

discord_bot/__init__.py

@@ -0,0 +1 @@
+from .client import DiscordClient

qa_engine/config.py

@@ -35,11 +35,14 @@ class Config:
     debug: bool = eval(get_env('DEBUG', 'True'))
 
     # Discord bot config - optional
-    discord_token: str = get_env('DISCORD_TOKEN', '', warn=False)
+    discord_token: str = get_env('DISCORD_TOKEN', '-', warn=False)
     num_last_messages: int = int(get_env('NUM_LAST_MESSAGES', 2, warn=False))
     use_names_in_context: bool = eval(get_env('USE_NAMES_IN_CONTEXT', 'False', warn=False))
     enable_commands: bool = eval(get_env('ENABLE_COMMANDS', 'True', warn=False))
 
+    # App mode
+    app_mode: str = get_env('APP_MODE', '-', warn=False) # 'gradio' or 'discord'
+
     def __post_init__(self):
         prompt_template_file = f'config/prompt_templates/{self.prompt_template_name}.txt'
         with open(prompt_template_file, 'r') as f: