adding servers for special groups/ ruff formatting

database/models.py

@@ -111,6 +111,7 @@ class Server(DictLikeMixin, Base):
     enabled = Column(Boolean, default=True)
 
     subgroups = relationship("ServerSubgroup", back_populates="server", cascade="all, delete-orphan")
+    groups = relationship("ServerSpecialgroup", back_populates="server", cascade="all, delete-orphan")
 
 
 class ServerSubgroup(DictLikeMixin, Base):
@@ -126,6 +127,18 @@ class ServerSubgroup(DictLikeMixin, Base):
     __table_args__ = (UniqueConstraint("server_id", "subgroup_title", name="uq_server_subgroup"),)
 
 
+class ServerSpecialgroup(DictLikeMixin, Base):
+    __tablename__ = "server_specialgroups"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    server_id = Column(Integer, ForeignKey("servers.id", ondelete="CASCADE"), index=True, nullable=False)
+    group_code = Column(String, nullable=False)
+
+    server = relationship("Server")
+
+    __table_args__ = (UniqueConstraint("server_id", "group_code", name="uq_server_group"),)
+
+
 class Payment(DictLikeMixin, Base):
     __tablename__ = "payments"
 

database/servers.py

@@ -2,7 +2,7 @@ from sqlalchemy import delete, func, insert, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from database.models import Key, Server, ServerSubgroup, Tariff
+from database.models import Key, Server, ServerSpecialgroup, ServerSubgroup, Tariff
 from logger import logger
 
 
@@ -58,11 +58,24 @@ async def get_servers(session: AsyncSession, include_enabled: bool = False) -> d
             for sid, sg in r.all():
                 subs_map.setdefault(sid, []).append(sg)
 
+        groups_map = {}
+        if ids:
+            r2 = await session.execute(
+                select(ServerSpecialgroup.server_id, ServerSpecialgroup.group_code).where(
+                    ServerSpecialgroup.server_id.in_(ids)
+                )
+            )
+            for sid, gc in r2.all():
+                groups_map.setdefault(sid, []).append(gc)
+
+        allowed = {"trial", "discounts", "discounts_max"}
+
         grouped = {}
         for s in servers:
             if not include_enabled and not s.enabled:
                 continue
             cluster = s.cluster_name
+            special = sorted({g for g in groups_map.get(s.id, []) if g in allowed})
             grouped.setdefault(cluster, []).append({
                 "server_name": s.server_name,
                 "api_url": s.api_url,
@@ -73,6 +86,7 @@ async def get_servers(session: AsyncSession, include_enabled: bool = False) -> d
                 "max_keys": s.max_keys,
                 "tariff_group": s.tariff_group,
                 "tariff_subgroups": subs_map.get(s.id, []),
+                "special_groups": special,
                 "cluster_name": cluster,
             })
         return grouped