Merge pull request #477 from aperture-data/release-0.4.32

Release 0.4.32

Author: gsaluja9

README.md

@@ -36,6 +36,7 @@ The tests are inside the `test` dir.
 All the tests can be run with:
 
 ```bash
+export GCP_SERVICE_ACCOUNT_KEY=<content of a GCP SERVICE ACCOUNT JSON file>
 bash run_test.sh
 ```
 

aperturedb/BBoxDataCSV.py

@@ -1,5 +1,3 @@
-from matplotlib.transforms import Bbox
-from aperturedb import ParallelLoader
 from aperturedb import CSVParser
 
 HEADER_X_POS = "x_pos"

aperturedb/ConnectionDataCSV.py

@@ -1,6 +1,6 @@
 import logging
 from aperturedb.CSVParser import CSVParser, CONSTRAINTS_PREFIX
-from aperturedb.Query import QueryBuilder, ObjectType
+from aperturedb.Query import QueryBuilder
 
 logger = logging.getLogger(__name__)
 

aperturedb/Connector.py

@@ -25,6 +25,7 @@
 # THE SOFTWARE.
 #
 from __future__ import annotations
+from typing import Optional
 from . import queryMessage
 import sys
 import os
@@ -105,7 +106,7 @@ def __init__(self, host="localhost", port=55555,
                  use_keepalive=True,
                  retry_interval_seconds=1,
                  retry_max_attempts=3,
-                 config: Configuration = None):
+                 config: Optional[Configuration] = None):
         """
         Constructor for the Connector class.
         """
@@ -167,11 +168,7 @@ def authenticate(self, shared_data, user, password, token):
         if not self.authenticated:
             if shared_data.session is None:
                 self.shared_data.lock = Lock()
-                try:
-                    self._authenticate(user, password, token)
-                except Exception as e:
-                    raise UnauthenticatedException(
-                        "Authentication failed:", str(e))
+                self._authenticate(user, password, token)
             else:
                 self.shared_data = shared_data
             self.authenticated = True
@@ -277,7 +274,6 @@ def _refresh_token(self):
             raise UnauthorizedException(response)
 
     def _connect(self):
-
         self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.conn.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
         if self.use_keepalive:
@@ -327,10 +323,6 @@ def _connect(self):
                 self.conn = self.context.wrap_socket(self.conn)
 
         except BaseException as e:
-            logger.error(
-                f"Error connecting to server: {str(e)} {self.config}",
-                exc_info=True,
-                stack_info=True)
             self.conn.close()
             self.connected = False
             raise
@@ -347,7 +339,7 @@ def connect(self, details: str = None):
                 self._connect()
             except socket.error as e:
                 logger.error(
-                    f"Error connecting to server: {self.config} \r\n{details}.",
+                    f"Error connecting to server: {self.config} \r\n{details}. {e=}",
                     exc_info=True,
                     stack_info=True)
 
@@ -436,8 +428,13 @@ def _query(self, query, blob_array = [], try_resume=True):
             if try_resume:
                 self._renew_session()
         if tries == self.config.retry_max_attempts:
+            # We have tried enough times, and failed. Log some state info.
             raise Exception(
-                f"Could not query apertureDB using TCP.")
+                f"Could not query apertureDB using TCP. \r\n\
+                {self.connected=}\r\n \
+                {self.authenticated=} \r\n \
+                attempts={tries}/{self.config.retry_max_attempts} \r\n \
+                {self.config=}")
         return (self.last_response, response_blob_array)
 
     def query(self, q, blobs=[]):

aperturedb/ConnectorRest.py

@@ -31,9 +31,7 @@
 import json
 import logging
 
-from threading import Lock
 from types import SimpleNamespace
-from dataclasses import dataclass
 from aperturedb.Connector import Connector
 from aperturedb.Configuration import Configuration
 

aperturedb/DescriptorSetDataCSV.py

@@ -1,5 +1,4 @@
 import ast
-from aperturedb import ParallelLoader
 from aperturedb import CSVParser
 
 HEADER_NAME = "name"

aperturedb/EntityDataCSV.py

@@ -1,5 +1,4 @@
 from aperturedb import CSVParser
-from aperturedb.EntityUpdateDataCSV import SingleEntityUpdateDataCSV
 import logging
 
 logger = logging.getLogger(__name__)

aperturedb/ImageDataCSV.py

@@ -1,8 +1,5 @@
-import time
-import requests
 import boto3
 
-import numpy as np
 import cv2
 
 from aperturedb import CSVParser

aperturedb/ImageDownloader.py

@@ -2,7 +2,6 @@
 import requests
 import os
 import logging
-from os import path
 
 import cv2
 import numpy as np

aperturedb/ParallelQuery.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Callable, Dict, List, Tuple, Optional
+from typing import Callable, List, Tuple, Optional
 from aperturedb import Parallelizer
 import numpy as np
 import json
@@ -147,8 +147,14 @@ def map_response_to_handler(cls, handler, query, query_blobs,  response, respons
             blobs_returned += b_count
 
     def __init__(self, db: Connector, dry_run: bool = False):
-
         super().__init__()
+        test_string = f"Connection test successful with {db.config}"
+        try:
+            _, _ = db.query([{"GetSchema": {}}], [])
+            logger.info(test_string)
+        except Exception as e:
+            logger.error(test_string.replace("successful", "failed"))
+            raise
 
         self.db = db.create_new_connection()