msfabricpysdkcore 0.0.12__py3-none-any.whl → 0.1.1__py3-none-any.whl

msfabricpysdkcore/admin_item.py

@@ -1,29 +1,26 @@
 import json
-from time import sleep
-
-import requests 
+from msfabricpysdkcore.adminapi import FabricClientAdmin
 
 
 class AdminItem:
     """Class to represent a item in Microsoft Fabric"""
 
-    def __init__(self, id, type, name, workspace_id, state, description, last_updated_date, capacity_id, creator_principal, auth) -> None:
+    def __init__(self, id, type, name, workspace_id, state, description, last_updated_date, capacity_id, creator_principal, admin_client: FabricClientAdmin) -> None:
         """Constructor for the Item class
         
         Args:
             id (str): The ID of the item
             type (str): The type of the item
             name (str): The name of the item
-            workspace_id (str): The ID of the workspace
+            workspace_id (str): The ID of the workspace to which the item belongs
             state (str): The state of the item
             description (str): The description of the item
-            last_updated_date (str): The last updated date of the item
-            capacity_id (str): The ID of the capacity
-            creator_principal (dict): The creator principal of the item
-            auth (Auth): The Auth object
-        Returns:
-            Item: The Item object
+            last_updated_date (str): The date when the item was last updated
+            capacity_id (str): The
+            creator_principal (str): The principal who created the item
+            admin_client (FabricClientAdmin): The FabricClientAdmin object
         """
+
         self.id = id
         self.type = type
         self.name = name
@@ -33,7 +30,7 @@ class AdminItem:
         self.last_updated_date = last_updated_date
         self.capacity_id = capacity_id
         self.creator_principal = creator_principal
-        self.auth = auth
+        self.admin_client = admin_client
 
 
     def __str__(self) -> str:
@@ -59,55 +56,32 @@ class AdminItem:
     def __repr__(self) -> str:
         return self.__str__()
     
-    def from_dict(item_dict, auth):
+    def from_dict(item_dict, admin_client):
         """Create Item object from dictionary
         
         Args:
-            item_dict (dict): The dictionary containing the item information
-            auth (Auth): The Auth object
+            item_dict (dict): The dictionary containing the item details
+            admin_client (FabricClientAdmin): The FabricClientAdmin object
         Returns:
-            Item: The Item object"""
+            AdminItem: The AdminItem object
+        """
         return AdminItem(
             id = item_dict['id'],
             type = item_dict['type'],
-            name = item_dict['name'],
+            name = item_dict.get('name', None),
             workspace_id = item_dict['workspaceId'],
             state = item_dict['state'],
             description = item_dict.get('description', None),
             last_updated_date = item_dict['lastUpdatedDate'],
             capacity_id = item_dict['capacityId'],
             creator_principal = item_dict['creatorPrincipal'],
-            auth = auth
+            admin_client = admin_client
         )
-    
-    def get_item_access_details(self, type=None):
-        """Get the access details of the item
-        
-        Returns:
-            dict: The access details of the item"""
-        return self.list_item_access_details(type)
-        
+            
     def list_item_access_details(self, type=None):
         """Get the access details of the item
         
         Returns:
             dict: The access details of the item"""
         
-        url = f"https://api.fabric.microsoft.com/v1/admin/workspaces/{self.workspace_id}/items/{self.id}/users"
-
-        if type:
-            url += f"?type={self.type}"
-        
-        for _ in range(10):
-            response = requests.get(url=url, headers=self.auth.get_headers())
-            if response.status_code == 429:
-                print("Too many requests, waiting 10 seconds")
-                sleep(10)
-                continue
-            if response.status_code not in (200, 429):
-                print(response.status_code)
-                print(response.text)
-                raise Exception(f"Error getting item: {response.text}")
-            break
-        
-        return json.loads(response.text)
+        return self.admin_client.list_item_access_details(self.workspace_id, self.id, type)

msfabricpysdkcore/admin_workspace.py

@@ -1,15 +1,14 @@
 import json
 from time import sleep
 
-import requests
-
 from msfabricpysdkcore.admin_item import AdminItem 
+from msfabricpysdkcore.adminapi import FabricClientAdmin
 
 
 class AdminWorkspace:
     """Class to represent a workspace in Microsoft Fabric"""
 
-    def __init__(self, id, type, name, state, capacity_id, auth) -> None:
+    def __init__(self, id, type, name, state, capacity_id, admin_client:FabricClientAdmin) -> None:
         """Constructor for the Workspace class
 
         Args:
