t2d2-sdk 1.2.dev5__tar.gz → 1.4.0__tar.gz

{t2d2-sdk-1.2.dev5/src/t2d2_sdk.egg-info → t2d2-sdk-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t2d2-sdk
-Version: 1.2.dev5
+Version: 1.4.0
 Summary: T2D2 SDK
 Author-email: Badri Hiriyur <badri@t2d2.ai>
 Project-URL: Homepage, https://t2d2.ai
@@ -54,6 +54,7 @@ With this client, you can interface with the app and get access to most of the f
 
 ```python
 t2d2.set_project(PROJECT_ID)
+project = t2d2.get_project()
 data = t2d2.get_images()
 ...
 ```

{t2d2-sdk-1.2.dev5 → t2d2-sdk-1.4.0}/README.md

@@ -38,6 +38,7 @@ With this client, you can interface with the app and get access to most of the f
 
 ```python
 t2d2.set_project(PROJECT_ID)
+project = t2d2.get_project()
 data = t2d2.get_images()
 ...
 ```

{t2d2-sdk-1.2.dev5 → t2d2-sdk-1.4.0}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.2.dev5'
-__version_tuple__ = version_tuple = (1, 2, 'dev5')
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

{t2d2-sdk-1.2.dev5 → t2d2-sdk-1.4.0/src/t2d2_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: t2d2-sdk
-Version: 1.2.dev5
+Version: 1.4.0
 Summary: T2D2 SDK
 Author-email: Badri Hiriyur <badri@t2d2.ai>
 Project-URL: Homepage, https://t2d2.ai
@@ -54,6 +54,7 @@ With this client, you can interface with the app and get access to most of the f
 
 ```python
 t2d2.set_project(PROJECT_ID)
+project = t2d2.get_project()
 data = t2d2.get_images()
 ...
 ```

{t2d2-sdk-1.2.dev5 → t2d2-sdk-1.4.0}/src/t2d2_sdk.py

@@ -12,6 +12,7 @@ TIMEOUT = 60
 BASE_URL = os.getenv("T2D2_API_URL", "https://api-v3.t2d2.ai/api/")
 # DEV https://api-v3-dev.t2d2.ai/api/
 
+
 ####################################################################################################
 def random_string(length: int = 6) -> str:
     """Generate a random string of fixed length"""
@@ -30,7 +31,10 @@ def download_file(url: str, file_path: str):
         s3.download_file(bucket, key, file_path)
         return {"success": True, "message": "File downloaded"}
     except Exception as e:
-        return {"success": False, "message": f"{str(e)} \n{bucket} \n{key} \n{file_path}"}
+        return {
+            "success": False,
+            "message": f"{str(e)} \n{bucket} \n{key} \n{file_path}",
+        }
 
 
 def upload_file(file_path: str, url: str):
@@ -43,7 +47,10 @@ def upload_file(file_path: str, url: str):
         s3.upload_file(file_path, bucket, key, ExtraArgs={"ACL": "public-read"})
         return {"success": True, "message": "File uploaded"}
     except Exception as e:
-        return {"success": False, "message": f"{str(e)} \n{bucket} \n{key} \n{file_path}"}
+        return {
+            "success": False,
+            "message": f"{str(e)} \n{bucket} \n{key} \n{file_path}",
+        }
 
 
 ####################################################################################################
@@ -202,12 +209,17 @@ class T2D2(object):
 
     def get_images(self, image_ids=None, params=None):
         """Return image list based on specified ids"""
-        if image_ids is None:
-            return []
-
         if not self.project:
-            raise ValueError("Project not set")
+            raise ValueError("Project not set yet")
+
+        # all images in project
+        if image_ids is None:
+            url = f"{self.project['id']}/images"
+            json_data = self.request(url, RequestType.GET, params=params)
+            results = json_data["data"]["image_list"]
+            return results
 
+        # Specified image_ids
         results = []
         for img_id in image_ids:
             url = f"{self.project['id']}/images/{img_id}"
@@ -260,32 +272,9 @@ class T2D2(object):
             results.append(json_data["data"])
         return results
 
-    def get_geotags(self, drawing_id=None, params=None):
-        """Return annotation list based on specified ids"""
-        if drawing_id is None:
-            return []
-
-        if not self.project:
-            raise ValueError("Project not set")
-
-        url = f"{self.project['id']}/geotags?drawing_id={drawing_id}"
-        json_data = self.request(url, RequestType.GET, params=params)
-
-        return json_data["data"]
-
     ################################################################################################
-    # Add / Upload methods
+    # Add / Upload Asset methods
     ################################################################################################
-    def add_annotations(self, payloads):
-        """Add annotations"""
-        results = []
-        for payload in payloads:
-            url = "annotation"
-            res = self.request(url, RequestType.POST, data=payload)
-            results.append(res)
-
-        return results
-
     def add_assets(self, payload):
         """Add assets"""
         url = f"{self.project['id']}/assets/bulk.create"
@@ -400,7 +389,10 @@ class T2D2(object):
             s3_path = (
                 self.s3_base_url + f"/projects/{self.project['id']}/reports/{filename}"
             )
-            upload_file(file_path, s3_path)
+            response = upload_file(file_path, s3_path)
+            if not response["success"]:
+                raise ValueError(response["message"])
+
             assets.append(
                 {
                     "name": base,
@@ -416,3 +408,77 @@ class T2D2(object):
         res = self.request(url, RequestType.POST, data=payload)
 
         return res
+
+    ################################################################################################
+    # Annotation methods
+    ################################################################################################
+    def get_annotations(self, image_id=None, params=None):
+        """TODO: Return annotation list based on specified ids"""
+        if not self.project:
+            raise ValueError("Project not set")
+
+        if params is None:
+            params = {}
+
+        if image_id is None:
+            images = self.get_images(params=params)
+            image_ids = [img["id"] for img in images]
+        else:
+            image_ids = [image_id]
+
+        images = self.get_images(image_ids=image_ids, params=params)
+        annotations = []
+        for img in images:
+            annotations.extend(img["annotations"])
+
+        return annotations
+
+    def delete_annotations(self, image_id, annotation_ids=None):
+        """Delete annotations"""
+
+        if not self.project:
+            raise ValueError("Project not set")
+
+        if annotation_ids is None:
+            # Get annotation_ids for all annotations in image
+            annotations = self.get_annotations(image_id)
+            annotation_ids = [ann["id"] for ann in annotations]
+
+        payload = {
+            "project_id": self.project["id"],
+            "image_id": image_id,
+            "annotation_ids": annotation_ids,
+        }
+
+        return self.request("annotation", RequestType.DELETE, data=payload)
+
+    def add_annotations(self, image_id, annotations):
+        """TODO: Add annotations"""
+        if not self.project:
+            raise ValueError("Project not set")
+
+        url = "annotation"
+        payload = {
+            "project_id": self.project["id"],
+            "image_id": image_id,
+            "annotations": annotations,
+        }
+        results = self.request(url, RequestType.POST, data=payload)
+
+        return results
+
+    ################################################################################################
+    # Geotag methods
+    ################################################################################################
+    def get_geotags(self, drawing_id, params=None):
+        """Return annotation list based on specified ids"""
+        if drawing_id is None:
+            return []
+
+        if not self.project:
+            raise ValueError("Project not set")
+
+        url = f"{self.project['id']}/geotags?drawing_id={drawing_id}"
+        json_data = self.request(url, RequestType.GET, params=params)
+
+        return json_data["data"]

t2d2-sdk-1.4.0/tests/t2d2_test.py

@@ -0,0 +1,101 @@
+# pylint: disable=missing-docstring,line-too-long
+import os
+import random
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(__file__), "../src"))
+
+# pylint: disable=import-error, wrong-import-position
+from t2d2_sdk import T2D2, random_string
+
+creds_api_key = {"api_key": os.getenv("T2D2_API_KEY", "")}
+BASE_URL = "https://api-v3.t2d2.ai/api"
+PROJECT_ID = 44
+
+
+def gen_random_polygons(n=5):
+    """Return random polygon points"""
+    points = []
+    for _ in range(n):
+        points.append([random.random(), random.random()])
+    return points
+
+
+def gen_random_box():
+    """Return random box points"""
+    points = [
+        0.1 + 0.01 * random.random(),
+        0.2 + 0.01 * random.random(),
+        0.4 + 0.01 * random.random(),
+        0.8 + 0.01 * random.random(),
+    ]
+    return points
+
+
+def generate_random_annotations(n=10):
+    """Generate random annotations"""
+    annotations = []
+    for _ in range(n):
+        annotations.append(
+            {
+                # "points": gen_random_polygons(),
+                # "shape": 4,
+                "points": gen_random_box(),
+                "shape": 3,
+                "annotation_class_name": "efflorescence",
+            }
+        )
+
+    return annotations
+
+
+class T2D2APITests(unittest.TestCase):
+    def setUp(self):
+        # Initialize T2D2 object with dummy credentials
+        self.t2d2 = T2D2(credentials=creds_api_key, base_url=BASE_URL)
+        self.t2d2.set_project(PROJECT_ID)
+
+    def test_random_string(self):
+        # Test random_string function
+        result = random_string(length=6)
+        self.assertEqual(len(result), 6)
+
+    def test_project(self):
+        # Test project function
+        project = self.t2d2.get_project(PROJECT_ID)
+        self.assertEqual(project["id"], PROJECT_ID)
+
+    def test_images(self):
+        # Get Images
+        images = self.t2d2.get_images(params={"image_types": [1, 2, 4]})
+        self.assertEqual(len(images), 205)
+
+        # Get Images
+        orthos = self.t2d2.get_images(params={"image_types": [3]})
+        self.assertEqual(len(orthos), 12)
+
+    def test_annotations(self):
+        # Test annotations function
+        image_id = 330243
+        params = {}
+
+        res = self.t2d2.delete_annotations(image_id=330243)
+        self.assertEqual(res["success"], True)
+
+        annotations = self.t2d2.get_annotations(image_id=image_id, params=params)
+        self.assertEqual(len(annotations), 0)
+
+        anns = generate_random_annotations(n=10)
+        # print(anns)
+        res = self.t2d2.add_annotations(image_id=image_id, annotations=anns)
+        self.assertEqual(res["success"], True)
+        # print(res)
+
+        annotations = self.t2d2.get_annotations(image_id=330243, params=params)
+        self.assertEqual(len(annotations), 10)
+
+
+if __name__ == "__main__":
+    print("Running tests...")
+    unittest.main()

t2d2-sdk-1.2.dev5/tests/t2d2_test.py

@@ -1,38 +0,0 @@
-# pylint: disable=missing-docstring,line-too-long
-import os
-import unittest
-
-from t2d2_sdk import T2D2, random_string
-
-creds_api_key = {
-    "api_key": os.getenv("T2D2_API_KEY", ""),
-}
-PROJECT_ID = 1
-
-
-class T2D2APITests(unittest.TestCase):
-    def setUp(self):
-        # Initialize T2D2 object with dummy credentials
-        self.t2d2 = T2D2(
-            credentials=creds_api_key, base_url="http://localhost:4000/api/"
-        )
-
-    def test_random_string(self):
-        # Test random_string function
-        result = random_string(length=6)
-        self.assertEqual(len(result), 6)
-
-    def test_project(self):
-        # Test project function
-        project = self.t2d2.get_project(PROJECT_ID)
-        self.assertEqual(project["id"], PROJECT_ID)
-
-        self.t2d2.set_project(PROJECT_ID)
-        self.assertEqual(self.t2d2.project["id"], PROJECT_ID)
-
-    # Add more test cases for other functions...
-
-
-if __name__ == "__main__":
-    print("Running tests...")
-    unittest.main()