The #6
Open
The #6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change adds internationalization (i18n) support to the Telegram bot, enabling it to work in Russian and Tajik, in addition to the default English. The following changes were made: - A new `localization.py` module was created to manage all translations. - The database schema in `InDMDevDB.py` was updated to include a `language` column in the `ShopUserTable` to store user language preferences. - A language selection flow was added to `store_main.py` for new users. - Hardcoded user-facing strings in `store_main.py`, `utils.py`, `purchase.py`, and `InDMCategories.py` were refactored to use the new localization system. - The keyboard creation logic was updated to be dynamic and multilingual. - All user-facing strings were translated into Russian and Tajik.
Update config.env
This change prepares the application for deployment on Render and completes the internationalization work. The following changes were made: - A `render.yaml` file was added to define the services for Render. - The database code in `InDMDevDB.py` was refactored to use PostgreSQL instead of SQLite. - The `requirements.txt` file was updated with `gunicorn` and `psycopg2-binary`. - The internationalization work was completed, with all user-facing strings refactored to use the localization module. - Several bugs related to keyboard creation and error handling were fixed.
Update config.env
This change adds internationalization (i18n) support to the Telegram bot, enabling it to work in Russian and Tajik, in addition to the default English. It also prepares the application for deployment on Render. The following changes were made: - A new `localization.py` module was created to manage all translations. - The database schema in `InDMDevDB.py` was updated to include a `language` column in the `ShopUserTable` to store user language preferences. - A language selection flow was added to `store_main.py` for new users. - Hardcoded user-facing strings in `store_main.py`, `utils.py`, `purchase.py`, and `InDMCategories.py` were refactored to use the new localization system. - The keyboard creation logic was updated to be dynamic and multilingual. - All user-facing strings were translated into Russian and Tajik. - A `render.yaml` file was added to define the services for Render. - The database code in `InDMDevDB.py` was refactored to use PostgreSQL instead of SQLite. - The `requirements.txt` file was updated with `gunicorn` and `psycopg2-binary`. - The database connection logic was refactored to be more robust and to work correctly on Render. - Several bugs related to keyboard creation and error handling were fixed.
feat: Add i18n and prepare for Render deployment This change adds internationalization (i18n) support to the Telegram bot, enabling it to work in Russian and Tajik, in addition to the default English. It also prepares the application for deployment on Render. The following changes were made: - A new `localization.py` module was created to manage all translations. - The database schema in `InDMDevDB.py` was updated to include a `language` column in the `ShopUserTable` to store user language preferences. - A language selection flow was added to `store_main.py` for new users. -
This change fixes a circular import issue between `store_main.py` and other modules by moving the `create_main_keyboard` function to `utils.py`. This also finalizes the preparations for deploying the bot on Render.
fix: Resolve circular import and finalize for Render This change fixes a circular import issue between `store_main.py` and other modules by moving the `create_main_keyboard` function to `utils.py`. This also finalizes the preparations for deploying the bot on Render.
This commit introduces two major changes:
1. **Internationalization (i18n):**
* Added a `localization.py` module to manage translations for English, Russian, and Tajik.
* Updated the database schema to include a `language` column for users.
* Refactored the codebase to use the new localization system instead of hardcoded strings.
* Implemented a language selection menu for new users.
2. **Render Deployment:**
* Created a `render.yaml` file to configure the deployment on Render.
* Switched the database from SQLite to PostgreSQL for production use.
* Added `gunicorn` and `psycopg2-binary` to the dependencies.
* Refactored the database connection logic to be more robust and handle environment variables correctly.
* Resolved a circular import error between `store_main.py` and `purchase.py`.
feat: Internationalize bot and configure for Render deployment
This commit introduces two major changes:
1. **Internationalization (i18n):**
* Added a `localization.py` module to manage translations for English, Russian, and Tajik.
* Updated the database schema to include a `language` column for users.
* Refactored the codebase to use the new localization system instead of hardcoded strings.
* Implemented a language selection menu for new users.
2. **Render Deployment:**
* Created a `render.yaml` file to configure the deployment on Render.
* Switched the database from SQLite to PostgreSQL for production use.
* Added `gunicorn` and `psycopg2-binary` to the dependencies.
* Refactored the database connection logic to be more robust and handle environment variables correctly.
* Resolved a circular import error between `store_main.py` and `purchase.py`.
This commit introduces two major changes:
1. **Internationalization (i18n):**
* Added a `localization.py` module to manage translations for English, Russian, and Tajik.
* Updated the database schema to include a `language` column for users.
* Refactored the codebase to use the new localization system instead of hardcoded strings.
* Implemented a language selection menu for new users.
2. **Render Deployment:**
* Created a `render.yaml` file to configure the deployment on Render.
* Switched the database from SQLite to PostgreSQL for production use.
* Added `gunicorn` and `psycopg2-binary` to the dependencies.
* Refactored the database connection logic to be more robust and handle environment variables correctly.
* Resolved a circular import error between `store_main.py` and `purchase.py`.
* Centralized the `telebot` instance to avoid token errors.
feat: Internationalize bot and configure for Render deployment
This commit introduces two major changes:
1. **Internationalization (i18n):**
* Added a `localization.py` module to manage translations for English, Russian, and Tajik.
* Updated the database schema to include a `language` column for users.
* Refactored the codebase to use the new localization system instead of hardcoded strings.
* Implemented a language selection menu for new users.
2. **Render Deployment:**
* Created a `render.yaml` file to configure the deployment on Render.
* Switched the database from SQLite to PostgreSQL for production use.
* Added `gunicorn` and `psycopg2-binary` to the dependencies.
* Refactored the database connection logic to be more robust and handle environment variables correctly.
* Resolved a circular import error between `store_main.py` and `purchase.py`.
* Centralized the `telebot` instance to avoid token errors.
This commit fixes several issues that were preventing the bot from running correctly on Render:
1. **Webhook URL:**
* Added a `WEBHOOK_URL` environment variable to `render.yaml`, which is set from the service URL.
* Updated `store_main.py` to use the `WEBHOOK_URL` environment variable.
2. **Circular Imports and Token Errors:**
* Created a `bot_instance.py` file to centralize the `telebot` instance and the `store_currency` variable.
* Updated `store_main.py`, `purchase.py`, and `InDMCategories.py` to import the `bot` instance from `bot_instance.py`, resolving circular import issues and token validation errors.
* Moved the `load_dotenv` call to `bot_instance.py` to ensure environment variables are loaded before they are used.
fix: Resolve webhook and circular import issues for Render deployment
This commit fixes several issues that were preventing the bot from running correctly on Render:
1. **Webhook URL:**
* Added a `WEBHOOK_URL` environment variable to `render.yaml`, which is set from the service URL.
* Updated `store_main.py` to use the `WEBHOOK_URL` environment variable.
2. **Circular Imports and Token Errors:**
* Created a `bot_instance.py` file to centralize the `telebot` instance and the `store_currency` variable.
* Updated `store_main.py`, `purchase.py`, and `InDMCategories.py` to import the `bot` instance from `bot_instance.py`, resolving circular import issues and token validation errors.
* Moved the `load_dotenv` call to `bot_instance.py` to ensure environment variables are loaded before they are used.
This commit fixes the webhook setting issue on Render by using a gunicorn `post_fork` hook. This approach ensures that the webhook is set only after the worker process has started and the service URL is available as an environment variable. Changes: - Created a `gunicorn_config.py` file with a `post_fork` hook to set the webhook. - Updated `render.yaml` to use the new `gunicorn_config.py` file. - Removed the webhook setting logic from `store_main.py`.
fix: Use gunicorn hook to set webhook for Render deployment This commit fixes the webhook setting issue on Render by using a gunicorn `post_fork` hook. This approach ensures that the webhook is set only after the worker process has started and the service URL is available as an environment variable. Changes: - Created a `gunicorn_config.py` file with a `post_fork` hook to set the webhook. - Updated `render.yaml` to use the new `gunicorn_config.py` file. - Removed the webhook setting logic from `store_main.py`.
This commit fixes the `relation "..." does not exist` error by adding table creation logic to `InDMDevDB.py`. A new `DBManager` class with an `initialize_database` method has been added. This method creates all the necessary tables if they don't exist, using lowercase table and column names to avoid case sensitivity issues with PostgreSQL. The `initialize_database` method is called when the `InDMDevDB.py` module is imported.
fix: Add database table creation logic This commit fixes the `relation "..." does not exist` error by adding table creation logic to `InDMDevDB.py`. A new `DBManager` class with an `initialize_database` method has been added. This method creates all the necessary tables if they don't exist, using lowercase table and column names to avoid case sensitivity issues with PostgreSQL. The `initialize_database` method is called when the `InDMDevDB.py` module is imported.
This commit improves the webhook handling logic in `store_main.py` to gracefully handle GET requests. Previously, GET requests to the webhook endpoint would cause an error to be logged and a 500 response to be returned. This was because the code was only expecting POST requests from Telegram. The `webhook` function has been updated to: - Check for GET requests and return a simple "Bot is running!" message with a 200 status code. This is useful for health checks. - Handle POST requests with a JSON body from Telegram. - Return appropriate error codes and messages for invalid requests.
fix: Gracefully handle GET requests to webhook endpoint This commit improves the webhook handling logic in `store_main.py` to gracefully handle GET requests. Previously, GET requests to the webhook endpoint would cause an error to be logged and a 500 response to be returned. This was because the code was only expecting POST requests from Telegram. The `webhook` function has been updated to: - Check for GET requests and return a simple "Bot is running!" message with a 200 status code. This is useful for health checks. - Handle POST requests with a JSON body from Telegram. - Return appropriate error codes and messages for invalid requests.
This commit fixes the `Invalid service property: url` error in `render.yaml`. The `fromService` block with `property: url` is not a valid way to get the public URL of a service. This commit replaces it with a hardcoded `value` for the `WEBHOOK_URL` environment variable.
fix: Correctly set WEBHOOK_URL in render.yaml This commit fixes the `Invalid service property: url` error in `render.yaml`. The `fromService` block with `property: url` is not a valid way to get the public URL of a service. This commit replaces it with a hardcoded `value` for the `WEBHOOK_URL` environment variable.
This commit renames the `get_user_language` method to `fetch_user_language` in `InDMDevDB.py` and updates the corresponding call in `localization.py`. This change is an attempt to resolve the `AttributeError: type object 'GetDataFromDB' has no attribute 'get_user_language'` error that was occurring on Render, which may be caused by a caching issue.
fix: Rename get_user_language to fetch_user_language This commit renames the `get_user_language` method to `fetch_user_language` in `InDMDevDB.py` and updates the corresponding call in `localization.py`. This change is an attempt to resolve the `AttributeError: type object 'GetDataFromDB' has no attribute 'get_user_language'` error that was occurring on Render, which may be caused by a caching issue.
This commit fixes the persistent `AttributeError: type object 'GetDataFromDB' has no attribute 'get_user_language'` by moving the database logic for fetching a user's language directly into the `localization.py` module. This approach eliminates the problematic dependency between `localization.py` and `InDMDevDB.py` that was likely causing issues with module loading or caching on the Render platform. Changes: - The `get_user_language` function in `localization.py` now contains the necessary database connection and query logic. - The corresponding method (`fetch_user_language`) has been removed from `InDMDevDB.py` to avoid confusion and code duplication.
fix: Resolve AttributeError by moving get_user_language logic This commit fixes the persistent `AttributeError: type object 'GetDataFromDB' has no attribute 'get_user_language'` by moving the database logic for fetching a user's language directly into the `localization.py` module. This approach eliminates the problematic dependency between `localization.py` and `InDMDevDB.py` that was likely causing issues with module loading or caching on the Render platform. Changes: - The `get_user_language` function in `localization.py` now contains the necessary database connection and query logic. - The corresponding method (`fetch_user_language`) has been removed from `InDMDevDB.py` to avoid confusion and code duplication.
This commit fixes the `NameError: name 'GetDataFromDB' is not defined` by changing the import statement in `store_main.py` from a wildcard import (`from InDMDevDB import *`) to an explicit import (`from InDMDevDB import GetDataFromDB, CreateDatas`). This change ensures that the required classes are correctly imported and available in the `store_main` module's scope, which should resolve the issue on the Render platform.
fix: Use explicit imports to resolve NameError This commit fixes the `NameError: name 'GetDataFromDB' is not defined` by changing the import statement in `store_main.py` from a wildcard import (`from InDMDevDB import *`) to an explicit import (`from InDMDevDB import GetDataFromDB, CreateDatas`). This change ensures that the required classes are correctly imported and available in the `store_main` module's scope, which should resolve the issue on the Render platform.
This commit renames the method for fetching a user's language to `get_language_for_user` in `InDMDevDB.py` and updates the corresponding call in `localization.py`. This is another attempt to resolve the persistent `AttributeError` on Render, which is suspected to be a caching or module loading issue.
This commit adds a print statement to `store_main.py` to debug the `NameError: name 'GetDataFromDB' is not defined`. This will help to determine if the `GetDataFromDB` class is being correctly imported on the Render platform.
To resolve persistent import errors and deployment failures on the Render platform, all Python modules have been consolidated into a single `store_main.py` file. This drastic measure was taken as a last resort after numerous attempts to fix module resolution issues failed in the Render environment. The monolithic structure eliminates all inter-file imports, thus bypassing the problematic import behavior. The following files have been merged into `store_main.py`: - `InDMDevDB.py` - `purchase.py` - `localization.py` - `utils.py` (to the extent it was used) - `bot_instance.py` - `gunicorn_config.py` The `render.yaml` has also been updated to reflect the new `gunicorn` start command. This change aims to create a stable and deployable application on Render.
fix: Rename get_user_language to get_language_for_user This commit renames the method for fetching a user's language to `get_language_for_user` in `InDMDevDB.py` and updates the corresponding call in `localization.py`. This is another attempt to resolve the persistent `AttributeError` on Render, which is suspected to be a caching or module loading issue.
This commit represents a major refactoring of the entire application into a single `store_main.py` file. This drastic measure was taken to resolve persistent and complex import errors that were preventing successful deployment on the Render platform. The following changes are included: - All Python logic from `InDMDevDB.py`, `purchase.py`, `InDMCategories.py`, and `utils.py` has been merged into `store_main.py`. The original files have been deleted. - The database backend has been migrated from SQLite to PostgreSQL to support a production environment on Render. All database queries have been updated to use the `psycopg2` driver. - A `render.yaml` file has been added to define the web service and PostgreSQL database for deployment on Render. - The application now dynamically sets the Telegram webhook using the `RENDER_EXTERNAL_URL` environment variable provided by the platform, removing the need for hardcoded URLs. - Hardcoded secrets (`TELEGRAM_BOT_TOKEN`, `DATABASE_URL`) have been removed from the `config.env` file to improve security. The file now serves as a template. - The internationalization (i18n) feature has been temporarily removed to resolve a critical bug caused by the loss of translation files. The bot is currently English-only. This was agreed upon with the user as a temporary measure to get a stable version running. - A `global` variable (`order_info`) that posed a stability risk has been removed.
feat: Refactor application into a single file for Render deployment This commit represents a major refactoring of the entire application into a single `store_main.py` file. This drastic measure was taken to resolve persistent and complex import errors that were preventing successful deployment on the Render platform. The following changes are included: - All Python logic from `InDMDevDB.py`, `purchase.py`, `InDMCategories.py`, and `utils.py` has been merged into `store_main.py`. The original files have been deleted. - The database backend has been migrated from SQLite to PostgreSQL to support a production environment on Render. All database queries have been updated to use the `psycopg2` driver. - A `render.yaml` file has been added to define the web service and
shubhamos-ai
approved these changes
Aug 29, 2025
shubhamos-ai
left a comment
shubhamos-ai
left a comment
There was a problem hiding this comment.
🎯 Perfect implementation! The separation of concerns is clear, the code is DRY, and the error messages are helpful. This follows industry best practices beautifully.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.