Merge branch 'main' of https://github.com/dmitryesin/diffy-bot into feature/get-applications-endpoints

Author: dmitryesin

README.md

@@ -1,21 +1,39 @@
-<h1 align="center"> Diffy Bot </h1>
+<h1 align="center"> Diffy Bot: Differential Equation Solver </h1>
 
 <img src="docs/images/preview.png" class="center">
 
-This bot is designed to solve differential equations of various orders using numerical methods such as Euler's Method, Improved Euler's Method, Runge-Kutta Method, and Dormand-Prince Method. It provides a Telegram interface for users to input equations and receive solutions.
+<p align="center"> <em> A powerful Telegram bot designed for solving differential equations using advanced numerical methods. </em> </p>
 
 ## Features
 
-- Supports solving 1st and higher-order differential equations.
-- Multiple numerical methods available:
-  - Euler's Method
-  - Improved Euler's Method
-  - Runge-Kutta Method
-  - Dormand-Prince Method
-- Generates plots of solutions for better visualization.
-- Solution history tracking.
-- Multilingual support.
-- Configurable settings for numerical methods, rounding precision, and language.
+- **Equation Solving**  
+  Capable of solving first-order and higher-order ordinary differential equations (ODEs).  
+  The bot accepts user-defined equations and initial conditions, automatically parsing and preparing them for numerical analysis.
+
+- **Numerical Methods**  
+  Implements a range of well-established numerical methods to approximate solutions with varying degrees of accuracy and computational efficiency:
+  - Euler's Method;
+  - Midpoint Method;
+  - Heun's Method;
+  - Runge-Kutta Method;
+  - Dormand-Prince Method.
+
+- **Visualization**  
+  Automatically generates clear and informative plots of the computed solutions.  
+  These visualizations help users interpret the behavior of differential systems over time.
+
+- **History Tracking**  
+  Maintains a record of previously solved equations and their corresponding results, enabling users to revisit and review past computations.
+
+- **Multilingual Support**  
+  Offers interaction in multiple languages, enhancing accessibility and usability for users from diverse linguistic backgrounds.
+
+- **Customizable Settings**  
+  Provides a flexible interface for tailoring computational and interaction parameters to user preferences:
+  - **Numerical Method** – Choose from a list of supported methods (e.g., Euler, Runge-Kutta, Dormand-Prince).  
+  - **Precision Control** – Set the number of decimal places to which numerical results are rounded.  
+  - **Language Selection** – Choose the interface language for all commands and responses.  
+  - **Hints Toggle** – Enable or disable contextual tips and usage hints to streamline the interface.
 
 ## License
 

docker-compose.yml

@@ -45,7 +45,7 @@ services:
       - solver-network
 
   solver-db:
-    image: postgres:17.5
+    image: postgres:17.5-alpine
     container_name: diffy-bot-db-container
     environment:
       POSTGRES_USER: ${DB_USERNAME}
@@ -55,7 +55,7 @@ services:
       - "5433:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
-      - ./database/schema.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./database/schema.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
       - solver-network
 

solver-bot/Dockerfile

@@ -2,8 +2,8 @@ FROM python:3.13.3-slim
 
 WORKDIR /solver-client
 
-COPY solver-bot /solver-client
-COPY .env .env
+COPY solver-bot .
+COPY .env .
 
 RUN pip install --no-cache-dir -r requirements.txt
 

solver-bot/src/main/python/shell.py

@@ -86,15 +86,18 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
         [
             InlineKeyboardButton(
                 LANG_TEXTS[current_language]["solve"],
-                callback_data="solve"),
+                callback_data="solve"
+            ),
             InlineKeyboardButton(
                 LANG_TEXTS[current_language]["settings"],
-                callback_data="settings")
+                callback_data="settings"
+            )
         ],
         [
             InlineKeyboardButton(
                 LANG_TEXTS[current_language]["solve_history"],
-                callback_data="solve_history")
+                callback_data="solve_history"
+            )
         ]
     ]
 
@@ -140,26 +143,41 @@ async def settings(update: Update, context: ContextTypes.DEFAULT_TYPE):
     current_hints = context.user_data.get('hints', DEFAULT_HINTS)
 
     keyboard = [
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["change_method"],
-            callback_data="settings_method")],
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["change_rounding"],
-            callback_data="settings_rounding")],
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["change_language"],
-            callback_data="settings_language")],
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["hints_switch"] + " " +
-            LANG_TEXTS[current_language]["hints_switch_on"],
-            callback_data="true")
-            if current_hints == "true" else InlineKeyboardButton(
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["change_method"],
+                callback_data="settings_method"
+            )
+        ],
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["change_rounding"],
+                callback_data="settings_rounding"
+            )
+        ],
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["change_language"],
+                callback_data="settings_language"
+            )
+        ],
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["hints_switch"] + " " +
+                LANG_TEXTS[current_language]["hints_switch_on"],
+                callback_data="true"
+            ) if current_hints == "true" else InlineKeyboardButton(
                 LANG_TEXTS[current_language]["hints_switch"] + " " +
                 LANG_TEXTS[current_language]["hints_switch_off"],
-                callback_data="false")],
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["back"],
-            callback_data="back")]
+                callback_data="false"
+            )
+        ],
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["back"],
+                callback_data="back"
+            )
+        ]
     ]
 
     new_text = LANG_TEXTS[current_language]["settings_menu"]
