Merge pull request #22 from remnawave:development

Add support for alias generation and update API models

Author: sm1ky

.gitignore

@@ -181,3 +181,4 @@ openapi/
 requirements.txt 
 requirements.in
 test_raw.py
+tests/test_one_time.py

README.md

@@ -63,7 +63,8 @@ pip install git+https://github.com/remnawave/python-sdk.git@development
 
 | Contract Version | Remnawave Panel Version |
 | ---------------- | ----------------------- |
-| 2.2.13           | >=2.2.0                 |
+| 2.2.6            | >=2.2.6                 |
+| 2.2.3            | >=2.2.13                |
 | 2.1.19           | >=2.1.19, <2.2.0        |
 | 2.1.18           | >=2.1.18                |
 | 2.1.17           | >=2.1.16, <=2.1.17      |

poetry.lock

@@ -1,7 +1,7 @@
 [project]
 name = "remnawave"
-version = "2.2.3.post2"
-description = "A Python SDK for interacting with the Remnawave API v2.2.3."
+version = "2.2.6"
+description = "A Python SDK for interacting with the Remnawave API v2.2.6."
 authors = [
     {name = "Artem",email = "[email protected]"}
 ]

pyproject.toml

@@ -137,6 +137,10 @@ def _prepare_headers(self) -> dict:
         if self.custom_headers:
             headers.update(self.custom_headers)
 
+        if "http://" in self.base_url:
+            headers["x-forwarded-proto"] = "https"
+            headers["x-forwarded-for"] = "127.0.0.1"
+
         return headers
 
     def _prepare_url(self) -> str:

remnawave/__init__.py

@@ -18,6 +18,8 @@
     UpdateNodeRequestDto,
     UpdateNodeResponseDto,
     RestartAllNodesRequestBodyDto, 
+    ResetNodeTrafficRequestDto,
+    ResetNodeTrafficResponseDto
 )
 from remnawave.rapid import BaseController, delete, get, patch, post
 
@@ -100,4 +102,12 @@ async def reorder_nodes(
         body: Annotated[ReorderNodeRequestDto, PydanticBody()],
     ) -> ReorderNodeResponseDto:
         """Reorder Nodes"""
+        ...
+        
+    @post("/nodes/actions/reset-traffic", response_class=ResetNodeTrafficResponseDto)
+    async def reset_traffic_all_nodes(
+        self,
+        body: Annotated[ResetNodeTrafficRequestDto, PydanticBody()],
+    ) -> ResetNodeTrafficResponseDto:
+        """Reset Traffic All Nodes"""
         ...

remnawave/controllers/nodes.py

@@ -78,3 +78,156 @@ class ErrorCode(StrEnum):
     SUBSCRIPTION_SETTINGS_NOT_FOUND = "A071"
     GET_SUBSCRIPTION_SETTINGS_ERROR = "A072"
     UPDATE_SUBSCRIPTION_SETTINGS_ERROR = "A073"
