Fix #12: Remove duplicate _to_member_out, use converters.member_out
Some checks failed
Deploy Tracker / deploy (push) Failing after 4s
Some checks failed
Deploy Tracker / deploy (push) Failing after 4s
This commit is contained in:
parent
872699647f
commit
7360c79eeb
@ -56,34 +56,6 @@ class MemberUpdate(BaseModel):
|
|||||||
agent_config: AgentConfigSchema | None = None
|
agent_config: AgentConfigSchema | None = None
|
||||||
|
|
||||||
|
|
||||||
# --- Helpers ---
|
|
||||||
|
|
||||||
def _to_member_out(m: Member, include_token: bool = False) -> MemberOut:
|
|
||||||
"""Convert Member to MemberOut schema."""
|
|
||||||
agent_config = None
|
|
||||||
if m.agent_config:
|
|
||||||
agent_config = AgentConfigOut(
|
|
||||||
capabilities=m.agent_config.capabilities or [],
|
|
||||||
chat_listen=m.agent_config.chat_listen,
|
|
||||||
task_listen=m.agent_config.task_listen,
|
|
||||||
prompt=m.agent_config.prompt,
|
|
||||||
model=m.agent_config.model,
|
|
||||||
)
|
|
||||||
|
|
||||||
return MemberOut(
|
|
||||||
id=str(m.id),
|
|
||||||
slug=m.slug,
|
|
||||||
name=m.name,
|
|
||||||
type=m.type,
|
|
||||||
role=m.role,
|
|
||||||
status=m.status,
|
|
||||||
avatar_url=m.avatar_url,
|
|
||||||
is_active=m.is_active,
|
|
||||||
token=m.token if include_token and m.type == MemberType.AGENT else None,
|
|
||||||
agent_config=agent_config,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# --- Endpoints ---
|
# --- Endpoints ---
|
||||||
|
|
||||||
@router.get("/members", response_model=list[MemberOut])
|
@router.get("/members", response_model=list[MemberOut])
|
||||||
@ -97,7 +69,7 @@ async def list_members(
|
|||||||
query = query.where(Member.is_active == True)
|
query = query.where(Member.is_active == True)
|
||||||
|
|
||||||
result = await db.execute(query)
|
result = await db.execute(query)
|
||||||
return [_to_member_out(m) for m in result.scalars()]
|
return [member_out(m) for m in result.scalars()]
|
||||||
|
|
||||||
|
|
||||||
@router.get("/members/{slug}", response_model=MemberOut)
|
@router.get("/members/{slug}", response_model=MemberOut)
|
||||||
@ -108,7 +80,7 @@ async def get_member(slug: str, db: AsyncSession = Depends(get_db)):
|
|||||||
member = result.scalar_one_or_none()
|
member = result.scalar_one_or_none()
|
||||||
if not member:
|
if not member:
|
||||||
raise HTTPException(404, "Member not found")
|
raise HTTPException(404, "Member not found")
|
||||||
return _to_member_out(member)
|
return member_out(member)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/members", response_model=MemberCreateResponse)
|
@router.post("/members", response_model=MemberCreateResponse)
|
||||||
@ -203,7 +175,7 @@ async def update_member(slug: str, req: MemberUpdate, db: AsyncSession = Depends
|
|||||||
|
|
||||||
await db.commit()
|
await db.commit()
|
||||||
await db.refresh(member)
|
await db.refresh(member)
|
||||||
return _to_member_out(member)
|
return member_out(member)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/members/{slug}/regenerate-token")
|
@router.post("/members/{slug}/regenerate-token")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user