refactor

Author: zkarpinski

codeinsight_sdk/client.py

@@ -1,7 +1,7 @@
 import requests
 import logging
 
-from .handlers import Handler
+from .handlers import ProjectHandler, Handler, ReportHandler
 from .models import Project, ProjectInventory, Report
 from .exceptions import CodeInsightError
 
@@ -21,7 +21,7 @@ def __init__(self,
             "User-Agent": "codeinsight_sdk_python",
         }
 
-    def request(self, method, url_part: str, params: dict = None):
+    def request(self, method, url_part: str, params: dict = None, body: any = None ):
         url = f"{self.api_url}/{url_part}"
 
         # Iterate over params and remove any that are None (Empty)
@@ -31,7 +31,7 @@ def request(self, method, url_part: str, params: dict = None):
                     del params[k]
 
         response = requests.request(method, url,
-                                     headers=self.__api_headers, params=params)
+                                     headers=self.__api_headers, params=params, json=body)
 
         if not response.ok:
             logger.error(f"Error: {response.status_code} - {response.reason}")
@@ -41,12 +41,12 @@ def request(self, method, url_part: str, params: dict = None):
         return response
 
     @property
-    def projects(self) -> Handler:
-        return Handler.create(self, Project)
+    def projects(self) -> ProjectHandler:
+        return ProjectHandler(self)
 
     @property
-    def reports(self) -> Handler:
-        return Handler.create(self, Report)
+    def reports(self) -> ReportHandler:
+        return ReportHandler(self)
 
 
     # Coming soon...?

codeinsight_sdk/handlers.py

@@ -1,13 +1,13 @@
 import abc
 from typing import List
 
-from codeinsight_sdk.models import Project, ProjectInventory, ProjectInventoryItem
+from codeinsight_sdk.models import Project, ProjectInventory, ProjectInventoryItem, Report
 from codeinsight_sdk.exceptions import CodeInsightError
 
 class Handler(abc.ABC):
-    def __init__(self, client, cls):
+    def __init__(self, client):
         self.client = client
-        self.cls = cls
+        self.cls = None
 
     @staticmethod
     def create(client, cls):
@@ -18,13 +18,17 @@ def create(client, cls):
         handler = handlers.get(k)
         if handler is None:
             raise ValueError(f"Handler not found for class '{k}'")
-        return handler(client, cls)
+        return handler(client)
 
     @abc.abstractmethod
     def get(self):
         pass
 
 class ProjectHandler(Handler):
+    def __init__(self, client):
+        super().__init__(client)
+        self.cls = Project       
+    
     #Note API endpoints switch between projects and project...
     def all(self) -> List[Project]:
             """
@@ -154,6 +158,10 @@ def get_inventory(self,project_id:int,
 
 
 class ReportHandler(Handler):
+    def __init__(self, client):
+        super().__init__(client)
+        self.cls = Report
+    
     def get(self, id:int):
         path = f"reports/{id}"
         resp = self.client.request("GET", url_part=path)

examples/requirements.examples.txt

@@ -0,0 +1,2 @@
+codeinsight-sdk==0.0.4
+pandas~=2.0.0

tests/test_handlers.py

@@ -4,14 +4,15 @@
 from codeinsight_sdk.handlers import Handler, ProjectHandler, ReportHandler
 from codeinsight_sdk.models import Project, Report
 
+
 class TestHandlers(object):
     @pytest.fixture
     def client(self):
         return CodeInsightClient("","")
 
     def test_bad_handler(self, client):
         with pytest.raises(Exception):
-            Handler.create(client, "BadClass")
+            Handler.create(client)
 
     def test_project_handler(self, client):
         project_handler = Handler.create(client, Project)