+    CREATE_INBOUND_ERROR = "A074"
+    DELETE_INBOUND_ERROR = "A075"
+    GET_INBOUND_ERROR = "A076"
+    INBOUND_NOT_FOUND = "A077"
+    INBOUND_TAG_ALREADY_EXISTS = "A078"
+    CREATE_HOST_BULK_ACTION_ERROR = "A079"
+    DELETE_HOST_BULK_ACTION_ERROR = "A080"
+    UPDATE_HOST_BULK_ACTION_ERROR = "A081"
+    BULK_ACTION_NOT_FOUND = "A082"
+    GET_USERS_STATS_ERROR = "A083"
+    RESET_USERS_TRAFFIC_BULK_ERROR = "A084"
+    UPDATE_USERS_BULK_ERROR = "A085"
+    DELETE_USERS_BULK_ERROR = "A086"
+    GET_USERS_BULK_ERROR = "A087"
+    CREATE_TEMPLATE_ERROR = "A088"
+    TEMPLATE_NOT_FOUND = "A089"
+    UPDATE_TEMPLATE_ERROR = "A090"
+    DELETE_TEMPLATE_ERROR = "A091"
+    TEMPLATE_NAME_ALREADY_EXISTS = "A092"
+    GET_TEMPLATE_ERROR = "A093"
+    GET_ALL_TEMPLATES_ERROR = "A094"
+    GENERATE_CONFIG_ERROR = "A095"
+    INVALID_TEMPLATE_TYPE = "A096"
+    CREATE_EXTERNAL_SQUAD_ERROR = "A097"
+    EXTERNAL_SQUAD_NOT_FOUND = "A098"
+    UPDATE_EXTERNAL_SQUAD_ERROR = "A099"
+    DELETE_EXTERNAL_SQUAD_ERROR = "A100"
+    EXTERNAL_SQUAD_NAME_ALREADY_EXISTS = "A101"
+    ADD_USERS_TO_EXTERNAL_SQUAD_ERROR = "A102"
+    REMOVE_USERS_FROM_EXTERNAL_SQUAD_ERROR = "A103"
+    GET_EXTERNAL_SQUAD_ERROR = "A104"
+    GET_ALL_EXTERNAL_SQUADS_ERROR = "A105"
+    CREATE_INTERNAL_SQUAD_ERROR = "A106"
+    INTERNAL_SQUAD_NOT_FOUND = "A107"
+    UPDATE_INTERNAL_SQUAD_ERROR = "A108"
+    DELETE_INTERNAL_SQUAD_ERROR = "A109"
+    INTERNAL_SQUAD_NAME_ALREADY_EXISTS = "A110"
+    GET_INTERNAL_SQUAD_ERROR = "A111"
+    GET_ALL_INTERNAL_SQUADS_ERROR = "A112"
+    CREATE_WEBHOOK_ERROR = "A113"
+    WEBHOOK_NOT_FOUND = "A114"
+    UPDATE_WEBHOOK_ERROR = "A115"
+    DELETE_WEBHOOK_ERROR = "A116"
+    WEBHOOK_URL_ALREADY_EXISTS = "A117"
+    GET_WEBHOOK_ERROR = "A118"
+    GET_ALL_WEBHOOKS_ERROR = "A119"
+    WEBHOOK_DELIVERY_ERROR = "A120"
+    CREATE_PASSKEY_ERROR = "A121"
+    PASSKEY_NOT_FOUND = "A122"
+    DELETE_PASSKEY_ERROR = "A123"
+    GET_PASSKEY_ERROR = "A124"
+    GET_ALL_PASSKEYS_ERROR = "A125"
+    PASSKEY_ALREADY_EXISTS = "A126"
+    CREATE_SNIPPET_ERROR = "A127"
+    SNIPPET_NOT_FOUND = "A128"
+    UPDATE_SNIPPET_ERROR = "A129"
+    DELETE_SNIPPET_ERROR = "A130"
+    SNIPPET_NAME_ALREADY_EXISTS = "A131"
+    GET_SNIPPET_ERROR = "A132"
+    GET_ALL_SNIPPETS_ERROR = "A133"
+    HWID_RESET_ERROR = "A134"
+    HWID_NOT_FOUND = "A135"
+    GET_HWID_ERROR = "A136"
+    GET_ALL_HWIDS_ERROR = "A137"
+    DELETE_HWID_ERROR = "A138"
+    BANDWIDTH_STATS_ERROR = "A139"
+    GET_NODES_USAGE_STATS_ERROR = "A140"
+    SUBSCRIPTION_REQUEST_ERROR = "A141"
+    SUBSCRIPTION_REQUEST_NOT_FOUND = "A142"
+    GET_SUBSCRIPTION_REQUEST_ERROR = "A143"
+    GET_ALL_SUBSCRIPTION_REQUESTS_ERROR = "A144"
+    APPROVE_SUBSCRIPTION_REQUEST_ERROR = "A145"
+    REJECT_SUBSCRIPTION_REQUEST_ERROR = "A146"
+    CREATE_SUBSCRIPTION_REQUEST_HISTORY_ERROR = "A147"
+    GET_SUBSCRIPTION_REQUEST_HISTORY_ERROR = "A148"
+    KEYGEN_ERROR = "A149"
+    GENERATE_KEYS_ERROR = "A150"
+    INVALID_KEY_TYPE = "A151"
+    SYSTEM_STATS_ERROR = "A152"
+    SYSTEM_HEALTH_ERROR = "A153"
+    NODES_METRICS_ERROR = "A154"
+    X25519_KEYGEN_ERROR = "A155"
+    HAPP_CRYPTO_ERROR = "A156"
+    SRR_MATCHER_ERROR = "A157"
+    GET_REMNAWAVE_SETTINGS_ERROR = "A158"
+    UPDATE_REMNAWAVE_SETTINGS_ERROR = "A159"
+    OAUTH_ERROR = "A160"
+    PASSKEY_SETTINGS_ERROR = "A161"
+    TELEGRAM_AUTH_ERROR = "A162"
+    BRANDING_SETTINGS_ERROR = "A163"
+    CONFIG_PROFILE_ERROR = "A164"
+    CONFIG_PROFILE_NOT_FOUND = "A165"
+    CREATE_CONFIG_PROFILE_ERROR = "A166"
+    UPDATE_CONFIG_PROFILE_ERROR = "A167"
+    DELETE_CONFIG_PROFILE_ERROR = "A168"
+    GET_CONFIG_PROFILE_ERROR = "A169"
+    GET_ALL_CONFIG_PROFILES_ERROR = "A170"
+    XRAY_CONFIG_ERROR = "A171"
+    XRAY_CONFIG_VALIDATION_ERROR = "A172"
+    INFRA_BILLING_ERROR = "A173"
+    INFRA_BILLING_NOT_FOUND = "A174"
+    GET_INFRA_BILLING_ERROR = "A175"
+    UPDATE_INFRA_BILLING_ERROR = "A176"
+    CALCULATE_BILLING_ERROR = "A177"
+    BILLING_PERIOD_ERROR = "A178"
+    
+    # Добавляем новые коды из failed тестов
+    CREATE_SUBSCRIPTION_TEMPLATE_ERROR = "A179"
+    SUBSCRIPTION_TEMPLATE_NOT_FOUND = "A180"
+    UPDATE_SUBSCRIPTION_TEMPLATE_ERROR = "A181"
+    DELETE_SUBSCRIPTION_TEMPLATE_ERROR = "A182"
+    GET_SUBSCRIPTION_TEMPLATE_ERROR = "A183"
+    
+    # Валидационные ошибки
+    VALIDATION_ERROR = "V001"
+    INVALID_UUID_FORMAT = "V002"
+    INVALID_EMAIL_FORMAT = "V003"
+    INVALID_DATE_FORMAT = "V004"
+    REQUIRED_FIELD_MISSING = "V005"
+    FIELD_TOO_LONG = "V006"
+    FIELD_TOO_SHORT = "V007"
+    INVALID_ENUM_VALUE = "V008"
+    INVALID_REGEX_PATTERN = "V009"
+    NUMERIC_VALIDATION_ERROR = "V010"
+    
+    # Сетевые ошибки
+    NETWORK_ERROR = "N003"
+    TIMEOUT_ERROR = "N004"
+    CONNECTION_ERROR = "N005"
+    DNS_ERROR = "N006"
+    SSL_ERROR = "N007"
+    
+    # Ошибки аутентификации и авторизации
+    INVALID_TOKEN = "AUTH001"
+    TOKEN_EXPIRED = "AUTH002"
+    INVALID_CREDENTIALS = "AUTH003"
+    TWO_FACTOR_REQUIRED = "AUTH004"
+    ACCOUNT_LOCKED = "AUTH005"
+    PASSWORD_COMPLEXITY_ERROR = "AUTH006"
+    
+    # Ошибки бизнес-логики
+    TRAFFIC_LIMIT_EXCEEDED = "BL001"
+    USER_LIMIT_EXCEEDED = "BL002"
+    SUBSCRIPTION_EXPIRED = "BL003"
+    FEATURE_NOT_AVAILABLE = "BL004"
+    QUOTA_EXCEEDED = "BL005"
+    RESOURCE_LOCKED = "BL006"
+    
+    # Общие коды
+    UNKNOWN = "UNKNOWN"
+    NOT_IMPLEMENTED = "NOT_IMPLEMENTED"
+    MAINTENANCE_MODE = "MAINTENANCE"
+    RATE_LIMIT_EXCEEDED = "RATE_LIMIT"

