revert

CAVEconnectome · Sep 9, 2024 · 65a4f84 · 65a4f84
1 parent 2efe3e4
commit 65a4f84
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 43 deletions.
diff --git a/caveclient/chunkedgraph.py b/caveclient/chunkedgraph.py
@@ -116,7 +116,6 @@ def ChunkedGraphClient(
     timestamp=None,
     verify=True,
     max_retries=None,
-    retry_backoff=None,
     pool_maxsize=None,
     pool_block=None,
     over_client=None,
@@ -150,7 +149,6 @@ def ChunkedGraphClient(
         table_name=table_name,
         verify=verify,
         max_retries=max_retries,
-        retry_backoff=retry_backoff,
         pool_maxsize=pool_maxsize,
         pool_block=pool_block,
         over_client=over_client,
@@ -171,7 +169,6 @@ def __init__(
         table_name=None,
         verify=True,
         max_retries=None,
-        retry_backoff=None,
         pool_maxsize=None,
         pool_block=None,
         over_client=None,
@@ -184,7 +181,6 @@ def __init__(
             server_key,
             verify=verify,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             over_client=over_client,

diff --git a/caveclient/emannotationschemas.py b/caveclient/emannotationschemas.py
@@ -18,7 +18,6 @@ def SchemaClient(
     auth_client=None,
     api_version="latest",
     max_retries=None,
-    retry_backoff=None,
     pool_maxsize=None,
     pool_block=None,
     over_client=None,
@@ -43,7 +42,6 @@ def SchemaClient(
         endpoints=endpoints,
         server_name=server_key,
         max_retries=max_retries,
-        retry_backoff=retry_backoff,
         pool_maxsize=pool_maxsize,
         pool_block=pool_block,
         over_client=over_client,
@@ -59,7 +57,6 @@ def __init__(
         endpoints,
         server_name,
         max_retries=None,
-        retry_backoff=None,
         pool_maxsize=None,
         pool_block=None,
         over_client=None,
@@ -71,7 +68,6 @@ def __init__(
             endpoints,
             server_name,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             over_client=over_client,

diff --git a/caveclient/frameworkclient.py b/caveclient/frameworkclient.py
@@ -13,6 +13,8 @@
 from .materializationengine import MaterializationClient, MaterializationClientType
 from .skeletonservice import SkeletonClient
 
+DEFAULT_RETRIES = 3
+
 
 class GlobalClientError(Exception):
     pass
@@ -27,8 +29,7 @@ def __new__(
         auth_token_key=None,
         auth_token=None,
         global_only=False,
-        max_retries=None,
-        retry_backoff=None,
+        max_retries=DEFAULT_RETRIES,
         pool_maxsize=None,
         pool_block=None,
         desired_resolution=None,
@@ -105,7 +106,6 @@ def __new__(
                 auth_token_key=auth_token_key,
                 auth_token=auth_token,
                 max_retries=max_retries,
-                retry_backoff=retry_backoff,
                 pool_maxsize=pool_maxsize,
                 pool_block=pool_block,
                 info_cache=info_cache,
@@ -118,7 +118,6 @@ def __new__(
                 auth_token_key=auth_token_key,
                 auth_token=auth_token,
                 max_retries=max_retries,
-                retry_backoff=retry_backoff,
                 pool_maxsize=pool_maxsize,
                 pool_block=pool_block,
                 desired_resolution=desired_resolution,
@@ -134,8 +133,7 @@ def __init__(
         auth_token_file=None,
         auth_token_key=None,
         auth_token=None,
-        max_retries=None,
-        retry_backoff=None,
+        max_retries=DEFAULT_RETRIES,
         pool_maxsize=None,
         pool_block=None,
         info_cache=None,
@@ -191,7 +189,6 @@ def __init__(
             auth_token=auth_token,
         )
         self._max_retries = max_retries
-        self._retry_backoff = retry_backoff
         self._pool_maxsize = pool_maxsize
         self._pool_block = pool_block
         self._info_cache = info_cache
@@ -253,7 +250,6 @@ def info(self) -> InfoServiceClientV2:
                 datastack_name=self.datastack_name,
                 auth_client=self.auth,
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -272,7 +268,6 @@ def state(self) -> JSONServiceV1:
                 server_address=self.server_address,
                 auth_client=self.auth,
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -290,7 +285,6 @@ def schema(self) -> SchemaClientLegacy:
                 server_address=self.server_address,
                 auth_client=self.auth,
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -326,8 +320,7 @@ def __init__(
         auth_token_file=default_token_file,
         auth_token_key="token",
         auth_token=None,
-        max_retries=None,
-        retry_backoff=None,
+        max_retries=DEFAULT_RETRIES,
         pool_maxsize=None,
         pool_block=None,
         desired_resolution=None,
@@ -394,7 +387,6 @@ def __init__(
             auth_token_key=auth_token_key,
             auth_token=auth_token,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             info_cache=info_cache,
@@ -476,7 +468,6 @@ def chunkedgraph(self) -> ChunkedGraphClientV1:
                 server_address=self.local_server,
                 auth_client=self.auth,
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -495,7 +486,6 @@ def annotation(self) -> AnnotationClientV2:
                 aligned_volume_name=self._aligned_volume_name,
                 auth_client=self.auth,
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -515,7 +505,6 @@ def materialize(self) -> MaterializationClientType:
                 datastack_name=self._datastack_name,
                 synapse_table=self.info.get_datastack_info().get("synapse_table", None),
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -553,7 +542,6 @@ def state(self) -> JSONServiceV1:
                 auth_client=self.auth,
                 ngl_url=self.info.viewer_site(),
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,
@@ -575,7 +563,6 @@ def l2cache(self) -> L2CacheClientLegacy:
                 auth_client=self.auth,
                 table_name=table_name,
                 max_retries=self._max_retries,
-                retry_backoff=self._retry_backoff,
                 pool_maxsize=self._pool_maxsize,
                 pool_block=self._pool_block,
                 over_client=self,

diff --git a/caveclient/infoservice.py b/caveclient/infoservice.py
@@ -28,7 +28,6 @@ def InfoServiceClient(
     api_version="latest",
     verify=True,
     max_retries=None,
-    retry_backoff=None,
     pool_maxsize=None,
     pool_block=None,
     over_client=None,
@@ -61,7 +60,6 @@ def InfoServiceClient(
         datastack_name,
         verify=verify,
         max_retries=max_retries,
-        retry_backoff=retry_backoff,
         pool_maxsize=pool_maxsize,
         pool_block=pool_block,
         over_client=over_client,
@@ -80,7 +78,6 @@ def __init__(
         datastack_name,
         verify=True,
         max_retries=None,
-        retry_backoff=None,
         pool_maxsize=None,
         pool_block=None,
         over_client=None,
@@ -95,7 +92,6 @@ def __init__(
             datastack_name,
             verify=verify,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             over_client=over_client,
@@ -228,7 +224,7 @@ def get_datastacks_by_aligned_volume(self, aligned_volume: str = None):
             raise ValueError(
                 "Must specify aligned_volume_id or provide datastack_name in init"
             )
-
+        print(aligned_volume)
         endpoint_mapping = self.default_url_mapping
         endpoint_mapping["aligned_volume_name"] = aligned_volume
         url = self._endpoints["datastacks_from_aligned_volume"].format_map(

diff --git a/caveclient/jsonservice.py b/caveclient/jsonservice.py
@@ -45,7 +45,6 @@ def JSONService(
     api_version="latest",
     ngl_url=None,
     max_retries=None,
-    retry_backoff=None,
     pool_maxsize=None,
     pool_block=None,
     over_client=None,
@@ -93,7 +92,6 @@ def JSONService(
         server_name=server_key,
         ngl_url=ngl_url,
         max_retries=max_retries,
-        retry_backoff=retry_backoff,
         pool_maxsize=pool_maxsize,
         pool_block=pool_block,
         over_client=over_client,
@@ -110,7 +108,6 @@ def __init__(
         server_name,
         ngl_url,
         max_retries=None,
-        retry_backoff=None,
         pool_maxsize=None,
         pool_block=None,
         over_client=None,
@@ -122,7 +119,6 @@ def __init__(
             endpoints,
             server_name,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             over_client=over_client,

diff --git a/caveclient/l2cache.py b/caveclient/l2cache.py
@@ -20,7 +20,6 @@ def L2CacheClient(
     auth_client=None,
     api_version="latest",
     max_retries=None,
-    retry_backoff=None,
     pool_maxsize=None,
     pool_block=None,
     over_client=None,
@@ -47,7 +46,6 @@ def L2CacheClient(
         server_name=server_key,
         table_name=table_name,
         max_retries=max_retries,
-        retry_backoff=retry_backoff,
         pool_maxsize=pool_maxsize,
         pool_block=pool_block,
         over_client=over_client,
@@ -65,7 +63,6 @@ def __init__(
         server_name,
         table_name=None,
         max_retries=None,
-        retry_backoff=None,
         pool_maxsize=None,
         pool_block=None,
         over_client=None,
@@ -78,7 +75,6 @@ def __init__(
             endpoints,
             server_name,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             over_client=over_client,

diff --git a/caveclient/materializationengine.py b/caveclient/materializationengine.py
@@ -147,7 +147,6 @@ def MaterializationClient(
     version=None,
     verify=True,
     max_retries=None,
-    retry_backoff=None,
     pool_maxsize=None,
     pool_block=None,
     desired_resolution=None,
@@ -211,7 +210,6 @@ def MaterializationClient(
         version=version,
         verify=verify,
         max_retries=max_retries,
-        retry_backoff=retry_backoff,
         pool_maxsize=pool_maxsize,
         pool_block=pool_block,
         over_client=over_client,
@@ -233,7 +231,6 @@ def __init__(
         version=None,
         verify=True,
         max_retries=None,
-        retry_backoff=None,
         pool_maxsize=None,
         pool_block=None,
         over_client=None,
@@ -247,7 +244,6 @@ def __init__(
             server_name,
             verify=verify,
             max_retries=max_retries,
-            retry_backoff=retry_backoff,
             pool_maxsize=pool_maxsize,
             pool_block=pool_block,
             over_client=over_client,