diff --git a/remnawave_api/__init__.py b/remnawave/__init__.py similarity index 99% rename from remnawave_api/__init__.py rename to remnawave/__init__.py index ea5c81b..4d4eb92 100644 --- a/remnawave_api/__init__.py +++ b/remnawave/__init__.py @@ -3,7 +3,7 @@ from typing import Optional import httpx -from remnawave_api.controllers import ( +from remnawave.controllers import ( APITokensManagementController, AuthController, BandWidthStatsController, diff --git a/remnawave_api/controllers/__init__.py b/remnawave/controllers/__init__.py similarity index 100% rename from remnawave_api/controllers/__init__.py rename to remnawave/controllers/__init__.py diff --git a/remnawave_api/controllers/api_tokens_management.py b/remnawave/controllers/api_tokens_management.py similarity index 91% rename from remnawave_api/controllers/api_tokens_management.py rename to remnawave/controllers/api_tokens_management.py index 49f514e..0dcf62e 100644 --- a/remnawave_api/controllers/api_tokens_management.py +++ b/remnawave/controllers/api_tokens_management.py @@ -4,13 +4,13 @@ from httpx import Response from rapid_api_client import Path from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( CreateApiTokenRequestDto, CreateApiTokenResponseDto, DeleteApiTokenResponseDto, FindAllApiTokensResponseDto, ) -from remnawave_api.rapid import BaseController, delete, get, post +from remnawave.rapid import BaseController, delete, get, post class APITokensManagementController(BaseController): diff --git a/remnawave_api/controllers/auth.py b/remnawave/controllers/auth.py similarity index 92% rename from remnawave_api/controllers/auth.py rename to remnawave/controllers/auth.py index 7a8b4ec..7d1e44f 100644 --- a/remnawave_api/controllers/auth.py +++ b/remnawave/controllers/auth.py @@ -2,7 +2,7 @@ from typing import Annotated from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( GetStatusResponseDto, LoginRequestDto, LoginResponseDto, @@ -11,7 +11,7 @@ from remnawave_api.models import ( TelegramCallbackRequestDto, TelegramCallbackResponseDto, ) -from remnawave_api.rapid import BaseController, get, post +from remnawave.rapid import BaseController, get, post class AuthController(BaseController): diff --git a/remnawave_api/controllers/bandwidthstats.py b/remnawave/controllers/bandwidthstats.py similarity index 82% rename from remnawave_api/controllers/bandwidthstats.py rename to remnawave/controllers/bandwidthstats.py index 91ad97b..ec6e56d 100644 --- a/remnawave_api/controllers/bandwidthstats.py +++ b/remnawave/controllers/bandwidthstats.py @@ -2,8 +2,8 @@ from typing import Annotated from rapid_api_client import Query -from remnawave_api.models import GetNodesUsageByRangeResponseDto, GetNodesRealtimeUsageResponseDto -from remnawave_api.rapid import BaseController, get +from remnawave.models import GetNodesUsageByRangeResponseDto, GetNodesRealtimeUsageResponseDto +from remnawave.rapid import BaseController, get class BandWidthStatsController(BaseController): diff --git a/remnawave_api/controllers/config_profiles.py b/remnawave/controllers/config_profiles.py similarity index 95% rename from remnawave_api/controllers/config_profiles.py rename to remnawave/controllers/config_profiles.py index 5d733c1..f798447 100644 --- a/remnawave_api/controllers/config_profiles.py +++ b/remnawave/controllers/config_profiles.py @@ -3,7 +3,7 @@ from typing import Annotated from rapid_api_client import Path, Query from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( CreateConfigProfileRequestDto, CreateConfigProfileResponseDto, DeleteConfigProfileResponseDto, @@ -14,7 +14,7 @@ from remnawave_api.models import ( UpdateConfigProfileRequestDto, UpdateConfigProfileResponseDto, ) -from remnawave_api.rapid import BaseController, delete, get, patch, post +from remnawave.rapid import BaseController, delete, get, patch, post class ConfigProfilesController(BaseController): diff --git a/remnawave_api/controllers/hosts.py b/remnawave/controllers/hosts.py similarity index 93% rename from remnawave_api/controllers/hosts.py rename to remnawave/controllers/hosts.py index a290967..16e0069 100644 --- a/remnawave_api/controllers/hosts.py +++ b/remnawave/controllers/hosts.py @@ -3,7 +3,7 @@ from typing import Annotated, List from rapid_api_client import Path from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( CreateHostRequestDto, CreateHostResponseDto, DeleteHostResponseDto, @@ -14,7 +14,7 @@ from remnawave_api.models import ( UpdateHostRequestDto, UpdateHostResponseDto, ) -from remnawave_api.rapid import AttributeBody, BaseController, delete, get, post, patch +from remnawave.rapid import AttributeBody, BaseController, delete, get, post, patch class HostsController(BaseController): diff --git a/remnawave_api/controllers/hosts_bulk_actions.py b/remnawave/controllers/hosts_bulk_actions.py similarity index 94% rename from remnawave_api/controllers/hosts_bulk_actions.py rename to remnawave/controllers/hosts_bulk_actions.py index 64ad179..4a9d62d 100644 --- a/remnawave_api/controllers/hosts_bulk_actions.py +++ b/remnawave/controllers/hosts_bulk_actions.py @@ -3,7 +3,7 @@ from uuid import UUID from rapid_api_client import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( BulkDeleteHostsResponseDto, BulkDisableHostsResponseDto, BulkEnableHostsResponseDto, @@ -11,7 +11,7 @@ from remnawave_api.models import ( SetInboundToManyHostsResponseDto, SetPortToManyHostsResponseDto, ) -from remnawave_api.rapid import AttributeBody, BaseController, post +from remnawave.rapid import AttributeBody, BaseController, post class HostsBulkActionsController(BaseController): diff --git a/remnawave_api/controllers/hwid.py b/remnawave/controllers/hwid.py similarity index 91% rename from remnawave_api/controllers/hwid.py rename to remnawave/controllers/hwid.py index 7fa5e6e..acde1c2 100644 --- a/remnawave_api/controllers/hwid.py +++ b/remnawave/controllers/hwid.py @@ -1,7 +1,7 @@ from typing import Annotated from uuid import UUID -from remnawave_api.models import ( +from remnawave.models import ( CreateUserHwidDeviceResponseDto, DeleteUserHwidDeviceResponseDto, GetUserHwidDevicesResponseDto, @@ -9,7 +9,7 @@ from remnawave_api.models import ( HWIDDeleteRequest ) from rapid_api_client import Path, PydanticBody -from remnawave_api.rapid import AttributeBody, BaseController, post, get +from remnawave.rapid import AttributeBody, BaseController, post, get class HWIDUserController(BaseController): diff --git a/remnawave_api/controllers/inbounds.py b/remnawave/controllers/inbounds.py similarity index 82% rename from remnawave_api/controllers/inbounds.py rename to remnawave/controllers/inbounds.py index fd54ae2..72fd30e 100644 --- a/remnawave_api/controllers/inbounds.py +++ b/remnawave/controllers/inbounds.py @@ -2,8 +2,8 @@ from typing import Annotated, Optional from uuid import UUID from rapid_api_client import Path -from remnawave_api.models import GetAllInboundsResponseDto, GetInboundsByProfileUuidResponseDto -from remnawave_api.rapid import BaseController, get +from remnawave.models import GetAllInboundsResponseDto, GetInboundsByProfileUuidResponseDto +from remnawave.rapid import BaseController, get class InboundsController(BaseController): diff --git a/remnawave_api/controllers/inbounds_bulk_actions.py b/remnawave/controllers/inbounds_bulk_actions.py similarity index 93% rename from remnawave_api/controllers/inbounds_bulk_actions.py rename to remnawave/controllers/inbounds_bulk_actions.py index 3d3e316..1075f85 100644 --- a/remnawave_api/controllers/inbounds_bulk_actions.py +++ b/remnawave/controllers/inbounds_bulk_actions.py @@ -1,13 +1,13 @@ from typing import Annotated from uuid import UUID -from remnawave_api.models import ( +from remnawave.models import ( AddInboundToNodesResponseDto, AddInboundToUsersResponseDto, RemoveInboundFromNodesResponseDto, RemoveInboundFromUsersResponseDto, ) -from remnawave_api.rapid import AttributeBody, BaseController, post +from remnawave.rapid import AttributeBody, BaseController, post class InboundsBulkActionsController(BaseController): diff --git a/remnawave_api/controllers/infra_billing.py b/remnawave/controllers/infra_billing.py similarity index 97% rename from remnawave_api/controllers/infra_billing.py rename to remnawave/controllers/infra_billing.py index 45469fd..cccc19f 100644 --- a/remnawave_api/controllers/infra_billing.py +++ b/remnawave/controllers/infra_billing.py @@ -3,7 +3,7 @@ from typing import Annotated from rapid_api_client import Path, Query from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( CreateInfraBillingNodeRequestDto, CreateInfraBillingNodeResponseDto, CreateInfraProviderRequestDto, @@ -21,7 +21,7 @@ from remnawave_api.models import ( UpdateInfraProviderRequestDto, UpdateInfraProviderResponseDto, ) -from remnawave_api.rapid import BaseController, delete, get, patch, post +from remnawave.rapid import BaseController, delete, get, patch, post class InfraBillingController(BaseController): diff --git a/remnawave_api/controllers/internal_squads.py b/remnawave/controllers/internal_squads.py similarity index 96% rename from remnawave_api/controllers/internal_squads.py rename to remnawave/controllers/internal_squads.py index 37cd395..67b8f77 100644 --- a/remnawave_api/controllers/internal_squads.py +++ b/remnawave/controllers/internal_squads.py @@ -3,7 +3,7 @@ from typing import Annotated from rapid_api_client import Path from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( AddUsersToInternalSquadRequestDto, AddUsersToInternalSquadResponseDto, CreateInternalSquadRequestDto, @@ -16,7 +16,7 @@ from remnawave_api.models import ( UpdateInternalSquadRequestDto, UpdateInternalSquadResponseDto, ) -from remnawave_api.rapid import BaseController, delete, get, patch, post +from remnawave.rapid import BaseController, delete, get, patch, post class InternalSquadsController(BaseController): diff --git a/remnawave_api/controllers/keygen.py b/remnawave/controllers/keygen.py similarity index 66% rename from remnawave_api/controllers/keygen.py rename to remnawave/controllers/keygen.py index 6bc1b44..18759f8 100644 --- a/remnawave_api/controllers/keygen.py +++ b/remnawave/controllers/keygen.py @@ -1,5 +1,5 @@ -from remnawave_api.models import GetPubKeyResponseDto -from remnawave_api.rapid import BaseController, get +from remnawave.models import GetPubKeyResponseDto +from remnawave.rapid import BaseController, get class KeygenController(BaseController): diff --git a/remnawave_api/controllers/nodes.py b/remnawave/controllers/nodes.py similarity index 96% rename from remnawave_api/controllers/nodes.py rename to remnawave/controllers/nodes.py index e4e0a07..7815d97 100644 --- a/remnawave_api/controllers/nodes.py +++ b/remnawave/controllers/nodes.py @@ -3,7 +3,7 @@ from typing import Annotated from rapid_api_client import Path from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( CreateNodeRequestDto, CreateNodeResponseDto, DeleteNodeResponseDto, @@ -18,7 +18,7 @@ from remnawave_api.models import ( UpdateNodeRequestDto, UpdateNodeResponseDto, ) -from remnawave_api.rapid import BaseController, delete, get, patch, post +from remnawave.rapid import BaseController, delete, get, patch, post class NodesController(BaseController): diff --git a/remnawave_api/controllers/nodes_usage_history.py b/remnawave/controllers/nodes_usage_history.py similarity index 92% rename from remnawave_api/controllers/nodes_usage_history.py rename to remnawave/controllers/nodes_usage_history.py index 91a2259..0749808 100644 --- a/remnawave_api/controllers/nodes_usage_history.py +++ b/remnawave/controllers/nodes_usage_history.py @@ -2,11 +2,11 @@ from typing import Annotated from rapid_api_client import Path, Query -from remnawave_api.models import ( +from remnawave.models import ( GetNodeUserUsageByRangeResponseDto, GetNodesUsageByRangeResponseDto, ) -from remnawave_api.rapid import BaseController, get +from remnawave.rapid import BaseController, get class NodesUsageHistoryController(BaseController): diff --git a/remnawave_api/controllers/subscription.py b/remnawave/controllers/subscription.py similarity index 91% rename from remnawave_api/controllers/subscription.py rename to remnawave/controllers/subscription.py index d3a823b..860cad8 100644 --- a/remnawave_api/controllers/subscription.py +++ b/remnawave/controllers/subscription.py @@ -2,9 +2,9 @@ from typing import Annotated from rapid_api_client import Path -from remnawave_api.enums import ClientType -from remnawave_api.models import GetSubscriptionInfoResponseDto -from remnawave_api.rapid import BaseController, get +from remnawave.enums import ClientType +from remnawave.models import GetSubscriptionInfoResponseDto +from remnawave.rapid import BaseController, get class SubscriptionController(BaseController): diff --git a/remnawave_api/controllers/subscriptions_settings.py b/remnawave/controllers/subscriptions_settings.py similarity index 89% rename from remnawave_api/controllers/subscriptions_settings.py rename to remnawave/controllers/subscriptions_settings.py index 0f60443..339a0a2 100644 --- a/remnawave_api/controllers/subscriptions_settings.py +++ b/remnawave/controllers/subscriptions_settings.py @@ -2,12 +2,12 @@ from typing import Annotated from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( GetSubscriptionSettingsResponseDto, UpdateSubscriptionSettingsRequestDto, UpdateSubscriptionSettingsResponseDto, ) -from remnawave_api.rapid import BaseController, get, patch +from remnawave.rapid import BaseController, get, patch class SubscriptionsSettingsController(BaseController): diff --git a/remnawave_api/controllers/subscriptions_template.py b/remnawave/controllers/subscriptions_template.py similarity index 78% rename from remnawave_api/controllers/subscriptions_template.py rename to remnawave/controllers/subscriptions_template.py index e2d3702..3280dd0 100644 --- a/remnawave_api/controllers/subscriptions_template.py +++ b/remnawave/controllers/subscriptions_template.py @@ -2,9 +2,9 @@ from typing import Annotated from rapid_api_client.annotations import Path, PydanticBody -from remnawave_api.enums import TemplateType -from remnawave_api.models import GetTemplateResponseDto, UpdateTemplateRequestDto, UpdateTemplateResponseDto -from remnawave_api.rapid import BaseController, get, put +from remnawave.enums import TemplateType +from remnawave.models import GetTemplateResponseDto, UpdateTemplateRequestDto, UpdateTemplateResponseDto +from remnawave.rapid import BaseController, get, put class SubscriptionsTemplateController(BaseController): diff --git a/remnawave_api/controllers/system.py b/remnawave/controllers/system.py similarity index 89% rename from remnawave_api/controllers/system.py rename to remnawave/controllers/system.py index 19f9c25..e87456d 100644 --- a/remnawave_api/controllers/system.py +++ b/remnawave/controllers/system.py @@ -1,9 +1,9 @@ -from remnawave_api.models import ( +from remnawave.models import ( GetBandwidthStatsResponseDto, GetNodesStatisticsResponseDto, GetStatsResponseDto, ) -from remnawave_api.rapid import BaseController, get +from remnawave.rapid import BaseController, get class SystemController(BaseController): diff --git a/remnawave_api/controllers/users.py b/remnawave/controllers/users.py similarity index 98% rename from remnawave_api/controllers/users.py rename to remnawave/controllers/users.py index 6de2ee6..b8b92ce 100644 --- a/remnawave_api/controllers/users.py +++ b/remnawave/controllers/users.py @@ -3,7 +3,7 @@ from typing import Annotated, Optional from rapid_api_client import Path, Query from rapid_api_client.annotations import PydanticBody -from remnawave_api.models import ( +from remnawave.models import ( CreateUserRequestDto, DeleteUserResponseDto, EmailUserResponseDto, @@ -15,7 +15,7 @@ from remnawave_api.models import ( TagsResponseDto, RevokeUserRequestDto ) -from remnawave_api.rapid import BaseController, delete, get, patch, post +from remnawave.rapid import BaseController, delete, get, patch, post class UsersController(BaseController): diff --git a/remnawave_api/controllers/users_bulk_actions.py b/remnawave/controllers/users_bulk_actions.py similarity index 94% rename from remnawave_api/controllers/users_bulk_actions.py rename to remnawave/controllers/users_bulk_actions.py index 7ca373a..702ad09 100644 --- a/remnawave_api/controllers/users_bulk_actions.py +++ b/remnawave/controllers/users_bulk_actions.py @@ -3,8 +3,8 @@ from uuid import UUID from rapid_api_client.annotations import PydanticBody -from remnawave_api.enums import UserStatus -from remnawave_api.models import ( +from remnawave.enums import UserStatus +from remnawave.models import ( BulkAllResetTrafficUsersResponseDto, BulkAllUpdateUsersRequestDto, BulkAllUpdateUsersResponseDto, @@ -12,7 +12,7 @@ from remnawave_api.models import ( BulkUpdateUsersInboundsRequestDto, UpdateUserFields, ) -from remnawave_api.rapid import AttributeBody, BaseController, patch, post +from remnawave.rapid import AttributeBody, BaseController, patch, post class UsersBulkActionsController(BaseController): diff --git a/remnawave_api/controllers/users_stats.py b/remnawave/controllers/users_stats.py similarity index 83% rename from remnawave_api/controllers/users_stats.py rename to remnawave/controllers/users_stats.py index 059e796..db086c9 100644 --- a/remnawave_api/controllers/users_stats.py +++ b/remnawave/controllers/users_stats.py @@ -2,8 +2,8 @@ from typing import Annotated from rapid_api_client import Path, Query -from remnawave_api.models import GetUserUsageByRangeResponseDto -from remnawave_api.rapid import BaseController, get +from remnawave.models import GetUserUsageByRangeResponseDto +from remnawave.rapid import BaseController, get class UsersStatsController(BaseController): diff --git a/remnawave_api/controllers/webhooks.py b/remnawave/controllers/webhooks.py similarity index 100% rename from remnawave_api/controllers/webhooks.py rename to remnawave/controllers/webhooks.py diff --git a/remnawave_api/controllers/xray_config.py b/remnawave/controllers/xray_config.py similarity index 79% rename from remnawave_api/controllers/xray_config.py rename to remnawave/controllers/xray_config.py index feb60ac..9992448 100644 --- a/remnawave_api/controllers/xray_config.py +++ b/remnawave/controllers/xray_config.py @@ -2,8 +2,8 @@ from typing import Annotated from rapid_api_client.annotations import JsonBody -from remnawave_api.models import GetConfigResponseDto, UpdateConfigResponseDto -from remnawave_api.rapid import BaseController, get, put +from remnawave.models import GetConfigResponseDto, UpdateConfigResponseDto +from remnawave.rapid import BaseController, get, put class XrayConfigController(BaseController): diff --git a/remnawave_api/enums/__init__.py b/remnawave/enums/__init__.py similarity index 100% rename from remnawave_api/enums/__init__.py rename to remnawave/enums/__init__.py diff --git a/remnawave_api/enums/alpn.py b/remnawave/enums/alpn.py similarity index 100% rename from remnawave_api/enums/alpn.py rename to remnawave/enums/alpn.py diff --git a/remnawave_api/enums/client_type.py b/remnawave/enums/client_type.py similarity index 100% rename from remnawave_api/enums/client_type.py rename to remnawave/enums/client_type.py diff --git a/remnawave_api/enums/error_code.py b/remnawave/enums/error_code.py similarity index 100% rename from remnawave_api/enums/error_code.py rename to remnawave/enums/error_code.py diff --git a/remnawave_api/enums/fingerprint.py b/remnawave/enums/fingerprint.py similarity index 100% rename from remnawave_api/enums/fingerprint.py rename to remnawave/enums/fingerprint.py diff --git a/remnawave_api/enums/security_layer.py b/remnawave/enums/security_layer.py similarity index 100% rename from remnawave_api/enums/security_layer.py rename to remnawave/enums/security_layer.py diff --git a/remnawave_api/enums/template_type.py b/remnawave/enums/template_type.py similarity index 100% rename from remnawave_api/enums/template_type.py rename to remnawave/enums/template_type.py diff --git a/remnawave_api/enums/users.py b/remnawave/enums/users.py similarity index 100% rename from remnawave_api/enums/users.py rename to remnawave/enums/users.py diff --git a/remnawave_api/exceptions/__init__.py b/remnawave/exceptions/__init__.py similarity index 100% rename from remnawave_api/exceptions/__init__.py rename to remnawave/exceptions/__init__.py diff --git a/remnawave_api/exceptions/general.py b/remnawave/exceptions/general.py similarity index 97% rename from remnawave_api/exceptions/general.py rename to remnawave/exceptions/general.py index 49fa95d..8c7e63e 100644 --- a/remnawave_api/exceptions/general.py +++ b/remnawave/exceptions/general.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import AliasChoices, BaseModel, Field -from remnawave_api.enums import ErrorCode +from remnawave.enums import ErrorCode from typing import Any, List, Optional diff --git a/remnawave_api/exceptions/handler.py b/remnawave/exceptions/handler.py similarity index 99% rename from remnawave_api/exceptions/handler.py rename to remnawave/exceptions/handler.py index 48d4891..efeafd7 100644 --- a/remnawave_api/exceptions/handler.py +++ b/remnawave/exceptions/handler.py @@ -2,7 +2,7 @@ from datetime import datetime import httpx -from remnawave_api.enums import ErrorCode +from remnawave.enums import ErrorCode from .general import ( ApiError, ApiErrorResponse, diff --git a/remnawave_api/models/__init__.py b/remnawave/models/__init__.py similarity index 100% rename from remnawave_api/models/__init__.py rename to remnawave/models/__init__.py diff --git a/remnawave_api/models/api_tokens_management.py b/remnawave/models/api_tokens_management.py similarity index 100% rename from remnawave_api/models/api_tokens_management.py rename to remnawave/models/api_tokens_management.py diff --git a/remnawave_api/models/auth.py b/remnawave/models/auth.py similarity index 100% rename from remnawave_api/models/auth.py rename to remnawave/models/auth.py diff --git a/remnawave_api/models/bandwidthstats.py b/remnawave/models/bandwidthstats.py similarity index 100% rename from remnawave_api/models/bandwidthstats.py rename to remnawave/models/bandwidthstats.py diff --git a/remnawave_api/models/config_profiles.py b/remnawave/models/config_profiles.py similarity index 100% rename from remnawave_api/models/config_profiles.py rename to remnawave/models/config_profiles.py diff --git a/remnawave_api/models/hosts.py b/remnawave/models/hosts.py similarity index 98% rename from remnawave_api/models/hosts.py rename to remnawave/models/hosts.py index 8db5b09..be2d4aa 100644 --- a/remnawave_api/models/hosts.py +++ b/remnawave/models/hosts.py @@ -3,7 +3,7 @@ from uuid import UUID from pydantic import BaseModel, Field, StringConstraints, RootModel -from remnawave_api.enums import ALPN, Fingerprint, SecurityLayer +from remnawave.enums import ALPN, Fingerprint, SecurityLayer class ReorderResponse(BaseModel): diff --git a/remnawave_api/models/hosts_bulk_actions.py b/remnawave/models/hosts_bulk_actions.py similarity index 92% rename from remnawave_api/models/hosts_bulk_actions.py rename to remnawave/models/hosts_bulk_actions.py index f9816f9..e16b582 100644 --- a/remnawave_api/models/hosts_bulk_actions.py +++ b/remnawave/models/hosts_bulk_actions.py @@ -3,7 +3,7 @@ from uuid import UUID from pydantic import BaseModel, Field -from remnawave_api.models import HostResponseDto +from remnawave.models import HostResponseDto class SetInboundToManyHostsRequestDto(BaseModel): diff --git a/remnawave_api/models/hwid.py b/remnawave/models/hwid.py similarity index 100% rename from remnawave_api/models/hwid.py rename to remnawave/models/hwid.py diff --git a/remnawave_api/models/inbounds.py b/remnawave/models/inbounds.py similarity index 100% rename from remnawave_api/models/inbounds.py rename to remnawave/models/inbounds.py diff --git a/remnawave_api/models/inbounds_bulk_actions.py b/remnawave/models/inbounds_bulk_actions.py similarity index 100% rename from remnawave_api/models/inbounds_bulk_actions.py rename to remnawave/models/inbounds_bulk_actions.py diff --git a/remnawave_api/models/infra_billing.py b/remnawave/models/infra_billing.py similarity index 100% rename from remnawave_api/models/infra_billing.py rename to remnawave/models/infra_billing.py diff --git a/remnawave_api/models/internal_squads.py b/remnawave/models/internal_squads.py similarity index 100% rename from remnawave_api/models/internal_squads.py rename to remnawave/models/internal_squads.py diff --git a/remnawave_api/models/keygen.py b/remnawave/models/keygen.py similarity index 100% rename from remnawave_api/models/keygen.py rename to remnawave/models/keygen.py diff --git a/remnawave_api/models/nodes.py b/remnawave/models/nodes.py similarity index 99% rename from remnawave_api/models/nodes.py rename to remnawave/models/nodes.py index 620ceec..a802361 100644 --- a/remnawave_api/models/nodes.py +++ b/remnawave/models/nodes.py @@ -4,7 +4,7 @@ from uuid import UUID from pydantic import BaseModel, Field, StringConstraints, RootModel -from remnawave_api.models.internal_squads import InboundsDto +from remnawave.models.internal_squads import InboundsDto class ExcludedInbounds(BaseModel): diff --git a/remnawave_api/models/nodes_usage_history.py b/remnawave/models/nodes_usage_history.py similarity index 100% rename from remnawave_api/models/nodes_usage_history.py rename to remnawave/models/nodes_usage_history.py diff --git a/remnawave_api/models/subscription.py b/remnawave/models/subscription.py similarity index 96% rename from remnawave_api/models/subscription.py rename to remnawave/models/subscription.py index 979dca8..3d587ce 100644 --- a/remnawave_api/models/subscription.py +++ b/remnawave/models/subscription.py @@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional from pydantic import BaseModel, Field -from remnawave_api.enums import TrafficLimitStrategy, UserStatus +from remnawave.enums import TrafficLimitStrategy, UserStatus class HappCrypto(BaseModel): diff --git a/remnawave_api/models/subscriptions_settings.py b/remnawave/models/subscriptions_settings.py similarity index 100% rename from remnawave_api/models/subscriptions_settings.py rename to remnawave/models/subscriptions_settings.py diff --git a/remnawave_api/models/subscriptions_template.py b/remnawave/models/subscriptions_template.py similarity index 94% rename from remnawave_api/models/subscriptions_template.py rename to remnawave/models/subscriptions_template.py index 5ea7cc6..23f082c 100644 --- a/remnawave_api/models/subscriptions_template.py +++ b/remnawave/models/subscriptions_template.py @@ -3,7 +3,7 @@ from uuid import UUID from pydantic import BaseModel, Field -from remnawave_api.enums import TemplateType +from remnawave.enums import TemplateType class TemplateResponseDto(BaseModel): diff --git a/remnawave_api/models/system.py b/remnawave/models/system.py similarity index 100% rename from remnawave_api/models/system.py rename to remnawave/models/system.py diff --git a/remnawave_api/models/users.py b/remnawave/models/users.py similarity index 99% rename from remnawave_api/models/users.py rename to remnawave/models/users.py index f0b03f9..ab0a070 100644 --- a/remnawave_api/models/users.py +++ b/remnawave/models/users.py @@ -9,7 +9,7 @@ from pydantic import ( StringConstraints, ) -from remnawave_api.enums import TrafficLimitStrategy, UserStatus +from remnawave.enums import TrafficLimitStrategy, UserStatus class UserActiveInboundsDto(BaseModel): diff --git a/remnawave_api/models/users_bulk_actions.py b/remnawave/models/users_bulk_actions.py similarity index 96% rename from remnawave_api/models/users_bulk_actions.py rename to remnawave/models/users_bulk_actions.py index 55b450b..0f41baa 100644 --- a/remnawave_api/models/users_bulk_actions.py +++ b/remnawave/models/users_bulk_actions.py @@ -4,8 +4,8 @@ from uuid import UUID from pydantic import BaseModel, EmailStr, Field, constr -from remnawave_api.enums import UserStatus -from remnawave_api.enums.users import TrafficLimitStrategy +from remnawave.enums import UserStatus +from remnawave.enums.users import TrafficLimitStrategy class BulkUpdateUsersInboundsRequestDto(BaseModel): diff --git a/remnawave_api/models/users_stats.py b/remnawave/models/users_stats.py similarity index 100% rename from remnawave_api/models/users_stats.py rename to remnawave/models/users_stats.py diff --git a/remnawave_api/models/xray_config.py b/remnawave/models/xray_config.py similarity index 100% rename from remnawave_api/models/xray_config.py rename to remnawave/models/xray_config.py diff --git a/remnawave_api/rapid/__init__.py b/remnawave/rapid/__init__.py similarity index 100% rename from remnawave_api/rapid/__init__.py rename to remnawave/rapid/__init__.py diff --git a/remnawave_api/rapid/annotations.py b/remnawave/rapid/annotations.py similarity index 100% rename from remnawave_api/rapid/annotations.py rename to remnawave/rapid/annotations.py diff --git a/remnawave_api/rapid/client.py b/remnawave/rapid/client.py similarity index 98% rename from remnawave_api/rapid/client.py rename to remnawave/rapid/client.py index 9054b95..cd941df 100644 --- a/remnawave_api/rapid/client.py +++ b/remnawave/rapid/client.py @@ -21,9 +21,9 @@ from rapid_api_client.client import pydantic_xml, RapidParameter, RapidParameter from rapid_api_client.typing import BM, T from rapid_api_client.utils import filter_none_values, find_annotation -from remnawave_api.exceptions import ApiError, ApiErrorResponse, handle_api_error -from remnawave_api.rapid import AttributeBody -from remnawave_api.utils.serializer import orjson_default +from remnawave.exceptions import ApiError, ApiErrorResponse, handle_api_error +from remnawave.rapid import AttributeBody +from remnawave.utils.serializer import orjson_default class BaseController(RapidApi): diff --git a/remnawave_api/rapid/decorators.py b/remnawave/rapid/decorators.py similarity index 100% rename from remnawave_api/rapid/decorators.py rename to remnawave/rapid/decorators.py diff --git a/remnawave_api/utils/__init__.py b/remnawave/utils/__init__.py similarity index 100% rename from remnawave_api/utils/__init__.py rename to remnawave/utils/__init__.py diff --git a/remnawave_api/utils/serializer.py b/remnawave/utils/serializer.py similarity index 100% rename from remnawave_api/utils/serializer.py rename to remnawave/utils/serializer.py diff --git a/remnawave_api/.DS_Store b/remnawave_api/.DS_Store deleted file mode 100644 index 12347bb..0000000 Binary files a/remnawave_api/.DS_Store and /dev/null differ diff --git a/tests/conftest.py b/tests/conftest.py index f28b89f..f124ae0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,7 @@ import os import pytest from dotenv import load_dotenv -from remnawave_api import RemnawaveSDK +from remnawave import RemnawaveSDK load_dotenv() REMNAWAVE_BASE_URL = os.getenv("REMNAWAVE_BASE_URL") diff --git a/tests/test_auth.py b/tests/test_auth.py index f93edbc..d76fd2f 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -1,7 +1,7 @@ import pytest -from remnawave_api.models import LoginRequestDto, LoginResponseDto, LoginTelegramRequestDto -from remnawave_api.exceptions import ForbiddenError, ApiError +from remnawave.models import LoginRequestDto, LoginResponseDto, LoginTelegramRequestDto +from remnawave.exceptions import ForbiddenError, ApiError from tests.conftest import REMNAWAVE_ADMIN_PASSWORD, REMNAWAVE_ADMIN_USERNAME diff --git a/tests/test_bandwidthstats.py b/tests/test_bandwidthstats.py index a103796..7da876a 100644 --- a/tests/test_bandwidthstats.py +++ b/tests/test_bandwidthstats.py @@ -1,4 +1,4 @@ -from remnawave_api.models import GetNodesUsageByRangeResponseDto, GetNodesRealtimeUsageResponseDto +from remnawave.models import GetNodesUsageByRangeResponseDto, GetNodesRealtimeUsageResponseDto from tests.utils import generate_isoformat_range diff --git a/tests/test_config_profiles.py b/tests/test_config_profiles.py index 0ae9b3a..b48a8b9 100644 --- a/tests/test_config_profiles.py +++ b/tests/test_config_profiles.py @@ -1,6 +1,6 @@ import pytest -from remnawave_api.models import ( +from remnawave.models import ( CreateConfigProfileRequestDto, CreateConfigProfileResponseDto, DeleteConfigProfileResponseDto, diff --git a/tests/test_hosts.py b/tests/test_hosts.py index fc26df1..3b3e9a2 100644 --- a/tests/test_hosts.py +++ b/tests/test_hosts.py @@ -2,8 +2,8 @@ import random import pytest -from remnawave_api.enums import ALPN, Fingerprint -from remnawave_api.models import ( +from remnawave.enums import ALPN, Fingerprint +from remnawave.models import ( CreateHostRequestDto, CreateHostResponseDto, DeleteHostResponseDto, diff --git a/tests/test_hwid.py b/tests/test_hwid.py index 78906d6..cb65a30 100644 --- a/tests/test_hwid.py +++ b/tests/test_hwid.py @@ -3,7 +3,7 @@ import uuid import pytest -from remnawave_api.models import ( +from remnawave.models import ( CreateUserHwidDeviceRequestDto, DeleteUserHwidDeviceRequestDto, CreateUserHwidDeviceResponseDto, diff --git a/tests/test_inbounds.py b/tests/test_inbounds.py index 2c5ad03..f25ef67 100644 --- a/tests/test_inbounds.py +++ b/tests/test_inbounds.py @@ -1,6 +1,6 @@ import pytest -from remnawave_api.models import GetAllInboundsResponseDto +from remnawave.models import GetAllInboundsResponseDto @pytest.mark.asyncio diff --git a/tests/test_infra_billing.py b/tests/test_infra_billing.py index 44345b0..416d602 100644 --- a/tests/test_infra_billing.py +++ b/tests/test_infra_billing.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta import pytest -from remnawave_api.models import ( +from remnawave.models import ( CreateInfraBillingNodeRequestDto, CreateInfraBillingNodeResponseDto, CreateInfraProviderRequestDto, diff --git a/tests/test_internal_squads.py b/tests/test_internal_squads.py index 2e65742..c4f587c 100644 --- a/tests/test_internal_squads.py +++ b/tests/test_internal_squads.py @@ -1,7 +1,7 @@ from uuid import UUID import pytest -from remnawave_api.models import ( +from remnawave.models import ( AddUsersToInternalSquadRequestDto, AddUsersToInternalSquadResponseDto, CreateInternalSquadRequestDto, diff --git a/tests/test_keygen.py b/tests/test_keygen.py index 418c47d..9b25720 100644 --- a/tests/test_keygen.py +++ b/tests/test_keygen.py @@ -1,6 +1,6 @@ import pytest -from remnawave_api.models import GetPubKeyResponseDto +from remnawave.models import GetPubKeyResponseDto @pytest.mark.asyncio diff --git a/tests/test_nodes.py b/tests/test_nodes.py index 6aabd4d..843ef95 100644 --- a/tests/test_nodes.py +++ b/tests/test_nodes.py @@ -2,7 +2,7 @@ import random import pytest -from remnawave_api.models import ( +from remnawave.models import ( NodeConfigProfileRequestDto, CreateNodeRequestDto, DeleteNodeResponseDto, @@ -13,7 +13,7 @@ from remnawave_api.models import ( ReorderNodeResponseDto, UpdateNodeRequestDto, ) -from remnawave_api.models.nodes import ReorderNodeItem +from remnawave.models.nodes import ReorderNodeItem from tests.conftest import REMNAWAVE_CONFIG_PROFILE_UUID, REMNAWAVE_INBOUND_UUID from tests.utils import generate_random_string diff --git a/tests/test_nodes_usage_history.py b/tests/test_nodes_usage_history.py index 61d1ae1..766a959 100644 --- a/tests/test_nodes_usage_history.py +++ b/tests/test_nodes_usage_history.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta import pytest -from remnawave_api.models import ( +from remnawave.models import ( GetNodeUserUsageByRangeResponseDto, GetNodesUsageByRangeResponseDto, ) diff --git a/tests/test_subscription.py b/tests/test_subscription.py index ff27f03..08d9bfa 100644 --- a/tests/test_subscription.py +++ b/tests/test_subscription.py @@ -1,7 +1,7 @@ import pytest -from remnawave_api.enums import ClientType -from remnawave_api.models import GetSubscriptionInfoResponseDto +from remnawave.enums import ClientType +from remnawave.models import GetSubscriptionInfoResponseDto from tests.conftest import REMNAWAVE_SHORT_UUID diff --git a/tests/test_subscriptions_settings.py b/tests/test_subscriptions_settings.py index 2321abc..4e829a4 100644 --- a/tests/test_subscriptions_settings.py +++ b/tests/test_subscriptions_settings.py @@ -1,6 +1,6 @@ import pytest -from remnawave_api.models import ( +from remnawave.models import ( GetSubscriptionSettingsResponseDto, UpdateSubscriptionSettingsRequestDto, UpdateSubscriptionSettingsResponseDto, diff --git a/tests/test_subscriptions_template.py b/tests/test_subscriptions_template.py index 0207985..54b7ff3 100644 --- a/tests/test_subscriptions_template.py +++ b/tests/test_subscriptions_template.py @@ -1,7 +1,7 @@ import pytest -from remnawave_api.enums import TemplateType -from remnawave_api.models import GetTemplateResponseDto, UpdateTemplateRequestDto, UpdateTemplateResponseDto +from remnawave.enums import TemplateType +from remnawave.models import GetTemplateResponseDto, UpdateTemplateRequestDto, UpdateTemplateResponseDto @pytest.mark.asyncio diff --git a/tests/test_system.py b/tests/test_system.py index 2ad24ac..99505c8 100644 --- a/tests/test_system.py +++ b/tests/test_system.py @@ -1,6 +1,6 @@ import pytest -from remnawave_api.models import ( +from remnawave.models import ( GetBandwidthStatsResponseDto, GetNodesStatisticsResponseDto, GetStatsResponseDto, diff --git a/tests/test_users.py b/tests/test_users.py index 5587d9f..500093b 100644 --- a/tests/test_users.py +++ b/tests/test_users.py @@ -4,9 +4,9 @@ from datetime import datetime, timedelta import pytest import pytz -from remnawave_api.enums import ErrorCode, UserStatus -from remnawave_api.exceptions import ApiError -from remnawave_api.models import ( +from remnawave.enums import ErrorCode, UserStatus +from remnawave.exceptions import ApiError +from remnawave.models import ( CreateUserRequestDto, DeleteUserResponseDto, EmailUserResponseDto, diff --git a/tests/test_users_bulk_actions.py b/tests/test_users_bulk_actions.py index 945de14..3cf12e1 100644 --- a/tests/test_users_bulk_actions.py +++ b/tests/test_users_bulk_actions.py @@ -4,7 +4,7 @@ from typing import List import pytest import pytz -from remnawave_api.models import BulkResponseDto, UpdateUserFields +from remnawave.models import BulkResponseDto, UpdateUserFields from tests.conftest import REMNAWAVE_USER_UUID diff --git a/tests/test_users_stats.py b/tests/test_users_stats.py index 5eb5832..bc1de85 100644 --- a/tests/test_users_stats.py +++ b/tests/test_users_stats.py @@ -1,6 +1,6 @@ import pytest -from remnawave_api.models import GetUserUsageByRangeResponseDto +from remnawave.models import GetUserUsageByRangeResponseDto from tests.conftest import REMNAWAVE_USER_UUID from tests.utils import generate_isoformat_range