Release 0.2.4 (#117)

* Fixes on server (#112)

* Add QueryGenerator class (#113)

* Docs and tests for resposne handler. (#103)

It addresses a bug in response handler that called a batch with partial objects with empty values, as it was based on batch size value.

Added tests for the same.This relies on fixtures from pytest.

* Add PolygonDataCSV (#105)

* PolygonLoader

* +PolygonDataCSV, +batch_context for getitem()

* remove unused

* pep8

* draw polygons

* fix connection ref bounding

* draw specific polygons, polygon overlays

* add more image overlay types

* color silliness

* better handling of polygon constraints

* fix slow queries, revert batch context

* pep8

* revert BBoxLoader

* Increasing the size of the database.

Co-authored-by: Gautam <[email protected]>

* Version bump: 0.2.3 to 0.2.4

* Update config for tests on new ApertureDB version

Co-authored-by: luisremis <[email protected]>
Co-authored-by: JoshStoddard <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: 4 people

.gitignore

@@ -128,6 +128,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# VSCode
+.vscode/
+
 #Data files
 *.adb.csv
 *.jpg

aperturedb/BBoxDataCSV.py

@@ -71,33 +71,30 @@ def __init__(self, filename):
 
     def getitem(self, idx):
 
-        val = self.df.loc[idx, self.img_key]
-        box_data_headers = [HEADER_X_POS,
-                            HEADER_Y_POS, HEADER_WIDTH, HEADER_HEIGHT]
-        box_data = [int(self.df.loc[idx, h]) for h in box_data_headers]
-
         q = []
 
-        ref_counter = idx + 1
-        # TODO we could reuse image references within the batch
-        # instead of creating a new find for every image.
-        img_ref = ref_counter
+        img_id = self.df.loc[idx, self.img_key]
+
+        img_ref = (idx % 10000) + 1
+
         fi = {
             "FindImage": {
                 "_ref": img_ref,
-            }
+                "constraints": {
+                    self.img_key: ["==", img_id],
+                },
+                "blobs": False,
+            },
         }
-
-        key = self.img_key
-        val = val
-        constraints = {}
-        constraints[key] = ["==", val]
-        fi["FindImage"]["constraints"] = constraints
         q.append(fi)
 
+        box_data_headers = [HEADER_X_POS,
+                            HEADER_Y_POS, HEADER_WIDTH, HEADER_HEIGHT]
+        box_data = [int(self.df.loc[idx, h]) for h in box_data_headers]
+
         rect_attrs = ["x", "y", "width", "height"]
         custom_fields = {
-            "image": img_ref,
+            "image_ref": img_ref,
             "rectangle": {
                 attr: val for attr, val in zip(rect_attrs, box_data)
             },

aperturedb/BBoxLoader.py

@@ -140,6 +140,7 @@ def generate_batch(self, bbox_data):
             fi = {
                 "FindImage": {
                     "_ref": img_ref,
+                    "blobs": False,
                 }
             }
 
@@ -154,7 +155,7 @@ def generate_batch(self, bbox_data):
 
             ai = {
                 "AddBoundingBox": {
-                    "image": img_ref,
+                    "image_ref": img_ref,
                     "rectangle": {
                         "x":      data["x"],
                         "y":      data["y"],

aperturedb/ConnectionDataCSV.py

@@ -77,7 +77,7 @@ def getitem(self, idx):
 
         try:
 
-            ref_src = 2 * idx + 1
+            ref_src = (2 * idx) % 10000 + 1
             fe_a = {
                 "FindEntity": {
                     "_ref": ref_src,
@@ -90,7 +90,7 @@ def getitem(self, idx):
                 "==", src_value]
             q.append(fe_a)
 
-            ref_dst = 2 * idx + 2
+            ref_dst = ref_src + 1
             fe_b = {
                 "FindEntity": {
                     "_ref": ref_dst,

aperturedb/Connector.py

@@ -198,40 +198,47 @@ def _connect(self):
         if sys.platform.startswith('linux'):
             self.conn.setsockopt(socket.SOL_TCP, socket.TCP_QUICKACK, 1)
 
-        self.conn.connect((self.host, self.port))
+        try:
+            self.conn.connect((self.host, self.port))
 
-        # Handshake with server to negotiate protocol
+            # Handshake with server to negotiate protocol
 
-        protocol = 2 if self.use_ssl else 1
+            protocol = 2 if self.use_ssl else 1
 
-        hello_msg = struct.pack('@II', PROTOCOL_VERSION, protocol)
+            hello_msg = struct.pack('@II', PROTOCOL_VERSION, protocol)
 
-        # Send desire protocol
-        self._send_msg(hello_msg)
+            # Send desire protocol
+            self._send_msg(hello_msg)
 
-        # Receive response from server
-        response = self._recv_msg()
+            # Receive response from server
+            response = self._recv_msg()
 
-        version, server_protocol = struct.unpack('@II', response)
+            version, server_protocol = struct.unpack('@II', response)
 
-        if version != PROTOCOL_VERSION:
-            logger.warning("Protocol version differ from server")
+            if version != PROTOCOL_VERSION:
+                logger.warning("Protocol version differ from server")
 
-        if server_protocol != protocol:
-            self.conn.close()
-            self.connected = False
-            raise Exception(
-                "Server did not accept protocol. Aborting Connection.")
+            if server_protocol != protocol:
+                self.conn.close()
+                self.connected = False
+                raise Exception(
+                    "Server did not accept protocol. Aborting Connection.")
 
-        if self.use_ssl:
+            if self.use_ssl:
 
-            # Server is ok with SSL, we switch over SSL.
-            self.context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-            self.context.check_hostname = False
-            # TODO, we need to add support for local certificates
-            # For now, we let the server send us the certificate
-            self.context.verify_mode = ssl.VerifyMode.CERT_NONE
-            self.conn = self.context.wrap_socket(self.conn)
+                # Server is ok with SSL, we switch over SSL.
+                self.context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+                self.context.check_hostname = False
+                # TODO, we need to add support for local certificates
+                # For now, we let the server send us the certificate
+                self.context.verify_mode = ssl.VerifyMode.CERT_NONE
+                self.conn = self.context.wrap_socket(self.conn)
+
+        except BaseException as e:
+            logger.error(f"Error connecting to server: {str(e)}")
+            self.conn.close()
+            self.connected = False
+            raise ConnectionError("Failed to connect to ApertureDB")
 
         self.connected = True