rms/Marzban
1
0
Fork 0
mirror of https://github.com/Gozargah/Marzban.git synced 2026-05-17 08:35:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: circular import in models

Browse Source
This commit is contained in:
SaintShit
2025-01-09 14:33:14 +03:30
parent 40041f2acb
commit 9e24dfbb4c
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/models/user.py
View File

@@ -2,13 +2,12 @@ import re
import secrets
from datetime import datetime
from enum import Enum
from typing import Dict, List, Optional, Union
from typing import Dict, List, Literal, Optional, Union
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
from pydantic import (BaseModel, ConfigDict, Field, field_validator,
model_validator)
from app import xray
from app.models.admin import Admin
from app.models.proxy import ProxySettings, ProxyTypes
from app.subscription.share import generate_v2ray_links
from app.utils.jwt import create_subscription_token
from config import XRAY_SUBSCRIPTION_PATH, XRAY_SUBSCRIPTION_URL_PREFIX
@@ -57,7 +56,7 @@ class NextPlanModel(BaseModel):
class User(BaseModel):
proxies: Dict[ProxyTypes, ProxySettings] = {}
proxies: Dict["ProxyTypes", "ProxySettings"] = {}
expire: Optional[int] = Field(None, nullable=True)
data_limit: Optional[int] = Field(
ge=0, default=None, description="data_limit can be 0 or greater"
@@ -65,7 +64,7 @@ class User(BaseModel):
data_limit_reset_strategy: UserDataLimitResetStrategy = (
UserDataLimitResetStrategy.no_reset
)
inbounds: Dict[ProxyTypes, List[str]] = {}
inbounds: Dict["ProxyTypes", List[str]] = {}
note: Optional[str] = Field(None, nullable=True)
sub_updated_at: Optional[datetime] = Field(None, nullable=True)
sub_last_user_agent: Optional[str] = Field(None, nullable=True)
@@ -288,9 +287,9 @@ class UserResponse(User):
links: List[str] = []
subscription_url: str = ""
proxies: dict
excluded_inbounds: Dict[ProxyTypes, List[str]] = {}
excluded_inbounds: Dict["ProxyTypes", List[str]] = {}
admin: Optional[Admin] = None
admin: Optional["Admin"] = None
model_config = ConfigDict(from_attributes=True)
@model_validator(mode="after")
@@ -328,10 +327,10 @@ class UserResponse(User):
class SubscriptionUserResponse(UserResponse):
admin: Admin | None = Field(default=None, exclude=True)
excluded_inbounds: Dict[ProxyTypes, List[str]] | None = Field(None, exclude=True)
admin: Literal["Admin"] | None = Field(default=None, exclude=True)
excluded_inbounds: Dict["ProxyTypes", List[str]] | None = Field(None, exclude=True)
note: str | None = Field(None, exclude=True)
inbounds: Dict[ProxyTypes, List[str]] | None = Field(None, exclude=True)
inbounds: Dict["ProxyTypes", List[str]] | None = Field(None, exclude=True)
auto_delete_in_days: int | None = Field(None, exclude=True)
model_config = ConfigDict(from_attributes=True)
@@ -364,3 +363,7 @@ class UserUsagesResponse(BaseModel):
class UsersUsagesResponse(BaseModel):
usages: List[UserUsageResponse]
from app.models.admin import Admin # noqa
from app.models.proxy import ProxySettings, ProxyTypes # noqa

8
app/models/user_template.py
View File

@@ -1,9 +1,8 @@
from typing import Dict, List, Optional
from pydantic import field_validator, ConfigDict, BaseModel, Field
from pydantic import BaseModel, ConfigDict, Field, field_validator
from app import xray
from app.models.proxy import ProxyTypes
class UserTemplate(BaseModel):
@@ -17,7 +16,7 @@ class UserTemplate(BaseModel):
username_prefix: Optional[str] = Field(max_length=20, min_length=1, default=None)
username_suffix: Optional[str] = Field(max_length=20, min_length=1, default=None)
inbounds: Dict[ProxyTypes, List[str]] = {}
inbounds: Dict["ProxyTypes", List[str]] = {}
class UserTemplateCreate(UserTemplate):
@@ -63,3 +62,6 @@ class UserTemplateResponse(UserTemplate):
final[protocol] = [inbound["tag"]]
return final
model_config = ConfigDict(from_attributes=True)
from app.models.proxy import ProxyTypes # noqa