Get entity by did or name

pkgs/clan-cli/clan_cli/webui/db_types.py

@@ -1,13 +0,0 @@
-from enum import Enum
-
-
-class Status(Enum):
-    ONLINE = "online"
-    OFFLINE = "offline"
-    UNKNOWN = "unknown"
-
-
-class Role(Enum):
-    PROSUMER = "service_prosumer"
-    AP = "AP"
-    DLG = "DLG"

pkgs/clan-cli/clan_cli/webui/routers/endpoints.py

@@ -231,8 +231,6 @@ def get_rpc_by_role(db: Session, role: Role, path: str) -> Any:
         raise ClanError(f"No {role} found")
     if len(matching_entities) > 1:
         raise ClanError(f"More than one {role} found")
-    if len(matching_entities) == 0:
-        raise ClanError(f"No {role} found")
     dlg = matching_entities[0]
 
     url = f"http://{dlg.ip}/{path}"
@@ -307,6 +305,7 @@ def get_all_eventmessages(
 #                            #
 ##############################
 @router.get("/emulate", response_class=HTMLResponse)
+@router.get("/emu", response_class=HTMLResponse)
 def get_emulated_enpoints() -> HTMLResponse:
     from clan_cli.config import ap_url, c1_url, c2_url, dlg_url
 

pkgs/clan-cli/clan_cli/webui/schemas.py

@@ -1,15 +1,25 @@
 import logging
 from datetime import datetime
+from enum import Enum
 from typing import List
 
 from pydantic import BaseModel, Field, validator
 
-from . import sql_models
-from .db_types import Role, Status
-
 log = logging.getLogger(__name__)
 
 
+class Status(Enum):
+    ONLINE = "online"
+    OFFLINE = "offline"
+    UNKNOWN = "unknown"
+
+
+class Role(Enum):
+    PROSUMER = "service_prosumer"
+    AP = "AP"
+    DLG = "DLG"
+
+
 class Machine(BaseModel):
     name: str
     status: Status
@@ -62,12 +72,8 @@ class Entity(EntityBase):
 
     # define a custom getter function for roles
     @validator("roles", pre=True)
-    def get_roles(cls, v: List[sql_models.EntityRoles | Role]) -> List[Role]:
+    def get_roles(cls, v: List[EntityRoles | Role]) -> List[Role]:
-        if (
+        if isinstance(v, list) and len(v) > 0 and isinstance(v[0], EntityRoles):
-            isinstance(v, list)
-            and len(v) > 0
-            and isinstance(v[0], sql_models.EntityRoles)
-        ):
             return [x.role for x in v]  # type: ignore
         else:
             return v  # type: ignore

pkgs/clan-cli/clan_cli/webui/sql_models.py

@@ -1,7 +1,7 @@
 from sqlalchemy import JSON, Boolean, Column, Enum, ForeignKey, Integer, String, Text
 from sqlalchemy.orm import relationship
 
-from .db_types import Role
+from .schemas import Role
 from .sql_db import Base
 
 # Relationsship example