zombie-squirrel 0.8.5__py3-none-any.whl → 0.8.6__py3-none-any.whl

zombie_squirrel/__init__.py

@@ -3,7 +3,7 @@
 Provides functions to fetch and cache project names, subject IDs, and asset
 metadata from the AIND metadata database with support for multiple backends."""
 
-__version__ = "0.8.5"
+__version__ = "0.8.6"
 
 from zombie_squirrel.acorn_contents.asset_basics import asset_basics  # noqa: F401
 from zombie_squirrel.acorn_contents.raw_to_derived import raw_to_derived  # noqa: F401

zombie_squirrel/acorns.py

@@ -9,6 +9,7 @@ from zombie_squirrel.forest import (
     MemoryTree,
     S3Tree,
 )
+from zombie_squirrel.utils import SquirrelMessage
 
 # --- Backend setup ---------------------------------------------------
 
@@ -17,10 +18,18 @@ API_GATEWAY_HOST = "api.allenneuraldynamics.org"
 forest_type = os.getenv("FOREST_TYPE", "memory").lower()
 
 if forest_type == "s3":  # pragma: no cover
-    logging.info("Using S3 forest for caching")
+    logging.info(SquirrelMessage(
+        tree="S3Tree",
+        acorn="system",
+        message="Initializing S3 forest for caching"
+    ).to_json())
     TREE = S3Tree()
 elif forest_type == "memory":
-    logging.info("Using in-memory forest for caching")
+    logging.info(SquirrelMessage(
+        tree="MemoryTree",
+        acorn="system",
+        message="Initializing in-memory forest for caching"
+    ).to_json())
     TREE = MemoryTree()
 else:
     raise ValueError(f"Unknown FOREST_TYPE: {forest_type}")

zombie_squirrel/forest.py

@@ -8,7 +8,7 @@ import boto3
 import duckdb
 import pandas as pd
 
-from zombie_squirrel.utils import get_s3_cache_path, prefix_table_name
+from zombie_squirrel.utils import get_s3_cache_path, prefix_table_name, SquirrelMessage
 
 
 class Tree(ABC):
@@ -53,7 +53,11 @@ class S3Tree(Tree):
             Key=s3_key,
             Body=parquet_buffer.getvalue(),
         )
-        logging.info(f"Stored cache to S3: s3://{self.bucket}/{s3_key}")
+        logging.info(SquirrelMessage(
+            tree="S3Tree",
+            acorn=table_name,
+            message=f"Stored cache to s3://{self.bucket}/{s3_key}"
+        ).to_json())
 
     def scurry(self, table_name: str) -> pd.DataFrame:
         """Fetch DataFrame from S3 parquet file."""
@@ -68,14 +72,18 @@ class S3Tree(Tree):
                 )
             """
             result = duckdb.query(query).to_df()
-            logging.info(
-                f"Retrieved cache from S3: s3://{self.bucket}/{s3_key}"
-            )
+            logging.info(SquirrelMessage(
+                tree="S3Tree",
+                acorn=table_name,
+                message=f"Retrieved cache from s3://{self.bucket}/{s3_key}"
+            ).to_json())
             return result
         except Exception as e:
-            logging.warning(
-                f"Error fetching from cache {s3_key}: {e}"
-            )
+            logging.warning(SquirrelMessage(
+                tree="S3Tree",
+                acorn=table_name,
+                message=f"Error fetching from cache {s3_key}: {e}"
+            ).to_json())
             return pd.DataFrame()
 
 

{zombie_squirrel-0.8.5.dist-info → zombie_squirrel-0.8.6.dist-info}/METADATA

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

{zombie_squirrel-0.8.5.dist-info → zombie_squirrel-0.8.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
-zombie_squirrel/__init__.py,sha256=VuYcirFF0r9h-Rn0WZsLuMZgNPONe0KmzKSxK45yV_s,693
-zombie_squirrel/acorns.py,sha256=ZjGZMzVcV44dI56Efrj_m4yZCV88UPBvOp-IBQ7pAc4,1224
-zombie_squirrel/forest.py,sha256=v0K1u0EA0OptzxocFC-fPEi6xYcnJ9SoWJ6aiPF4jLg,2939
+zombie_squirrel/__init__.py,sha256=xHHJ6bd_QrBfJVqejcucILL05-9V1SHbB3EFC4ebf70,693
+zombie_squirrel/acorns.py,sha256=Sb5bYUGhvTvtWpRn7IuymBbFQ5-WhO6DOJf0hRZ-azI,1484
+zombie_squirrel/forest.py,sha256=hsXBJrtAs4LnAabpIBp88ByDeDXfrK0AePqdkVMz-e8,3262
 zombie_squirrel/sync.py,sha256=51ufe4n_3CvYrfTKW4KHngY4k-E9k0I_HGdWOIHY-bA,366
 zombie_squirrel/utils.py,sha256=hyXoWstJ7rUYZVmazEtt5hXJ4SAMbfmlQMDUmBlfFZw,1280
 zombie_squirrel/acorn_contents/__init__.py,sha256=N4Wun9kn44_nCwV4g6naEVzf76ozOgEoupAHLYpiGsI,224
@@ -9,8 +9,8 @@ zombie_squirrel/acorn_contents/raw_to_derived.py,sha256=7y2xA7GLC2hMj_Z7gz-uBOKi
 zombie_squirrel/acorn_contents/source_data.py,sha256=I7A3mHqVO4C4880w82LNlBHZZ72uSHw3eCwrKtVCnSI,1901
 zombie_squirrel/acorn_contents/unique_project_names.py,sha256=VAS0CZzsC9ObPM39KfrIjYPDIVcqu9H9wyZz8styznQ,1612
 zombie_squirrel/acorn_contents/unique_subject_ids.py,sha256=H_eb3ucayNOdt4GtW26qckqvX6qGcRU59Q_D9NlnSbg,1585
-zombie_squirrel-0.8.5.dist-info/licenses/LICENSE,sha256=U0Y7B3gZJHXpjJVLgTQjM8e_c8w4JJpLgGhIdsoFR1Y,1092
-zombie_squirrel-0.8.5.dist-info/METADATA,sha256=pXffN2yY6CD9ygtZhqGxeWF1VVL_qg4ZunrKKO23c8w,1897
-zombie_squirrel-0.8.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-zombie_squirrel-0.8.5.dist-info/top_level.txt,sha256=FmM0coe4AangURZLjM4JwwRv2B8H6oINYCoZLKLDCKA,16
-zombie_squirrel-0.8.5.dist-info/RECORD,,
+zombie_squirrel-0.8.6.dist-info/licenses/LICENSE,sha256=U0Y7B3gZJHXpjJVLgTQjM8e_c8w4JJpLgGhIdsoFR1Y,1092
+zombie_squirrel-0.8.6.dist-info/METADATA,sha256=dNdtuz95_8ZWfhRivvf8cUH4gtXGLO0d_6eaGfsHnt8,1897
+zombie_squirrel-0.8.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+zombie_squirrel-0.8.6.dist-info/top_level.txt,sha256=FmM0coe4AangURZLjM4JwwRv2B8H6oINYCoZLKLDCKA,16
+zombie_squirrel-0.8.6.dist-info/RECORD,,