enabled

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

Author: rakdutta

mcpgateway/admin.py

@@ -854,7 +854,7 @@ async def admin_list_servers(
         ...     icon="test-icon.png",
         ...     created_at=datetime.now(timezone.utc),
         ...     updated_at=datetime.now(timezone.utc),
-        ...     is_active=True,
+        ...     enabled=True,
         ...     associated_tools=["tool1", "tool2"],
         ...     associated_resources=[1, 2],
         ...     associated_prompts=[1],
@@ -960,7 +960,7 @@ async def admin_get_server(server_id: str, db: Session = Depends(get_db), user=D
         ...     icon="test-icon.png",
         ...     created_at=datetime.now(timezone.utc),
         ...     updated_at=datetime.now(timezone.utc),
-        ...     is_active=True,
+        ...     enabled=True,
         ...     associated_tools=["tool1"],
         ...     associated_resources=[1],
         ...     associated_prompts=[1],
@@ -1012,7 +1012,7 @@ async def admin_get_server(server_id: str, db: Session = Depends(get_db), user=D
     except ServerNotFoundError as e:
         raise HTTPException(status_code=404, detail=str(e))
     except Exception as e:
-        LOGGER.error(f"Error getting gateway {server_id}: {e}")
+        LOGGER.error(f"Error getting server {server_id}: {e}")
         raise e
 
 
@@ -1721,7 +1721,7 @@ async def admin_list_resources(
         ...     size=100,
         ...     created_at=datetime.now(timezone.utc),
         ...     updated_at=datetime.now(timezone.utc),
-        ...     is_active=True,
+        ...     enabled=True,
         ...     metrics=ResourceMetrics(
         ...         total_executions=5, successful_executions=5, failed_executions=0,
         ...         failure_rate=0.0, min_response_time=0.1, max_response_time=0.5,
@@ -1747,7 +1747,7 @@ async def admin_list_resources(
         ...     id="39334ce0ed2644d79ede8913a66930c9", uri="test://resource/2", name="Inactive Resource",
         ...     description="Another test", mime_type="application/json", size=50,
         ...     created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc),
-        ...     is_active=False, metrics=ResourceMetrics(
+        ...     enabled=False, metrics=ResourceMetrics(
         ...         total_executions=0, successful_executions=0, failed_executions=0,
         ...         failure_rate=0.0, min_response_time=0.0, max_response_time=0.0,
         ...         avg_response_time=0.0, last_execution_time=None),
@@ -2235,7 +2235,7 @@ async def admin_ui(
         True
         >>>
         >>> # Test with populated data (mocking a few items)
-        >>> mock_server = ServerRead(id="s1", name="S1", description="d", created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), is_active=True, associated_tools=[], associated_resources=[], associated_prompts=[], icon="i", metrics=ServerMetrics(total_executions=0, successful_executions=0, failed_executions=0, failure_rate=0.0, min_response_time=0.0, max_response_time=0.0, avg_response_time=0.0, last_execution_time=None))
+        >>> mock_server = ServerRead(id="s1", name="S1", description="d", created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), enabled=True, associated_tools=[], associated_resources=[], associated_prompts=[], icon="i", metrics=ServerMetrics(total_executions=0, successful_executions=0, failed_executions=0, failure_rate=0.0, min_response_time=0.0, max_response_time=0.0, avg_response_time=0.0, last_execution_time=None))
         >>> mock_tool = ToolRead(
         ...     id="t1", name="T1", original_name="T1", url="http://t1.com", description="d",
         ...     created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc),
@@ -6117,7 +6117,7 @@ async def admin_resources_partial_html(
 
     # Apply active/inactive filter
     if not include_inactive:
-        query = query.where(DbResource.is_active.is_(True))
+        query = query.where(DbResource.enabled.is_(True))
 
     # Access conditions: owner, team, public
     access_conditions = [DbResource.owner_email == user_email]
@@ -6141,7 +6141,7 @@ async def admin_resources_partial_html(
             else:
                 count_query = count_query.where(DbResource.gateway_id.in_(non_null_ids))
     if not include_inactive:
-        count_query = count_query.where(DbResource.is_active.is_(True))
+        count_query = count_query.where(DbResource.enabled.is_(True))
 
     total_items = db.scalar(count_query) or 0
 
@@ -6326,7 +6326,7 @@ async def admin_get_all_resource_ids(
                 LOGGER.debug(f"Filtering resources by gateway IDs: {non_null_ids}")
 
     if not include_inactive:
-        query = query.where(DbResource.is_active.is_(True))
+        query = query.where(DbResource.enabled.is_(True))
 
     access_conditions = [DbResource.owner_email == user_email, DbResource.visibility == "public"]
     if team_ids:
@@ -6374,7 +6374,7 @@ async def admin_search_resources(
 
     query = select(DbResource.id, DbResource.name, DbResource.description)
     if not include_inactive:
-        query = query.where(DbResource.is_active.is_(True))
+        query = query.where(DbResource.enabled.is_(True))
 
     access_conditions = [DbResource.owner_email == user_email, DbResource.visibility == "public"]
     if team_ids:
@@ -8115,7 +8115,7 @@ async def admin_get_resource(resource_id: str, db: Session = Depends(get_db), us
         >>> mock_resource = ResourceRead(
         ...     id=resource_id, uri=resource_uri, name="Get Resource", description="Test",
         ...     mime_type="text/plain", size=10, created_at=datetime.now(timezone.utc),
-        ...     updated_at=datetime.now(timezone.utc), is_active=True, metrics=ResourceMetrics(
+        ...     updated_at=datetime.now(timezone.utc), enabled=True, metrics=ResourceMetrics(
         ...         total_executions=0, successful_executions=0, failed_executions=0,
         ...         failure_rate=0.0, min_response_time=0.0, max_response_time=0.0, avg_response_time=0.0,
         ...         last_execution_time=None
@@ -12297,7 +12297,7 @@ async def get_servers_section(
                     "name": server.name,
                     "description": server.description,
                     "tags": server.tags or [],
-                    "isActive": server.is_active,
+                    "isActive": server.enabled,
                     "team_id": getattr(server, "team_id", None),
                     "visibility": getattr(server, "visibility", "private"),
                 }

mcpgateway/alembic/versions/356a2d4eed6f_uuid_change_for_prompt_and_resources.py

@@ -44,7 +44,7 @@ def upgrade() -> None:
         sa.Column("argument_schema", sa.JSON, nullable=True),
         sa.Column("created_at", sa.DateTime(timezone=True), nullable=True),
         sa.Column("updated_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("is_active", sa.Boolean, nullable=True),
+        sa.Column("enabled", sa.Boolean, nullable=True),
         sa.Column("tags", sa.JSON, nullable=False),
         sa.Column("created_by", sa.String(255), nullable=True),
         sa.Column("created_from_ip", sa.String(45), nullable=True),
@@ -67,7 +67,7 @@ def upgrade() -> None:
 
     # 3) Copy data from prompts into prompts_tmp using id_new as id
     copy_cols = (
-        "id, name, description, template, argument_schema, created_at, updated_at, is_active, tags,"
+        "id, name, description, template, argument_schema, created_at, updated_at, enabled, tags,"
         " created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip,"
         " modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility"
     )
@@ -151,7 +151,7 @@ def upgrade() -> None:
         sa.Column("uri_template", sa.Text, nullable=True),
         sa.Column("created_at", sa.DateTime(timezone=True), nullable=True),
         sa.Column("updated_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("is_active", sa.Boolean, nullable=True),
+        sa.Column("enabled", sa.Boolean, nullable=True),
         sa.Column("tags", sa.JSON, nullable=False),
         sa.Column("text_content", sa.Text, nullable=True),
         sa.Column("binary_content", sa.LargeBinary, nullable=True),
@@ -175,7 +175,7 @@ def upgrade() -> None:
     )
 
     # Copy data into resources_tmp using id_new
-    res_copy_cols = "id, uri, name, description, mime_type, size, uri_template, created_at, updated_at, is_active, tags, text_content, binary_content, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility"
+    res_copy_cols = "id, uri, name, description, mime_type, size, uri_template, created_at, updated_at, enabled, tags, text_content, binary_content, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility"
     conn.execute(
         text(
             (
@@ -255,6 +255,14 @@ def upgrade() -> None:
     op.rename_table("server_resource_association_tmp", "server_resource_association")
     op.rename_table("resource_subscriptions_tmp", "resource_subscriptions")
 
+    with op.batch_alter_table("servers") as batch_op:
+        batch_op.alter_column(
+            "is_active",
+            new_column_name="enabled",
+            existing_type=sa.Boolean(),
+            existing_server_default=sa.text("1"),
+            existing_nullable=False,
+        )
 
 def downgrade() -> None:
     """Downgrade schema."""
@@ -296,7 +304,7 @@ def downgrade() -> None:
     # We'll preserve uniqueness by using the team_id/owner_email/name triple to later remap.
     conn.execute(
         text(
-            "INSERT INTO prompts_old (name, description, template, argument_schema, created_at, updated_at, is_active, tags, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility) SELECT name, description, template, argument_schema, created_at, updated_at, is_active, tags, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility FROM prompts"
+            "INSERT INTO prompts_old (name, description, template, argument_schema, created_at, updated_at, is_active, tags, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility) SELECT name, description, template, argument_schema, created_at, updated_at, enabled, tags, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility FROM prompts"
         )
     )
 
@@ -418,7 +426,7 @@ def downgrade() -> None:
     # 2) Insert rows from current resources into resources_old letting id autoincrement.
     conn.execute(
         text(
-            "INSERT INTO resources_old (uri, name, description, mime_type, size, uri_template, created_at, updated_at, is_active, tags, text_content, binary_content, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility) SELECT uri, name, description, mime_type, size, uri_template, created_at, updated_at, is_active, tags, text_content, binary_content, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility FROM resources"
+            "INSERT INTO resources_old (uri, name, description, mime_type, size, uri_template, created_at, updated_at, is_active, tags, text_content, binary_content, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility) SELECT uri, name, description, mime_type, size, uri_template, created_at, updated_at, enabled, tags, text_content, binary_content, created_by, created_from_ip, created_via, created_user_agent, modified_by, modified_from_ip, modified_via, modified_user_agent, import_batch_id, federation_source, version, gateway_id, team_id, owner_email, visibility FROM resources"
         )
     )
 
@@ -519,3 +527,11 @@ def downgrade() -> None:
     op.rename_table("resource_metrics_old", "resource_metrics")
     op.rename_table("server_resource_association_old", "server_resource_association")
     op.rename_table("resource_subscriptions_old", "resource_subscriptions")
+    with op.batch_alter_table("servers") as batch_op:
+        batch_op.alter_column(
+            "enabled",
+            new_column_name="is_active",
+            existing_type=sa.Boolean(),
+            existing_server_default=sa.text("1"),
+            existing_nullable=False,
+        )

mcpgateway/services/completion_service.py

@@ -266,7 +266,7 @@ async def _complete_resource_uri(self, db: Session, ref: Dict[str, Any], arg_val
             raise CompletionError("Missing URI template")
 
         # List matching resources
-        resources = db.execute(select(DbResource).where(DbResource.is_active)).scalars().all()
+        resources = db.execute(select(DbResource).where(DbResource.enabled)).scalars().all()
 
         # Filter by URI pattern
         matches = []