@@ -199,41 +217,23 @@ async def settings_method(update: Update, context: ContextTypes.DEFAULT_TYPE):
     current_language = context.user_data.get('language', DEFAULT_LANGUAGE)
     current_method = context.user_data.get('method', DEFAULT_METHOD)
 
-    keyboard = [
-        [InlineKeyboardButton(
-            f"→ {LANG_TEXTS[current_language]["numerical_methods"]["euler"]} ←",
-            callback_data="euler")
-            if current_method == "euler" else InlineKeyboardButton(
-                LANG_TEXTS[current_language]["numerical_methods"]["euler"],
-                callback_data="euler")],
-        [InlineKeyboardButton(
-            f"→ {LANG_TEXTS[current_language]["numerical_methods"]["midpoint"]} ←",
-            callback_data="midpoint")
-            if current_method == "midpoint" else InlineKeyboardButton(
-                LANG_TEXTS[current_language]["numerical_methods"]["midpoint"],
-                callback_data="midpoint")],
-        [InlineKeyboardButton(
-            f"→ {LANG_TEXTS[current_language]["numerical_methods"]["heun"]} ←",
-            callback_data="heun")
-            if current_method == "heun" else InlineKeyboardButton(
-                LANG_TEXTS[current_language]["numerical_methods"]["heun"],
-                callback_data="heun")],
-        [InlineKeyboardButton(
-            f"→ {LANG_TEXTS[current_language]["numerical_methods"]["runge_kutta"]} ←",
-            callback_data="runge_kutta")
-            if current_method == "runge_kutta" else InlineKeyboardButton(
-                LANG_TEXTS[current_language]["numerical_methods"]["runge_kutta"],
-                callback_data="runge_kutta")],
-        [InlineKeyboardButton(
-            f"→ {LANG_TEXTS[current_language]["numerical_methods"]["dormand_prince"]} ←",
-            callback_data="dormand_prince")
-            if current_method == "dormand_prince" else InlineKeyboardButton(
-                LANG_TEXTS[current_language]["numerical_methods"]["dormand_prince"],
-                callback_data="dormand_prince")],
-        [InlineKeyboardButton(
+    methods = ["euler", "midpoint", "heun", "runge_kutta", "dormand_prince"]
+
+    numerical_texts = LANG_TEXTS[current_language]["numerical_methods"]
+
+    keyboard = []
+
+    for method in methods:
+        method_name = numerical_texts[method]
+        text = f"→ {method_name} ←" if current_method == method else method_name
+        keyboard.append([InlineKeyboardButton(text, callback_data=method)])
+
+    keyboard.append([
+        InlineKeyboardButton(
             LANG_TEXTS[current_language]["back"],
-            callback_data="settings_back")]
-    ]
+            callback_data="settings_back"
+        )
+    ])
 
     new_text = LANG_TEXTS[current_language]["settings_menu"]
     new_reply_markup = InlineKeyboardMarkup(keyboard)
@@ -272,31 +272,26 @@ async def settings_rounding(update: Update, context: ContextTypes.DEFAULT_TYPE):
     current_language = context.user_data.get('language', DEFAULT_LANGUAGE)
     current_rounding = context.user_data.get('rounding', DEFAULT_ROUNDING)
 