remnawave/enums/error_code.py

@@ -1,23 +1,39 @@
-from .handler import handle_api_error
 from .general import (
-    ConflictError,
+    ApiError,
     ApiErrorResponse,
+    AuthenticationError,
     BadRequestError,
-    NotFoundError,
+    BusinessLogicError,
+    ConflictError,
+    FeatureNotAvailableError,
     ForbiddenError,
-    UnauthorizedError,
+    MaintenanceError,
+    NetworkError,
+    NotFoundError,
+    QuotaExceededError,
+    RateLimitError,
     ServerError,
-    ApiError,
+    UnauthorizedError,
+    ValidationError,
 )
+from .handler import handle_api_error
 
 __all__ = [
-    "handle_api_error",
     "ApiError",
     "ApiErrorResponse",
-    "NotFoundError",
+    "AuthenticationError",
     "BadRequestError",
-    "ForbiddenError",
-    "UnauthorizedError",
+    "BusinessLogicError",
     "ConflictError",
+    "FeatureNotAvailableError",
+    "ForbiddenError",
+    "MaintenanceError",
+    "NetworkError",
+    "NotFoundError",
+    "QuotaExceededError",
+    "RateLimitError",
     "ServerError",
-]
+    "UnauthorizedError",
+    "ValidationError",
+    "handle_api_error",
+]

