doctest

Signed-off-by: rakdutta <rakhibiswas@yahoo.com>

Author: rakdutta

mcpgateway/admin.py

@@ -856,8 +856,8 @@ async def admin_list_servers(
         ...     updated_at=datetime.now(timezone.utc),
         ...     enabled=True,
         ...     associated_tools=["tool1", "tool2"],
-        ...     associated_resources=[1, 2],
-        ...     associated_prompts=[1],
+        ...     associated_resources=["1", "2"],
+        ...     associated_prompts=["1"],
         ...     metrics=mock_metrics
         ... )
         >>>
@@ -962,8 +962,8 @@ async def admin_get_server(server_id: str, db: Session = Depends(get_db), user=D
         ...     updated_at=datetime.now(timezone.utc),
         ...     enabled=True,
         ...     associated_tools=["tool1"],
-        ...     associated_resources=[1],
-        ...     associated_prompts=[1],
+        ...     associated_resources=["1"],
+        ...     associated_prompts=["1"],
         ...     metrics=mock_metrics
         ... )
         >>>
@@ -1143,9 +1143,8 @@ async def admin_add_server(request: Request, db: Session = Depends(get_db), user
 
     try:
         LOGGER.debug(f"User {get_user_email(user)} is adding a new server with name: {form['name']}")
-        server_id = form.get("id")
         visibility = str(form.get("visibility", "private"))
-        
+
         # Handle "Select All" for tools
         associated_tools_list = form.getlist("associatedTools")
         if form.get("selectAllTools") == "true":
@@ -1755,7 +1754,7 @@ async def admin_list_resources(
         >>> resource_service.list_resources_for_user = AsyncMock(return_value=[mock_resource, mock_inactive_resource])
         >>> async def test_admin_list_resources_all():
         ...     result = await admin_list_resources(include_inactive=True, db=mock_db, user=mock_user)
-        ...     return len(result) == 2 and not result[1]['isActive']
+        ...     return len(result) == 2 and not result[1]['enabled']
         >>>
         >>> asyncio.run(test_admin_list_resources_all())
         True
@@ -1864,7 +1863,7 @@ async def admin_list_prompts(
         >>> prompt_service.list_prompts_for_user = AsyncMock(return_value=[mock_prompt, mock_inactive_prompt])
         >>> async def test_admin_list_prompts_all():
         ...     result = await admin_list_prompts(include_inactive=True, db=mock_db, user=mock_user)
-        ...     return len(result) == 2 and not result[1]['isActive']
+        ...     return len(result) == 2 and not result[1]['enabled']
         >>>
         >>> asyncio.run(test_admin_list_prompts_all())
         True

mcpgateway/db.py

@@ -2219,7 +2219,7 @@ class Resource(Base):
     uri_template: Mapped[Optional[str]] = mapped_column(Text, nullable=True)  # URI template for parameterized resources
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
-    #is_active: Mapped[bool] = mapped_column(default=True)
+    # is_active: Mapped[bool] = mapped_column(default=True)
     enabled: Mapped[bool] = mapped_column(default=True)
     tags: Mapped[List[str]] = mapped_column(JSON, default=list, nullable=False)
 
@@ -2477,7 +2477,7 @@ class Prompt(Base):
     argument_schema: Mapped[Dict[str, Any]] = mapped_column(JSON)
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
-    #is_active: Mapped[bool] = mapped_column(default=True)
+    # is_active: Mapped[bool] = mapped_column(default=True)
     enabled: Mapped[bool] = mapped_column(default=True)
     tags: Mapped[List[str]] = mapped_column(JSON, default=list, nullable=False)
 
@@ -2669,7 +2669,7 @@ class Server(Base):
     icon: Mapped[Optional[str]] = mapped_column(String(767), nullable=True)
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
-    #is_active: Mapped[bool] = mapped_column(default=True)
+    # is_active: Mapped[bool] = mapped_column(default=True)
     enabled: Mapped[bool] = mapped_column(default=True)
     tags: Mapped[List[str]] = mapped_column(JSON, default=list, nullable=False)
 

mcpgateway/schemas.py

@@ -2287,7 +2287,7 @@ class PromptRead(BaseModelWithConfigDict):
     arguments: List[PromptArgument]
     created_at: datetime
     updated_at: datetime
-    #is_active: bool
+    # is_active: bool
     enabled: bool
     tags: List[Dict[str, str]] = Field(default_factory=list, description="Tags for categorizing the prompt")
     metrics: PromptMetrics
@@ -3711,7 +3711,7 @@ class ServerRead(BaseModelWithConfigDict):
     icon: Optional[str]
     created_at: datetime
     updated_at: datetime
-    #is_active: bool
+    # is_active: bool
     enabled: bool
     associated_tools: List[str] = []
     associated_resources: List[str] = []

mcpgateway/services/resource_service.py

@@ -644,9 +644,8 @@ async def list_server_resources(self, db: Session, server_id: str, include_inact
         """
         logger.debug(f"Listing resources for server_id: {server_id}, include_inactive: {include_inactive}")
         query = (
-            select(DbResource)
-            .join(server_resource_association, DbResource.id == server_resource_association.c.resource_id)
-            #.where(DbResource.uri_template.is_(None))
+            select(DbResource).join(server_resource_association, DbResource.id == server_resource_association.c.resource_id)
+            # .where(DbResource.uri_template.is_(None))
             .where(server_resource_association.c.server_id == server_id)
         )
         if not include_inactive: