Skeleton service work.

CAVEconnectome · Aug 20, 2024 · 2862e36 · 2862e36
1 parent af7ada4
commit 2862e36
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/caveclient/endpoints.py b/caveclient/endpoints.py
@@ -294,17 +294,14 @@
 # ------ Skeleton endpoints
 # -------------------------------
 
-# Correct:         https://minnie.microns-daf.com/skeletoncache/api/v1/minnie65_phase3_v1/precomputed/skeleton/info
-# What I'm seeing: https://minniev1.microns-daf.com/            api/v1/minnie65_phase3_v1/precomputed/skeleton/info
-
 skeletonservice_common = {}
 
 skeleton_v1 = "{skeleton_server_address}/api/v1"
 skeletonservice_endpoints_v1 = {
-    "skeleton_info": skeleton_v1 + "/{datastack_name}/precomputed/skeleton/info",
-    "skeleton_by_rid": skeleton_v1 + "/{datastack_name}/precomputed/skeleton/{root_id}",
+    "skeleton_info":             skeleton_v1 + "/{datastack_name}/precomputed/skeleton/info",
+    "skeleton_by_rid":           skeleton_v1 + "/{datastack_name}/precomputed/skeleton/{root_id}",
+    "get_skeleton_by_full_desc": skeleton_v1 + "/{datastack_name}/precomputed/skeleton/{skeleton_version}/{root_id}/{output_format}",
 }
 skeletonservice_api_versions = {
     1: skeletonservice_endpoints_v1
 }
-
diff --git a/caveclient/skeletonservice.py b/caveclient/skeletonservice.py
@@ -107,17 +107,29 @@ def __init__(
             over_client=over_client,
         )
 
+    def get_skeleton_info(
+        self,
+        datastack_name,
+    ):
+        endpoint_mapping = self.default_url_mapping
+        endpoint_mapping["datastack_name"] = datastack_name
+
+        url = self._endpoints["skeleton_info"].format_map(endpoint_mapping)
+        print(f"get_skeleton_info() url: {url}")
+
+        response = self.session.get(url)
+        return handle_response(response, False)
+
     def get_skeleton_by_datastack_and_rid(
         self,
         datastack_name,
         rid,
     ):
         endpoint_mapping = self.default_url_mapping
         endpoint_mapping["datastack_name"] = datastack_name
-        endpoint_mapping["rid"] = rid
+        endpoint_mapping["root_id"] = rid
 
-        # url = self._endpoints["version_metadata"].format_map(endpoint_mapping)
-        url = self._endpoints["skeleton_info"].format_map(endpoint_mapping)
+        url = self._endpoints["skeleton_by_rid"].format_map(endpoint_mapping)
         print(f"get_skeleton_by_datastack_and_rid() url: {url}")
 
         response = self.session.get(url)
@@ -126,18 +138,25 @@ def get_skeleton_by_datastack_and_rid(
     def get_skeleton_by_full_desc(
         self,
         datastack_name,
+        skeleton_version,
         rid,
         output_format,
+        # bucket,
+        # verbose_level,
     ):
         endpoint_mapping = self.default_url_mapping
         endpoint_mapping["datastack"] = datastack_name
-        endpoint_mapping["rid"] = rid
+        endpoint_mapping["skeleton_version"] = skeleton_version
+        endpoint_mapping["root_id"] = rid
         endpoint_mapping["output_format"] = output_format
+        # endpoint_mapping["bucket"] = bucket
+        # endpoint_mapping["verbose_level_"] = verbose_level
 
-        url = self._endpoints["version_metadata"].format_map(endpoint_mapping)
+        url = self._endpoints["get_skeleton_by_full_desc"].format_map(endpoint_mapping)
+        print(f"get_skeleton_by_full_desc() url: {url}")
 
         response = self.session.get(url)
-        return handle_response(response)
+        return handle_response(response, False)
 
 
 client_mapping = {