-    keyboard = [
-        [
-            InlineKeyboardButton(
-                "→ 4 ←", callback_data="4") 
-                if current_rounding == "4" else InlineKeyboardButton(
-                    "4", callback_data="4"),
-            InlineKeyboardButton(
-                "→ 6 ←", callback_data="6") 
-                if current_rounding == "6" else InlineKeyboardButton(
-                    "6", callback_data="6"),
-            InlineKeyboardButton(
-                "→ 8 ←", callback_data="8") 
-                if current_rounding == "8" else InlineKeyboardButton(
-                    "8", callback_data="8"),
-        ],
-        [InlineKeyboardButton(
-            f"→ {LANG_TEXTS[current_language]["without_rounding"]} ←",
-            callback_data="16")
-            if current_rounding == "16" else InlineKeyboardButton(
-                LANG_TEXTS[current_language]["without_rounding"],
-                callback_data="16")],
-        [InlineKeyboardButton(
+    roundings = ["4", "6", "8"]
+
+    keyboard = []
+
+    row = []
+    for rounding in roundings:
+        text = f"→ {rounding} ←" if current_rounding == rounding else rounding
+        row.append(InlineKeyboardButton(text, callback_data=rounding))
+    keyboard.append(row)
+
+    no_rounding_text = LANG_TEXTS[current_language]["without_rounding"]
+    text = f"→ {no_rounding_text} ←" if current_rounding == "16" else no_rounding_text
+    keyboard.append([InlineKeyboardButton(text, callback_data="16")])
+
+    keyboard.append([
+        InlineKeyboardButton(
             LANG_TEXTS[current_language]["back"],
-            callback_data="settings_back")]
-    ]
+            callback_data="settings_back"
+        )
+    ])
 
     new_text = LANG_TEXTS[current_language]["settings_menu"]
     new_reply_markup = InlineKeyboardMarkup(keyboard)
@@ -334,24 +329,25 @@ async def settings_language(update: Update, context: ContextTypes.DEFAULT_TYPE):
 
     current_language = context.user_data.get('language', DEFAULT_LANGUAGE)
 
-    keyboard = [
-        [InlineKeyboardButton(
-            "→ English ←", callback_data="en") 
-            if current_language == "en" else InlineKeyboardButton(
-                "English", callback_data="en")],
-        [InlineKeyboardButton(
-            "→ Русский ←", callback_data="ru") 
-            if current_language == "ru" else InlineKeyboardButton(
-                "Русский", callback_data="ru")],
-        [InlineKeyboardButton(
-            "→ 中文 ←", callback_data="zh") 
-            if current_language == "zh" else InlineKeyboardButton(
-                "中文", callback_data="zh")],
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["back"],
-            callback_data="settings_back")]
+    languages = [
+        ("en", "English"),
+        ("ru", "Русский"),
+        ("zh", "中文")
     ]
 
+    keyboard = []
+
+    for language_callback, language in languages:
+        text = f"→ {language} ←" if current_language == language_callback else language
+        keyboard.append([InlineKeyboardButton(text, callback_data=language_callback)])
+
+    keyboard.append([
+        InlineKeyboardButton(
+            LANG_TEXTS[current_language]["back"],
+            callback_data="settings_back"
+        )
+    ])
+
     new_text = LANG_TEXTS[current_language]["settings_menu"]
     new_reply_markup = InlineKeyboardMarkup(keyboard)
 
@@ -498,12 +494,12 @@ async def solve_history_details(update: Update, context: ContextTypes.DEFAULT_TY
             f"{print_solution(solution, order, current_rounding)}"
         )
 
-        keyboard = [
-            [InlineKeyboardButton(
+        keyboard = [[
+            InlineKeyboardButton(
                 LANG_TEXTS[current_language]["back"],
                 callback_data="solve_history_back"
-            )]
-        ]
+            )
+        ]]
 
         media = InputMediaPhoto(
             media=plot_graph,
@@ -789,12 +785,18 @@ async def solution(update: Update, context: ContextTypes.DEFAULT_TYPE):
     current_language = context.user_data.get('language', DEFAULT_LANGUAGE)
 
     keyboard = [
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["solve_over"],
-            callback_data="solve")],
-        [InlineKeyboardButton(
-            LANG_TEXTS[current_language]["menu"],
-            callback_data="menu")]
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["solve_over"],
+                callback_data="solve"
+            )
+        ],
+        [
+            InlineKeyboardButton(
+                LANG_TEXTS[current_language]["menu"],
+                callback_data="menu"
+            )
+        ]
     ]
 
     new_reply_markup = InlineKeyboardMarkup(keyboard)
@@ -911,12 +913,18 @@ async def cancel(update: Update, context: ContextTypes.DEFAULT_TYPE):
         current_language = context.user_data.get('language', DEFAULT_LANGUAGE)
 
         keyboard = [
-            [InlineKeyboardButton(
-                LANG_TEXTS[current_language]["solve_over"],
-                callback_data="solve")],
-            [InlineKeyboardButton(
-                LANG_TEXTS[current_language]["menu"],
-                callback_data="menu")]
+            [
+                InlineKeyboardButton(
+                    LANG_TEXTS[current_language]["solve_over"],
+                    callback_data="solve"
+                )
+            ],
+            [
+                InlineKeyboardButton(
+                    LANG_TEXTS[current_language]["menu"],
+                    callback_data="menu"
+                )
+            ]
         ]
 
         new_reply_markup = InlineKeyboardMarkup(keyboard)