Move to command folder

Author: aperez-worklytics

cli.py

@@ -5,10 +5,10 @@
 
 import typer
 
-from gcd_tools.config import AppConfig, load_config
-from gcd_tools.analyze_kinds import analyze_kinds, print_summary_table
-from gcd_tools.analyze_entity_fields import analyze_field_contributions, print_field_summary
-from gcd_tools.cleanup_expired import cleanup_expired
+from commands.config import AppConfig, load_config
+from commands.analyze_kinds import analyze_kinds, print_summary_table
+from commands.analyze_entity_fields import analyze_field_contributions, print_field_summary
+from commands.cleanup_expired import cleanup_expired
 
 app = typer.Typer(help="Utilities for analyzing and managing local Datastore/Firestore (Datastore mode)")
 

gcd_tools/__init__.py commands/__init__.pygcd_tools/__init__.py renamed to commands/__init__.py

@@ -5,14 +5,14 @@
 from . import config as config
 
 __all__ = [
-    "AppConfig",
-    "load_config",
-    "build_client",
-    "list_namespaces",
-    "list_kinds",
-    "format_size",
-    "analyze_kinds",
-    "analyze_entity_fields",
-    "cleanup_expired",
-    "config",
-]
+	"AppConfig",
+	"load_config",
+	"build_client",
+	"list_namespaces",
+	"list_kinds",
+	"format_size",
+	"analyze_kinds",
+	"analyze_entity_fields",
+	"cleanup_expired",
+	"config",
+]

gcd_tools/analyze_entity_fields.py commands/analyze_entity_fields.pygcd_tools/analyze_entity_fields.py renamed to commands/analyze_entity_fields.py

@@ -125,10 +125,14 @@ def analyze_field_contributions(
 ) -> Dict:
     client = build_client(config)
 
-    # If no namespace provided, iterate across all namespaces
+    # If no namespace provided, or config.namespaces is None/empty, iterate all namespaces
     if namespace is None:
+        if hasattr(config, "namespaces") and (not config.namespaces):
+            ns_list = list_namespaces(client)
+        else:
+            ns_list = [namespace] if namespace else list_namespaces(client)
         results: Dict[str, Dict] = {}
-        for ns in list_namespaces(client):
+        for ns in ns_list:
             results[ns or ""] = _analyze_single_namespace(
                 client, kind=kind, namespace=ns, group_by_field=group_by_field, only_fields=only_fields
             )
@@ -161,4 +165,4 @@ def print_field_summary(result: Dict) -> None:
         )
         for field, stats in result["fields"].items():
             avg = stats["avg_per_entity"]
-            print(f"  {field:30} {stats['human']:>12} ({avg:.1f} bytes avg)")
+            print(f"  {field:30} {stats['human']:>12} ({avg:.1f} bytes avg)")

gcd_tools/analyze_kinds.py commands/analyze_kinds.pygcd_tools/analyze_kinds.py renamed to commands/analyze_kinds.py

@@ -70,13 +70,18 @@ def analyze_kinds(config: AppConfig, method: Optional[str] = None) -> List[Dict]
     # Decide method priority: parameter > config > default
     method = method or getattr(config, "method", None) or "stats"
 
-    # Thanks to config.py normalisation, [] is the only “all” case
-    namespaces = config.namespaces or list_namespaces(client)
+    # If namespaces is None or empty, iterate all available namespaces
+    if not config.namespaces:
+        namespaces = list_namespaces(client)
+    else:
+        namespaces = config.namespaces
 
+    print(f"Found namespaces: {namespaces}")
     from tqdm import tqdm
     results: List[Dict] = []
     for ns in namespaces:
         kinds = config.kinds or list_kinds(client, ns)
+        print(f"Namespace '{ns}': found kinds: {kinds}")
         logger.info("Analyzing namespace=%s, %d kinds", ns or "(default)", len(kinds))
         for kind in tqdm(kinds, desc=f"Analyzing kinds in ns={ns or '(default)'}", unit="kind"):
             if method == "stats":

gcd_tools/cleanup_expired.py commands/cleanup_expired.pygcd_tools/cleanup_expired.py renamed to commands/cleanup_expired.py

@@ -6,8 +6,6 @@
 
 from google.cloud import datastore
 