@@ -18,7 +17,7 @@ class AdminWorkspace:
             name (str): The name of the workspace
             state (str): The state of the workspace
             capacity_id (str): The ID of the capacity
-            auth (Auth): The Auth object
+            admin_client (FabricClientAdmin): The FabricClientAdmin object
         Returns:
             Workspace: The Workspace object
         """
@@ -27,7 +26,7 @@ class AdminWorkspace:
         self.name = name
         self.state = state
         self.capacity_id = capacity_id
-        self.auth = auth
+        self.admin_client = admin_client
 
 
     def __str__(self) -> str:
@@ -49,12 +48,12 @@ class AdminWorkspace:
     def __repr__(self) -> str:
         return self.__str__()
     
-    def from_dict(item_dict, auth):
+    def from_dict(item_dict, admin_client):
         """Create Workspace object from dictionary
 
         Args:
             item_dict (dict): The dictionary representing the workspace
-            auth (Auth): The Auth object
+            admin_client (FabricClientAdmin): The FabricClientAdmin object
         Returns:
             Workspace: The Workspace object
         """
@@ -64,39 +63,19 @@ class AdminWorkspace:
             name=item_dict['name'],
             state=item_dict['state'],
             capacity_id=item_dict['capacityId'],
-            auth=auth
+            admin_client=admin_client
         )
-    
-    def get_workspace_access_details(self):
-        """Get the access details of the workspace
-
-        Returns:
-            dict: The access details of the workspace
-        """
-        return self.list_workspace_access_details()
-    
+        
     def list_workspace_access_details(self):
         """Get the access details of the workspace
 
         Returns:
             dict: The access details of the workspace
         """
-        url = f"https://api.fabric.microsoft.com/v1/admin/workspaces/{self.id}/users"
-           
-        for _ in range(10):
-            response = requests.get(url=url, headers=self.auth.get_headers())
-            if response.status_code == 429:
-                print("Too many requests, waiting 10 seconds")
-                sleep(10)
-                continue
-            if response.status_code not in (200, 429):
-                print(response.status_code)
-                print(response.text)
-                raise Exception(f"Error getting workspace: {response.text}")
-            break
+        return self.admin_client.list_workspace_access_details(self.id)
+    
+    # Items
 
-        return json.loads(response.text)
-        
     def get_item(self, item_id, type = None):
         """Get an item from the workspace
         
@@ -106,22 +85,7 @@ class AdminWorkspace:
         Returns:
             AdminItem: The item object
         """
-        url = f"https://api.fabric.microsoft.com/v1/admin/workspaces/{self.id}/items/{item_id}"
-        if type:
-            url += f"?type={type}"
-        for _ in range(10):
-            response = requests.get(url=url, headers=self.auth.get_headers())
-            if response.status_code == 429:
-                print("Too many requests, waiting 10 seconds")
-                sleep(10)
-                continue
-            if response.status_code not in (200, 429):
-                print(response.status_code)
-                print(response.text)
-                raise Exception(f"Error getting item: {response.text}")
-            break
-        item_dict = json.loads(response.text) 
-        return AdminItem.from_dict(item_dict, self.auth)
+        return self.admin_client.get_item(self.id, item_id, type)
     
     def list_item_access_details(self, item_id, type=None):
         """Get the access details of the item
@@ -132,15 +96,4 @@ class AdminWorkspace:
         Returns:
             dict: The access details of the item
         """
-        return self.get_item(item_id, type).list_item_access_details()
-
-    def get_item_access_details(self, item_id, type=None):
-        """Get the access details of the item
-        
-        Args:
-            item_id (str): The ID of the item
-            type (str): The type of the item
-        Returns:
-            dict: The access details of the item
-        """
-        return self.list_item_access_details(item_id, type)
+        return self.admin_client.list_item_access_details(self.id, item_id, type)