updating code with review comments

Author: pmajali

linode_api4/groups/monitor.py

@@ -7,12 +7,9 @@
     Dashboard,
     MonitorServiceSupported,
     MetricDefinition,
-    DashboardsByID,
 )
 
-__all__ = [
-    "MonitorGroup",
-]
+
 class MonitorGroup(Group):
     """
     Encapsulates Monitor-related methods of the :any:`LinodeClient`.  This
@@ -42,28 +39,6 @@ def dashboards(self, *filters):
         """
         return self.client._get_and_filter(Dashboard, *filters)
 
-    def dashboard_by_ID(self, dashboard_id: int, *filters):
-        """
-        Returns a dashboards on your account based on the ID passed. 
-
-        .. note:: This endpoint is in beta. This will only function if base_url is set to `https://api.linode.com/v4beta`.
-        
-        API Documentation: https://techdocs.akamai.com/linode-api/reference/get-dashboards-by-id
-
-        :param filters: Any number of filters to apply to this query.
-                        See :doc:`Filtering Collections</linode_api4/objects/filtering>`
-                        for more details on filtering.
-
-        :returns: A Dashboards.
-        :rtype: PaginatedList of the Dashboard
-        """
-        result = self.client.get(f"/monitor/dashboards/{dashboard_id}")
-
-        if not "id" in result:
-            raise UnexpectedResponseError(
-                "Unexpected response when getting Dashboard!", json=result
-            )
-        return DashboardsByID(self.client, result["id"], result)
 
 
     def dashboards_by_service(self, service_type: str, *filters):

linode_api4/objects/monitor.py

@@ -3,13 +3,12 @@
     Property,
 )
 
-__all__ = ['Dashboard', 'DashboardsByID', 'DashboardByService', 'MonitorServiceSupported', 'ServiceDetails', 'MetricDefinition', 'CreateToken']  
 class Dashboard(Base):
     """
     List dashboards: https://techdocs.akamai.com/linode-api/get-dashboards-all
     """
 
-    api_endpoint = "/monitor/dashboards/"
+    api_endpoint = "/monitor/dashboards/{id}"
     properties = {
         "id": Property(identifier=True),
         "created": Property(is_datetime=True),
@@ -21,23 +20,8 @@ class Dashboard(Base):
 
     }
 
-class DashboardsByID(Base):
-    """
-    Get a dashboard: https://techdocs.akamai.com/linode-api/reference/get-dashboards-by-id
-    """
 
 
-    properties = {
-        "id": Property(identifier=True),
-        "created": Property(is_datetime=True),
-        "label": Property(),
-        "service_type": Property(),
-        "type": Property(),
-        "widgets": Property(mutable=True),
-        "updated": Property(is_datetime=True),
-     
-    }
-
 class DashboardByService(Base):
     """
     Get a dashboard: https://techdocs.akamai.com/linode-api/reference/get-dashboards

test/integration/models/monitor/test_monitor.py

@@ -1,7 +1,6 @@
 from linode_api4.objects import (
     MonitorServiceSupported,
     Dashboard,
-    DashboardsByID,
     DashboardByService,
     ServiceDetails,
     MetricDefinition,
@@ -26,17 +25,15 @@ def test_get_all_dashboards(test_linode_client):
     assert isinstance(dashboards[0],Dashboard)
 
     dashboard_get = dashboards[0]
-    dashboard_id = dashboard_get.id
     get_service_type = dashboard_get.service_type
-    print(f"printing svc {get_service_type}")
 
     #Fetch Dashboard by ID
-    dashboard_by_id = client.monitor.dashboard_by_ID(dashboard_id=dashboard_id)
-    assert isinstance(dashboard_by_id, DashboardsByID)
-    assert dashboard_by_id.id == dashboard_id
+    dashboard_by_id = client.load(Dashboard, 1)
+    assert isinstance(dashboard_by_id, Dashboard)
+    assert dashboard_by_id.id == 1
 
-    #Fetch Dashboard by service_type
-    dashboards_by_svc = client.monitor.dashboard_by_service(service_type=get_service_type)
+    # #Fetch Dashboard by service_type
+    dashboards_by_svc = client.monitor.dashboards_by_service(service_type=get_service_type)
     assert isinstance(dashboards_by_svc[0], DashboardByService)
     assert dashboards_by_svc[0].service_type == get_service_type
 

test/unit/objects/monitor_test.py

@@ -1,7 +1,10 @@
 from test.unit.base import ClientBaseCase
+from linode_api4.objects import (
+    Dashboard,
+    )
 import datetime
 
-class MonitorSupportedServicesTest(ClientBaseCase):
+class MonitorTest(ClientBaseCase):
     """
     Tests the methods of MonitorServiceSupported class
     """
@@ -19,7 +22,7 @@ def test_dashboard_by_ID(self):
         """
         Test the dashboard by ID API
         """
-        dashboard = self.client.monitor.dashboard_by_ID(dashboard_id=1)
+        dashboard = self.client.load(Dashboard, 1)
         self.assertEqual(dashboard.type, "standard")
         self.assertEqual(dashboard.created,  datetime.datetime(2024, 10, 10, 5, 1, 58))
         self.assertEqual(dashboard.id, 1)
@@ -37,7 +40,7 @@ def test_dashboard_by_ID(self):
 
 
     def test_dashboard_by_service_type(self):
-        dashboards = self.client.monitor.dashboard_by_service(service_type="dbaas")
+        dashboards = self.client.monitor.dashboards_by_service(service_type="dbaas")
         self.assertEqual(dashboards[0].type, "standard")
         self.assertEqual(dashboards[0].created,  datetime.datetime(2024, 10, 10, 5, 1, 58))
         self.assertEqual(dashboards[0].id, 1)
@@ -89,7 +92,7 @@ def test_metric_definitions(self):
         self.assertEqual(metrics[0].dimensions[0].label, "Node Type")
         self.assertEqual(metrics[0].dimensions[0].values,["primary", "secondary"])
 
-    def create_token(self):
+    def test_create_token(self):
 
         with self.mock_post("/monitor/services/dbaas/token") as m:
             self.client.monitor.create_token(service_type="dbaas", entity_ids=[189690,188020])