-from tqdm import tqdm
-
 from .config import (
     AppConfig,
     build_client,
@@ -33,8 +31,11 @@ def cleanup_expired(
 ) -> Dict[str, int]:
     client = build_client(config)
 
-    # Determine namespaces: explicit list, or all
-    namespaces = config.namespaces if config.namespaces else list_namespaces(client)
+    # If namespaces is None or empty, iterate all available namespaces
+    if not config.namespaces:
+        namespaces = list_namespaces(client)
+    else:
+        namespaces = config.namespaces
 
     totals: Dict[str, int] = {}
     now = datetime.now(timezone.utc)
@@ -47,6 +48,7 @@ def cleanup_expired(
             query = client.query(kind=kind, namespace=ns or None)
             to_delete: List[datastore.Key] = []
             entities = list(query.fetch())
+            from tqdm import tqdm
             for entity in tqdm(entities, desc=f"Scanning {kind} in ns={ns or '(default)'}", unit="entity"):
                 expire_at = entity.get(config.ttl_field)
                 expired = expire_at is None if config.delete_missing_ttl else False
@@ -68,17 +70,17 @@ def cleanup_expired(
                 )
                 totals[f"{ns}:{kind}"] = len(to_delete)
             else:
-                    deleted = 0
-                    if to_delete:
-                        for batch in tqdm(list(chunked(to_delete, config.batch_size)), desc=f"Deleting {kind} in ns={ns or '(default)'}", unit="batch"):
-                            client.delete_multi(batch)
-                            deleted += len(batch)
-                    logger.info(
-                        "ns=%s kind=%s deleted %d expired entities",
-                        ns or "(default)",
-                        kind,
-                        deleted,
-                    )
-                    totals[f"{ns}:{kind}"] = deleted
+                deleted = 0
+                if to_delete:
+                    for batch in tqdm(list(chunked(to_delete, config.batch_size)), desc=f"Deleting {kind} in ns={ns or '(default)'}", unit="batch"):
+                        client.delete_multi(batch)
+                        deleted += len(batch)
+                logger.info(
+                    "ns=%s kind=%s deleted %d expired entities",
+                    ns or "(default)",
+                    kind,
+                    deleted,
+                )
+                totals[f"{ns}:{kind}"] = deleted
 
-    return totals
+    return totals

gcd_tools/config.py commands/config.pygcd_tools/config.py renamed to commands/config.py

@@ -8,7 +8,6 @@
 import yaml
 from google.cloud import datastore
 
-
 @dataclass
 class AppConfig:
     project_id: Optional[str] = None
@@ -87,7 +86,6 @@ def load_config(path: Optional[str] = None, overrides: Optional[Dict] = None) ->
     return config
 
 
-
 def _configure_logging(level: str) -> None:
     level_value = getattr(logging, level.upper(), logging.INFO)
     logging.basicConfig(level=level_value, format="%(asctime)s | %(levelname)s | %(message)s")
@@ -148,4 +146,4 @@ def format_size(bytes_size: int) -> str:
         if size < 1024:
             return f"{size:.2f} {unit}"
         size /= 1024
-    return f"{size:.2f} PB"
+    return f"{size:.2f} PB"

pyproject.toml

@@ -38,7 +38,7 @@ local-storage-utils = "cli:app"
 
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["gcd_tools*"]
+include = ["commands*"]
 
 [tool.black]
 line-length = 100

tests/test_commands.py

@@ -1,10 +1,9 @@
-
 import sys
 import os
 import pytest
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-from gcd_tools import analyze_kinds, analyze_entity_fields, cleanup_expired, config
-from gcd_tools.config import AppConfig
+from commands import analyze_kinds, analyze_entity_fields, cleanup_expired, config
+from commands.config import AppConfig, build_client, list_namespaces
 
 # Dummy config for testing (adjust as needed for emulator)
 def make_dummy_config():
@@ -43,3 +42,11 @@ def test_cleanup_expired_runs():
         assert isinstance(result, dict)
     except Exception as e:
         pytest.skip(f"cleanup_expired requires emulator: {e}")
+
+def test_list_namespaces_returns_default_and_any_custom():
+    cfg = AppConfig(project_id="dummy-project", emulator_host="localhost:8010")
+    client = build_client(cfg)
+    namespaces = list_namespaces(client)
+    assert "" in namespaces  # default namespace always present
+    # This test will pass if at least the default namespace is present
+    # Add more asserts if you know your emulator has more namespaces

tests/test_import.py

@@ -3,8 +3,8 @@
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
 def test_imports():
-    import gcd_tools
-    from gcd_tools import analyze_kinds, analyze_entity_fields, cleanup_expired, config
+    import commands
+    from commands import analyze_kinds, analyze_entity_fields, cleanup_expired, config
 
-    assert gcd_tools is not None
+    assert commands is not None
     assert hasattr(config, "AppConfig")