remnawave/exceptions/__init__.py

@@ -1,14 +1,13 @@
 from datetime import datetime
+from typing import Any, List, Optional
 
 from pydantic import AliasChoices, BaseModel, Field
 
 from remnawave.enums import ErrorCode
 
 
-from typing import Any, List, Optional
-
-
 class ApiErrorResponse(BaseModel):
+    """Standard API error response model"""
     timestamp: Optional[datetime] = Field(None, description="Время возникновения ошибки")
     path: Optional[str] = Field(None, description="Путь запроса")
     message: str = Field(..., description="Сообщение об ошибке")
@@ -23,45 +22,102 @@ class ApiErrorResponse(BaseModel):
 
 
 class ApiError(Exception):
+    """Base API error exception"""
+    
     def __init__(self, status_code: int, error: ApiErrorResponse):
         self.status_code = status_code
         self.error = error
         super().__init__(
             f"API Error {error.code}: {error.message} (HTTP {status_code})"
         )
 
+    @property
+    def code(self) -> Optional[str]:
+        """Get error code"""
+        return self.error.code
+
+    @property
+    def message(self) -> str:
+        """Get error message"""
+        return self.error.message
+
+    @property
+    def timestamp(self) -> Optional[datetime]:
+        """Get error timestamp"""
+        return self.error.timestamp
+
+    @property
+    def path(self) -> Optional[str]:
+        """Get request path"""
+        return self.error.path
+
 
 class BadRequestError(ApiError):
     """Ошибки клиента (400)"""
-
     pass
 
 
 class UnauthorizedError(ApiError):
     """Ошибка авторизации (401)"""
-
     pass
 
 
 class ForbiddenError(ApiError):
     """Доступ запрещен (403)"""
-
     pass
 
 
 class NotFoundError(ApiError):
     """Ресурс не найден (404)"""
-
     pass
 
 
 class ConflictError(ApiError):
     """Конфликт (409)"""
+    pass
 
+
+class ValidationError(ApiError):
+    """Ошибка валидации данных (422)"""
     pass
 
 
 class ServerError(ApiError):
-    """Серверная ошибка (500)"""
+    """Серверная ошибка (500+)"""
+    pass
 
+
+# Новые специализированные исключения
+class NetworkError(ApiError):
+    """Сетевые ошибки"""
     pass
+
+
+class AuthenticationError(ApiError):
+    """Ошибки аутентификации"""
+    pass
+
+
+class BusinessLogicError(ApiError):
+    """Ошибки бизнес-логики"""
+    pass
+
+
+class RateLimitError(BadRequestError):
+    """Превышен лимит запросов"""
+    pass
+
+
+class MaintenanceError(ServerError):
+    """Режим обслуживания"""
+    pass
+
+
+class QuotaExceededError(BusinessLogicError):
+    """Превышена квота"""
+    pass
+
+
+class FeatureNotAvailableError(BusinessLogicError):
+    """Функция недоступна"""
+    pass