zombie-squirrel 0.1.0__tar.gz → 0.1.2__tar.gz

{zombie_squirrel-0.1.0/src/zombie_squirrel.egg-info → zombie_squirrel-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zombie-squirrel
-Version: 0.1.0
+Version: 0.1.2
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT

zombie_squirrel-0.1.2/src/zombie_squirrel/__init__.py

@@ -0,0 +1,4 @@
+"""Init package"""
+__version__ = "0.1.2"
+
+from zombie_squirrel.squirrels import unique_project_names

{zombie_squirrel-0.1.0 → zombie_squirrel-0.1.2}/src/zombie_squirrel/acorns.py

@@ -4,10 +4,7 @@ import pandas as pd
 import os
 
 from aind_data_access_api.rds_tables import Client, RDSCredentials
-
-
-def prefix_table_name(table_name: str) -> str:
-    return "zs_" + table_name
+from zombie_squirrel.utils import prefix_table_name
 
 
 class Acorn(ABC):

{zombie_squirrel-0.1.0 → zombie_squirrel-0.1.2}/src/zombie_squirrel/squirrels.py

@@ -4,6 +4,8 @@ from typing import Any, Callable, Optional
 from zombie_squirrel.acorns import RedshiftAcorn, MemoryAcorn
 from aind_data_access_api.document_db import MetadataDbClient
 import os
+import logging
+from zombie_squirrel.utils import prefix_table_name, rds_get_handle_empty
 
 # --- Backend setup ---------------------------------------------------
 
@@ -12,8 +14,10 @@ API_GATEWAY_HOST = "api.allenneuraldynamics.org"
 tree_type = os.getenv("TREE_SPECIES", "memory").lower()
 
 if tree_type == "redshift":
+    logging.info("Using Redshift acorn for caching")
     ACORN = RedshiftAcorn()
 else:
+    logging.info("Using in-memory acorn for caching")
     ACORN = MemoryAcorn()
 
 # --- Squirrel registry -----------------------------------------------------
@@ -31,13 +35,19 @@ def register_squirrel(name: str):
 
 # --- Squirrels -----------------------------------------------------
 
+NAMES = {
+    "upn": "unique-project-names",
+    "usi": "unique-subject-ids",
+}
 
-@register_squirrel("unique-project-names")
+
+@register_squirrel(NAMES["upn"])
 def unique_project_names(force_update: bool = False) -> list[str]:
-    df = ACORN.scurry("unique-project-names")
+    df = rds_get_handle_empty(ACORN, NAMES["upn"])
 
     if df.empty or force_update:
         # If cache is missing, fetch data
+        logging.info("Updating cache for unique project names")
         client = MetadataDbClient(
             host=API_GATEWAY_HOST,
             version="v2",
@@ -49,14 +59,14 @@ def unique_project_names(force_update: bool = False) -> list[str]:
             ]
         )
         df = pd.DataFrame(unique_project_names)
-        ACORN.hide("unique-project-names", df)
+        ACORN.hide(NAMES["upn"], df)
 
     return df["project_name"].tolist()
 
 
-@register_squirrel("unique-subject-ids")
+@register_squirrel(NAMES["usi"])
 def unique_subject_ids(force_update: bool = False) -> list[str]:
-    df = ACORN.scurry("unique-subject-ids")
+    df = rds_get_handle_empty(ACORN, NAMES["usi"])
 
     if df.empty or force_update:
         # If cache is missing, fetch data
@@ -71,6 +81,6 @@ def unique_subject_ids(force_update: bool = False) -> list[str]:
             ]
         )
         df = pd.DataFrame(unique_subject_ids)
-        ACORN.hide("unique-subject-ids", df)
+        ACORN.hide(NAMES["usi"], df)
 
     return df["subject_id"].tolist()

zombie_squirrel-0.1.2/src/zombie_squirrel/utils.py

@@ -0,0 +1,20 @@
+"""Utility functions"""
+import pandas as pd
+import logging
+
+from zombie_squirrel.acorns import Acorn
+
+
+def prefix_table_name(table_name: str) -> str:
+    return "zs_" + table_name
+
+
+def rds_get_handle_empty(acorn: Acorn, table_name: str) -> pd.DataFrame:
+    """Utility function for testing purposes."""
+    try:
+        df = acorn.scurry(table_name)
+    except Exception as e:
+        logging.warning(f"Error fetching from cache: {e}")
+        df = pd.DataFrame()
+
+    return df

{zombie_squirrel-0.1.0 → zombie_squirrel-0.1.2/src/zombie_squirrel.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zombie-squirrel
-Version: 0.1.0
+Version: 0.1.2
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT

{zombie_squirrel-0.1.0 → zombie_squirrel-0.1.2}/src/zombie_squirrel.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/zombie_squirrel/__init__.py
 src/zombie_squirrel/acorns.py
 src/zombie_squirrel/squirrels.py
 src/zombie_squirrel/sync.py
+src/zombie_squirrel/utils.py
 src/zombie_squirrel.egg-info/PKG-INFO
 src/zombie_squirrel.egg-info/SOURCES.txt
 src/zombie_squirrel.egg-info/dependency_links.txt

zombie_squirrel-0.1.0/src/zombie_squirrel/__init__.py

@@ -1,4 +0,0 @@
-"""Init package"""
-__version__ = "0.1.0"
-
-from zombie_squirrel.squirrels import unique_project_names